fixed watch task crashing

Author: benholloway

lib/util/jshint-reporter.js

@@ -9,10 +9,10 @@ var yargs = require('./yargs');
 var defaultReporterName = 'angularity-jshint-reporter';
 
 /**
- * Cached copy of the reporter
+ * Cache resolved reporter object or stream
  * @type {function}
  */
-var jsHintReporter;
+var resolvedReporter;
 
 /**
  * Dynamically load a JsHint reporter
@@ -29,33 +29,46 @@ var jsHintReporter;
  * @return {function} The `required`ed jshint report, ready to be piped a gulp stream
  */
 function getJsHintReporter(reporterName) {
-  if (typeof reporterName !== 'string') {
-    throw 'Get JsHint Reporter: Reporter name is unspecified';
-  }
 
   // establish a cached copy
-  if (!jsHintReporter) {
-    if (reporterName === defaultReporterName) {
-      jsHintReporter = require(defaultReporterName);
-    } else {
-      var reporterPath = (path.dirname(reporterName) === '.') ?
-        path.resolve('node_modules', reporterName) :
-        reporterName;
-      try {
-        jsHintReporter = require(reporterPath);
-        if (typeof jsHintReporter === 'string') {
-          //In JsHint convention, the `index.js` file exports a string which jshint itself should require
-          //e.g. `module.exports = require('path').join(__dirname, 'reporter.js');`
-          jsHintReporter = gulpJshint.reporter(require(jsHintReporter));
-        }
-      } catch (ex) {
+  if (!resolvedReporter) {
+    if (typeof reporterName !== 'string') {
+      throw 'Get JsHint Reporter: Reporter name is unspecified';
+    }
+    else {
+      // first check angularity installed modules, then check project locally installed modules
+      [ path.resolve('node_modules'), null ].forEach(function (base) {
+          var reporterPath = base ? path.join(base, reporterName) : reporterName;
+          try {
+            // In JsHint convention, the `index.js` file exports a string which jshint itself should require
+            // e.g. `module.exports = require('path').join(__dirname, 'reporter.js');`
+            // this is the indirect case.
+            // However in some cases it may be the reporter itself
+            var indirect = require(reporterPath);
+            resolvedReporter = (typeof indirect === 'string') ? require(indirect) : indirect;
+          } catch (ex) {
+            /* do nothing */
+          }
+        });
+      if (!resolvedReporter) {
         throw 'Get JsHint Reporter: Attempt to require reporter from path ' + reporterPath + ' with no success.';
       }
     }
   }
 
   // return cached copy
-  return jsHintReporter;
+  //  closure that returns a stream
+  if (typeof resolvedReporter === 'function') {
+    return resolvedReporter();
+  }
+  //  jshint plugin object with reporter field
+  else if (!!(resolvedReporter) && (typeof resolvedReporter.reporter === 'function')) {
+    return gulpJshint.reporter(resolvedReporter);
+  }
+  //  unsupported
+  else {
+    throw 'Get JsHint Reporter: Given reporter is badly formed';
+  }
 }
 
 var yargsOptionDefiniton = {

tasks/javascript.js

@@ -4,7 +4,6 @@ var path            = require('path'),
     fs              = require('fs');
 
 var gulp            = require('gulp'),
-    gulpFilter      = require('gulp-filter'),
     jshint          = require('gulp-jshint'),
     rimraf          = require('gulp-rimraf'),
     runSequence     = require('run-sequence'),