Don't add --help if -V. Fixes #273

webgme · Oct 13, 2020 · 0807275 · 0807275
1 parent 92fe997
commit 0807275
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/BinUtils.js b/src/BinUtils.js
@@ -82,6 +82,7 @@ var createSubCommands = function(dir, defArgs, descTs, opts) {
     program = createCommands(_.values(componentNames), defArgs, descTs, opts);
 
     if (!componentNames[component]) {
+        const showVersion = process.argv.includes('--version') || process.argv.includes('-V');
         var config = utils.getConfig();
         if (inferrable && config) {  // Try to infer the component. Assume name is provided
             var name = process.argv[2],
@@ -100,7 +101,7 @@ var createSubCommands = function(dir, defArgs, descTs, opts) {
             } 
 
             process.argv.splice(2, 0, rAlias[component] || component || '--help');
-        } else if (process.argv.indexOf('--version') === -1) {
+        } else if (!showVersion) {
             // Show the help message
             process.argv = [
                 process.argv[0],

diff --git a/test/cli.spec.js b/test/cli.spec.js
@@ -2,6 +2,7 @@
 // Testing the command line interfaces for the commands
 'use strict';
 
+const {version} = require('../package.json');
 var spawn = require('child_process').spawn,
     path = require('path'),
     fs = require('fs'),
@@ -187,6 +188,24 @@ describe('cli', function() {
         });
     });
 
+    describe('version info', function() {
+        it('should show version on --version', done => {
+            var testFn = function(res, err, done) {
+                assert(res.includes(version));
+                done();
+            };
+            testCliCall(['--version'], testFn, done);
+        });
+
+        it('should show version on -V', done => {
+            var testFn = function(res, err, done) {
+                assert(res.includes(version));
+                done();
+            };
+            testCliCall(['--version'], testFn, done);
+        });
+    });
+
     describe('--package-name option on import', function() {
         var binDir = path.join(__dirname, '..', 'bin'),
             files = fs.readdirSync(binDir),