Merge remote-tracking branch 'origin/jshint' into jshint

Author: impaler

lib/build/browserify.js

@@ -112,11 +112,11 @@ function compile(bannerWidth, transforms) {
      * @return {string} The transformed file path
      */
     function rootRelative(filePath, i, array) {
-      var rootRelative = slash(path.relative(process.cwd(), path.resolve(filePath))); // resolve relative references
-      var isProject    = (rootRelative.slice(0, 2) !== '..');
-      var result       = [
+      var rootRelPath = slash(path.relative(process.cwd(), path.resolve(filePath))); // resolve relative references
+      var isProject   = (rootRelPath.slice(0, 2) !== '..');
+      var result      = [
         sourceMapBase || '',
-        isProject ? rootRelative : path.basename(rootRelative)
+        isProject ? rootRelPath : path.basename(rootRelPath)
       ].join(path.sep);
       if ((typeof i === 'number') && (typeof array === 'object')) {
         array[i] = result;
@@ -179,43 +179,52 @@ function compile(bannerWidth, transforms) {
     var timeout;
     function errorHandler(error) {
       var text = error.toString();
-      var analysis;
-      var message;
-
-      // SyntaxError: <file>:<reason>:<line>:<column>
-      if (analysis = /^\s*SyntaxError\:\s*([^:]*)\s*\:\s*([^(]*)\s*\((\d+:\d+)\)\s*\n/.exec(text)) {
-        message = [analysis[1], analysis[3], analysis[2]].join(':') + '\n';
-
-      // Error: SyntaxError: <reason> while parsing json file <file>
-      } else if (analysis = /^\s*Error: SyntaxError\:\s*(.*)\s*while parsing json file\s*([^]*)/.exec(text)) {
-        message = [analysis[2], '0', '0', ' ' + analysis[1]].join(':') + '\n';
-
-      // Line <line>: <reason>: <file>
-      } else if (analysis = /Line\s*(\d+)\s*\:\s*([^:]*)\s*:\s*(.*)\s*/.exec(text)) {
-        message = [analysis[3], analysis[1], 0, ' ' + analysis[2]].join(':') + '\n';
-
-      // Error: Cannot find module '<reason>' from '<directory>'
-      //  find the first text match for any text quoted in <reason>
-      } else if (analysis = /^\s*Error\: Cannot find module '(.*)\'\s*from\s*\'(.*)\'\s*$/.exec(text)) {
-        var filename = fs.readdirSync(analysis[2])
-          .filter(RegExp.prototype.test.bind(/\.js$/i))
-          .filter(function (jsFilename) {
-            var fullPath = path.join(analysis[2], jsFilename);
-            var fileText = fs.readFileSync(fullPath).toString();
-            return (new RegExp('[\'"]' + analysis[1] + '[\'"]')).test(fileText);
-          })
-          .shift();
-        message = path.join(analysis[2], filename) + ':0:0: Cannot find import ' + analysis[1] + '\n';
-
-      // Unknown
-      } else {
-        message = 'TODO parse this error\n' + text + '\n';
-      }
-
-      // add unique
-      if (output.indexOf(message) < 0) {
-        output.push(message);
-      }
+      [
+        // SyntaxError: <file>:<reason>:<line>:<column>
+        function() {
+          var analysis = /^\s*SyntaxError\:\s*([^:]*)\s*\:\s*([^(]*)\s*\((\d+:\d+)\)\s*\n/.exec(text);
+          return analysis && ([analysis[1], analysis[3], analysis[2]].join(':') + '\n');
+        },
+        // Error: SyntaxError: <reason> while parsing json file <file>
+        function() {
+          var analysis = /^\s*Error: SyntaxError\:\s*(.*)\s*while parsing json file\s*([^]*)/.exec(text);
+          return analysis && ([analysis[2], '0', '0', ' ' + analysis[1]].join(':') + '\n');
+        },
+        // Line <line>: <reason>: <file>
+        function() {
+          var analysis = /Line\s*(\d+)\s*\:\s*([^:]*)\s*:\s*(.*)\s*/.exec(text);
+          return analysis && ([analysis[3], analysis[1], 0, ' ' + analysis[2]].join(':') + '\n');
+        },
+        // Error: Cannot find module '<reason>' from '<directory>'
+        //  find the first text match for any text quoted in <reason>
+        function() {
+          var analysis = /^\s*Error\: Cannot find module '(.*)\'\s*from\s*\'(.*)\'\s*$/.exec(text);
+          if (analysis) {
+            var filename = fs.readdirSync(analysis[2])
+              .filter(RegExp.prototype.test.bind(/\.js$/i))
+              .filter(function (jsFilename) {
+                var fullPath = path.join(analysis[2], jsFilename);
+                var fileText = fs.readFileSync(fullPath).toString();
+                return (new RegExp('[\'"]' + analysis[1] + '[\'"]')).test(fileText);
+              })
+              .shift();
+            return path.join(analysis[2], filename) + ':0:0: Cannot find import ' + analysis[1] + '\n';
+          }
+        },
+        // Unknown
+        function() {
+          return 'TODO parse this error\n' + text + '\n';
+        }
+      ]
+        .map(function(method) {
+          return method();
+        })
+        .filter(Boolean)
+        .forEach(function addUnique(message) {
+          if (output.indexOf(message) < 0) {
+            output.push(message);
+          }
+        });
 
       // complete overall only once there are no further errors
       clearTimeout(timeout);

lib/build/node-sass.js

@@ -28,7 +28,32 @@ function encodeRelativeURL(startPath, uri) {
    */
   function notPackage(absolutePath) {
     return ['package.json', 'bower.json'].every(function fileNotFound(file) {
-        return !(fs.existsSync(path.resolve(absolutePath, file)));
+      return !(fs.existsSync(path.resolve(absolutePath, file)));
+    });
+  }
+
+  /**
+   * Enqueue subdirectories that are not packages and are not in the root path
+   * @param {Array} queue The queue to add to
+   * @param {string} basePath The path to consider
+   */
+  function enqueue(queue, basePath) {
+    fs.readdirSync(basePath)
+      .filter(function notHidden(filename) {
+        return (filename.charAt(0) !== '.');
+      })
+      .map(function toAbsolute(filename) {
+        return path.join(basePath, filename);
+      })
+      .filter(function directoriesOnly(absolutePath) {
+        return fs.statSync(absolutePath).isDirectory();
+      })
+      .filter(function notInRootPath(absolutePath) {
+        return (pathToRoot.indexOf(absolutePath) < 0);
+      })
+      .filter(notPackage)
+      .forEach(function enqueue(absolutePath) {
+        queue.push(absolutePath);
       });
   }
 
@@ -37,12 +62,13 @@ function encodeRelativeURL(startPath, uri) {
   if (absoluteStart) {
 
     // find path to the root, stopping at cwd, package.json or bower.json
-    var pathToRoot = [ ];
-    do {
+    var pathToRoot = [];
+    var isWorking = true;
+    while (isWorking) {
       pathToRoot.push(absoluteStart);
-      var isWorking = (absoluteStart !== process.cwd()) && notPackage(absoluteStart);
+      isWorking     = (absoluteStart !== process.cwd()) && notPackage(absoluteStart);
       absoluteStart = path.resolve(absoluteStart, '..');
-    } while (isWorking);
+    }
 
     // start a queue with the path to the root
     var queue = pathToRoot.concat();
@@ -57,30 +83,14 @@ function encodeRelativeURL(startPath, uri) {
 
       // file exists so convert to a dataURI and end
       if (fs.existsSync(fullPath)) {
-        var type     = mime.lookup(fullPath);
+        var type = mime.lookup(fullPath);
         var contents = fs.readFileSync(fullPath);
-        var base64   = new Buffer(contents).toString('base64');
+        var base64 = new Buffer(contents).toString('base64');
         return 'url(data:' + type + ';base64,' + base64 + ')';
       }
       // enqueue subdirectories that are not packages and are not in the root path
       else {
-        fs.readdirSync(basePath)
-          .filter(function notHidden(filename) {
-            return (filename.charAt(0) !== '.');
-          })
-          .map(function toAbsolute(filename) {
-            return path.join(basePath, filename);
-          })
-          .filter(function directoriesOnly(absolutePath) {
-            return fs.statSync(absolutePath).isDirectory();
-          })
-          .filter(function notInRootPath(absolutePath) {
-            return (pathToRoot.indexOf(absolutePath) < 0);
-          })
-          .filter(notPackage)
-          .forEach(function enqueue(absolutePath) {
-            queue.push(absolutePath);
-          });
+        enqueue(queue, basePath);
       }
     }
   }

lib/config/defaults.js

@@ -12,7 +12,8 @@ var instances = { };
  * @returns {{file: Function, defaults: Function, get: Function}}
  */
 function getInstance(key) {
-  return instances[key] = instances[key] || new Defaults(key);
+  var result = instances[key] = instances[key] || new Defaults(key);
+  return result;
 }
 
 /**
@@ -39,10 +40,11 @@ function Defaults(key) {
  * @return {Defaults} the current instance
  */
 function file() {
-  var file = this.file_ = path.resolve(path.join.apply(path, arguments));
-  if (file && fs.existsSync(file)) {
+  /* jshint validthis:true */
+  var filePath = this.file_ = path.resolve(path.join.apply(path, arguments));
+  if (filePath && fs.existsSync(filePath)) {
     var existing = this.values_;
-    this.values_ = readFile(file, this.key_) || {};
+    this.values_ = readFile(filePath, this.key_) || {};
     this.set(existing);
   }
   return this;
@@ -54,6 +56,7 @@ function file() {
  * @return {Defaults} the current instance
  */
 function defaults(parameters) {
+  /* jshint validthis:true */
   this.defaults_ = (typeof parameters === 'object') ? parameters : {};
   return this;
 }
@@ -64,6 +67,7 @@ function defaults(parameters) {
  * @return {*} the resolved value of that field
  */
 function get(field) {
+  /* jshint validthis:true */
   if (field) {
     return (field in this.values_) ? this.values_[field] : this.defaults_[field];
   } else {
@@ -76,6 +80,7 @@ function get(field) {
  * @returns {Array.<string>} List of changed fields, possible empty
  */
 function changeList() {
+  /* jshint validthis:true */
   return Object.keys(this.values_);
 }
 
@@ -86,6 +91,7 @@ function changeList() {
  * @return {Defaults} the current instance
  */
 function set(objectOrField, value) {
+  /* jshint validthis:true */
 
   // enumerable object mode
   if (typeof objectOrField === 'object') {
@@ -115,6 +121,7 @@ function set(objectOrField, value) {
  * Clear any overrides
  */
 function revert() {
+  /* jshint validthis:true */
   this.values_ = {};
   return this;
 }
@@ -124,6 +131,7 @@ function revert() {
  * @return {string} the full path to the file that was written
  */
 function commit() {
+  /* jshint validthis:true */
   var pending;
   if (this.key_) {
     pending = readFile(this.file_) || {};

lib/inject/adjacent-files.js

@@ -34,16 +34,19 @@ module.exports = function (extension, opts, recurse) {
 
       // use terms in the relative address, from none to all
       var split = fileRelative.split(/[\\\/]/g);
-      for(var i = 0, glob = [ ]; i < split.length; i++) {
-        extensions.forEach(function(extension) {
+      for(var i = 0, glob = []; i < split.length; i++) {
+        extensions.forEach(addSliceToGlob(glob, 0, i + 1));
+      }
+      function addSliceToGlob(glob, start, stop) {
+        return function (extension) {
           var item = [ fileRecurse ]
-            .concat(split.slice(0, i + 1))
+            .concat(split.slice(start, stop))
             .concat('*.' + extension)
             .join('/');
           if (glob.indexOf(item) < 0) {
             glob.push(item);
           }
-        });
+        };
       }
       return gulp.src(glob, { read: false })
         .pipe(semiflat(file.base))

lib/inject/bower-files.js

@@ -84,7 +84,7 @@ module.exports = function () {
 
     function greatestCommonBase(absolute) {
       if (base) {
-        for (var i = 0; (base[i] === absolute[i]); i++);
+        for (var i = 0; (base[i] === absolute[i]); i++) {} /* jshint -W035 */
         base = base.slice(0, i);
       } else if (options.base === true) {
         base = path.dirname(absolute);
@@ -126,7 +126,9 @@ module.exports = function () {
 
       // combination of source streams with specific base path for each package
       stream = combined.create();
-      (prepend) && stream.append(prepend);
+      if (prepend) {
+        stream.append(prepend);
+      }
       value.forEach(function (bowerPackage) {
         var src = gulp.src(bowerPackage.concat(), bowerPackage.options)
           .pipe(through.obj(function(file, encoding, done) {