commit 6f1a1c7beb2dddfa00d1a2dec1827362c7ef3350
author Raphael von der Grün <raphinesse@gmail.com> Sun Mar 31 22:01:13 2019 +0200
committer Raphael von der Grün <raphinesse@gmail.com> Mon Apr 01 01:31:22 2019 +0200
tree a139019a27329f9341d056f21a8ea6b761afb225
parent 7e4df8cb87fd5ac8f4304b1d047885a75611d4cf

If we fail, do so with helpful error message and code

package.json

diff --git a/package.json b/package.json
index 5be8601..dd6ce02 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,8 @@
   "dependencies": {
     "cordova-lib": "^9.0.0",
     "nopt": "^4.0.1",
-    "p-each-series": "^1.0.0"
+    "p-each-series": "^1.0.0",
+    "p-try": "^2.2.0"
   },
   "devDependencies": {
     "eslint": "^5.15.3",

src/commands.js

diff --git a/src/commands.js b/src/commands.js
index 81807c6..2423706 100644
--- a/src/commands.js
+++ b/src/commands.js
@@ -19,14 +19,13 @@
 
 // copyright (c) 2013 Andrew Lunny, Adobe Systems
 
+const pTry = require('p-try');
 const pEachSeries = require('p-each-series');
 const { plugman } = require('cordova-lib');
 
 module.exports = {
     install (cli_opts) {
-        if (!cli_opts.platform || !cli_opts.project || !cli_opts.plugin) {
-            return console.log(plugman.help());
-        }
+        assertRequiredOptions(cli_opts, ['platform', 'project', 'plugin']);
 
         var opts = {
             subdir: '.',
@@ -46,9 +45,7 @@
     },
 
     uninstall (cli_opts) {
-        if (!cli_opts.platform || !cli_opts.project || !cli_opts.plugin) {
-            return console.log(plugman.help());
-        }
+        assertRequiredOptions(cli_opts, ['platform', 'project', 'plugin']);
 
         var opts = {
             www_dir: cli_opts.www,
@@ -62,30 +59,44 @@
     },
 
     create (cli_opts) {
-        if (!cli_opts.name || !cli_opts.plugin_id || !cli_opts.plugin_version) {
-            return console.log(plugman.help());
-        }
+        assertRequiredOptions(cli_opts, ['name', 'plugin_id', 'plugin_version']);
+
         const cli_variables = expandCliVariables(cli_opts.variable);
         return plugman.create(cli_opts.name, cli_opts.plugin_id, cli_opts.plugin_version, cli_opts.path || '.', cli_variables);
     },
 
     platform (cli_opts) {
+        assertRequiredOptions(cli_opts, ['platform_name']);
         var operation = cli_opts.argv.remain[ 0 ] || '';
-        if ((operation !== 'add' && operation !== 'remove') || !cli_opts.platform_name) {
-            return console.log(plugman.help());
+        if (operation !== 'add' && operation !== 'remove') {
+            throw new Error(`Operation must be either 'add' or 'remove' but was '${operation}'`);
         }
+
         return plugman.platform({ operation: operation, platform_name: cli_opts.platform_name });
     },
 
     createpackagejson (cli_opts) {
         var plugin_path = cli_opts.argv.remain[0];
         if (!plugin_path) {
-            return console.log(plugman.help());
+            throw new Error(`Missing required path to plugin`);
         }
         return plugman.createpackagejson(plugin_path);
     }
 };
 
+// Until we can declare all above functions async, wrap them all with pTry
+// to turn all thrown errors into rejections
+for (const key in module.exports) {
+    const fn = module.exports[key];
+    module.exports[key] = (...args) => pTry(fn, ...args);
+}
+
+function assertRequiredOptions (options, requiredKeys) {
+    for (const key of requiredKeys) {
+        if (!options[key]) throw new Error(`Missing required option --${key}`);
+    }
+}
+
 function expandCliVariables (cliVarList) {
     return (cliVarList || []).reduce((cli_variables, variable) => {
         var tokens = variable.split('=');