Fix CLI tests

Author: pmeijer

src/bin/apply.js

@@ -53,8 +53,14 @@ main = function (argv) {
             }
         };
 
+    // Commander v7+ no longer exposes options as direct properties by default
+    // (it prefers `program.opts()`), but this CLI and its tests read `program.projectName`,
+    // `program.target`, etc. Keep the legacy access pattern for backwards compatibility.
+    program.storeOptionsAsProperties();
+
     program
         .version('0.2.0')
+        .argument('<patch-file>', 'Path to patch json file')
         .usage('<patch-file> [options]')
         .option('-m, --mongo-database-uri [url]',
             'URI of the MongoDB [by default we use the one from the configuration file]')
@@ -63,7 +69,15 @@ main = function (argv) {
         .option('-o, --owner [string]', 'the owner of the project [by default, the user is the owner]')
         .option('-t, --target [branch/commit]', 'the target where we should apply the patch [mandatory]')
         .option('-n, --no-update', 'show if we should not update the branch [by default it is false]')
-        .parse(argv);
+        .exitOverride();
+
+    try {
+        program.parse(argv);
+    } catch (e) {
+        program.outputHelp();
+        mainDeferred.reject(new SyntaxError('invalid argument'));
+        return mainDeferred.promise;
+    }
 
     if (program.mongoDatabaseUri) {
         // this line throws a TypeError for invalid databaseConnectionString

src/bin/diff.js

@@ -51,6 +51,8 @@ main = function (argv) {
         },
         badArgument = false;
 
+    program.storeOptionsAsProperties();
+
     program
         .version('0.2.0')
         .option('-m, --mongo-database-uri [url]',

src/bin/export.js

@@ -48,6 +48,8 @@ main = function (argv) {
         program = new Command(),
         syntaxFailure = false;
 
+    program.storeOptionsAsProperties();
+
     gmeConfig = require(path.join(process.cwd(), 'config'));
     logger = webgme.Logger.create('gme:bin:export', gmeConfig.bin.log, false);
     blobClient = new FSBlobClient(gmeConfig, logger.fork('BlobClient'));

src/bin/import.js

@@ -110,8 +110,11 @@ main = function (argv) {
             }
         };
 
+    program.storeOptionsAsProperties();
+
     program
         .version('1.7.2')
+        .argument('<project-package-file>', 'Path to exported webgmex package')
         .usage('<project-package-file> [options]')
         .option('-m, --mongo-database-uri [url]',
             'URI of the MongoDB [by default we use the one from the configuration file]')
@@ -122,7 +125,15 @@ main = function (argv) {
             'the branch that should be created with the imported data [by default it is the \'master\']')
         .option('-w --overwrite [boolean]', 'if a project exist it will be deleted and created again')
         .option('-c --commit [string]', 'if given, the import will be a descendant of it')
-        .parse(argv);
+        .exitOverride();
+
+    try {
+        program.parse(argv);
+    } catch (e) {
+        program.outputHelp();
+        mainDeferred.reject(new SyntaxError('invalid argument'));
+        return mainDeferred.promise;
+    }
 
     if (program.mongoDatabaseUri) {
         // this line throws a TypeError for invalid databaseConnectionString

src/bin/merge.js

@@ -27,6 +27,7 @@ var main = function (argv) {
         syntaxFailure = false;
 
     logger.debug(argv);
+    program.storeOptionsAsProperties();
     program
         .version('0.2.0')
         .option('-m, --mongo-database-uri [url]',

src/bin/run_plugin.js

@@ -39,9 +39,10 @@ main = function (argv, callback) {
     }
 
     webgme.addToRequireJsPaths(gmeConfig);
+    program.storeOptionsAsProperties();
     program
         .version('2.2.0')
-        .arguments('<pluginName> <projectName>')
+        .arguments('[pluginName] [projectName]')
         .option('-b, --branchName [string]', 'Name of the branch to load and save to.', 'master')
         .option('-c, --commitHash [string]', 'Commit hash to run from, if set branch will only be used for update.')
         .option('-a, --activeNode [string]', 'ID/Path to active node.', '')