daplie-tools - npm Package Compare versions

Comparing version 1.0.0-alpha.903 to 1.0.0-alpha.904

bin/daplie.js

@@ -26,2 +26,14 @@ #!/usr/bin/env node
 
+function mergeDefaults(program) {
+  var opts = program.opts();
+
+  Object.keys(cliOptions).forEach(function (key) {
+    if (undefined === opts[key]) {
+      opts[key] = cliOptions[key];
+    }
+  });
+
+  return opts;
+}
+
 function help() {
@@ -37,2 +49,3 @@ console.log("");
   console.log("  accounts   #  manage accounts");
+  console.log("  addresses  #  manage addresses");
   console.log("  auth       #  authentication (login, logout)");
@@ -83,2 +96,3 @@ console.log("  devices    #  manage IP devices");
   'accounts'
+, 'addresses'
 , 'auth'
@@ -134,3 +148,3 @@ , 'devices'
 
-all['accounts'] = function () {
+all.accounts = function () {
   console.log("");
@@ -147,2 +161,4 @@ console.log("Usage: daplie accounts:COMMAND [command-specific-options]");
 all['accounts:list'] = function () {
+  var opts = mergeDefaults(program);
+
   if (helpme) {
@@ -155,4 +171,3 @@ console.log("");
 
-  program.provider = cliOptions.provider;
-  oauth3.Accounts.list(program.opts()).then(function (results) {
+  oauth3.Accounts.list(opts).then(function (results) {
     console.log('');
@@ -165,4 +180,33 @@ console.log(JSON.stringify(results, null, '  '));
 
-all['auth'] = function () {
+all.addresses = function () {
   console.log("");
+  console.log("Usage: daplie addresses:COMMAND [command-specific-options]");
+  console.log("");
+  console.log('Primary help topics, type "daplie help addresses:COMMAND" for more details:');
+  console.log("");
+  console.log("  addresses:list    # show all addresses for current account");
+//  console.log("  accounts:select  # set the current account");
+  console.log("");
+};
+
+all['addresses:list'] = function () {
+  var opts = mergeDefaults(program);
+
+  if (helpme) {
+    console.log("");
+    console.log("  addresses:list    # show all mailing addresses for current login(s)");
+    console.log("");
+    return;
+  }
+
+  oauth3.Addresses.list(opts).then(function (results) {
+    console.log('');
+    console.log(JSON.stringify(results, null, '  '));
+    //console.log(results.accounts.length);
+    console.log('');
+  });
+};
+
+all.auth = function () {
+  console.log("");
   console.log("Usage: daplie auth");
@@ -182,8 +226,9 @@ console.log("");
 
-all['login'] = all['auth:login'] = function () {
+all.login = all['auth:login'] = function () {
   program
     .usage('auth:login  # login through oauth3.org')
-        .parse(process.argv)
-    ;
+    .parse(process.argv)
+  ;
 
+  var opts = mergeDefaults(program);
   if (helpme) {
@@ -194,3 +239,3 @@ program.help();
 
-  oauth3.manualLogin(cliOptions).then(function (results) {
+  oauth3.manualLogin(opts).then(function (results) {
     if (results && results.oauth3 && results.session && results.sessionTested) {
@@ -213,3 +258,3 @@ // TODO
 
-all['domains'] = function () {
+all.domains = function () {
   console.log("");
@@ -229,2 +274,4 @@ console.log("Usage: daplie domains:COMMAND [command-specific-options]");
 all['domains:list'] = function () {
+  var opts = mergeDefaults(program);
+
   if (helpme) {
@@ -237,3 +284,3 @@ console.log("");
 
-  oauth3.Domains.all(cliOptions).then(function (results) {
+  oauth3.Domains.all(opts).then(function (results) {
     console.log('');
@@ -272,2 +319,3 @@ console.log('PURCHASED AT\t\tRENEWAL COST\tDOMAIN NAME');
 
+  var opts = mergeDefaults(program);
   if (helpme) {
@@ -279,6 +327,6 @@ program.help();
   oauth3.Domains.purchase({
-    provider: cliOptions.provider
-  , domains: program.domainnames || program.domains
-  , tip: program.tip
-  , 'max-purchase-price': program['max-purchase-price'] || program.maxPurchasePrice
+    provider: opts.provider
+  , domains: opts.domainnames || opts.domains
+  , tip: opts.tip
+  , 'max-purchase-price': opts['max-purchase-price'] || opts.maxPurchasePrice
   }).then(function (results) {
@@ -294,3 +342,3 @@ // TODO fix 2.9% on fee
 
-all['dns'] = function () {
+all.dns = function () {
   console.log("");
@@ -316,3 +364,4 @@ console.log("Usage: daplie dns:COMMAND [command-specific-options]");
 
-  if (helpme || (!program.opts().all && 'string' !== typeof program.opts().name)) {
+  var opts = mergeDefaults(program);
+  if (helpme || (!opts.all && 'string' !== typeof opts.name)) {
     program.help();
@@ -324,8 +373,7 @@ return;
 
-  program.provider = cliOptions.provider;
-  if (program.opts().all) {
-    promise = oauth3.Dns.all(program.opts());
+  if (opts.all) {
+    promise = oauth3.Dns.all(opts);
   }
   else {
-    promise = oauth3.Dns.get(program.opts());
+    promise = oauth3.Dns.get(opts);
   }
@@ -404,3 +452,4 @@ promise.then(function (results) {
 
-  if (helpme || !('string' === typeof program.opts().name && program.type && program.answer)) {
+  var opts = mergeDefaults(program);
+  if (helpme || !('string' === typeof opts.name && opts.type && opts.answer)) {
     program.help();
@@ -411,8 +460,8 @@ return;
   oauth3.Dns.set({
-    provider: cliOptions.provider
-  , domain: program.opts().name
-  , answer: program.answer
-  , type: program.type
-  , ttl: program.ttl
-  , priority: program.priority
+    provider: opts.provider
+  , domain: opts.name
+  , answer: opts.answer
+  , type: opts.type
+  , ttl: opts.ttl
+  , priority: opts.priority
   }).then(function (results) {
@@ -436,3 +485,4 @@ console.log(results);
 
-  if (helpme || !('string' === typeof program.opts().name && program.type && program.answer)) {
+  var opts = mergeDefaults(program);
+  if (helpme || !('string' === typeof opts.name && opts.type && opts.answer)) {
     program.help();
@@ -444,5 +494,5 @@ return;
     provider: cliOptions.provider
-  , domain: program.opts().name
-  , answer: program.answer
-  , type: program.type
+  , domain: opts.name
+  , answer: opts.answer
+  , type: opts.type
   }).then(function (results) {
@@ -453,3 +503,3 @@ console.log(results);
 
-all['devices'] = function () {
+all.devices = function () {
   console.log("");
@@ -483,3 +533,2 @@ console.log("Usage: daplie devices:COMMAND [command-specific-options]");
 
-  program.provider = cliOptions.provider;
   oauth3.Devices.all().then(function (results) {
@@ -528,3 +577,4 @@ results.devices.sort(function (a, b) {
 
-  if (helpme || (!program.opts().auto && !(program.opts().device && program.opts().addresses))) {
+  var opts = mergeDefaults(program);
+  if (helpme || (!opts.auto && !(opts.device && opts.addresses))) {
     program.help();
@@ -537,4 +587,3 @@ console.log('');
 
-  program.provider = cliOptions.provider;
-  oauth3.Devices.set(program.opts()).then(function (results) {
+  oauth3.Devices.set(opts).then(function (results) {
     console.log('DEBUG devices:set results:');
@@ -554,3 +603,4 @@ console.log(results);
 
-  if (helpme || ('delete' !== program.opts().confirm || !program.opts().device)) {
+  var opts = mergeDefaults(program);
+  if (helpme || ('delete' !== opts.confirm || !opts.device)) {
     program.help();
@@ -563,4 +613,3 @@ console.log('');
 
-  program.provider = cliOptions.provider;
-  oauth3.Devices.destroy(program.opts()).then(function (results) {
+  oauth3.Devices.destroy(opts).then(function (results) {
     console.log('DEBUG devices:unset results:');
@@ -582,3 +631,4 @@ console.log(results);
 
-  if (helpme || (!program.opts().device || !program.opts().device)) {
+  var opts = mergeDefaults(program);
+  if (helpme || (!opts.device || !opts.device)) {
     program.help();
@@ -591,4 +641,3 @@ console.log('');
 
-  program.provider = cliOptions.provider;
-  oauth3.Devices.attach(program.opts()).then(function (results) {
+  oauth3.Devices.attach(opts).then(function (results) {
     console.log('DEBUG devices:attach results:');
@@ -607,3 +656,4 @@ console.log(results);
 
-  if (helpme || (!program.opts().device || !program.opts().name)) {
+  var opts = mergeDefaults(program);
+  if (helpme || (!opts.device || !opts.name)) {
     program.help();
@@ -616,4 +666,3 @@ console.log('');
 
-  program.provider = cliOptions.provider;
-  oauth3.Devices.detach(program.opts()).then(function (results) {
+  oauth3.Devices.detach(opts).then(function (results) {
     console.log('DEBUG devices:detach results:');
@@ -636,3 +685,3 @@ console.log(results);
 
-  if (helpme || !(program.opts().sourceDevice && program.opts().targetDevice)) {
+  if (helpme || !(opts.sourceDevice && opts.targetDevice)) {
     program.help();
@@ -654,3 +703,4 @@ console.log('');
 
-  if (helpme || 'string' !== typeof program.device) {
+  var opts = mergeDefaults(program);
+  if (helpme || 'string' !== typeof opts.device) {
     program.help();
@@ -660,8 +710,7 @@ return;
 
-  program.provider = cliOptions.provider;
-  oauth3.Devices.token(program.opts()).then(function (results) {
+  oauth3.Devices.token(opts).then(function (results) {
     //console.log('');
     //console.log('DEVICE NAME\t\tTOKEN');
     //console.log('');
-    //console.log(program.device + '\t' + results.token);
+    //console.log(opts.device + '\t' + results.token);
     console.log('');
@@ -675,3 +724,3 @@ console.log('Set your DDNS client to use this URL:');
 
-all['wallet'] = function () {
+all.wallet = function () {
   console.log("");
@@ -692,4 +741,3 @@ console.log("Usage: daplie wallet:COMMAND [command-specific-options]");
 all['wallet:sources'] = function () {
-  program.provider = cliOptions.provider;
-  var opts = program.opts();
+  var opts = mergeDefaults(program);
 
@@ -715,2 +763,3 @@ listCards(opts, null);
 
+  var opts = mergeDefaults(program);
   if (helpme) {
@@ -724,8 +773,6 @@ program.help();
 
-  var opts = program.opts();
   opts.ccPriority = opts.priority;
   opts.ccNick = opts.nick;
   opts.ccComment = opts.comment;
-  program.provider = cliOptions.provider;
-  oauth3.Cards.add(program.opts()).then(function (card1) {
+  oauth3.Cards.add(opts).then(function (card1) {
     return listCards(opts, card1);
@@ -750,3 +797,3 @@ });
 
-  var opts = program.opts();
+  var opts = mergeDefaults(program);
   if (helpme
@@ -768,12 +815,12 @@ || !(opts.last4)
     if ('amex' === opts.brand.toLowerCase()) {
-      program.brand = 'American Express';
+      opts.brand = 'American Express';
     }
     else if ('mc' === opts.brand.toLowerCase()) {
-      program.brand = 'MasterCard';
+      opts.brand = 'MasterCard';
     }
     else if ('disc' === opts.brand.toLowerCase()) {
-      program.brand = 'Discover';
+      opts.brand = 'Discover';
     }
     else if (/^(dci|diner)/i.test(opts.brand)) {
-      program.brand = 'Diners Club';
+      opts.brand = 'Diners Club';
     }
@@ -798,3 +845,3 @@ }
 
-  var opts = program.opts();
+  var opts = mergeDefaults(program);
   if (helpme) {
@@ -808,14 +855,14 @@ program.help();
 
-  if (program.opts().brand) {
-    if ('amex' === program.opts().brand.toLowerCase()) {
-      program.brand = 'American Express';
+  if (opts.brand) {
+    if ('amex' === opts.brand.toLowerCase()) {
+      opts.brand = 'American Express';
     }
-    else if ('mc' === program.opts().brand.toLowerCase()) {
-      program.brand = 'MasterCard';
+    else if ('mc' === opts.brand.toLowerCase()) {
+      opts.brand = 'MasterCard';
     }
-    else if ('disc' === program.opts().brand.toLowerCase()) {
-      program.brand = 'Discover';
+    else if ('disc' === opts.brand.toLowerCase()) {
+      opts.brand = 'Discover';
     }
-    else if (/^(dci|diner)/i.test(program.opts().brand)) {
-      program.brand = 'Diners Club';
+    else if (/^(dci|diner)/i.test(opts.brand)) {
+      opts.brand = 'Diners Club';
     }
@@ -822,0 +869,0 @@ }

package.json

 {
   "name": "daplie-tools",
-  "version": "1.0.0-alpha.903",
+  "version": "1.0.0-alpha.904",
   "description": "Taking back the Internet",
@@ -35,5 +35,5 @@ "main": "index.js",
     "commander": "^2.9.0",
-    "oauth3-cli": "git+https://github.com/OAuth3/oauth3-cli.git#v1.0.0-alpha.903",
+    "oauth3-cli": "git+https://github.com/OAuth3/oauth3-cli.git#v1.0.0-alpha.904",
     "request": "^2.69.0"
   }
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Git dependency

Supply chain risk

Contains a dependency which resolves to a remote git URL. Dependencies fetched from git URLs are not immutable can be used to inject untrusted code or reduce the likelihood of a reproducible install.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Git dependency

Supply chain risk

Contains a dependency which resolves to a remote git URL. Dependencies fetched from git URLs are not immutable can be used to inject untrusted code or reduce the likelihood of a reproducible install.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

27153

increased by2.9%

Lines of code

760

increased by5.26%

Dependency changes

• Updatedoauth3-cli@git+https://github.com/OAuth3/oauth3-cli.git#v1.0.0-alpha.904