WIP: I think it is done!

Author: Kent C. Dodds

package.json

@@ -1,6 +1,6 @@
 {
   "name": "p-s",
-  "version": "2.5.0-beta.2",
+  "version": "0.0.0-semantically-released",
   "description": "All the benefits of npm scripts without the cost of a bloated package.json and limits of json",
   "main": "dist/index",
   "scripts": {
@@ -21,7 +21,6 @@
   "license": "MIT",
   "dependencies": {
     "arrify": "1.0.1",
-    "async": "2.0.1",
     "bluebird": "3.4.6",
     "colors": "1.1.2",
     "commander": "2.9.0",

src/bin/p-s.js

@@ -60,12 +60,9 @@ function loadAndRun(scriptsAndArgs, psConfig) {
       parallel: scriptsAndArgs.parallel,
       logLevel: program.logLevel,
     }),
-  }, result => {
-    if (result.error) {
-      log.error(result.error)
-      process.exit(FAIL_CODE)
-    }
-    process.exit(result.code)
+  }).catch(error => {
+    log.error(error)
+    process.exitCode = error.code || FAIL_CODE
   })
 }
 

src/index.js

@@ -1,84 +1,69 @@
 import spawn from 'spawn-command-with-kill'
 import Promise from 'bluebird'
-import async from 'async'
 import colors from 'colors/safe'
-import {isString, find, clone} from 'lodash'
+import {isString, clone} from 'lodash'
 import {sync as findUpSync} from 'find-up'
 import managePath from 'manage-path'
 import arrify from 'arrify'
 import getScriptToRun from './get-script-to-run'
 import getScriptsFromConfig from './get-scripts-from-config'
 import getLogger from './get-logger'
 
-const noop = () => {} // eslint-disable-line func-style, no-empty-function
 const NON_ERROR = 0
 
 export default runPackageScripts
 
-function runPackageScripts({scriptConfig, scripts, args, options = {}}, callback = noop) {
+function runPackageScripts({scriptConfig, scripts, args, options = {}}) {
   if (scripts.length === 0) {
     scripts = ['default']
   }
   const scriptNames = arrify(scripts)
   if (options.parallel) {
-    runParallel()
+    return runParallel()
   } else {
-    runSeries()
+    return runSeries()
   }
 
   function runSeries() {
-    async.mapSeries(scriptNames, (scriptName, cb) => {
-      runPackageScript({scriptConfig, options, scriptName, args})
-      .then(code => cb(null, code), cb)
-    }, onFinished)
+    return scriptNames.reduce((res, scriptName) => {
+      return res.then(() => (
+        runPackageScript({scriptConfig, options, scriptName, args})
+      ))
+    }, Promise.resolve())
   }
 
   function runParallel() {
     const results = scriptNames.map(script => ({script, code: undefined}))
     let aborted = false
-    let errorCode = null
 
     const promises = scriptNames.map(scriptName => {
       return runPackageScript({scriptConfig, options, scriptName, args})
     })
 
-    const allPromise = Promise.all((promise, index) => {
+    const allPromise = Promise.all(promises.map((promise, index) => {
       return promise.then(code => {
-        if (aborted) {
-          return
-        }
-
-        results[index].code = code
-
-        if (errorCode === null && code !== 0) {
-          errorCode = errorCode || code
-          abortAll()
+        if (!aborted) {
+          results[index].code = code
         }
       })
-    })
+    })).then(() => results)
 
     allPromise.catch(() => {
-      if (!aborted) {
+      /* istanbul ignore if */
+      if (aborted) {
+        // this is very unlikely to happen
+      } else {
         abortAll()
       }
     })
 
-    allPromise.then(() => onFinished(null, results), onFinished)
+    return allPromise
 
     function abortAll() {
       aborted = true
       promises.forEach(p => p.abort())
     }
   }
-
-  function onFinished(err, results) {
-    if (err) {
-      callback({error: err})
-    } else {
-      const result = find(results, r => r !== NON_ERROR)
-      callback({code: result})
-    }
-  }
 }
 
 
@@ -121,6 +106,7 @@ function runPackageScript({scriptConfig, options, scriptName, args}) {
             `The script called "${scriptName}" which runs "${command}" failed with exit code ${code}`
           ),
           ref: 'failed-with-exit-code',
+          code,
         })
       }
     })