@rpcbase/cli 0.11.0 → 0.14.0

package/bin.js

@@ -1,39 +1,64 @@
 #!/usr/bin/env node
 /* @flow */
 process.title = "rb"
+// load .env
 const path = require("path")
-require("dotenv").config({path: path.join(__dirname, "./.env")})
+require("dotenv").config({path: path.join(process.cwd(), "./.env")})
+// 
 const yargs = require("yargs/yargs")
 const {hideBin} = require("yargs/helpers")
 
-const default_command = require("./src/default_command")
+const start_command = require("./src/start_command")
+const print_versions = require("./src/print_versions")
 const update = require("./src/update")
 
-let is_command = false
-
-const args = yargs(hideBin(process.argv))
-  .command(["update", "up"], "Update rb dependencies to latest version", () => {}, async(argv) => {
-    is_command = true
+yargs(hideBin(process.argv))
+  .command(["start", "*"], "Starts client, server, and infrastructure", (yargs) => {
+    yargs
+      .option("coverage", {
+        alias: "c",
+        type: "boolean",
+        default: false,
+        description: "Adds coverage instrumentation (always disabled in production)"
+      })
+      .option("verbose", {
+        type: "boolean",
+        default: false,
+        description: "Run with verbose logging"
+      })
+      .option("debug", {
+        type: "boolean",
+        default: false,
+        description: "Run with debug logging"
+      })
+  }, (argv) => {
+    if (argv.version) return print_versions()
+    start_command(argv)
+  })
+  // Update
+  .command(["update", "up"], "Update rb dependencies to latest version", (yargs) => {
+    yargs
+      .option("dry-run", {
+        type: "boolean",
+        default: false,
+        description: "Print output without writing any files"
+      })
+  }, async(argv) => {
+    if (argv.version) return print_versions()
     await update()
   })
+  // Ping
   .command("ping", "Ping", () => {}, (argv) => {
-    is_command = true
+    if (argv.version) return print_versions()
     console.log("PING")
   })
-  .option("coverage", {
-    alias: "c",
+  // Global options
+  .version(false)
+  .option("version", {
+    alias: "v",
     type: "boolean",
-    default: false,
-    description: "Adds coverage instrumentation (always disabled in production)"
+    description: "Displays the @rpcbase/cli version"
   })
-  // .option("version", {
-  //   alias: "v",
-  //   type: "boolean",
-  //   default: false,
-  //   // description: "Displays CLI version"
-  // })
+  .help("h")
+  .alias("h", "help")
   .parse()
-
-if (!is_command) {
-  default_command(args)
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.11.0",
+  "version": "0.14.0",
   "license": "SSPL-1.0",
   "bin": {
     "rb": "./bin.js"
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "bluebird": "3.7.2",
-    "concurrently": "7.2.1",
+    "concurrently": "7.3.0",
     "debug": "4.3.4",
     "dotenv": "16.0.1",
     "picocolors": "1.0.0",

package/src/print_versions.js

@@ -0,0 +1,15 @@
+/* @flow */
+const {execSync} = require("child_process")
+
+const colors = require("picocolors")
+
+const package = require("../package.json")
+
+const print_versions = () => {
+  console.log(`${colors.cyan("rb")} v${package.version}`)
+
+  const node_out = execSync("node -v")
+  console.log(`${colors.green("node")} ${node_out.toString().trim()}`)
+}
+
+module.exports = print_versions

package/src/{default_command.js → start_command.js}

@@ -13,7 +13,7 @@ const verify_project = require("./verify_project")
 // TODO: nuke this
 // server native + docker + docker-native is way too complex
 // either everything is native, or everything is in docker
-const default_command = async(args) => {
+const start_command = async(args) => {
   const run_configs = get_run_configs()
 
   const run_commands = []
@@ -39,11 +39,20 @@ const default_command = async(args) => {
       prefixColor = "#4DB33D"
     }
 
-    // pass through coverage arg to client and server
-    if (["client", "server"].includes(cfg.type) && args.coverage) {
-      command = `${command} --coverage`
+    // pass through listed args to client and server
+    if (["client", "server"].includes(cfg.type)) {
+      if (args.coverage) {
+        command = `${command} --coverage`
+      }
+      if (args.debug) {
+        command = `${command} --debug`
+      }
+      if (args.verbose) {
+        command = `${command} --verbose`
+      }
     }
 
+
     // add command
     run_commands.push({
       name,
@@ -94,4 +103,4 @@ const default_command = async(args) => {
   }
 }
 
-module.exports = default_command
+module.exports = start_command