From 31dbc52b86973cfda7031fec935a022c8ae74151 Mon Sep 17 00:00:00 2001 From: Matt Karl Date: Fri, 23 Dec 2016 09:34:22 -0500 Subject: [PATCH 1/2] Better use of minimist for defaults, booleans, etc --- bin.js | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/bin.js b/bin.js index 3f9c1c2..3cf3959 100755 --- a/bin.js +++ b/bin.js @@ -3,24 +3,39 @@ var fs = require('fs') var path = require('path') var nugget = require('./') -var args = require('minimist')(process.argv.slice(2)) +var opts = require('minimist')(process.argv.slice(2), { + string: ['out', 'dir'], + boolean: ['continue', 'force', 'quiet', 'strict-ssl'], + default: { + continue: false, + force: false, + quiet: false, + 'strict-ssl': true, + proxy: null, + frequency: null + }, + alias: { + o: 'out', + O: 'out', + d: 'dir', + c: 'continue', + f: 'force', + s: 'sockets', + q: 'quiet', + target: 'out', + resume: 'continue', + strictSSL: 'strict-ssl' + } +}); -var urls = args._ +var urls = opts._ if (urls.length === 0) { console.log(fs.readFileSync(path.join(__dirname, 'usage.txt')).toString()) process.exit(1) } -var opts = { - target: args.o || args.O || args.out, - dir: args.d || args.dir, - resume: args.c || args.continue, - force: args.f || args.force, - sockets: args.s || args.sockets, - quiet: args.q || args.quiet, - frequency: args.frequency ? +args.frequency : null, - proxy: args.proxy ? args.proxy : null, - strictSSL: args['strict-ssl'] +if (opts.frequency) { + opts.frequency = +opts.frequency; } nugget(urls, opts, function (err) { From 911ea283a1c4a6934c13240b95e753694f001fbb Mon Sep 17 00:00:00 2001 From: Matt Karl Date: Fri, 23 Dec 2016 09:34:49 -0500 Subject: [PATCH 2/2] Removed semicolons --- bin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin.js b/bin.js index 3cf3959..cc3f05b 100755 --- a/bin.js +++ b/bin.js @@ -26,7 +26,7 @@ var opts = require('minimist')(process.argv.slice(2), { resume: 'continue', strictSSL: 'strict-ssl' } -}); +}) var urls = opts._ if (urls.length === 0) { @@ -35,7 +35,7 @@ if (urls.length === 0) { } if (opts.frequency) { - opts.frequency = +opts.frequency; + opts.frequency = +opts.frequency } nugget(urls, opts, function (err) {