Fix: remove useless if for old tests (fixes #67)

Author: mysticatea

src/bin/common/bootstrap.js

@@ -5,70 +5,40 @@
  */
 "use strict"
 
-//------------------------------------------------------------------------------
-// Helpers
-//------------------------------------------------------------------------------
-
-/**
- * Define the function for main process.
- *
- * @param {string} name - A program name.
- * @returns {function} The function for main process.
- */
-function defineMain(name) {
-    /**
-     * The main process of `npm-run-all` command.
-     *
-     * @param {string[]} args - Arguments to parse.
-     * @param {stream.Writable} stdout - A writable stream to print logs.
-     * @param {stream.Writable} stderr - A writable stream to print errors.
-     * @returns {Promise} A promise which comes to be fulfilled when all
-     *      npm-scripts are completed.
-     * @private
-     */
-    return function main(args, stdout = null, stderr = null) {
-        switch (args[0]) {
-            case undefined:
-            case "-h":
-            case "--help":
-                return require(`../${name}/help`)(stdout)
-
-            case "-v":
-            case "--version":
-                return require("./version")(stdout)
-
-            default:
-                return require(`../${name}/main`)(args, stdout, stderr)
-        }
-    }
-}
-
 //------------------------------------------------------------------------------
 // Public Interface
 //------------------------------------------------------------------------------
-
-module.exports = function bootstrap(entryModule, name) {
-    const main = entryModule.exports = defineMain(name)
-
-    /* eslint-disable no-console, no-process-exit */
-    /* istanbul ignore if */
-    if (require.main === entryModule) {
-        const argv = process.argv.slice(2)
-
-        // Execute.
-        const promise = main(argv, process.stdout, process.stderr)
-
-        // Error Handling.
-        promise.then(
-            () => {
-                // I'm not sure why, but maybe the process never exits
-                // on Git Bash (MINGW64)
-                process.exit(0)
-            },
-            () => {
-                process.exit(1)
-            }
-        )
+/*eslint-disable no-console, no-process-exit */
+
+module.exports = function bootstrap(name) {
+    const argv = process.argv.slice(2)
+
+    switch (argv[0]) {
+        case undefined:
+        case "-h":
+        case "--help":
+            return require(`../${name}/help`)(process.stdout)
+
+        case "-v":
+        case "--version":
+            return require("./version")(process.stdout)
+
+        default:
+            return require(`../${name}/main`)(
+                argv,
+                process.stdout,
+                process.stderr
+            ).then(
+                () => {
+                    // I'm not sure why, but maybe the process never exits
+                    // on Git Bash (MINGW64)
+                    process.exit(0)
+                },
+                () => {
+                    process.exit(1)
+                }
+            )
     }
 }
 
+/*eslint-enable */

src/bin/npm-run-all/index.js

@@ -10,4 +10,4 @@
 // Main
 //------------------------------------------------------------------------------
 
-require("../common/bootstrap")(module, "npm-run-all")
+require("../common/bootstrap")("npm-run-all")

src/bin/run-p/index.js

@@ -10,4 +10,4 @@
 // Main
 //------------------------------------------------------------------------------
 
-require("../common/bootstrap")(module, "run-p")
+require("../common/bootstrap")("run-p")

src/bin/run-s/index.js

@@ -10,4 +10,4 @@
 // Main
 //------------------------------------------------------------------------------
 
-require("../common/bootstrap")(module, "run-s")
+require("../common/bootstrap")("run-s")