apigeetool - npm Package Compare versions

Comparing version 0.14.1 to 0.14.2

lib/options.js

@@ -128,4 +128,4 @@ /* jshint node: true  */
   var desc = descriptor[propName];
-  // console.log( "DEBUG " + desc.required + " " + opts[propName] + " " + opts.prompt + " " + desc.prompt + " " + propName);
-  // console.log( "DEBUG OPTs" + JSON.stringify(opts) );
+  // console.log( "DEBUG COND " + propName + " " + desc.required + " " + !opts[propName] + " " + !opts.prompt + " " + desc.prompt);
+  // console.log( "DEBUG OPTs" + JSON.stringify(opts) + "\n");
   if (desc === null || desc === undefined) {
@@ -135,23 +135,19 @@ done(new Error(util.format('Invalid property %s', propName)));
   }
-  if (desc.required && !opts[propName]) {
-    if (desc.prompt && !opts.prompt ) {
-      if (opts.interactive) {
-        var pn = (desc.name ? desc.name : propName);
-        prompt(pn, desc.secure, function(err, val) {
-          if (err) {
-            done(err);
+  if (desc.required && !opts[propName] && (!opts.prompt && desc.prompt)) {
+    if (opts.interactive) {
+      var pn = (desc.name ? desc.name : propName);
+      prompt(pn, desc.secure, function(err, val) {
+        if (err) {
+          done(err);
+        } else {
+          if (desc.secure === true) {
+            opts[propName] = new SecureValue(val);
           } else {
-            if (desc.secure === true) {
-              opts[propName] = new SecureValue(val);
-            } else {
-              opts[propName] = val;
-            }
-            done();
+            opts[propName] = val;
           }
-        });
-      } else {
-        done(new Error(util.format('Missing required option "%s"', propName)));
-      }
+          done();
+        }
+      });
     } else {
-        done(new Error(util.format('Missing required option with no prompt "%s"', propName)));
+      done(new Error(util.format('Missing required option "%s"', propName)));
     }
@@ -222,5 +218,5 @@ } else {
       (d[1].shortOption ? '-' + d[1].shortOption : ''),
-      ((d[1].required && !d[1].prompt) ? '(required)': '(optional)'),
+      ((d[1].required) ? '(required)': '(optional)'),
       ((d[1].name ? d[1].name : 'undefined')),
-      ((d[1].scope == 'default') ? '' : '(command specific)')
+      ((d[1].scope == 'default') ? ((d[1].shortOption == 't' || d[1].shortOption == 'N') ? '(overrides -p/-u)' : '') : '(command specific)')
     ]);
@@ -227,0 +223,0 @@ });

package.json

 {
   "name": "apigeetool",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "description": "A CLI for Apigee Edge",
@@ -5,0 +5,0 @@ "main": "lib/main.js",

No alert changes

Worsened metrics

Total package byte prevSize

257034

decreased by-0.03%

Lines of code

6768

decreased by-0.06%

No dependency changes