swap fileset for glob

- Close #648 (ORIGINAL PR with similar purpose)
- Close #658 (PR with similar purpose)
- Fix #638
- Fix #678
- Fix #653

README.md

@@ -259,7 +259,7 @@ The following third-party libraries are used by this module:
 * async: https://github.com/caolan/async - for parallel instrumentation of files
 * escodegen: https://github.com/Constellation/escodegen - for JS code generation
 * esprima: https://github.com/ariya/esprima - for JS parsing
-* fileset: https://github.com/mklabs/node-fileset - for loading and matching path expressions
+* glob: https://github.com/isaacs/node-glob - for loading and matching path expressions
 * handlebars: https://github.com/wycats/handlebars.js/ - for report template expansion
 * js-yaml: https://github.com/nodeca/js-yaml - for YAML config file load
 * mkdirp: https://github.com/substack/node-mkdirp - to create output directories

index.js

@@ -93,7 +93,7 @@ module.exports = {
      * When no options are passed, the match function is one that matches all JS
      * files under the current working directory except ones under `node_modules`
      *
-     * Match patterns are `ant`-style patterns processed using the `fileset` library.
+     * Match patterns are `ant`-style patterns processed using the `glob` library.
      * Examples not provided due to limitations in putting asterisks inside
      * jsdoc comments. Please refer to tests under `test/other/test-matcher.js`
      * for examples.

lib/command/check-coverage.js

@@ -72,7 +72,7 @@ Command.mix(CheckCoverageCommand, {
         console.error('For example, --statements 90 implies minimum statement coverage is 90%.');
         console.error('             --statements -10 implies that no more than 10 uncovered statements are allowed\n');
         console.error('Per-file thresholds can be specified via a configuration file.\n');
-        console.error('<include-pattern> is a fileset pattern that can be used to select one or more coverage files ' +
+        console.error('<include-pattern> is a glob pattern that can be used to select one or more coverage files ' +
             'for merge. This defaults to "**/coverage*.json"');
 
         console.error('\n');

lib/command/common/run-with-cover.js

@@ -25,8 +25,8 @@ function usage(arg0, command) {
         + [
             formatOption('--config <path-to-config>', 'the configuration file to use, defaults to .istanbul.yml'),
             formatOption('--root <path> ', 'the root path to look for files to instrument, defaults to .'),
-            formatOption('-x <exclude-pattern> [-x <exclude-pattern>]', 'one or more fileset patterns e.g. "**/vendor/**"'),
-            formatOption('-i <include-pattern> [-i <include-pattern>]', 'one or more fileset patterns e.g. "**/*.js"'),
+            formatOption('-x <exclude-pattern> [-x <exclude-pattern>]', 'one or more glob patterns e.g. "**/vendor/**"'),
+            formatOption('-i <include-pattern> [-i <include-pattern>]', 'one or more glob patterns e.g. "**/*.js"'),
             formatOption('--[no-]default-excludes', 'apply default excludes [ **/node_modules/**, **/test/**, **/tests/** ], defaults to true'),
             formatOption('--hook-run-in-context', 'hook vm.runInThisContext in addition to require (supports RequireJS), defaults to false'),
             formatOption('--post-require-hook <file> | <module>', 'JS module that exports a function for post-require processing'),

lib/command/instrument.js

@@ -143,7 +143,7 @@ Command.mix(InstrumentCommand, {
                 formatOption('--config <path-to-config>', 'the configuration file to use, defaults to .istanbul.yml'),
                 formatOption('--output <file-or-dir>', 'The output file or directory. This is required when the input is a directory, ' +
                     'defaults to standard output when input is a file'),
-                formatOption('-x <exclude-pattern> [-x <exclude-pattern>]', 'one or more fileset patterns (e.g. "**/vendor/**" to ignore all files ' +
+                formatOption('-x <exclude-pattern> [-x <exclude-pattern>]', 'one or more glob patterns (e.g. "**/vendor/**" to ignore all files ' +
                     'under a vendor directory). Also see the --default-excludes option'),
                 formatOption('--variable <global-coverage-variable-name>', 'change the variable name of the global coverage variable from the ' +
                     'default value of `__coverage__` to something else'),

lib/command/report.js

@@ -43,7 +43,7 @@ Command.mix(ReportCommand, {
                 formatOption('--config <path-to-config>', 'the configuration file to use, defaults to .istanbul.yml'),
                 formatOption('--root <input-directory>', 'The input root directory for finding coverage files'),
                 formatOption('--dir <report-directory>', 'The output directory where files will be written. This defaults to ./coverage/'),
-                formatOption('--include <glob>', 'The fileset pattern to select one or more coverage files, defaults to **/coverage*.json'),
+                formatOption('--include <glob>', 'The glob pattern to select one or more coverage files, defaults to **/coverage*.json'),
                 formatOption('--verbose, -v', 'verbose mode')
             ].join('\n\n'));
 

lib/config.js

@@ -203,10 +203,10 @@ addMethods(InstrumentOptions,
  */
 InstrumentOptions.prototype.root = function () { return path.resolve(this.config.root); };
 /**
- * returns an array of fileset patterns that should be excluded for instrumentation.
+ * returns an array of glob patterns that should be excluded for instrumentation.
  * Used by the `instrument` and `cover` commands.
  * @method excludes
- * @return {Array} an array of fileset patterns that should be excluded for
+ * @return {Array} an array of glob patterns that should be excluded for
  *  instrumentation.
  */
 InstrumentOptions.prototype.excludes = function (excludeTests) {

lib/util/file-matcher.js

@@ -4,7 +4,7 @@
  */
 
 var async = require('async'),
-    fileset = require('fileset'),
+    glob = require('glob'),
     fs = require('fs'),
     path = require('path'),
     seq = 0;
@@ -27,10 +27,10 @@ function filesFor(options, callback) {
     includes = includes && Array.isArray(includes) ? includes : [ '**/*.js' ];
     excludes = excludes && Array.isArray(excludes) ? excludes : [ '**/node_modules/**' ];
 
-    opts = { cwd: root, nodir: true };
+    opts = { cwd: root, nodir: true, ignore: excludes };
     seq += 1;
     opts['x' + seq + new Date().getTime()] = true; //cache buster for minimatch cache bug
-    fileset(includes.join(' '), excludes.join(' '), opts, function (err, files) {
+    glob(includes.join(' '), opts, function (err, files) {
         if (err) { return callback(err); }
         if (relative) { return callback(err, files); }
 

package.json

@@ -111,7 +111,7 @@
     "async": "1.x",
     "escodegen": "1.8.x",
     "esprima": "2.7.x",
-    "fileset": "0.2.x",
+    "glob": "^5.0.15",
     "handlebars": "^4.0.1",
     "js-yaml": "3.x",
     "mkdirp": "0.5.x",
@@ -124,7 +124,6 @@
   },
   "devDependencies": {
     "coveralls": "2.x",
-    "glob": "^5.0.14",
     "jshint": "^2.8.0",
     "nodeunit": "0.9.x",
     "requirejs": "2.x",

test/other/test-matcher.js

@@ -1,6 +1,6 @@
 /*jslint nomen: true */
 var path = require('path'),
-    fileset = require('fileset'),
+    glob = require('glob'),
     root = path.resolve(__dirname, 'data', 'matcher'),
     src = '../../lib/util/file-matcher.js',
     fileMatcher = require(src),
@@ -9,7 +9,7 @@ var path = require('path'),
 module.exports = {
     setUp: function (cb) {
         if (!allFiles) {
-            fileset('**/*.js', '', { cwd: root}, function (err, files) {
+            glob('**/*.js', { cwd: root}, function (err, files) {
                 allFiles = files.map(function (file) { return path.resolve(root, file); });
                 cb();
             });