nyc 7.0.0-candidate2 → 7.1.0

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="7.1.0"></a>
+# [7.1.0](https://github.com/bcoe/nyc/compare/v7.0.0...v7.1.0) (2016-07-24)
+
+
+### Bug Fixes
+
+* make --all flag work with files with extensions other than .js ([#326](https://github.com/bcoe/nyc/issues/326)) ([d0a8674](https://github.com/bcoe/nyc/commit/d0a8674))
+* work around for Windows path issue nodejs/node[#6624](https://github.com/bcoe/nyc/issues/6624) ([6b1fed0](https://github.com/bcoe/nyc/commit/6b1fed0))
+
+
+### Features
+
+* nyc no longer tries to run arguments passed to the instrumented bin ([#322](https://github.com/bcoe/nyc/issues/322)) ([e0a8c0b](https://github.com/bcoe/nyc/commit/e0a8c0b))
+* use istanbul-lib-hook to wrap require and support vm hooks ([#308](https://github.com/bcoe/nyc/issues/308)) ([2b64cf8](https://github.com/bcoe/nyc/commit/2b64cf8))
+
+
+
 <a name="7.0.0"></a>
 # [7.0.0](https://github.com/bcoe/nyc/compare/v6.6.1...v7.0.0) (2016-07-09)
 

package/README.md

@@ -222,19 +222,40 @@ modules should be required in the subprocess collecting coverage:
 ## Caching
 
 You can run `nyc` with the optional `--cache` flag, to prevent it from
-instrumenting the same files multiple times. This can signficantly
+instrumenting the same files multiple times. This can significantly
 improve runtime performance.
 
 ## Configuring `nyc`
 
-Any configuration options that can be set via the command line
-can also be specified in the `nyc` stanza of your package.json:
+Any configuration options that can be set via the command line can also be specified in the `nyc` stanza of your package.json (these will not affect `nyc` subcommands):
 
 ```json
 {
+  "description": "These are just examples for demonstration, nothing prescriptive",
   "nyc": {
     "lines": 99,
-    "check-coverage": false,
+    "statements": 99,
+    "functions": 99,
+    "branches": 99,
+    "include": [
+      "src/**/*.js"
+    ],
+    "exclude": [
+      "src/**/*.spec.js"
+    ],
+    "reporter": [
+      "lcov",
+      "text-summary"
+    ],
+    "require": [
+      "./test/helpers/some-helper.js"
+    ],
+    "extension": [
+      ".jsx"
+    ],
+    "cache": true,
+    "all": true,
+    "check-coverage": true,
     "report-dir": "./alternative"
   }
 }

package/bin/nyc.js

@@ -7,145 +7,14 @@ try {
 } catch (e) {
   NYC = require('../index.js')
 }
+var processArgs = require('../lib/process-args')
 
 var sw = require('spawn-wrap')
 var wrapper = require.resolve('./wrap.js')
+var Yargs = require('yargs/yargs')
 
-var yargs = require('yargs/yargs')(process.argv.slice(2))
-  .usage('$0 [command] [options]\n\nrun your tests with the nyc bin to instrument them with coverage')
-  .command('report', 'run coverage report for .nyc_output', function (yargs) {
-    return yargs
-      .usage('$0 report [options]')
-      .option('reporter', {
-        alias: 'r',
-        describe: 'coverage reporter(s) to use',
-        default: 'text'
-      })
-      .option('report-dir', {
-        describe: 'directory to output coverage reports in',
-        default: 'coverage'
-      })
-      .option('temp-directory', {
-        describe: 'directory from which coverage JSON files are read',
-        default: './.nyc_output'
-      })
-      .example('$0 report --reporter=lcov', 'output an HTML lcov report to ./coverage')
-  })
-  .command('check-coverage', 'check whether coverage is within thresholds provided', function (yargs) {
-    return yargs
-      .usage('$0 check-coverage [options]')
-      .option('branches', {
-        default: 0,
-        description: 'what % of branches must be covered?'
-      })
-      .option('functions', {
-        default: 0,
-        description: 'what % of functions must be covered?'
-      })
-      .option('lines', {
-        default: 90,
-        description: 'what % of lines must be covered?'
-      })
-      .option('statements', {
-        default: 0,
-        description: 'what % of statements must be covered?'
-      })
-      .example('$0 check-coverage --lines 95', "check whether the JSON in nyc's output folder meets the thresholds provided")
-  })
-  .command(require('../lib/commands/instrument'))
-  .option('reporter', {
-    alias: 'r',
-    describe: 'coverage reporter(s) to use',
-    default: 'text'
-  })
-  .option('report-dir', {
-    describe: 'directory to output coverage reports in',
-    default: 'coverage'
-  })
-  .option('silent', {
-    alias: 's',
-    default: false,
-    type: 'boolean',
-    describe: "don't output a report after tests finish running"
-  })
-  .option('all', {
-    alias: 'a',
-    default: false,
-    type: 'boolean',
-    describe: 'whether or not to instrument all files of the project (not just the ones touched by your test suite)'
-  })
-  .option('exclude', {
-    alias: 'x',
-    default: [],
-    describe: 'a list of specific files and directories that should be excluded from coverage, glob patterns are supported, node_modules is always excluded'
-  })
-  .option('include', {
-    alias: 'n',
-    default: [],
-    describe: 'a list of specific files that should be covered, glob patterns are supported'
-  })
-  .option('require', {
-    alias: 'i',
-    default: [],
-    describe: 'a list of additional modules that nyc should attempt to require in its subprocess, e.g., babel-register, babel-polyfill.'
-  })
-  .option('cache', {
-    alias: 'c',
-    default: false,
-    type: 'boolean',
-    describe: 'cache instrumentation results for improved performance'
-  })
-  .option('extension', {
-    alias: 'e',
-    default: [],
-    describe: 'a list of extensions that nyc should handle in addition to .js'
-  })
-  .option('check-coverage', {
-    type: 'boolean',
-    default: false,
-    describe: 'check whether coverage is within thresholds provided'
-  })
-  .option('branches', {
-    default: 0,
-    description: 'what % of branches must be covered?'
-  })
-  .option('functions', {
-    default: 0,
-    description: 'what % of functions must be covered?'
-  })
-  .option('lines', {
-    default: 90,
-    description: 'what % of lines must be covered?'
-  })
-  .option('statements', {
-    default: 0,
-    description: 'what % of statements must be covered?'
-  })
-  .option('source-map', {
-    default: true,
-    type: 'boolean',
-    description: 'should nyc detect and handle source maps?'
-  })
-  .option('instrument', {
-    default: true,
-    type: 'boolean',
-    description: 'should nyc handle instrumentation?'
-  })
-  .option('hook-run-in-context', {
-    default: true,
-    type: 'boolean',
-    description: 'should nyc wrap vm.runInThisContext?'
-  })
-  .help('h')
-  .alias('h', 'help')
-  .version()
-  .pkgConf('nyc', process.cwd())
-  .example('$0 npm test', 'instrument your tests with coverage')
-  .example('$0 --require babel-core/register npm test', 'instrument your tests with coverage and babel')
-  .example('$0 report --reporter=text-lcov', 'output lcov report after running your tests')
-  .epilog('visit https://git.io/voHar for list of available reporters')
-
-var argv = yargs.argv
+var yargs = decorateYargs(buildYargs())
+var argv = yargs.parse(processArgs.hideInstrumenteeArgs())
 
 if (argv._[0] === 'report') {
   // run a report.
@@ -155,7 +24,7 @@ if (argv._[0] === 'report') {
 } else if (argv._[0] === 'check-coverage') {
   checkCoverage(argv)
 } else if (argv._[0] === 'instrument') {
-  // noop, let the command handler do its thing.
+  // look in lib/commands/instrument.js for logic.
 } else if (argv._.length) {
   // wrap subprocesses and execute argv[1]
   argv.require = arrify(argv.require)
@@ -206,7 +75,11 @@ if (argv._[0] === 'report') {
   // set process.exitCode. Keep track so that both children are run, but
   // a non-zero exit codes in either one leads to an overall non-zero exit code.
   process.exitCode = 0
-  foreground(nyc.mungeArgs(argv), function (done) {
+  foreground(processArgs.hideInstrumenterArgs(
+    // use the same argv descrption, but don't exit
+    // for flags like --help.
+    buildYargs().parse(process.argv.slice(2))
+  ), function (done) {
     var mainChildExitCode = process.exitCode
 
     if (argv.checkCoverage) {
@@ -244,3 +117,148 @@ function checkCoverage (argv, cb) {
     statements: argv.statements
   })
 }
+
+function buildYargs () {
+  return Yargs([])
+    .usage('$0 [command] [options]\n\nrun your tests with the nyc bin to instrument them with coverage')
+    .command('report', 'run coverage report for .nyc_output', function (yargs) {
+      return yargs
+        .usage('$0 report [options]')
+        .option('reporter', {
+          alias: 'r',
+          describe: 'coverage reporter(s) to use',
+          default: 'text'
+        })
+        .option('report-dir', {
+          describe: 'directory to output coverage reports in',
+          default: 'coverage'
+        })
+        .option('temp-directory', {
+          describe: 'directory from which coverage JSON files are read',
+          default: './.nyc_output'
+        })
+        .example('$0 report --reporter=lcov', 'output an HTML lcov report to ./coverage')
+    })
+    .command('check-coverage', 'check whether coverage is within thresholds provided', function (yargs) {
+      return yargs
+        .usage('$0 check-coverage [options]')
+        .option('branches', {
+          default: 0,
+          description: 'what % of branches must be covered?'
+        })
+        .option('functions', {
+          default: 0,
+          description: 'what % of functions must be covered?'
+        })
+        .option('lines', {
+          default: 90,
+          description: 'what % of lines must be covered?'
+        })
+        .option('statements', {
+          default: 0,
+          description: 'what % of statements must be covered?'
+        })
+        .example('$0 check-coverage --lines 95', "check whether the JSON in nyc's output folder meets the thresholds provided")
+    })
+    .option('reporter', {
+      alias: 'r',
+      describe: 'coverage reporter(s) to use',
+      default: 'text'
+    })
+    .option('report-dir', {
+      describe: 'directory to output coverage reports in',
+      default: 'coverage'
+    })
+    .option('silent', {
+      alias: 's',
+      default: false,
+      type: 'boolean',
+      describe: "don't output a report after tests finish running"
+    })
+    .option('all', {
+      alias: 'a',
+      default: false,
+      type: 'boolean',
+      describe: 'whether or not to instrument all files of the project (not just the ones touched by your test suite)'
+    })
+    .option('exclude', {
+      alias: 'x',
+      default: [],
+      describe: 'a list of specific files and directories that should be excluded from coverage, glob patterns are supported, node_modules is always excluded'
+    })
+    .option('include', {
+      alias: 'n',
+      default: [],
+      describe: 'a list of specific files that should be covered, glob patterns are supported'
+    })
+    .option('require', {
+      alias: 'i',
+      default: [],
+      describe: 'a list of additional modules that nyc should attempt to require in its subprocess, e.g., babel-register, babel-polyfill.'
+    })
+    .option('cache', {
+      alias: 'c',
+      default: false,
+      type: 'boolean',
+      describe: 'cache instrumentation results for improved performance'
+    })
+    .option('extension', {
+      alias: 'e',
+      default: [],
+      describe: 'a list of extensions that nyc should handle in addition to .js'
+    })
+    .option('check-coverage', {
+      type: 'boolean',
+      default: false,
+      describe: 'check whether coverage is within thresholds provided'
+    })
+    .option('branches', {
+      default: 0,
+      description: 'what % of branches must be covered?'
+    })
+    .option('functions', {
+      default: 0,
+      description: 'what % of functions must be covered?'
+    })
+    .option('lines', {
+      default: 90,
+      description: 'what % of lines must be covered?'
+    })
+    .option('statements', {
+      default: 0,
+      description: 'what % of statements must be covered?'
+    })
+    .option('source-map', {
+      default: true,
+      type: 'boolean',
+      description: 'should nyc detect and handle source maps?'
+    })
+    .option('instrument', {
+      default: true,
+      type: 'boolean',
+      description: 'should nyc handle instrumentation?'
+    })
+    .option('hook-run-in-context', {
+      default: true,
+      type: 'boolean',
+      description: 'should nyc wrap vm.runInThisContext?'
+    })
+    .pkgConf('nyc', process.cwd())
+    .example('$0 npm test', 'instrument your tests with coverage')
+    .example('$0 --require babel-core/register npm test', 'instrument your tests with coverage and babel')
+    .example('$0 report --reporter=text-lcov', 'output lcov report after running your tests')
+    .epilog('visit https://git.io/voHar for list of available reporters')
+    .boolean('help')
+    .boolean('h')
+    .boolean('version')
+}
+
+// decorate yargs with all the actions
+// that would make it exit: help, version, command.
+function decorateYargs (yargs) {
+  return yargs
+    .help('h')
+    .alias('h', 'help')
+    .version()
+    .command(require('../lib/commands/instrument'))
+}

package/index.js

@@ -143,13 +143,17 @@ NYC.prototype.addFile = function (filename) {
   }
 }
 
-NYC.prototype._readTranspiledSource = function (path) {
+NYC.prototype._readTranspiledSource = function (filePath) {
   var source = null
-  Module._extensions['.js']({
+  var ext = path.extname(filePath)
+  if (typeof Module._extensions[ext] === 'undefined') {
+    ext = '.js'
+  }
+  Module._extensions[ext]({
     _compile: function (content, filename) {
       source = content
     }
-  }, path)
+  }, filePath)
   return source
 }
 
@@ -287,6 +291,8 @@ NYC.prototype._handleSourceMap = function (cacheDir, code, hash, filename) {
 
 NYC.prototype._handleJs = function (code, filename) {
   var relFile = path.relative(this.cwd, filename)
+  // ensure the path has correct casing (see istanbuljs/nyc#269 and nodejs/node#6624)
+  filename = path.resolve(this.cwd, relFile)
   return this._maybeInstrumentSource(code, filename, relFile) || code
 }
 
@@ -473,10 +479,4 @@ NYC.prototype.tempDirectory = function () {
   return path.resolve(this.cwd, './', this._tempDirectory)
 }
 
-NYC.prototype.mungeArgs = function (yargv) {
-  var argv = process.argv.slice(1)
-  argv = argv.slice(argv.indexOf(yargv._[0]))
-  return argv
-}
-
 module.exports = NYC

package/lib/process-args.js

@@ -0,0 +1,33 @@
+var parser = require('yargs-parser')
+var commands = [
+  'report',
+  'check-coverage',
+  'instrument'
+]
+
+module.exports = {
+  // don't pass arguments that are meant
+  // for nyc to the bin being instrumented.
+  hideInstrumenterArgs: function (yargv) {
+    var argv = process.argv.slice(1)
+    argv = argv.slice(argv.indexOf(yargv._[0]))
+    return argv
+  },
+  // don't pass arguments for the bin being
+  // instrumented to nyc.
+  hideInstrumenteeArgs: function () {
+    var argv = process.argv.slice(2)
+    var yargv = parser(argv)
+    if (!yargv._.length) return argv
+    for (var i = 0, command; (command = yargv._[i]) !== undefined; i++) {
+      if (~commands.indexOf(command)) return argv
+    }
+
+    // drop all the arguments after the bin being
+    // instrumented by nyc.
+    argv = argv.slice(0, argv.indexOf(yargv._[0]))
+    argv.push(yargv._[0])
+
+    return argv
+  }
+}

package/node_modules/ansi-regex/package.json

@@ -29,7 +29,7 @@
     "/has-ansi",
     "/strip-ansi"
   ],
-  "_resolved": "http://54.88.212.27:8080/a/ansi-regex/_attachments/ansi-regex-2.0.0.tgz",
+  "_resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
   "_shasum": "c5061b6e0ef8a81775e50f5d66151bf6bf371107",
   "_shrinkwrap": null,
   "_spec": "ansi-regex@^2.0.0",

package/node_modules/ansi-styles/package.json

@@ -32,7 +32,7 @@
   "_requiredBy": [
     "/chalk"
   ],
-  "_resolved": "http://54.88.212.27:8080/a/ansi-styles/_attachments/ansi-styles-2.2.1.tgz",
+  "_resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
   "_shasum": "b432dd3358b634cf75e1e4664368240533c1ddbe",
   "_shrinkwrap": null,
   "_spec": "ansi-styles@^2.2.1",

package/node_modules/append-transform/index.js

@@ -1,7 +1,5 @@
 'use strict';
 
-var js = require('default-require-extensions/js');
-
 module.exports = appendTransform;
 
 var count = 0;
@@ -16,7 +14,7 @@ function appendTransform(transform, ext, extensions) {
 	var forwardGet;
 	var forwardSet;
 
-	var descriptor = Object.getOwnPropertyDescriptor(extensions, ext) || {value: js, configurable: true};
+	var descriptor = Object.getOwnPropertyDescriptor(extensions, ext) || {value: undefined, configurable: true};
 
 	if (
 		((descriptor.get || descriptor.set) && !(descriptor.get && descriptor.set)) ||
@@ -44,7 +42,14 @@ function appendTransform(transform, ext, extensions) {
 		};
 	}
 
+	function hookWasUndefined(module, filename) {
+		throw new Error('Can not load ' + filename + '. No require extension has been installed for ' + ext + ' files');
+	}
+
 	function wrapCustomHook(hook) {
+		if (hook === undefined) {
+			return hookWasUndefined;
+		}
 		return function (module, filename) {
 			// We wrap every added extension, but we only apply the transform to the one on top of the stack
 			if (!module[key]) {

package/node_modules/append-transform/package.json

@@ -1,38 +1,38 @@
 {
   "_args": [
     [
-      "append-transform@*",
-      "/Users/benjamincoe/bcoe/nyc"
+      "append-transform@^0.3.0",
+      "/Users/benjamincoe/bcoe/nyc/node_modules/istanbul-lib-hook"
     ]
   ],
-  "_from": "append-transform@*",
-  "_id": "append-transform@0.4.0",
+  "_from": "append-transform@>=0.3.0 <0.4.0",
+  "_id": "append-transform@0.3.0",
   "_inCache": true,
   "_installable": true,
   "_location": "/append-transform",
-  "_nodeVersion": "0.10.40",
+  "_nodeVersion": "5.4.1",
   "_npmUser": {
     "email": "james@talmage.io",
     "name": "jamestalmage"
   },
-  "_npmVersion": "3.4.0",
+  "_npmVersion": "3.5.3",
   "_phantomChildren": {},
   "_requested": {
     "name": "append-transform",
-    "raw": "append-transform@*",
-    "rawSpec": "*",
+    "raw": "append-transform@^0.3.0",
+    "rawSpec": "^0.3.0",
     "scope": null,
-    "spec": "*",
+    "spec": ">=0.3.0 <0.4.0",
     "type": "range"
   },
   "_requiredBy": [
-    "/"
+    "/istanbul-lib-hook"
   ],
-  "_resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz",
-  "_shasum": "d76ebf8ca94d276e247a36bad44a4b74ab611991",
+  "_resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.3.0.tgz",
+  "_shasum": "d6933ce4a85f09445d9ccc4cc119051b7381a813",
   "_shrinkwrap": null,
-  "_spec": "append-transform@*",
-  "_where": "/Users/benjamincoe/bcoe/nyc",
+  "_spec": "append-transform@^0.3.0",
+  "_where": "/Users/benjamincoe/bcoe/nyc/node_modules/istanbul-lib-hook",
   "author": {
     "email": "james@talmage.io",
     "name": "James Talmage",
@@ -41,9 +41,7 @@
   "bugs": {
     "url": "https://github.com/jamestalmage/append-transform/issues"
   },
-  "dependencies": {
-    "default-require-extensions": "^1.0.0"
-  },
+  "dependencies": {},
   "description": "Install a transform to `require.extensions` that always runs last, even if additional extensions are added later.",
   "devDependencies": {
     "ava": "^0.7.0",
@@ -54,8 +52,8 @@
   },
   "directories": {},
   "dist": {
-    "shasum": "d76ebf8ca94d276e247a36bad44a4b74ab611991",
-    "tarball": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz"
+    "shasum": "d6933ce4a85f09445d9ccc4cc119051b7381a813",
+    "tarball": "https://registry.npmjs.org/append-transform/-/append-transform-0.3.0.tgz"
   },
   "engines": {
     "node": ">=0.10.0"
@@ -63,7 +61,7 @@
   "files": [
     "index.js"
   ],
-  "gitHead": "0b737d26fdebbdfb8ed4be096535099ed7da9ab1",
+  "gitHead": "66aed1b6ee4634e96c08478c79b428e25e97928a",
   "homepage": "https://github.com/jamestalmage/append-transform#readme",
   "keywords": [
     "append",
@@ -92,7 +90,7 @@
   "scripts": {
     "test": "xo && nyc --reporter=lcov --reporter=text ava"
   },
-  "version": "0.4.0",
+  "version": "0.3.0",
   "xo": {
     "ignores": [
       "test.js"

package/node_modules/async/package.json

@@ -29,7 +29,7 @@
     "/handlebars",
     "/istanbul-lib-report"
   ],
-  "_resolved": "http://54.88.212.27:8080/a/async/_attachments/async-1.5.2.tgz",
+  "_resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
   "_shasum": "ec6a61ae56480c0c3cb241c95618e20892f9672a",
   "_shrinkwrap": null,
   "_spec": "async@^1.4.2",