Merge branch 'minimist'

Author: fgnass

bin/node-dev

@@ -1,25 +1,31 @@
 #!/usr/bin/env node
 
 var dev = require('..')
-var program = require('commander')
-var resolveMain = require('../lib/resolveMain')
+var minimist = require('minimist')
 
+function getFirstNonOptionArgIndex(args) {
+  for (var i=2; i < args.length; i++) {
+    if (args[i][0] != '-') return i;
+  }
+  return args.length;
+}
 
-program
-  .version(require('../package.json').version)
-  .option('--all-deps', 'watch the whole dependency tree')
-  .option('--no-deps', 'watch only the project’s own files and linked modules' +
-    ' (via `npm link`)')
-  .option('--dedupe', 'dedupe modules dynamically')
-  .arguments('<script> [arguments...]')
-  .action(function (script, scriptArgs) {
-    var wrapper = resolveMain(__dirname + '/../lib/wrap.js')
+var scriptIndex = getFirstNonOptionArgIndex(process.argv)
+var script = process.argv[scriptIndex]
+var scriptArgs = process.argv.slice(scriptIndex + 1)
+var devArgs = process.argv.slice(2, scriptIndex)
 
-    dev(wrapper, script, scriptArgs || [], {
-      allDeps: program.allDeps || false,
-      noDeps: program.noDeps || false,
-      dedupe: program.dedupe || false,
-    })
-  })
+var nodeArgs = []
+var opts = minimist(devArgs, {
+  boolean: ['all-deps', 'no-deps', 'dedupe'],
+  unknown: function(arg) {
+    nodeArgs.push(arg)
+  }
+})
 
-program.parse(process.argv)
+if (!script) {
+  console.log('Usage: node-dev [options] script [arguments]\n')
+  process.exit(1)
+}
+
+dev(script, scriptArgs, nodeArgs, opts)

lib/index.js

@@ -5,10 +5,7 @@ var ipc = require('./ipc')
 var resolveMain = require('./resolveMain')
 
 
-module.exports = function(wrapper, script, scriptArgs, opts) {
-  if (typeof wrapper !== 'string' || wrapper.length === 0) {
-    throw new TypeError('`wrapper` must be a string')
-  }
+module.exports = function(script, scriptArgs, nodeArgs, opts) {
 
   if (typeof script !== 'string' || script.length === 0) {
     throw new TypeError('`script` must be a string')
@@ -18,9 +15,14 @@ module.exports = function(wrapper, script, scriptArgs, opts) {
     throw new TypeError('`scriptArgs` must be an array')
   }
 
+  if (!Array.isArray(nodeArgs)) {
+    throw new TypeError('`nodeArgs` must be an array')
+  }
+
   // The child_process
   var child
 
+  var wrapper = resolveMain(__dirname + '/wrap.js')
   var main = resolveMain(script)
   var cfg = require('./cfg')(main, opts)
   var log = require('./log')(cfg)
@@ -57,8 +59,8 @@ module.exports = function(wrapper, script, scriptArgs, opts) {
    * Run the wrapped script.
    */
   function start() {
-    var wrapperArgs = [script].concat(scriptArgs)
-    child = fork(wrapper, wrapperArgs, {
+    var cmd = nodeArgs.concat(wrapper, script, scriptArgs)
+    child = fork(cmd[0], cmd.slice(1), {
       cwd: process.cwd(),
       env: process.env
     })

package.json

@@ -30,10 +30,10 @@
     "test": "tap test/*.js"
   },
   "dependencies": {
-    "commander": "^2.8.1",
     "dateformat": "~1.0.4-1.2.3",
     "dynamic-dedupe": "^0.2.0",
     "filewatcher": "~1.1.1",
+    "minimist": "^1.1.3",
     "node-notifier": "^4.0.2",
     "resolve": "^1.0.0"
   },

test/index.js

@@ -75,7 +75,7 @@ function run(cmd, done) {
 
 test('should pass unknown args to node binary', function(t) {
   spawn('--expose_gc gc.js foo', function(out) {
-    t.is(out, 'foo function')
+    t.is(out.trim(), 'foo function')
     return { exit: t.end.bind(t) }
   })
 })