Refactor cli

Author: lukasaric

cli.js

@@ -1,10 +1,12 @@
 #!/usr/bin/env node
 
+'use strict';
+
 const gravatar = require('./lib/gravatar');
 const emailValidator = require('email-validator');
-const path = require('path');
+const pkg = require('./package.json');
 
-const mainOpts = {
+const options = {
   size: {
     alias: 's',
     describe: 'size of the requested image. (1-2048)'
@@ -16,80 +18,71 @@ const mainOpts = {
   },
   default: {
     alias: 'd',
-    describe: 'default image when no profile image found. [choices: "404", "mm", "identicon", "monsterid", "wavatar", "retro", "blank", "an image url"]'
+    describe: `default image when no profile image found.
+[choices: "404", "mm", "identicon", "monsterid", "wavatar", "retro", "blank", "an image url"]`
+  }
+};
+
+const profileOptions = {
+  format: {
+    alias: 'f',
+    describe: 'format of the requested profile url',
+    choices: ['json', 'xml', 'qr', 'php', 'vcf']
+  },
+  callback: {
+    alias: 'c',
+    describe: 'name of a callback function when using json profile url eg. doSomething'
   }
 };
+
+const getOptions = argv => pick(argv, [...Object.keys(options), ...Object.keys(profileOptions)]);
+
 const setUsage = function (yargs) {
   return yargs
-    .options(mainOpts)
+    .options(options)
     .help('h')
     .alias('h', 'help')
     .alias('v', 'version')
-    .version(() => path.join('gravatar version: ', require('./package').version))
+    .version(`gravatar version: ${pkg.version}`)
     .describe('v', 'show version information')
     .epilogue(`Useful Links:
-        \n- https://en.gravatar.com/site/implement/images/
-        \n- https://en.gravatar.com/site/implement/profiles/
-        \n- https://github.com/emerleite/node-gravatar`);
+      - https://en.gravatar.com/site/implement/images/
+      - https://en.gravatar.com/site/implement/profiles/
+      - ${pkg.homepage}`);
 };
 
 const yargs = setUsage(require('yargs'))
   .usage('Usage: $0 command somebody@example.com [options]')
-  .command('avatar', 'avatar somebody@example.com  [options]', mainOpts)
-  .command('profile', 'profile somebody@example.com  [options]', {
-    format: {
-      alias: 'f',
-      describe: 'format of the requested profile url',
-      choices: ['json', 'xml', 'qr', 'php', 'vcf']
-    },
-    callback: {
-      alias: 'c',
-      describe: 'name of a callback function when using json profile url eg. doSomething'
-    }
-  })
+  .command('avatar', 'avatar somebody@example.com  [options]', options)
+  .command('profile', 'profile somebody@example.com  [options]', profileOptions)
   .example('$0 somebody@example.com')
   .example('$0 avatar somebody@example.com')
   .example('$0 profile somebody@example.com');
 
-const argv = yargs.argv;
-const command = argv._[0];
-const email = argv._[1];
-
-const getOptions = function (argv) {
-  const options = {};
-  options.default = argv.d || argv.default;
-  options.size = argv.s || argv.size;
-  options.protocol = argv.p || argv.protocol;
-  options.format = argv.f || argv.format;
-  options.callback = argv.c || argv.callback;
-
-  // prune options
-  for (const prop in options) {
-    if (options.hasOwnProperty(prop) && !options[prop]) {
-      delete options[prop];
-    }
-  }
-  return options;
-};
-
 function printAvatarUrl(email, options) {
-  console.log('Gravatar (avatar):');
-  return `${gravatar.url(email, options)}\n`;
+  console.log('Gravatar (avatar):\n%s', gravatar.url(email, options));
 }
 
 function printAvatarProfile(email, options) {
-  console.log('Gravatar (profile):');
-  return `${gravatar.profile_url(email, options)}\n`;
+  console.log('Gravatar (profile):\n%s', gravatar.profileUrl(email, options));
 }
 
-const exec = function (argv) {
+function exec(argv) {
+  const [ command, email ] = argv._;
   const options = getOptions(argv);
   if (command === 'profile') return printAvatarProfile(email, options);
   if (command === 'avatar' && emailValidator.validate(email)) return printAvatarUrl(email, options);
   if (emailValidator.validate(command)) return printAvatarUrl(command, options);
   yargs.showHelp();
   return '';
-};
+}
 
-process.stdout.write(exec(argv));
+process.stdout.write(exec(yargs.argv));
 process.exit();
+
+function pick(obj, keys = []) {
+  return keys.reduce((acc, key) => {
+    if (!obj.hasOwnProperty(key) || !obj[key]) return acc;
+    return Object.assign(acc, { [key]: obj[key] });
+  }, {});
+}

package.json

@@ -11,6 +11,7 @@
     "type": "git",
     "url": "git://github.com/emerleite/node-gravatar.git"
   },
+  "homepage": "https://github.com/emerleite/node-gravatar",
   "files": [
     "lib"
   ],

test/gravatar.test.js

@@ -120,7 +120,7 @@ describe('CLI', function () {
     it('accepts an email argument with options and writes gravatar URL to STDOUT', function (done) {
       nixt()
         .run('./cli.js zeke@sikelianos.com -p https -s 500 -d retro')
-        .stdout('Gravatar (avatar):\nhttps://gravatar.com/avatar/8f344b1c4bdcfc28bd848e97e94c3523?default=retro&size=500')
+        .stdout('Gravatar (avatar):\nhttps://gravatar.com/avatar/8f344b1c4bdcfc28bd848e97e94c3523?size=500&default=retro')
         .end(done);
     });
     it('outputs usage if -h arg is present', function (done) {
@@ -135,7 +135,7 @@ describe('CLI', function () {
     it('accepts an email argument with options and writes gravatar URL to STDOUT', function (done) {
       nixt()
         .run('./cli.js avatar zeke@sikelianos.com -p https -s 500 -d retro')
-        .stdout('Gravatar (avatar):\nhttps://gravatar.com/avatar/8f344b1c4bdcfc28bd848e97e94c3523?default=retro&size=500')
+        .stdout('Gravatar (avatar):\nhttps://gravatar.com/avatar/8f344b1c4bdcfc28bd848e97e94c3523?size=500&default=retro')
         .end(done);
     });
   });