Fix issues with yargs configuration. Remove duplicate 'instances' com…

…mand definition. Don't show '--flavor' option on 'instances' command. Move '--detach' option out of 'Server' group

src/packages/cli/src/args.ts

@@ -3,7 +3,7 @@ import yargs from "yargs";
 import { StartArgs, GanacheArgs } from "./types";
 import chalk from "chalk";
 import { EOL } from "os";
-import { configureFlavorOptions, loadFlavorFromArgs } from "./flavors";
+import { configureStartCommandForFlavor, loadFlavorFromArgs } from "./flavors";
 import { center, highlight, wrapWidth } from "./helpers";
 
 const NEED_HELP = "Need more help? Reach out to the Truffle community at";
@@ -47,38 +47,7 @@ export const parseArgs = (version: string, rawArgs = process.argv.slice(2)) => {
     );
 
   const { flavor, options: flavorOptions } = loadFlavorFromArgs(rawArgs);
-  configureFlavorOptions(yargs, flavor, flavorOptions);
-
-  yargs.command(
-    "instances",
-    highlight(
-      "Manage instances of Ganache running in detached mode." +
-        EOL +
-        "(Ganache can be run in detached mode by providing the `--detach` flag)"
-    ),
-    _yargs => {
-      _yargs
-        .command(
-          "list",
-          "List instances running in detached mode",
-          _ => {},
-          listArgs => {
-            listArgs.action = "list";
-          }
-        )
-        .command(
-          "stop <name>",
-          "Stop the instance specified by <name>",
-          stopArgs => {
-            stopArgs.positional("name", { type: "string" });
-          },
-          stopArgs => {
-            stopArgs.action = "stop";
-          }
-        )
-        .version(false);
-    }
-  );
+  configureStartCommandForFlavor(yargs, flavor, flavorOptions);
 
   yargs
     .command(

src/packages/cli/src/flavors.ts

@@ -37,7 +37,16 @@ function addFlavorFlag(yargs: Argv<{}>) {
   });
 }
 
-function addOptions(
+function addDetachFlag(yargs: Argv<{}>) {
+  yargs.option("detach", {
+    type: "boolean",
+    description: `Run Ganache in detached (daemon) mode.
+See \`ganache instances --help\` for information on managing detached instances.`,
+    alias: ["D", "😈"]
+  });
+}
+
+export function configureStartCommandForFlavor(
   yargs: Argv<{}>,
   flavor: string,
   options: {
@@ -70,21 +79,10 @@ function addOptions(
 
       applyDefaults(combinedCliOptions, args);
       applyDefaults(combinedServerOptions, args);
+
+      addFlavorFlag(args);
+      addDetachFlag(args);
     },
     parsed => (parsed.action = parsed.detach ? "start-detached" : "start")
   );
 }
-
-export function configureFlavorOptions(
-  yargs: Argv<{}>,
-  flavor: string,
-  options: {
-    provider?: OptionsConfig<any>;
-    server?: OptionsConfig<any>;
-    cli?: OptionsConfig<any>;
-  }
-) {
-  addFlavorFlag(yargs);
-
-  addOptions(yargs, flavor, options);
-}

src/packages/cli/src/helpers.ts

@@ -117,6 +117,12 @@ function addOption(
 
     const key = `${category}.${option}`;
 
+    // todo: this is a terrible hack - the `default` property must be set for `server.host` and
+    // `server.port` in order for detach mode to work
+    if ((key === "server.host" || key === "server.port") && optionObj.default) {
+      options.default = optionObj.default(state);
+    }
+
     // First, create *hidden* deprecated aliases...
     argv = addAliases(argv, legacyAliases, key);
 

src/packages/flavor/src/options/cli/cli-config.ts

@@ -31,14 +31,5 @@ export type CliConfig = {
         host: boolean;
       };
     };
-
-    /**
-     * Host for the server to bind to
-     *
-     * @defaultValue true
-     */
-    readonly detach: {
-      type: boolean;
-    };
   };
 };

src/packages/flavor/src/options/cli/cli-options.ts

@@ -34,12 +34,5 @@ export const CliOptions: CliOptions = {
     legacyName: "host",
     cliType: "string",
     cliAliases: ["h", "host"]
-  },
-  detach: {
-    normalize: detach => detach,
-    cliDescription: `Run Ganache in detached (daemon) mode.
-See \`ganache instances --help\` for information on managing detached instances.`,
-    cliType: "boolean",
-    cliAliases: ["D", "😈", "detach"]
   }
 };