chore(cleanup): Handle exists for all spawned processes + deadline implementation + cleanup

pilsy · pilsy · commit 528cda0e130d · 2015-04-14T19:43:29.000+10:00
diff --git a/bin/clever-init b/bin/clever-init
@@ -10,6 +10,7 @@ var path            = require('path')
   , async           = require('async')
   , exec            = require('child_process').exec
   , spawn           = require('child_process').spawn
+  , readline        = require('readline')
   , Promise         = require('bluebird')
   , singleSeed      = true
   , seedsToInstall  = []
@@ -112,15 +113,24 @@ function installNPMPackages(projectDir) {
     var args = ['install']
       , opts = { env: process.env, cwd: projectDir };
 
-    if (!!program.verbose) {
-      opts.stdio = 'inherit';
-    } else {
+    if (!program.verbose) {
       args.push('--silent');
     }
 
     var proc  = spawn('npm', args, opts)
       , error = '';
 
+    if (!!program.verbose) {
+      readline
+        .createInterface({
+          input    : proc.stdout,
+          terminal : false
+        })
+        .on('line', function(line) {
+          console.log('      ' + line);
+        });
+    }
+
     proc.on('error', function(err) {
       error += err;
     });
diff --git a/bin/clever-setup b/bin/clever-setup
@@ -5,6 +5,7 @@ var path      = require('path')
   , program   = GLOBAL.program = require('commander')
   , async     = require('async')
   , spawn     = require('child_process').spawn
+  , readline  = require('readline')
   , fs        = require('fs')
   , os        = require('os')
   , isWin     = /^win32/.test(os.platform())
@@ -99,23 +100,39 @@ async.waterfall(
                 var args = ['install']
                   , opts = { cwd: _path, env: process.env };
 
-                if (program.verbose) {
-                  opts.stdio = 'inherit';
-                  lib.utils.info('  Installing NPM modules for ' + _path + '...');
-                } else {
+                lib
+                  .utils
+                  .info('  Installing NPM modules for ' + seed.name + '...')
+                  .running('  Installing NPM modules for ' + seed.name + '...');
+
+                if (!program.verbose) {
                   args.push('--silent');
-                  lib.utils.info('  Installing NPM modules for ' + seed.name + '...');
                 }
-                lib.utils.running('  Installing NPM modules for ' + seed.name + '...');
 
-                var proc  = spawn(!isWin ? 'npm' : 'npm.cmd', args, opts)
-                  , error = '';
+                var posixProc = spawn(!isWin ? 'npm' : 'npm.cmd', args, opts)
+                  , exitHdlr  = process.kill.bind(process, posixProc)
+                  , error     = '';
+
+                if (!!program.verbose) {
+                  readline
+                    .createInterface({
+                      input    : posixProc.stdout,
+                      terminal : false
+                    })
+                    .on('line', function(line) {
+                      console.log('        ' + line);
+                    });
+                }
 
-                proc.on('error', function(err) {
+                process.on('SIGTERM', exitHdlr);
+
+                posixProc.on('error', function(err) {
                   error += err;
                 });
 
-                proc.on('close', function(code) {
+                posixProc.on('close', function(code) {
+                  process.removeListener('SIGTERM', exitHdlr);
+
                   if (code !== 0) {
                     return lib.utils.fail(error);
                   }
diff --git a/lib/project.js b/lib/project.js
@@ -1,13 +1,14 @@
-var Promise = require('bluebird')
-  , path    = require('path')
-  , async   = require('async')
-  , spawn   = require('child_process').spawn
-  , fs      = Promise.promisifyAll(require('fs'))
-  , install = GLOBAL.lib.install
-  , _bower  = GLOBAL.lib.util.bower
-  , utils   = GLOBAL.lib.utils
-  , os      = require('os')
-  , isWin   = /^win32/.test(os.platform());
+var Promise  = require('bluebird')
+  , path     = require('path')
+  , async    = require('async')
+  , spawn    = require('child_process').spawn
+  , readline = require('readline')
+  , fs       = Promise.promisifyAll(require('fs'))
+  , install  = GLOBAL.lib.install
+  , _bower   = GLOBAL.lib.util.bower
+  , utils    = GLOBAL.lib.utils
+  , os       = require('os')
+  , isWin    = /^win32/.test(os.platform());
 
 Promise.longStackTraces();
 
@@ -156,20 +157,34 @@ exports.installModule = function(project, modulePath) {
             , args = ['install', '--prefix', projectFolder].concat(deps)
             , cmd  = !isWin ? 'npm' : 'npm.cmd';
 
-          if (!!program.verbose) {
-            opts.stdio = 'inherit';
-          } else {
+          if (!program.verbose) {
             args.push('--silent');
           }
 
-          var proc = spawn(cmd, args, opts)
-            , error = '';
+          var posixProc = spawn(cmd, args, opts)
+            , exitHdlr  = process.kill.bind(process, posixProc)
+            , error     = '';
+
+          process.on('SIGTERM', exitHdlr);
+
+          if (!!program.verbose) {
+            readline
+              .createInterface({
+                input    : posixProc.stdout,
+                terminal : false
+              })
+              .on('line', function(line) {
+                console.log('      ' + line);
+              });
+          }
 
-          proc.on('error', function(err) {
+          posixProc.on('error', function(err) {
             error += err;
           });
 
-          proc.on('close', function(code) {
+          posixProc.on('close', function(code) {
+            process.removeListener('SIGTERM', exitHdlr);
+
             if (code !== 0 || !!error) {
               callback(error);
             } else {
diff --git a/lib/util/bower.js b/lib/util/bower.js
@@ -1,6 +1,7 @@
-var spawn = require('child_process').spawn
-  , os    = require('os')
-  , isWin = /^win32/.test(os.platform());
+var spawn    = require('child_process').spawn
+  , readline = require('readline')
+  , os       = require('os')
+  , isWin    = /^win32/.test(os.platform());
 
 /**
  * Runs bower install
@@ -54,14 +55,25 @@ exports.install = function(modulePath, options, fn) {
     additionalOptions.push('--verbose');
   }
 
-  var proc = spawn(!isWin ? 'bower' : 'bower.cmd', additionalOptions, params)
+  var posixProc = spawn(!isWin ? 'bower' : 'bower.cmd', additionalOptions, params)
     , error;
 
-  proc.on('error', function(err) {
+  if (!!program.verbose || process.mainModule.filename.match('build')) {
+    readline
+      .createInterface({
+        input    : posixProc.stdout,
+        terminal : false
+      })
+      .on('line', function(line) {
+        console.log('      ' + line);
+      });
+  }
+
+  posixProc.on('error', function(err) {
     error += err;
   });
 
-  proc.on('close', function(code) {
+  posixProc.on('close', function(code) {
     if (code !== 0 || !!error) {
       fn(error);
     } else {
diff --git a/lib/util/grunt.js b/lib/util/grunt.js
@@ -1,10 +1,11 @@
-var Promise = require('bluebird')
-  , path    = require('path')
-  , async   = require('async')
-  , fs      = require('fs')
-  , spawn   = require('child_process').spawn
-  , os      = require('os')
-  , isWin   = /^win32/.test(os.platform());
+var Promise  = require('bluebird')
+  , path     = require('path')
+  , async    = require('async')
+  , fs       = require('fs')
+  , spawn    = require('child_process').spawn
+  , readline = require('readline')
+  , os       = require('os')
+  , isWin    = /^win32/.test(os.platform());
 
 /**
  * Mimmicks a small grunt-cli utility
@@ -107,31 +108,65 @@ var readTasks = exports.readTasks = function(pathSrc, silence) {
  * @return {Promise}              Returns a promise from bluebird
  * @api private
  */
-function runTask(projectFolder, cmd) {
+exports.runTask = function runTask(projectFolder, command) {
+  var args       = [].slice.call(arguments, 1);
+
   return new Promise(function(resolve, reject) {
-    var env   = process.env
-      , paths = process.env.NODE_PATH ? [process.env.NODE_PATH] : [];
+    var cmd      = !isWin ? 'grunt' : 'grunt.cmd'
+      , env      = process.env
+      , opts     = {env: env, cwd: projectFolder}
+      , paths    = process.env.NODE_PATH ? [process.env.NODE_PATH] : [];
+
+    // Pass the --verbose call down to grunt as well
+    if (!!program.verbose) {
+      args.push('--verbose');
+      
+      var logMsg = 'Spawning posix child process to run '+lib.colors.lightGreen(cmd+' '+args.join(' ')) + '...';
+      lib.utils.info(logMsg).running(logMsg);
+    }
 
     paths.push(path.resolve(path.join(projectFolder, 'lib')) + path.sep);
     paths.push(path.resolve(path.join(projectFolder, 'modules')) + path.sep);
 
-    env.NODE_PATH = paths.join(os.platform() === 'win32' ? ';' : ':');
+    env.NODE_PATH = paths.join(!!isWin ? ';' : ':');
 
-    spawn(!isWin ? 'grunt' : 'grunt.cmd', [ cmd ], { cwd: projectFolder, env: env, stdio: 'inherit' })
-      .on('close', function(code) {
-        if (code !== 0) {
-          return reject();
-        }
+    var posixProc = spawn(cmd, args, opts)
+      , exitHdlr  = process.kill.bind(process, posixProc)
+      , error     = '';
 
-        if (cmd.indexOf('prompt')) {
-          lib.utils.progress();
-          lib.utils.startBar(function() {
-            resolve();
-          });
-        } else {
+    process.on('SIGTERM', exitHdlr);
+
+    if (!!program.verbose || process.mainModule.filename.match('build')) {
+      readline
+        .createInterface({
+          input    : posixProc.stdout,
+          terminal : false
+        })
+        .on('line', function(line) {
+          console.log('      ' + line);
+        });
+    }
+
+    posixProc.on('error', function(err) {
+      error += err;
+    });
+
+    posixProc.on('close', function(code) {
+      process.removeListener('SIGTERM', exitHdlr);
+
+      if (code !== 0 || !!error) {
+        return reject(error);
+      }
+
+      if (command.indexOf('prompt')) {
+        lib.utils.progress();
+        lib.utils.startBar(function() {
           resolve();
-        }
-      });
+        });
+      } else {
+        resolve();
+      }
+    });
   });
 }
 
@@ -152,7 +187,7 @@ function runDBMigrations(projectFolder) {
     paths.push(path.resolve(path.join(projectFolder, 'lib')) + path.sep);
     paths.push(path.resolve(path.join(projectFolder, 'modules')) + path.sep);
 
-    env.NODE_PATH  = paths.join(os.platform() === 'win32' ? ';' : ':');
+    env.NODE_PATH  = paths.join(!!isWin ? ';' : ':');
 
     // check for NODE_ENV json config file if it doesn't exist then revert to local
     if (!fs.existsSync(path.join(projectFolder, 'config', env.NOD_ENV + '.json'))) {
@@ -198,8 +233,13 @@ function runDBMigrations(projectFolder) {
  */
 exports.runTasks = function(projectFolder, modulePath) {
   return new Promise(function(resolve, reject) {
+    var originalCwd = process.cwd();
+    process.chdir(projectFolder);
+
     readTasks(modulePath)
       .spread(function(tasks) {
+        
+        process.chdir(originalCwd);
 
         if (tasks.length) {
           lib.utils.warn('  Running grunt tasks for module ' + modulePath.split(path.sep).pop() + '...');
