Feat: change from command options to option flags (#17)

* Feat: change change from command options to option flags * Test: update for new feature
aichbauer · Oct 23, 2017 · 43bb3e9 · 43bb3e9
1 parent d3703a9
commit 43bb3e9
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 23 deletions.
diff --git a/lib/cli.js b/lib/cli.js
@@ -2,10 +2,14 @@
 
 import yargs from 'yargs';
 import updateNotifier from 'update-notifier';
+
+import options from './options';
+
 import pkg from '../package.json';
 
 yargs // eslint-disable-line
   .commandDir('cmds')
+  .options(options)
   .demandCommand()
   .help()
   .argv;

diff --git a/lib/cmds/recover.js b/lib/cmds/recover.js
@@ -1,29 +1,16 @@
 import recoverTasks from '../tasks/recover-tasks';
 
-const command = 'recover [backup]';
-
-const builder = {
-  backup: {
-    default: false,
-  },
-};
+const command = 'recover';
 
 const aliases = ['r'];
 
 const desc = 'Recover the complete CHANGELOG.md';
 
 /* istanbul ignore next */
-const handler = (argv) => {
-  if (argv.backup || argv.b) {
-    return recoverTasks(true).run();
-  }
-
-  return recoverTasks(false).run();
-};
+const handler = (argv) => recoverTasks(argv.b).run();
 
 export {
   command,
-  builder,
   aliases,
   desc,
   handler,

diff --git a/lib/options/backup.js b/lib/options/backup.js
@@ -0,0 +1,7 @@
+const backup = {
+  alias: 'b',
+  describe: 'backup CHANGELOG.md when recover',
+  type: 'boolean',
+};
+
+export default backup;
diff --git a/lib/options/index.js b/lib/options/index.js
@@ -0,0 +1,5 @@
+import backup from './backup';
+
+export default {
+  backup,
+};
diff --git a/test/cmds/recover.js b/test/cmds/recover.js
@@ -2,25 +2,18 @@ import test from 'ava';
 
 import {
   command,
-  builder,
   aliases,
   desc,
 } from '../../lib/cmds/recover';
 
 test('CMDS | RECOVER | check command name, builder, aliases, and desc', (t) => {
   const value = {
     command,
-    builder,
     aliases,
     desc,
   };
   const expected = {
-    command: 'recover [backup]',
-    builder: {
-      backup: {
-        default: false,
-      },
-    },
+    command: 'recover',
     aliases: ['r'],
     desc: 'Recover the complete CHANGELOG.md',
   };

diff --git a/test/options/backup.js b/test/options/backup.js
@@ -0,0 +1,13 @@
+import test from 'ava';
+
+import backup from '../../lib/options/backup';
+
+test('OPTIONS | BACKUP | check alias, describe and type', (t) => {
+  const expected = {
+    alias: 'b',
+    describe: 'backup CHANGELOG.md when recover',
+    type: 'boolean',
+  };
+
+  t.deepEqual(backup, expected);
+});