Merge pull request #24 from bguiz/jshint-reporter-standard-export

=BG= Use updated angularity-jshint-reporter

Author: bholloway

lib/util/jshint-reporter.js

@@ -29,43 +29,49 @@ var resolvedReporter;
  * @return {function} The `required`ed jshint report, ready to be piped a gulp stream
  */
 function getJsHintReporter(reporterName) {
-
   // establish a cached copy
   if (!resolvedReporter) {
     if (typeof reporterName !== 'string') {
       throw 'Get JsHint Reporter: Reporter name is unspecified';
     }
     else {
+      var reporterPath;
+
       // 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
+      [(path.resolve('node_modules')), undefined].forEach(function (baseDir) {
+        reporterPath = (!!baseDir) ? path.join(baseDir, reporterName) : reporterName;
+        try {
+          var indirect = require(reporterPath);
+          if (Object.prototype.toString.call(indirect) === '[object Object]') {
+            // In newer JsHint convention, the `index.js` file exports the object with the reporter functions directly
+            // e.g. `modules.exports = { reporter: function( /* ... */ ) { /* ... */ } };`
+            resolvedReporter = indirect;
+          }
+          else if (typeof indirect === 'string') {
+            // In legacy 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 */
+            resolvedReporter = require(indirect);
           }
-        });
+        }
+        catch (ex) {
+          // Do nothing: Handled outside loop when resolvedReporter not set
+        }
+      });
       if (!resolvedReporter) {
-        throw 'Get JsHint Reporter: Attempt to require reporter from path ' + reporterPath + ' with no success.';
+        throw 'Get JsHint Reporter: Attempt to require specified reporter with no success.';
       }
     }
   }
 
   // return cached copy
-  //  closure that returns a stream
-  if (typeof resolvedReporter === 'function') {
-    return resolvedReporter();
+  if (!!resolvedReporter && (typeof resolvedReporter.streamReporter === 'function')) {
+    // Streaming reporters can get instantiated directly
+    return resolvedReporter.streamReporter();
   }
-  //  jshint plugin object with reporter field
-  else if (!!(resolvedReporter) && (typeof resolvedReporter.reporter === 'function')) {
+  else if (!!resolvedReporter && (typeof resolvedReporter.reporter === 'function')) {
+    // Standard JsHint reporters need to be wrapped by gulp-jshint
     return gulpJshint.reporter(resolvedReporter);
   }
-  //  unsupported
   else {
     throw 'Get JsHint Reporter: Given reporter is badly formed';
   }