arcadible 0.1.28 → 0.1.31

package/bin/arc-init.js

@@ -14,17 +14,20 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const args = require("../src/util/argv");
 const cfgpackage = require("../src/config/package");
 const cfgproduct = require("../src/config/product");
 const cfgtemplate = require("../src/config/template");
 const init = require("../src/cli/init");
 const log = require("../src/util/log");
 const output = require("../src/util/output");
+const phrase = require("../src/phrase");
 const rc = require("../src/util/rc");
 const spinner = require("../src/util/spinner");
 
 // [use]
 
+const abort = output.abort;
 const findRc = rc.findRc;
 const join = path.join;
 const pathExists = fs.pathExists;
@@ -46,7 +49,7 @@ const conf = {
   project: ".",
   quiet: false,
   yes: false,
-  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv),
 };
 
 // [function]
@@ -56,17 +59,6 @@ const handler = function ({ json, quiet, sw }) {
     onInitBegin() {
       sw.start(json || quiet);
     },
-    onLogInfo({ level, message }) {
-      if (!json && !quiet) {
-        switch (level) {
-          case "warn":
-            sw.stop(true);
-            log.pw(`⚠ ${message}`);
-            sw.start(json || quiet);
-          // no default
-        }
-      }
-    },
   };
 };
 
@@ -77,7 +69,6 @@ const start = function (argv) {
   const quiet = argv.quiet;
   const sw = new SpinnerWheel("Initializing... %s");
   return init({
-    force: true,
     handler: handler({ json, quiet, sw }),
     patch: argv.patch,
     project: argv.project,
@@ -87,31 +78,15 @@ const start = function (argv) {
     .then((project) => {
       if (json) {
         print({ project });
-        return;
-      }
-      if (!quiet) {
+      } else if (!quiet) {
         sw.stop(true);
-        log.hs("Done.");
-        if (project) {
-          print(project, { toml: true });
-          return;
-        }
-        log.p("Nothing to do.");
+        log.hs("Initialized.");
+        print(project, { nl: true, toml: true });
       }
-      // degit sometimes hangs
-      process.exit(0);
+      // degit sometimes hangs, so exit once stdout is written.
+      process.stdout.write("", () => process.exit(0));
     })
-    .catch((ex) => {
-      const message = ex.message;
-      if (json) {
-        print({ error: { message } });
-      } else {
-        sw.stop(true);
-        log.hd("Init aborted.");
-        log.p(message);
-      }
-      process.exit(1);
-    });
+    .catch((ex) => abort("Init aborted.", ex, { json, sw }));
 };
 
 // [function]
@@ -130,6 +105,10 @@ const prompt = async function ({ yes, ...argv }) {
     return opts;
   }
   if (!opts.template) {
+    // without a terminal, the prompt would read end-of-input and exit.
+    if (!process.stdin.isTTY) {
+      throw new Error(phrase.noTemplate());
+    }
     opts.template = await select(cfgtemplate);
   }
   return opts;
@@ -137,9 +116,22 @@ const prompt = async function ({ yes, ...argv }) {
 
 // [function]
 
+const inquire = function (argv) {
+  return prompt(argv)
+    .then(start)
+    .catch((ex) => {
+      if (ex?.name === "ExitPromptError") {
+        process.exit(130);
+      }
+      abort("Init aborted.", ex, { json: argv.json });
+    });
+};
+
+// [function]
+
 const main = function (argv) {
-  return prompt(
-    yargs(hideBin(argv))
+  return inquire(
+    yargs(args.normalize(hideBin(argv)))
       .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [project] [options]")
       .command("$0 [project]", false, (cli) =>
@@ -175,28 +167,17 @@ const main = function (argv) {
         describe: "Output only errors",
         type: "boolean",
       })
-      .option("cwd", {
-        alias: "C",
-        default: ".",
-        describe: "Set the working directory",
-        type: "string",
-      })
+      .option("cwd", args.CWD)
       .help("help")
       .alias("help", "h")
       .version(VERSION)
       .alias("version", "v")
       .strict()
       .parse(),
-  )
-    .then(start)
-    .catch((ex) => {
-      if (ex && ex.name === "ExitPromptError") {
-        process.exit(0);
-      }
-    });
+  );
 };
 
-// [main]
+// [start]
 
 if (require.main === module) {
   main(process.argv);

package/bin/arc-inspect.js

@@ -12,20 +12,19 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const args = require("../src/util/argv");
 const cfgpackage = require("../src/config/package");
 const cfgproduct = require("../src/config/product");
 const inspect = require("../src/cli/inspect");
-const log = require("../src/util/log");
 const output = require("../src/util/output");
 const rc = require("../src/util/rc");
-const spinner = require("../src/util/spinner");
 
 // [use]
 
+const abort = output.abort;
 const findRc = rc.findRc;
 const print = output.print;
 const resolve = path.resolve;
-const SpinnerWheel = spinner.SpinnerWheel;
 
 // [declare]
 
@@ -38,17 +37,7 @@ const VERSION = cfgpackage.version;
 const conf = {
   json: false,
   selector: null,
-  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
-};
-
-// [function]
-
-const handler = function ({ json, sw }) {
-  return {
-    onInspectFetch() {
-      sw.start(json);
-    },
-  };
+  ...findRc(TOOL, COMMAND, process.argv),
 };
 
 // [function]
@@ -56,10 +45,7 @@ const handler = function ({ json, sw }) {
 const start = function (argv) {
   const json = argv.json;
   const selector = argv.selector;
-  const sw = new SpinnerWheel("Loading... %s");
   return inspect({
-    game: null,
-    handler: handler({ json, sw }),
     root: resolve(process.cwd(), argv.cwd),
     selector,
   })
@@ -68,27 +54,16 @@ const start = function (argv) {
         print(data);
         return;
       }
-      sw.stop(true);
       print(data, { key: selector, toml: true });
     })
-    .catch((ex) => {
-      const message = ex.message;
-      if (json) {
-        print({ error: { message } });
-      } else {
-        sw.stop(true);
-        log.hd("Inspect aborted.");
-        log.p(message);
-      }
-      process.exit(1);
-    });
+    .catch((ex) => abort("Inspect aborted.", ex, { json }));
 };
 
 // [function]
 
 const main = function (argv) {
   return start(
-    yargs(hideBin(argv))
+    yargs(args.normalize(hideBin(argv)))
       .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [selector] [options]")
       .command("$0 [selector]", false, (cli) =>
@@ -104,12 +79,7 @@ const main = function (argv) {
         describe: "Format output as JSON",
         type: "boolean",
       })
-      .option("cwd", {
-        alias: "C",
-        default: ".",
-        describe: "Set the working directory",
-        type: "string",
-      })
+      .option("cwd", args.CWD)
       .help("help")
       .alias("help", "h")
       .version(VERSION)
@@ -119,7 +89,7 @@ const main = function (argv) {
   );
 };
 
-// [main]
+// [start]
 
 if (require.main === module) {
   main(process.argv);

package/bin/arc-login.js

@@ -9,6 +9,7 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const args = require("../src/util/argv");
 const cfgpackage = require("../src/config/package");
 const cfgproduct = require("../src/config/product");
 const log = require("../src/util/log");
@@ -35,7 +36,7 @@ const VERSION = cfgpackage.version;
 const conf = {
   browser: true,
   qrcode: true,
-  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv),
 };
 
 // [function]
@@ -86,7 +87,6 @@ const handler = function ({ browser, qrcode: qr, sw }) {
         }
       });
     },
-    onLoginPoll() {},
   };
 };
 
@@ -105,14 +105,13 @@ const start = function (argv) {
       }
       sw.stop(true);
       process.stdin.pause();
-      log.nlhs("Logged in.");
-      log.p(user.display_name);
+      log.result("Logged in.", [user.display_name], { nl: true });
     })
     .catch((ex) => {
       sw.stop(true);
       process.stdin.pause();
       log.nlhd("Login aborted.");
-      log.p(ex.message);
+      log.pd(ex.message);
       process.exit(1);
     });
 };
@@ -121,7 +120,7 @@ const start = function (argv) {
 
 const main = function (argv) {
   return start(
-    yargs(hideBin(argv))
+    yargs(args.normalize(hideBin(argv)))
       .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [options]")
       .option("browser", {
@@ -143,7 +142,7 @@ const main = function (argv) {
   );
 };
 
-// [main]
+// [start]
 
 if (require.main === module) {
   main(process.argv);

package/bin/arc-logout.js

@@ -8,14 +8,17 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const args = require("../src/util/argv");
 const cfgpackage = require("../src/config/package");
 const cfgproduct = require("../src/config/product");
 const log = require("../src/util/log");
 const logout = require("../src/cli/logout");
+const output = require("../src/util/output");
 const rc = require("../src/util/rc");
 
 // [use]
 
+const abort = output.abort;
 const findRc = rc.findRc;
 
 // [declare]
@@ -28,7 +31,7 @@ const VERSION = cfgpackage.version;
 
 const conf = {
   quiet: false,
-  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv),
 };
 
 // [function]
@@ -40,18 +43,14 @@ const start = function (argv) {
         log.hs("Logged out.");
       }
     })
-    .catch((ex) => {
-      log.hd("Logout aborted.");
-      log.p(ex.message);
-      process.exit(1);
-    });
+    .catch((ex) => abort("Logout aborted.", ex));
 };
 
 // [function]
 
 const main = function (argv) {
   return start(
-    yargs(hideBin(argv))
+    yargs(args.normalize(hideBin(argv)))
       .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [options]")
       .option("quiet", {
@@ -69,7 +68,7 @@ const main = function (argv) {
   );
 };
 
-// [main]
+// [start]
 
 if (require.main === module) {
   main(process.argv);

package/bin/arc-open.js

@@ -12,17 +12,20 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const args = require("../src/util/argv");
 const cfgpackage = require("../src/config/package");
 const cfgproduct = require("../src/config/product");
 const cfguri = require("../src/config/uri");
 const log = require("../src/util/log");
 const open = require("../src/cli/open");
+const output = require("../src/util/output");
 const phrase = require("../src/phrase");
 const rc = require("../src/util/rc");
 const shell = require("../src/util/shell");
 
 // [use]
 
+const abort = output.abort;
 const findRc = rc.findRc;
 const launch = shell.launch;
 const resolve = path.resolve;
@@ -38,7 +41,7 @@ const VERSION = cfgpackage.version;
 const conf = {
   browser: false,
   game: "self",
-  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv),
 };
 
 // [function]
@@ -53,27 +56,29 @@ const start = function (argv) {
       if (!page) {
         throw new Error(phrase.noGameId());
       }
-      if (argv.browser) {
-        launch(`${cfguri.HOST_HTTP_WWW}${page}`);
-        return;
+      const url = `${cfguri.HOST_HTTP_WWW}${page}`;
+      const opening = argv.browser
+        ? launch(url)
+        : launch(`${cfguri.HOST_APP_STORE}${page}`, url);
+      return Promise.all([opening, url]);
+    })
+    .then(([where, url]) => {
+      if (where) {
+        log.result(phrase.opened(where), [url]);
+      } else {
+        log.result(phrase.unableToOpen(), [url, phrase.openToContinue()], {
+          color: "yellow",
+        });
       }
-      launch(
-        `${cfguri.HOST_APP_STORE}${page}`,
-        `${cfguri.HOST_HTTP_WWW}${page}`,
-      );
     })
-    .catch((ex) => {
-      log.hd("Open aborted.");
-      log.p(ex.message);
-      process.exit(1);
-    });
+    .catch((ex) => abort("Open aborted.", ex));
 };
 
 // [function]
 
 const main = function (argv) {
   return start(
-    yargs(hideBin(argv))
+    yargs(args.normalize(hideBin(argv)))
       .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [game] [options]")
       .command("$0 [game]", false, (cli) =>
@@ -88,12 +93,7 @@ const main = function (argv) {
         describe: "Open in a web browser",
         type: "boolean",
       })
-      .option("cwd", {
-        alias: "C",
-        default: ".",
-        describe: "Set the working directory",
-        type: "string",
-      })
+      .option("cwd", args.CWD)
       .help("help")
       .alias("help", "h")
       .version(VERSION)
@@ -103,7 +103,7 @@ const main = function (argv) {
   );
 };
 
-// [main]
+// [start]
 
 if (require.main === module) {
   main(process.argv);

package/bin/arc-pack.js

@@ -12,6 +12,7 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const args = require("../src/util/argv");
 const cfgpackage = require("../src/config/package");
 const cfgproduct = require("../src/config/product");
 const log = require("../src/util/log");
@@ -24,6 +25,7 @@ const validate = require("../src/cli/validate");
 
 // [use]
 
+const abort = output.abort;
 const findRc = rc.findRc;
 const print = output.print;
 const resolve = path.resolve;
@@ -42,7 +44,7 @@ const conf = {
   json: false,
   output: null,
   quiet: false,
-  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv),
 };
 
 // [function]
@@ -52,13 +54,14 @@ const start = function (argv) {
   const quiet = argv.quiet;
   const root = resolve(process.cwd(), argv.cwd);
   let sw = new SpinnerWheel("Validating... %s");
+  sw.start(json || quiet);
   return validate({ root })
     .then((issues) => {
       const count = issues.length;
       if (count) {
         throw new Error(phrase.issuesFound(count));
       }
-      sw.stop();
+      sw.stop(true);
       sw = new SpinnerWheel("Packing... %s");
       sw.start(json || quiet);
       return pack({ input: argv.input, output: argv.output, root });
@@ -70,32 +73,18 @@ const start = function (argv) {
       }
       if (!quiet) {
         sw.stop(true);
-        log.hs("Done.");
-        if (artifact) {
-          print(artifact, { toml: true });
-          return;
-        }
-        log.p("Nothing to do.");
+        log.hs("Packed.");
+        print(artifact, { nl: true, toml: true });
       }
     })
-    .catch((ex) => {
-      const message = ex.message;
-      if (json) {
-        print({ error: { message } });
-      } else {
-        sw.stop(true);
-        log.hd("Pack aborted.");
-        log.p(message);
-      }
-      process.exit(1);
-    });
+    .catch((ex) => abort("Pack aborted.", ex, { json, sw }));
 };
 
 // [function]
 
 const main = function (argv) {
   return start(
-    yargs(hideBin(argv))
+    yargs(args.normalize(hideBin(argv)))
       .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [options]")
       .option("input", {
@@ -122,12 +111,7 @@ const main = function (argv) {
         describe: "Output only errors",
         type: "boolean",
       })
-      .option("cwd", {
-        alias: "C",
-        default: ".",
-        describe: "Set the working directory",
-        type: "string",
-      })
+      .option("cwd", args.CWD)
       .help("help")
       .alias("help", "h")
       .version(VERSION)
@@ -137,7 +121,7 @@ const main = function (argv) {
   );
 };
 
-// [main]
+// [start]
 
 if (require.main === module) {
   main(process.argv);

package/bin/arc-play.js

@@ -12,10 +12,12 @@ const yargs = require("yargs/yargs");
 
 // [import]
 
+const args = require("../src/util/argv");
 const cfgpackage = require("../src/config/package");
 const cfgproduct = require("../src/config/product");
 const cfguri = require("../src/config/uri");
 const log = require("../src/util/log");
+const output = require("../src/util/output");
 const phrase = require("../src/phrase");
 const play = require("../src/cli/play");
 const rc = require("../src/util/rc");
@@ -24,6 +26,7 @@ const spinner = require("../src/util/spinner");
 
 // [use]
 
+const abort = output.abort;
 const findRc = rc.findRc;
 const launch = shell.launch;
 const resolve = path.resolve;
@@ -41,8 +44,7 @@ const conf = {
   browser: false,
   game: "self",
   quiet: false,
-  release: "production",
-  ...findRc(TOOL, COMMAND, process.argv, ["--cwd", "-C"]),
+  ...findRc(TOOL, COMMAND, process.argv),
 };
 
 // [function]
@@ -72,25 +74,33 @@ const start = function (argv) {
         throw new Error(phrase.noGameId());
       }
       sw.stop(true);
-      if (argv.browser) {
-        launch(url);
-        return;
+      if (data.fallback && !argv.quiet) {
+        log.pw(phrase.noProductionRelease());
       }
-      launch(`${cfguri.HOST_APP_PLAY}/${orientation}/${url}`, url);
+      const opening = argv.browser
+        ? launch(url)
+        : launch(`${cfguri.HOST_APP_PLAY}/${orientation}/${url}`, url);
+      return Promise.all([opening, url]);
     })
-    .catch((ex) => {
-      sw.stop(true);
-      log.hd("Play aborted.");
-      log.p(ex.message);
-      process.exit(1);
-    });
+    .then(([where, url]) => {
+      if (!argv.quiet) {
+        if (where) {
+          log.result(phrase.opened(where), [url]);
+        } else {
+          log.result(phrase.unableToOpen(), [url, phrase.openToContinue()], {
+            color: "yellow",
+          });
+        }
+      }
+    })
+    .catch((ex) => abort("Play aborted.", ex, { sw }));
 };
 
 // [function]
 
 const main = function (argv) {
   return start(
-    yargs(hideBin(argv))
+    yargs(args.normalize(hideBin(argv)))
       .scriptName(`${TOOL} ${COMMAND}`)
       .usage("$0 [game] [options]")
       .command("$0 [game]", false, (cli) =>
@@ -103,6 +113,9 @@ const main = function (argv) {
       .option("release", {
         alias: "r",
         default: conf.release,
+        // without one, the action picks production, or staging when there's
+        // no production release yet (docs: arc-play.md).
+        defaultDescription: '"production"',
         describe: "Release channel or version",
         type: "string",
       })
@@ -117,12 +130,7 @@ const main = function (argv) {
         describe: "Output only errors",
         type: "boolean",
       })
-      .option("cwd", {
-        alias: "C",
-        default: ".",
-        describe: "Set the working directory",
-        type: "string",
-      })
+      .option("cwd", args.CWD)
       .help("help")
       .alias("help", "h")
       .version(VERSION)
@@ -132,7 +140,7 @@ const main = function (argv) {
   );
 };
 
-// [main]
+// [start]
 
 if (require.main === module) {
   main(process.argv);