fix: run command --list should not need script arg

electrode-io · Apr 16, 2020 · ed579dd · ed579dd
1 parent 291451f
commit ed579dd
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 15 deletions.
diff --git a/cli/fyn-cli.js b/cli/fyn-cli.js
@@ -442,19 +442,20 @@ class FynCli {
     return showStat(this.fyn, argv.args.packages, argv.opts.follow);
   }
 
-  run(argv, parsed) {
-    if (argv.opts.list) {
-      return this.fyn
-        ._initialize({ noLock: true })
-        .then(() => {
-          console.log(Object.keys(_.get(this.fyn._pkg, "scripts", {})).join("\n"));
-        })
-        .finally(() => {
-          fyntil.exit(0);
-        });
+  async run(argv) {
+    if (argv.opts.list || !argv.args.script) {
+      try {
+        await this.fyn._initialize({ noLock: true });
+        if (!argv.opts.list) {
+          console.log(`Lifecycle scripts included in ${this.fyn._pkg.name}:\n`);
+        }
+        console.log(Object.keys(_.get(this.fyn._pkg, "scripts", {})).join("\n"));
+      } finally {
+        fyntil.exit(0);
+      }
     }
 
-    let { script = argv.name } = argv.args;
+    let { script } = argv.args;
 
     const config = x => this.fyn.allrc[x];
 

diff --git a/cli/main.js b/cli/main.js
@@ -368,7 +368,7 @@ const commands = {
   },
   run: {
     desc: "Run a npm script",
-    args: "<script>",
+    args: "[script]",
     alias: ["rum", "r"],
     usage: "$0 $1 <command> [-- <args>...]",
     exec: (argv, parsed) => {

diff --git a/fyn-lock.yaml b/fyn-lock.yaml
@@ -1778,6 +1778,15 @@ binary-extensions:
  1.12.0:
   $: sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==
   _: 'https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz'
+bindings:
+ _latest: 1.5.0
+ _:
+  ^1.5.0: 1.5.0
+ 1.5.0:
+  $: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  _: 'https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz'
+  dependencies:
+   file-uri-to-path: 1.0.0
 block-stream:
  _:
   '*': 0.0.9
@@ -3220,6 +3229,13 @@ file-entry-cache:
   dependencies:
    flat-cache: ^1.2.1
    object-assign: ^4.0.1
+file-uri-to-path:
+ _latest: 2.0.0
+ _:
+  1.0.0: 1.0.0
+ 1.0.0:
+  $: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+  _: 'https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz'
 filesize:
  _:
   ^3.6.1: 3.6.1
@@ -3396,6 +3412,21 @@ fs.realpath:
  1.0.0:
   $: sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
   _: 'https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz'
+fsevents:
+ _latest: 2.1.2
+ _:
+  ^1.2.2: 1.2.12
+ 1.2.12:
+  hasI: 1
+  $: sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==
+  _: 'https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz'
+  dependencies:
+   bindings: ^1.5.0
+   nan: ^2.12.1
+  bundleDependencies:
+   - node-pre-gyp
+  os:
+   - darwin
 fstream:
  _:
   '^1.0.0,^1.0.2': 1.0.11
@@ -4802,6 +4833,13 @@ mute-stream:
  0.0.7:
   $: sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
   _: 'https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz'
+nan:
+ _latest: 2.14.0
+ _:
+  ^2.12.1: 2.14.0
+ 2.14.0:
+  $: sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+  _: 'https://registry.npmjs.org/nan/-/nan-2.14.0.tgz'
 nanomatch:
  _:
   ^1.2.9: 1.2.13
@@ -7044,11 +7082,18 @@ visual-exec:
    visual-logger: ^1.1.1
    xsh: ^0.4.4
 visual-logger:
- _latest: 1.1.1
+ _latest: 1.1.2
  _:
   ^1.1.1: 1.1.1
- 1.1.1:
+  ^1.1.2: 1.1.2
+ 1.1.2:
   top: 1
+  $: sha512-D7fu+XWq277W+YtWdJcY4SS3By6wNzcAj1epyX+Db1v84hsXBThc+COdCgucm30QOSSChWLOvkkOqGC5rC9VjQ==
+  _: 'https://registry.npmjs.org/visual-logger/-/visual-logger-1.1.2.tgz'
+  dependencies:
+   chalk: ^4.0.0
+   log-update: ^4.0.0
+ 1.1.1:
   $: sha512-fMqKlV5YqUVycfF5QxOpIlivBTvF1Fx/jwlNu3JSxFwyzVyi4P11i+R1+iVDNsU8AHHuUZqi1ONs1OpxAplMoA==
   _: 'https://registry.npmjs.org/visual-logger/-/visual-logger-1.1.1.tgz'
   dependencies:

diff --git a/package.json b/package.json
@@ -74,7 +74,7 @@
     "semver": "^7.3.0",
     "tar": "^6.0.0",
     "visual-exec": "^0.1.7",
-    "visual-logger": "^1.1.1",
+    "visual-logger": "^1.1.2",
     "xaa": "^1.3.0",
     "xenv-config": "^1.3.0",
     "xsh": "^0.4.0",