Merge pull request #27 from bholloway/master

tweaks

Author: bguiz

lib/build/node-sass.js

@@ -232,16 +232,29 @@ module.exports = function (bannerWidth, libraryPaths) {
       done();
     }
 
-    // perform the sass render
-    sass.render({
-      file        : file.path,
-      data        : file.contents.toString(),
-      success     : successHandler,
-      error       : errorHandler,
-      includePaths: libList,
-      outputStyle : 'compressed',
-      stats       : { },
-      sourceMap   : mapName
+    /**
+     * Perform the sass render with the given <code>sourceMap</code>, <code>error</code>, and <code>success</code>
+     * parameters.
+     * @param {string|boolean} map The source map filename or <code>false</code> for none
+     * @param {function ({string})} error Handler for error
+     * @param {function ({string}, {string})} success Handler for success
+     */
+    function render(map, error, success) {
+      sass.render({
+        file        : file.path,
+        data        : file.contents.toString(),
+        success     : success,
+        error       : error,
+        includePaths: libList,
+        outputStyle : 'compressed',
+        stats       : { },
+        sourceMap   : map
+      });
+    }
+
+    // run first without source-map as this can cause process exit where errors exist
+    render(false, errorHandler, function () {
+      render(mapName, errorHandler, successHandler);
     });
 
   }, function (done) {

lib/config/streams.js

@@ -1,38 +1,42 @@
 'use strict';
 
-var gulp        = require('gulp'),
-    path        = require('path'),
-    reduce      = require('lodash.reduce'),
-    slash       = require('gulp-slash'),
-    bowerDir    = require('bower-directory');
+var gulp     = require('gulp'),
+    path     = require('path'),
+    flatten  = require('lodash.flatten'),
+    reduce   = require('lodash.reduce'),
+    slash    = require('gulp-slash'),
+    bowerDir = require('bower-directory');
 
 var bowerFiles = require('../inject/bower-files');
 
 var NODE           = 'node_modules',
     BOWER          = path.relative(process.cwd(), bowerDir.sync()),
     APP            = 'app',
+    GENERATED      = 'app-*',
     BUILD          = 'app-build',
     TEST           = 'app-test',
     RELEASE_BUNDLE = 'app-release',
     RELEASE_VENDOR = 'app-release/vendor',
     ROUTES         = reduce([ '', BOWER, BUILD ], mapRoutes, { });
 
 /**
- * Create a glob with the given pattern elements, and additional directory
- * @param {Array|string} pattern One or more glob pattern entries to be included as-in
- * @param {Array|string} [additional] Any number of non-library directories to include
- * @return {Array} A multi-element glob pattern
+ * Create a glob generator that features the given additional directories
+ * @param {...string} [additional] Any number of non-library directories to include
+ * @return {function({Array})} A multi-element glob pattern
  */
-function getGlob(pattern, additional) {
-  var patternArray    = (typeof pattern    === 'string') ? [ pattern  ]   : pattern    || [];
-  var additionalArray = (typeof additional === 'string') ? [ additional ] : additional || [];
-  return patternArray.concat([NODE, BOWER, APP, BUILD, TEST, RELEASE_BUNDLE, RELEASE_VENDOR]
+function getGlob() {
+  var additional = flatten(Array.prototype.slice.call(arguments));
+  var excludes   = [NODE, BOWER, APP, GENERATED]
     .filter(function convertAdditionalToExclude(element) {
-      return (additionalArray.indexOf(element) < 0);
+      return (additional.indexOf(element) < 0);
     })
-    .map(function excludeDir(exclude) {
+    .map(function excludeDirectory(exclude) {
       return '!' + exclude + '/**';
-    }));
+    });
+  return function() {
+    return flatten(Array.prototype.slice.call(arguments))
+      .concat(excludes); // important - excludes must come after includes
+  }
 }
 
 function mapRoutes(result, path) {
@@ -45,11 +49,11 @@ function jsApp(opts) {
 }
 
 function jsLib(opts) {
-  return gulp.src(getGlob(['**/*.js', '!*.js', '!**/*.spec.js']), opts);
+  return gulp.src(getGlob()('**/*.js', '!*.js', '!**/*.spec.js'), opts);
 }
 
 function jsSpec(opts) {
-  return gulp.src(getGlob(['**/*.spec.js', '!*.spec.js']), opts);
+  return gulp.src(getGlob()('**/*.spec.js', '!*.spec.js'), opts);
 }
 
 function scssApp(opts) {
@@ -63,7 +67,7 @@ function htmlApp(opts) {
 function testDependencies(opts) {
   return bowerFiles(80)
     .src('js', opts);
-};
+}
 
 module.exports = {
   NODE            : NODE,

package.json

@@ -17,7 +17,7 @@
   "scripts": {
     "test": "node ./node_modules/jasmine-node/bin/jasmine-node test"
   },
-  "author": "Ben Holloway, Chris Decoster, Brendan Graetz",
+  "contributors": ["bholloway", "impaler", "bguiz"],
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -31,9 +31,10 @@
   "bin": {
     "angularity": "./bin/cli.js"
   },
-  "engineStrict": true,
+  "engineStrict": "true",
   "engines": {
-    "node": ">= 0.9"
+    "node": ">=0.10.28 <0.11",
+    "npm": ">=2.0"
   },
   "dependencies": {
     "6to5ify": "latest",

tasks/watch.js

@@ -65,29 +65,30 @@ yargs.getInstance('watch')
   .wrap(80);
 
 gulp.task('watch', ['server'], function () {
+  var getGlobAppNodeBower = streams.getGlob(streams.APP, streams.NODE, streams.BOWER);
 
   // enqueue actions to avoid multiple trigger
   var queue = watchSequence(500, function () {
     console.log(hr('\u2591', 80));
   });
 
   // watch statements
-  watch(streams.getGlob(['**/*.js', '**/*.html', '!*.*', '!**/*.spec.*'], [streams.APP, streams.NODE, streams.BOWER]), {
+  watch(getGlobAppNodeBower('**/*.js', '**/*.html', '!' + streams.APP + '/**/*.html', '!*.*', '!**/*.spec.*'), {
     name      : 'JS|HTML',
     emitOnGlob: false
-  }, queue.getHandler('javascript', 'html', 'reload')); // app html will be needed in case previous injection failed
+  }, queue.getHandler('javascript', 'html', 'reload')); // html will be needed in case previous injection failed
 
-  watch(streams.getGlob(['**/*.scss', '!*.scss'], [streams.APP, streams.NODE, streams.BOWER]), {
+  watch(getGlobAppNodeBower(['**/*.scss', '!*.scss']), {
     name      : 'CSS',
     emitOnGlob: false
   }, queue.getHandler('css', 'html', 'reload')); // html will be needed in case previous injection failed
 
-  watch([streams.BOWER + '/**/*', '!**/*.js', '!**/*.scss'], {  // don't conflict with JS or CSS
-    name      : 'BOWER',
+  watch([streams.APP + '/**/*.html', streams.BOWER + '/**/*', '!**/*.js', '!**/*.scss'], {  // don't conflict JS or CSS
+    name      : 'INJECT',
     emitOnGlob: false
   }, queue.getHandler('html', 'reload'));
 
-  watch(streams.getGlob(['**/*.spec.js', '!*.spec.js']), {
+  watch(streams.getGlob()(['**/*.spec.js', '!*.spec.js']), {
     name      : 'TEST',
     emitOnGlob: false
   }, queue.getHandler('test'));