Refactor: extract all commands from bin file (#2)

* Chore: Use next version of deployd Core

* Extract commands into their own modules

* Fix issue with createserver

* Fix: resources listing under repl

* Remove latestversion file

Author: NicolasRitouet

.gitignore

@@ -1,3 +1,3 @@
 /node_modules
-/.latestversion
+.latestversion
 npm-debug.log

bin/dpd

@@ -1,33 +1,13 @@
 #!/usr/bin/env node
 
 /**
- * Dependencies
+ * External dependencies
  */
 
-var program = require('commander')
-  , repl = require('../lib/client/repl')
-  , shelljs = require('shelljs/global')
-  , mongod = require('../lib/util/mongod')
-  , path = require('path')
-  , fs = require('fs')
-  , tty = require('tty')
-  , request = require('request')
-  , packageInfo = require('../package')
-  , latestversionFile = path.join(__dirname, '../.latestversion')
-  , Step = require('step')
-  , open = require('../lib/util/open')
-  , semver = require('semver')
-  , resolve = require('resolve').sync
-  , upgrade = require('doh').upgrade
-  , exec = require('child_process').exec;
+var cli = require('../lib/cli');
 
-var basedir = process.cwd();
-  
-/**
- * Get the version number from the package.json
- */
 
-program
+cli.program
   .version(require('../package').version)
   .option('-m, --mongod [path]', 'path to mongod executable (defaults to `mongod`)')
   .option('-p, --port [port]', 'port to host server (defaults to 2403)')
@@ -39,300 +19,37 @@ program
   .option('-P, --mongoPort [mongoPort]', 'mongodb port to connect to')
   .option('-n, --dbname [dbname]', 'name of the mongo database')
   .option('-a, --auth', 'prompts for mongo server credentials')
-  .option('    --deploydPath [deploydPath]', 'allow overriding the path to deployd main script')
-  ;
-
-/**
- * Commands
- */
+  .option('    --deploydPath [deploydPath]', 'allow overriding the path to deployd main script');
 
-program
+cli.program
   .command('create [project-name]')
   .description('\tcreate a project in a new directory\n\teg. `dpd create my-app`')
-  .action(function(name) {
-    name = name || 'my-deployd-app';
-    if (test('-d',  name)) {
-      return console.info(name + " already exists in this directory");
-    }
-
-    mkdir('-p', name);
-    cp('-Rf', path.join(__dirname, '/createtemplate/*'), name);
-    mkdir('-p', name + '/.dpd');
-    mkdir('-p', name + '/.dpd/pids');
-    ('').to(name + '/.dpd/pids/mongod');
-    rm(ls('-R', name).filter(function(p) {
-      return path.basename(p) === 'PLACEHOLDER';
-    }).map(function(p) { return name + '/' + p}));
-    
-    process.chdir(name);
-    
-    console.log('Running npm install... please wait')
-    child = exec('npm install',
-      function (error, stdout, stderr) {
-        if (error !== null) {
-            console.log(stderr);
-            console.log('npm install error: ' + error);
-        } else {
-          if (program.dashboard || program.open) {
-            start(name + '/app.dpd');
-          } else {
-            console.info('to start your app:');
-            console.info('\t$ cd', name);
-            console.info('\t$ dpd');
-          }
-        }
-      });
-
-  });
-
-function start(file) {
-  var port = program.port
-    , host = program.host || '127.0.0.1'
-    , dbname = program.dbname || '-deployd'
-    , mongoPort = generatePort()
-    , env = program.environment || process.env.DPD_ENV || 'development'
-    , retries = 0
-    , credentials
-    ;
-
-  if (!port) {
-    port = 2403;
-    retries = env === 'development' && 5;
-  }
-
-  if (program.mongoPort) {
-      mongoPort = Number(program.mongoPort);
-  }
-
-  if (file) {
-    process.chdir(path.dirname(file));
-  }
-  if (test('-f', 'app.dpd')) {
-    console.log("deployd CLI version " + packageInfo.version);
-    console.log("starting deployd");
-
-    if (fs.existsSync(latestversionFile)) {
-      var latest = fs.readFileSync(latestversionFile, 'utf-8');
-      if (latest && semver.gt(latest, packageInfo.version)) {
-        console.log("deployd CLI v" + latest + " is available.");
-        console.log();
-      }
-    }
-    checkForUpdates();
-
-    if (!test('-d', './.dpd')) mkdir('-p', './.dpd');
-    if (!test('-d', './.dpd/pids')) mkdir('-p', './.dpd/pids');
-    if (!test('-d', './data')) mkdir('-p', './data');
-
-    if (program.auth && program.host === undefined) {
-        console.error("Authentication requires the '-h' host flag... exiting.");
-        process.exit();
-    }
-
-    if (program.host) {
-        if (program.auth) {
-            Step(function () {
-                    var next = this;
-                    credentials = {};
-                    program.prompt('username: ', function(username){
-                        if (username && username !== '') {
-                            credentials.username = username;
-                            next();
-                        } else {
-                            console.error('Username cannot be blank.');
-                            process.exit();
-                        }
-                    });
-                },
-                function () {
-                    var next = this;
-                    program.password('Password: ', function(pass){
-                        if (pass && pass !== '') {
-                            credentials.password = pass;
-                            next();
-                        } else {
-                            console.error('Password cannot be blank.');
-                            process.exit();
-                        }
-                    });
-                },
-                startup
-            );
-        } else {
-            startup();
-        }
-    } else {
-        mongod.restart(program.mongod || 'mongod', env, mongoPort, startup);
-    }
-
-  } else {
-    console.log("This directory does not contain a Deployd app!");
-    console.log("Use \"dpd create <appname>\" to create a new app");
-    console.log("or use \"dpd path/to/app.dpd\" to start an app in another directory");
-    stop(1);
-  }
-
-  function startup (err) {
-      if (err) {
-        console.log("Failed to start MongoDB (Make sure 'mongod' are in your $PATH or use dpd --mongod option. Ref: http://docs.deployd.com/docs/basics/cli.html)");
-        return stop(1);
-      }
-
-      var options = {port: port, env: 'development', db: {host: host, port: mongoPort, name: dbname}};
+  .action(cli.create);
 
-      options.env = program.environment || process.env.DPD_ENV || options.env;
-      if(options.env !== 'development') console.log('starting in %s mode', options.env);
-
-      if(credentials !== undefined) options.db.credentials = credentials;
-      var dpd = createServer(options);
-      dpd.on('listening', onListening);
-      dpd.on('error', onError);
-      dpd.listen();
-      dpd.deploydPath = program.deploydPath;
-      
-      function onListening () {
-        console.info('listening on port', options.port);
-        var commands = repl(dpd);
-        if (program.dashboard) {
-          commands.dashboard();
-        } else if (program.open) {
-          commands.open();
-        }
-      }
-
-      function onError (err) {
-        if (err.code === "EADDRINUSE") {
-          console.error();
-          console.error("ERROR: port " + options.port + " is already in use");
-          if (retries > 0) {
-            options.port++;
-            console.log("Trying again on port " + options.port + "...");
-            console.log();
-            retries--;
-            dpd = createServer(options);
-            dpd.on('listening', onListening);
-            dpd.on('error', onError);
-            dpd.listen();
-          } else {
-            process.exit();
-          }
-        } else {
-          console.error(err);
-          process.exit();
-        }
-      }
-    }
-}
-
-
-program
+cli.program
   .command('keygen')
   .description('\tgenerate a key for remote access (./.dpd/keys.json)')
-  .action(function() {
-    var Keys = require('../lib/keys')
-      , keys = new Keys();
-
-    keys.create(function(err, key) {
-      if(err) return console.error(err);
-      console.log('created key', key.substr(0, 16) + '...');
-    });
-  });
+  .action(cli.keygen);
 
-program
+cli.program
   .command('showkey')
   .description('\tshows current key for connecting to remote dashboard (./.dpd/keys.json)')
-  .action(function() {
-    var Keys = require('../lib/keys')
-      , keys = new Keys();
+  .action(cli.showkey);
 
-    keys.getLocal(function(err, key) {
-      if(err) return console.error(err);
-      if(!key) {
-        console.log('No key file found. Run the following to create one:');
-        console.log();
-        console.log('dpd keygen');
-        console.log();
-        return;
-      }
-      console.log("Copy this key for use in remote dashboard");
-      console.log();
-      console.log(key);
-      console.log();
-    });
-  });
 
-
-program
+cli.program
   .command('*')
   .description('\t[default] start the server in the current project in development mode\n' +
                '\twith an interactive shell/repl for interacting with the running server\n' +
                '\te.g. dpd (starts server in current directory),\n' +
                '\t     dpd my-app/app.dpd (starts app from file)')
-  .action(start);
-
+  .action(cli.start);
 
-function stop(code) {
-  var fn = function() {
-    exit(code);
-  };
-
-  if (program.wait) {
-    process.stdin.resume();
-    process.stdin.setRawMode(true);
-    process.stdout.write('\nPress any key to continue...\n');
-    process.stdin.on('keypress', fn);
-  } else {
-    fn();
-  }
-}
 
 /**
  * Parse the arguments
  */
 
-program.parse(process.argv);
-
-if(program.args.length === 0) start();
-
-/**
- * Port generation
- */
-
-function generatePort() {
-  var portRange = [ 3000, 9000 ];
-  return Math.floor(Math.random() * (portRange[1] - portRange[0])) + portRange[0];
-}
-
-function checkForUpdates() {
-  request('http://registry.npmjs.org/deployd-cli', function(err, res, body) {
-    if (!err) {
-      var json;
-      try {
-        json = JSON.parse(body);
-      } catch (ex) {}
-
-      if (json && json['dist-tags'] && json['dist-tags'].latest) {
-        var latest = json['dist-tags'].latest;
-        fs.writeFile(latestversionFile, latest);
-      }
-    }
-  });
-}
-
-function createServer(config) {
-  var deploydpath;
-  try {
-    deploydpath = program.deploydPath || resolve('deployd', {basedir: process.cwd()});
-  } catch (e) {
-    console.log('Unable to find local deployd');
-    process.exit(99);
-  }
- 
-  var Server = require(deploydpath);
-
-  var server = new Server(config);
-  server.options = config;
-  upgrade(server);
+cli.program.parse(process.argv);
 
-  return server;  
-}
+if (cli.program.args.length === 0) cli.start();