updated package.json

node_modules/forever/lib/forever.js

@@ -758,14 +758,16 @@ forever.findByUid = function (script, processes) {
 // Finds the process with the specified pid.
 //
 forever.findByPid = function (pid, processes) {
-  var procs = !processes
-    ? null
-    : processes.filter(function (p) {
-      return p.pid == pid;
-    });
+  pid = typeof pid === 'string'
+    ? parseInt(pid, 10)
+    : pid;
+
+  var procs = processes && processes.filter(function (p) {
+    return p.pid === pid;
+  });
 
   if (procs && procs.length === 0) { procs = null; }
-  return procs;
+  return procs || null;
 };
 
 //
@@ -972,7 +974,7 @@ forever.logEvents = function (monitor) {
   });
 
   monitor.on('exit:code', function (code, signal) {
-    forever.out.error(!isNaN(code)
+    forever.out.error((code !== null && code !== undefined)
       ? 'Forever detected script exited with code: ' + code
       : 'Forever detected script was killed by signal: ' + signal);
   });

node_modules/forever/lib/forever/cli.js

@@ -11,7 +11,12 @@ var fs = require('fs'),
     util = require('util'),
     colors = require('colors'),
     cliff = require('cliff'),
+    isAbsolute = require('path-is-absolute'),
     flatiron = require('flatiron'),
+    shush = require('shush'),
+    prettyjson = require('prettyjson'),
+    clone = require('clone'),
+    objectAssign = require('object-assign'),
     forever = require('../forever');
 
 var cli = exports;
@@ -196,7 +201,46 @@ function checkColumn(name) {
 // `forever.startDaemon`
 //
 var getOptions = cli.getOptions = function (file) {
-  var options = {};
+  var options = {},
+      absFile = isAbsolute(file) ? file : path.resolve(process.cwd(), file),
+      configKeys = [
+        'pidFile', 'logFile', 'errFile', 'watch', 'minUptime', 'append',
+        'silent', 'outFile', 'max', 'command', 'path', 'spinSleepTime',
+        'sourceDir', 'workingDir', 'uid', 'watchDirectory', 'watchIgnore',
+        'killTree', 'killSignal', 'id'
+      ],
+      specialKeys = ['script', 'args'],
+      configs;
+
+  //
+  // Load JSON configuration values
+  //
+  if (path.extname(file) === '.json') {
+    configs = shush(absFile);
+    configs = !Array.isArray(configs) ? [configs] : configs;
+
+    configs = configs.map(function (conf) {
+      var mut = Object.keys(conf)
+        .reduce(function (acc, key) {
+          if (~configKeys.indexOf(key) || ~specialKeys.indexOf(key)) {
+            acc[key] = conf[key];
+          }
+
+          return acc;
+        }, {});
+
+      if (!mut.script) {
+        forever.log.error('"script" option required in JSON configuration files');
+        console.log(prettyjson.render(mut));
+        process.exit(1);
+      }
+
+      return mut;
+    });
+  } else {
+    options.script = file;
+  }
+
   //
   // First isolate options which should be passed to file
   //
@@ -209,12 +253,7 @@ var getOptions = cli.getOptions = function (file) {
   app.config.stores.argv.store = {};
   app.config.use('argv', argvOptions);
 
-  [
-    'pidFile', 'logFile', 'errFile', 'watch', 'minUptime', 'append',
-    'silent', 'outFile', 'max', 'command', 'path', 'spinSleepTime',
-    'sourceDir', 'workingDir', 'uid', 'watchDirectory', 'watchIgnore',
-    'killTree', 'killSignal', 'id'
-  ].forEach(function (key) {
+  configKeys.forEach(function (key) {
     options[key] = app.config.get(key);
   });
 
@@ -240,7 +279,13 @@ var getOptions = cli.getOptions = function (file) {
   options.workingDir = options.workingDir || options.sourceDir;
   options.spawnWith  = { cwd: options.workingDir };
 
-  return options;
+  if (configs && configs.length) {
+    return configs.map(function (conf) {
+      return objectAssign(clone(options), conf);
+    });
+  }
+
+  return [options];
 };
 
 //
@@ -264,10 +309,13 @@ app.cmd(/start (.+)/, cli.startDaemon = function () {
   var file = app.argv._[1],
       options = getOptions(file);
 
-  forever.log.info('Forever processing file: ' + file.grey);
-  tryStart(file, options, function () {
-    forever.startDaemon(file, options);
+  options.forEach(function (o) {
+    forever.log.info('Forever processing file: ' + o.script.grey);
+    tryStart(o.script, o, function () {
+      forever.startDaemon(o.script, o);
+    });
   });
+
 });
 
 //
@@ -559,10 +607,12 @@ cli.run = function () {
   var file = app.argv._[0],
       options = getOptions(file);
 
-  tryStart(file, options, function () {
-    var monitor = forever.start(file, options);
-    monitor.on('start', function () {
-      forever.startServer(monitor);
+  options.forEach(function (o) {
+    tryStart(o.script, o, function () {
+      var monitor = forever.start(o.script, o);
+      monitor.on('start', function () {
+        forever.startServer(monitor);
+      });
     });
   });
 };