Shorten duration formatting, combine host and port, right align PID in instances table. Revert changes to standardise prompts in README

Author: jeffsmale90

src/packages/cli/src/cli.ts

@@ -200,11 +200,11 @@ if (argv.action === "start") {
           chalk.bold("Flavor"),
           chalk.bold("Version"),
           chalk.bold("Host"),
-          chalk.bold("Port"),
           chalk.bold("Uptime")
         ],
+        colAligns: ["right", "left", "left", "left", "left", "left"],
         style: {
-          head: ["white", "white", "white", "white", "white", "white", "white"]
+          head: ["white", "white", "white", "white", "white", "white"]
         }
       });
 
@@ -218,8 +218,7 @@ if (argv.action === "start") {
           porscheColor(instance.name),
           instance.flavor,
           instance.version,
-          instance.host,
-          instance.port.toString(),
+          `${instance.host}:${instance.port.toString()}`,
           formatUptime(uptime)
         ]);
       }

src/packages/cli/src/detach.ts

@@ -310,15 +310,15 @@ export function formatUptime(ms: number) {
   ms = Math.abs(ms);
 
   const time = {
-    day: Math.floor(ms / 86400000),
-    hour: Math.floor(ms / 3600000) % 24,
-    minute: Math.floor(ms / 60000) % 60,
-    second: Math.floor(ms / 1000) % 60
+    d: Math.floor(ms / 86400000),
+    h: Math.floor(ms / 3600000) % 24,
+    m: Math.floor(ms / 60000) % 60,
+    s: Math.floor(ms / 1000) % 60
   };
   const duration = Object.entries(time)
     .filter(val => val[1] !== 0)
-    .map(([key, val]) => `${val} ${key}${val !== 1 ? "s" : ""}`)
-    .join(", ");
+    .map(([key, val]) => `${val}${key}`)
+    .join(" ");
 
   return isFuture ? `In ${duration}` : duration;
 }

src/packages/cli/tests/detach.test.ts

@@ -10,16 +10,16 @@ describe("@ganache/cli", () => {
         [1, "Just started"],
         [-1, "Just started"],
         [2, "Just started"],
-        [1000, "1 second"],
-        [1001, "1 second"],
-        [-1000, "In 1 second"],
-        [-1001, "In 1 second"],
-        [2000, "2 seconds"],
-        [60000, "1 minute"],
-        [62000, "1 minute, 2 seconds"],
-        [1000000, "16 minutes, 40 seconds"],
-        [-171906000, "In 1 day, 23 hours, 45 minutes, 6 seconds"],
-        [171906000, "1 day, 23 hours, 45 minutes, 6 seconds"]
+        [1000, "1s"],
+        [1001, "1s"],
+        [-1000, "In 1s"],
+        [-1001, "In 1s"],
+        [2000, "2s"],
+        [60000, "1m"],
+        [62000, "1m 2s"],
+        [1000000, "16m 40s"],
+        [-171906000, "In 1d 23h 45m 6s"],
+        [171906000, "1d 23h 45m 6s"]
       ];
 
       durations.forEach(duration => {

src/packages/ganache/README.md

@@ -60,7 +60,7 @@ In case you're upgrading from a previous version of Ganache, we've also written
 Once installed globally, you can start ganache right from your command line:
 
 ```console
-$ ganache
+ganache
 ```
 
 Your output should look something like this:
@@ -230,7 +230,7 @@ In the meantime, check out our [Ethereum JSON-RPC documentation](/src/chains/eth
 The startup options are grouped in the `chain`, `database`, `fork`, `logging`, `miner`, and `wallet` namespaces, and should be used as such on startup, i.e.
 
 ```console
-$ ganache --namespace.option="value"
+ganache --namespace.option="value"
 ```
 
 for CLI use, and
@@ -518,7 +518,7 @@ Process stopped
 With the following command, you can start Ganache, run your tests, and stop Ganache when you are finished.
 
 ```console
-$ GANACHE=$(ganache --detach) && npm run test; ganache instances stop $GANACHE
+GANACHE=$(ganache --detach) && npm run test; ganache instances stop $GANACHE
 ```
 
 Or if you are running PowerShell on Windows, you can do: