@rpcbase/cli 0.6.0 → 0.9.0

package/bin.js

@@ -20,6 +20,12 @@ const args = yargs(hideBin(process.argv))
     is_command = true
     console.log("PING")
   })
+  .option("coverage", {
+    alias: "c",
+    type: "boolean",
+    default: false,
+    description: "Adds coverage instrumentation (always disabled in production)"
+  })
   // .option("version", {
   //   alias: "v",
   //   type: "boolean",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/cli",
-  "version": "0.6.0",
+  "version": "0.9.0",
   "license": "SSPL-1.0",
   "bin": {
     "rb": "./bin.js"
@@ -11,11 +11,11 @@
   "dependencies": {
     "bluebird": "3.7.2",
     "chalk": "4.1.2",
-    "concurrently": "7.0.0",
+    "concurrently": "7.2.1",
     "debug": "4.3.4",
-    "dotenv": "16.0.0",
-    "semver": "7.3.5",
+    "dotenv": "16.0.1",
+    "semver": "7.3.7",
     "validator": "13.7.0",
-    "yargs": "17.4.0"
+    "yargs": "17.5.1"
   }
 }

package/src/default_command.js

@@ -5,16 +5,19 @@ const fs = require("fs")
 const chalk = require("chalk")
 const concurrently = require("concurrently")
 
+const docker_runtime_check = require("./helpers/docker_runtime_check")
 const exit_with_message = require("./helpers/exit_with_message")
 const get_run_configs = require("./helpers/get_run_configs")
-const docker_runtime_check = require("./helpers/docker_runtime_check")
 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 run_configs = get_run_configs()
 
-  const run_commands = run_configs.map((cfg) => {
+  const run_commands = []
+  run_configs.forEach((cfg) => {
     let name
     let command
     let prefixColor
@@ -36,15 +39,21 @@ const default_command = async(args) => {
       prefixColor = "#4DB33D"
     }
 
-    // command, name, prefixColor, env, cwd
-    return {
+    // pass through coverage arg to client and server
+    if (["client", "server"].includes(cfg.type) && args.coverage) {
+      command = `${command} --coverage`
+    }
+
+    // add command
+    run_commands.push({
       name,
       command,
       prefixColor,
       cwd: cfg.working_dir
-    }
+    })
   })
 
+  // check if docker is running
   if (run_configs.filter((c) => c.type === "server").length > 0) {
     docker_runtime_check()
   }

package/src/helpers/docker_runtime_check.js

@@ -1,8 +1,17 @@
 /* @flow */
 const {execSync} = require("child_process")
+const os = require("os")
 const chalk = require("chalk")
 
+const {FORCE_DOCKER} = process.env
+
 const docker_runtime_check = () => {
+  // skip check on osx except when forcing docker
+  if (os.platform() === "darwin" && !FORCE_DOCKER) {
+    return
+  }
+
+
   try {
     execSync("docker version -f json")
   } catch (err) {

package/src/helpers/get_run_configs.js

@@ -5,11 +5,11 @@ const fs = require("fs")
 const ERRORS = require("../errors")
 const exit_with_message = require("./exit_with_message")
 
-
 // run type is client | server | both
 const get_run_configs = () => {
   const cwd = process.cwd()
 
+
   // check if running parent of rb project
   const dir_contents = fs.readdirSync(cwd)
   const is_parent_dir = dir_contents.includes("client") && dir_contents.includes("server")
@@ -57,6 +57,8 @@ const get_run_configs = () => {
           working_dir: path.join(cwd, "../infrastructure")
         },
       ]
+    } else {
+      console.log("TODO: server get_run_configs:handle edge case here")
     }
   }