Merge pull request #59 from kumar303/program

Split Program into its own module

src/cli.js

@@ -1,55 +1,9 @@
 /* @flow */
 import path from 'path';
 import {readFileSync} from 'fs';
-import yargs from 'yargs';
 
 import build from './build';
-
-
-export class Program {
-  yargs: any;
-  commands: { [key: string]: Function };
-
-  constructor(argv: ?Array<string>) {
-    if (argv !== undefined) {
-      this.yargs = yargs(argv);
-    } else {
-      this.yargs = yargs;
-    }
-    this.commands = {};
-  }
-
-  command(name: string, description: string, executor: Function,
-          configureCommand: ?Function): Program {
-    this.yargs.command(name, description, configureCommand);
-    this.commands[name] = executor;
-    return this;
-  }
-
-  run(): Promise {
-    let argv = this.yargs.argv;
-    let cmd = argv._[0];
-    return new Promise(
-      (resolve) => {
-        if (cmd === undefined) {
-          throw new Error('No sub-command was specified in the args');
-        }
-        if (!this.commands[cmd]) {
-          throw new Error(`unknown command: ${cmd}`);
-        }
-        resolve();
-      })
-      .then(() => this.commands[cmd](argv))
-      .catch((error) => {
-        let prefix = 'error:';
-        if (cmd) {
-          prefix = `${cmd} ${prefix}`;
-        }
-        console.error(prefix, error);
-        throw error;
-      });
-  }
-}
+import {Program} from './program';
 
 
 export function main() {

src/program.js

@@ -0,0 +1,48 @@
+/* @flow */
+import yargs from 'yargs';
+
+
+export class Program {
+  yargs: any;
+  commands: { [key: string]: Function };
+
+  constructor(argv: ?Array<string>) {
+    if (argv !== undefined) {
+      this.yargs = yargs(argv);
+    } else {
+      this.yargs = yargs;
+    }
+    this.commands = {};
+  }
+
+  command(name: string, description: string, executor: Function,
+          configureCommand: ?Function): Program {
+    this.yargs.command(name, description, configureCommand);
+    this.commands[name] = executor;
+    return this;
+  }
+
+  run(): Promise {
+    let argv = this.yargs.argv;
+    let cmd = argv._[0];
+    return new Promise(
+      (resolve) => {
+        if (cmd === undefined) {
+          throw new Error('No sub-command was specified in the args');
+        }
+        if (!this.commands[cmd]) {
+          throw new Error(`unknown command: ${cmd}`);
+        }
+        resolve();
+      })
+      .then(() => this.commands[cmd](argv))
+      .catch((error) => {
+        let prefix = 'error:';
+        if (cmd) {
+          prefix = `${cmd} ${prefix}`;
+        }
+        console.error(prefix, error);
+        throw error;
+      });
+  }
+}

tests/cli/test.cli.js → tests/program/test.program.js

@@ -1,10 +1,10 @@
 import {assert} from 'chai';
 import {spy} from 'sinon';
 
-import {Program} from '../../src/cli';
+import {Program} from '../../src/program';
 
 
-describe('cli.Program', () => {
+describe('program.Program', () => {
 
   it('executes a command callback', () => {
     let thing = spy(() => new Promise((resolve) => resolve()));