Merge pull request #59 from angularity/bugfix/globbing

fix scalability of globbing

Author: impaler

.travis.yml

@@ -1,5 +1,7 @@
 language: node_js
 
+sudo: false
+
 node_js:
   - "0.10"
 

lib/config/lib-globber.js

@@ -0,0 +1,66 @@
+'use strict';
+
+var fs        = require('fs'),
+    path      = require('path'),
+    flatten   = require('lodash.flatten'),
+    minimatch = require('minimatch');
+
+/**
+ * Define a glob generator that includes files from the local library, where the local library is all subdirectories
+ * except those given in the <code>exclusions</code>.
+ * @param {...string|Array} [excludes] Any number of non-library directory names to exclude (glob syntax)
+ * @returns {function({...string|Array}):function} A function that creates a globber with additions
+ */
+function libGlobber() {
+  var excludes = flatten(Array.prototype.slice.call(arguments));
+
+  /**
+   * Create a glob generator that includes items from the exclusion list.
+   * @param {...string|Array} [additional] Any number of excluded directory names to include (glob syntax)
+   * @returns {function({...string|Array}):{Array.<string>}} A function that creates a multi-element glob pattern
+   */
+  return function globberWithAdditions() {
+    var additional = flatten(Array.prototype.slice.call(arguments)),
+        subdirs    = fs.readdirSync(process.cwd())
+          .filter(testIsDirectory)
+          .filter(removeExcludesKeepAdditional);
+
+    /**
+     * Create a glob where the given elements are appended to all directores in the library.
+     * Negative elements appear as-is and are not appended to library directores.
+     * @param {...string|Array} Any number of glob elements
+     * @returns {Array.<string>} A multi-element glob pattern
+     */
+    return function doGlob() {
+      var args = flatten(Array.prototype.slice.call(arguments)),
+          list = args.reduce(prependSubdirs, []);
+      return list;
+    };
+
+    function prependSubdirs(reduced, pattern) {
+      if (pattern.charAt(0) === '!') {
+        return reduced.concat(pattern);
+      } else {
+        return reduced.concat(subdirs.map(function eachSubdir(subdir) {
+          return subdir + '/' + pattern;
+        }));
+      }
+    }
+
+    function testIsDirectory(filename) {
+      return (filename.charAt(0) !== '.') && fs.statSync(path.resolve(filename)).isDirectory();
+    }
+
+    function removeExcludesKeepAdditional(element) {
+      return !excludes.some(matchGlobWith(element)) || additional.some(matchGlobWith(element));
+    }
+
+    function matchGlobWith(element) {
+      return function matchGlob(glob) {
+        return minimatch(element, glob);
+      };
+    }
+  };
+}
+
+module.exports = libGlobber;

lib/config/streams.js

@@ -1,13 +1,12 @@
 'use strict';
 
-var gulp     = require('gulp'),
-    path     = require('path'),
-    flatten  = require('lodash.flatten'),
-    reduce   = require('lodash.reduce'),
-    slash    = require('gulp-slash'),
-    bowerDir = require('bower-directory');
+var gulp      = require('gulp'),
+    path      = require('path'),
+    slash     = require('gulp-slash'),
+    bowerDir  = require('bower-directory');
 
-var bowerFiles = require('../inject/bower-files');
+var bowerFiles = require('../inject/bower-files'),
+    libGlobber = require('./lib-globber');
 
 var NODE           = 'node_modules',
     BOWER          = path.relative(process.cwd(), bowerDir.sync()),
@@ -17,29 +16,9 @@ var NODE           = 'node_modules',
     TEST           = 'app-test',
     RELEASE_BUNDLE = 'app-release',
     RELEASE_VENDOR = 'app-release/vendor',
-    ROUTES         = reduce([ '', BOWER, BUILD ], mapRoutes, { });
+    ROUTES         = ['', BOWER, BUILD].reduce(mapRoutes, {});
 
-/**
- * Create a glob generator that only includes files from the local library, unless additional paths are given.
- * Additional paths must be of the form <code>NODE</code>, <code>BOWER</code>, <code>APP</code>, or
- * <code>GENERATED</code>.
- * @param {...string} [additional] Any number of non-library directories to include
- * @return {function({Array})} A multi-element glob pattern
- */
-function getLocalLibGlob() {
-  var additional = flatten(Array.prototype.slice.call(arguments));
-  var excludes   = [NODE, BOWER, APP, GENERATED]
-    .filter(function convertAdditionalToExclude(element) {
-      return (additional.indexOf(element) < 0);
-    })
-    .map(function excludeDirectory(exclude) {
-      return '!' + exclude + '/**';
-    });
-  return function() {
-    return flatten(Array.prototype.slice.call(arguments))
-      .concat(excludes); // important - excludes must come after includes
-  };
-}
+var getLocalLibGlob = libGlobber(NODE, BOWER, APP, GENERATED);
 
 function mapRoutes(result, path) {
   result['/' + slash(path)] = path; // result['/<path>'] = <path>
@@ -51,11 +30,11 @@ function jsApp(opts) {
 }
 
 function jsLib(opts) {
-  return gulp.src(getLocalLibGlob()('**/*.js', '!*.js', '!**/*.spec.js'), opts);
+  return gulp.src(getLocalLibGlob()('**/*.js', '!**/*.spec.js'), opts);
 }
 
 function jsSpec(opts) {
-  return gulp.src(getLocalLibGlob()('**/*.spec.js', '!*.spec.js'), opts);
+  return gulp.src(getLocalLibGlob()('**/*.spec.js'), opts);
 }
 
 function scssApp(opts) {

package.json

@@ -87,7 +87,6 @@
     "lodash.defaults": "latest",
     "lodash.flatten": "latest",
     "lodash.merge": "latest",
-    "lodash.reduce": "latest",
     "lodash.template": "latest",
     "mime": "latest",
     "minimatch": "latest",

tasks/watch.js

@@ -47,13 +47,13 @@ function setUpTaskWatch(context) {
 
         // watch statements
         //  All JS and HTML sources but not the app HTML
-        watch(getGlobApp(['**/*.js', '**/*.html', '**/*.json', '!' + streams.APP + '/**/*.html', '!*.*']), {
+        watch(getGlobApp('**/*.js', '**/*.html', '**/*.json', '!' + streams.APP + '/**/*.html'), {
           name      : 'JS|HTML',
           emitOnGlob: false
         }, queue.getHandler('javascript', 'html', 'reload')); // html will be needed in case previous injection failed
 
         //  All SASS sources
-        watch(getGlobApp(['**/*.scss', '!*.scss']), {
+        watch(getGlobApp('**/*.scss'), {
           name      : 'CSS',
           emitOnGlob: false
         }, queue.getHandler('css', 'html', 'reload')); // html will be needed in case previous injection failed