Merge pull request #30 from codeclimate/include-paths-or-exclude-paths

Update to handle config.include_paths or config.exclude_paths.

Author: fhwang

bin/eslint.js

@@ -45,33 +45,74 @@ function buildIssueJson(message, path) {
   return JSON.stringify(issue);
 }
 
-// Uses glob to traverse code directory and find files to analyze,
-// excluding files passed in with by CLI config, and including only
-// files in the list of desired extensions
-function fileWalk(excludePaths, extensions){
-  var analysisFiles = [];
-  var allFiles = glob.sync("/code/**/**", {});
-
-  allFiles.forEach(function(file, i, a){
-    if(excludePaths.indexOf(file.split("/code/")[1]) < 0) {
-      if(!fs.lstatSync(file).isDirectory()) {
-        var extension = "." + file.split(".").pop();
-
-        if(extensions.indexOf(extension) >= 0) {
-          analysisFiles.push(file);
+function isFileWithMatchingExtension(file, extensions) {
+  var stats = fs.lstatSync(file);
+  var extension = "." + file.split(".").pop();
+  return (
+    stats.isFile() &&
+    !stats.isSymbolicLink()
+    && extensions.indexOf(extension) >= 0
+  );
+}
+
+function exclusionBasedFileListBuilder(excludePaths) {
+  // Uses glob to traverse code directory and find files to analyze,
+  // excluding files passed in with by CLI config, and including only
+  // files in the list of desired extensions.
+  //
+  // Deprecated style of file expansion, supported for users of the old CLI.
+  return function(extensions) {
+    var analysisFiles = [];
+    var allFiles = glob.sync("/code/**/**", {});
+
+    allFiles.forEach(function(file, i, a){
+      if(excludePaths.indexOf(file.split("/code/")[1]) < 0) {
+        if(fs.lstatSync(file).isFile()) {
+          if (isFileWithMatchingExtension(file)) {
+            analysisFiles.push(file);
+          }
         }
       }
-    }
-  });
+    });
+
+    return analysisFiles;
+  };
+}
 
-  return analysisFiles;
+function inclusionBasedFileListBuilder(includePaths) {
+  // Uses glob to expand the files and directories in includePaths, filtering
+  // down to match the list of desired extensions.
+  return function(extensions) {
+    var analysisFiles = [];
+
+    includePaths.forEach(function(fileOrDirectory, i) {
+      if ((/\/$/).test(fileOrDirectory)) {
+        // if it ends in a slash, expand and push
+        var filesInThisDirectory = glob.sync(
+          "/code/" + fileOrDirectory + "/**/**"
+        );
+        filesInThisDirectory.forEach(function(file, j){
+          if (isFileWithMatchingExtension(file, extensions)) {
+            analysisFiles.push(file);
+          }
+        });
+      } else {
+        // if not, check for ending in *.js
+        var fullPath = "/code/" + fileOrDirectory;
+        if (isFileWithMatchingExtension(fullPath, extensions)) {
+          analysisFiles.push(fullPath);
+        }
+      }
+    });
+
+    return analysisFiles;
+  };
 }
 
 var options = {
   extensions: [".js"], ignore: true, reset: false, useEslintrc: true
 };
-var ignores = [];
-
+var buildFileList;
 runWithTiming("engineConfig", function () {
   if (fs.existsSync("/config.json")) {
     var engineConfig = JSON.parse(fs.readFileSync("/config.json"));
@@ -80,8 +121,16 @@ runWithTiming("engineConfig", function () {
       options.configFile = "/code/" + engineConfig.config;
     }
 
-    if (engineConfig.exclude_paths) {
-      ignores = engineConfig.exclude_paths;
+    if (engineConfig.include_paths) {
+      buildFileList = inclusionBasedFileListBuilder(
+        engineConfig.include_paths
+      );
+    } else if (engineConfig.exclude_paths) {
+      var ignores = engineConfig.exclude_paths;
+      buildFileList = exclusionBasedFileListBuilder(ignores);
+    } else {
+      // No includes or excludes, let's try with everything
+      buildFileList = exclusionBasedFileListBuilder([]);
     }
 
     if (engineConfig.extensions) {
@@ -90,8 +139,10 @@ runWithTiming("engineConfig", function () {
   }
 });
 
-var analysisFiles = runWithTiming("fileWalk", function() { return fileWalk(ignores, options.extensions); }),
-    cli = runWithTiming("cliInit", function() { return new CLIEngine(options); }),
+var analysisFiles = runWithTiming("buildFileList", function() {
+  return buildFileList(options.extensions);
+});
+var cli = runWithTiming("cliInit", function() { return new CLIEngine(options); }),
     report = runWithTiming("cliRun", function() { return cli.executeOnFiles(analysisFiles); });
 
 runWithTiming("resultsOutput",