add cli test and small refactor

Author: Nathan Mahdavi

__tests__/cli.js

@@ -0,0 +1,32 @@
+const program = require('commander');
+
+const cli = require('../cli');
+
+describe('entry', () => {
+
+  beforeEach(() => {
+    jest.spyOn(program, 'option');
+    jest.spyOn(program, 'parse').mockReturnValue();
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  test('all of the correct options are defined', () => {
+    const commands = [
+      ['a, add <alias>', 'Add user'],
+      ['r, remove <alias>', 'Remove user'],
+      ['u, use <alias>', 'Use user'],
+      ['l, list', 'List users'],
+      ['w, whoami', 'Current logged in user']
+    ];
+
+    cli();
+
+    commands.forEach((command) => {
+      expect(program.option).toHaveBeenCalledWith(...command);
+    });
+  });
+
+});

cli.js

@@ -0,0 +1,36 @@
+const program = require('commander');
+const fs = require('fs');
+
+function getMappedCommands() {
+  return fs.readdirSync('./commands').reduce((commands, command) => {
+    const commandWithoutExtension = command.replace('.js', '');
+
+    return Object.assign(commands, {
+      [commandWithoutExtension]: require(`./commands/${command}`)
+    });
+  }, {});
+}
+
+function findAndExecuteOption(commands) {
+  Object.keys(commands).forEach((command) => {
+    const commandCallback = commands[command];
+    const commandValue = program[command];
+    const commandWasCalled = program.hasOwnProperty(command);
+
+    if (commandWasCalled) {
+      commandCallback(commandValue);
+    }
+  });
+}
+
+module.exports = (args = process.argv) => {
+  program
+    .option('a, add <alias>', 'Add user')
+    .option('r, remove <alias>', 'Remove user')
+    .option('u, use <alias>', 'Use user')
+    .option('l, list', 'List users')
+    .option('w, whoami', 'Current logged in user')
+    .parse(args);
+
+  findAndExecuteOption(getMappedCommands());
+};

commands/add.js

@@ -9,8 +9,8 @@ module.exports = (alias) => {
     throw new Error('This user already exists. Use `npm-users list` and `npm-users remove <alias>` to resolve.');
   }
 
-  const loginProcess = child_process.spawnSync('npm', ['login'], { stdio: 'inherit' });
-  if (loginProcess.status !== 0) {
+  const { status: loginStatusCode } = child_process.spawnSync('npm', ['login'], { stdio: 'inherit' });
+  if (loginStatusCode !== 0) {
     throw new Error('We were unable to add this login.');
   }
 

commands/remove.js

@@ -3,7 +3,7 @@ const fs = require('fs');
 
 module.exports = (alias) => {
   const targetUserFile = directories.getNpmUsersHomeDirectory() + alias;
-  const userNotFound = !fs.existsSync(targetUserFile);
+  const userNotFound = fs.existsSync(targetUserFile) === false;
   if (userNotFound) {
     throw new Error('The specified user could not be found.');
   }

commands/use.js

@@ -3,7 +3,7 @@ const directories = require('../directories');
 
 module.exports = (alias) => {
   const targetUserFile = directories.getNpmUsersHomeDirectory() + alias;
-  const userNotFound = !fs.existsSync(targetUserFile);
+  const userNotFound = fs.existsSync(targetUserFile) === false;
   if (userNotFound) {
     throw new Error('The specified user could not be found.');
   }

index.js

@@ -1,28 +1,4 @@
 #!/usr/bin/env node
 
-const program = require('commander');
-const fs = require('fs');
-
 require('./setup')();
-
-program
-  .option('a, add <alias>', 'Add user')
-  .option('r, remove <alias>', 'Remove user')
-  .option('u, use <alias>', 'Use user')
-  .option('l, list', 'List users')
-  .option('w, whoami', 'Current logged in user')
-  .parse(process.argv);
-
-
-const commands = fs.readdirSync('./commands').reduce((commands, command) => {
-  const commandWithoutExtension = command.replace('.js', '');
-  return Object.assign(commands, {
-    [commandWithoutExtension]: require(`./commands/${command}`)
-  });
-}, {});
-
-Object.keys(commands).forEach((command) => {
-  if (program[command]) {
-    commands[command](program[command]);
-  }
-});
+require('./cli.js')();