minor tweaks to jshint-reporter.js

Author: benholloway

lib/util/jshint-reporter.js

@@ -8,6 +8,12 @@ var yargs = require('./yargs');
 
 var defaultReporterName = 'angularity-jshint-reporter';
 
+/**
+ * Cached copy of the reporter
+ * @type {function}
+ */
+var jsHintReporter;
+
 /**
  * Dynamically load a JsHint reporter
  *
@@ -22,46 +28,44 @@ var defaultReporterName = 'angularity-jshint-reporter';
  *   - The absolute path to a node package
  * @return {function} The `required`ed jshint report, ready to be piped a gulp stream
  */
-var jsHintReporter;
 function getJsHintReporter(reporterName) {
   if (typeof reporterName !== 'string') {
     throw 'Get JsHint Reporter: Reporter name is unspecified';
   }
-  if (jsHintReporter) {
-    return jsHintReporter; //cached copy
-  }
 
-  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));
+  // 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) {
+        throw 'Get JsHint Reporter: Attempt to require reporter from path ' + reporterPath + ' with no success.';
       }
     }
-    catch (ex) {
-      throw 'Get JsHint Reporter: Attempt to require reporter from path '+reporterPath+' with no success.';
-    }
   }
 
+  // return cached copy
   return jsHintReporter;
 }
 
 var yargsOptionDefiniton = {
   key: 'reporter',
   value: {
-    describe: 'Specify a custom JsHint reporter to use. '+
-      'Either a locally npm installed module, or an asolute path to one.',
+    describe: 'Specify a custom JsHint reporter to use. Either a locally npm installed module, or the absolute path ' +
+      'to one.',
     alias: ['r'],
     default: defaultReporterName,
-    string: true,
+    string: true
   }
 };
 var checkJsHintReporter = yargs.createCheck()
@@ -77,15 +81,15 @@ var checkJsHintReporter = yargs.createCheck()
         getJsHintReporter(value);
       }
       catch (ex) {
-        return 'Illegal value for "reporter"\n'+ex;
+        return 'Illegal value for "reporter"\n' + ex;
       }
-    },
+    }
   })
   .commit();
 
 module.exports = {
-  get: getJsHintReporter,
-  yargsCheck: checkJsHintReporter,
-  yargsOption: yargsOptionDefiniton,
+  get                : getJsHintReporter,
+  yargsCheck         : checkJsHintReporter,
+  yargsOption        : yargsOptionDefiniton,
   defaultReporterName: defaultReporterName
 };