Initial implementation of general donejs add.

.editorconfig

@@ -0,0 +1,6 @@
+; Unix-style newlines
+[*]
+indent_size = 2
+end_of_line = LF
+indent_style = space
+insert_final_newline = true

.jshintrc

@@ -22,6 +22,8 @@
     "describe": true,
     "before": true,
     "after": true,
-    "exports": true
+    "exports": true,
+    "beforeEach": true,
+    "afterEach": true
   }
-}
+}

.travis.yml

@@ -19,3 +19,4 @@ notifications:
       - matthew@bitovi.com
     on_success: change
     on_failure: change
+script: npm run jshint && npm run document && npm run test-guides && npm run coverage:upload

bin/donejs

@@ -1,93 +1,9 @@
 #!/usr/bin/env node
-var fs = require('fs');
-var path = require('path');
-var program = require('commander');
 
-var utils = require('../lib/utils');
-var mypkg = require(path.join(__dirname, '..', 'package.json'));
+var program = require('../lib/cli');
 
-program.version(mypkg.version);
+program.parse(process.argv);
 
-utils.projectRoot().then(function(root) {
-  var doneScript = process.platform === 'win32' ? 'donejs.cmd' : 'donejs';
-  var donejsBinary = path.join(root, 'node_modules', '.bin', doneScript);
-  var runBinary = function(args) {
-    if(!fs.existsSync(donejsBinary)) {
-      console.error('Could not find local DoneJS binary (' + donejsBinary + ')');
-      return;
-    }
-
-    return utils.spawn(donejsBinary, args, { cwd: root });
-  };
-  var runInit = function(folder, opts) {
-    var promise = utils.mkdirp(folder).then(function(fullPath) {
-      var options = { cwd: fullPath };
-
-      console.log('Initializing new DoneJS application at', fullPath);
-      console.log('Installing donejs-cli');
-
-      var cliArg = 'donejs-cli@' + utils.versionRange(mypkg.version);
-
-      return utils.spawn('npm', [ 'install', cliArg, '--loglevel', 'error' ], options)
-        .then(function() {
-          var args = [ 'node_modules', 'donejs-cli', 'bin', 'donejs' ];
-          var binary = path.join.apply(path, [fullPath].concat(args));
-
-          if(!fs.existsSync(binary)) {
-            // If donejs-cli wasn't installed in this folder, it is the root
-            binary = path.join.apply(path, [root].concat(args));
-          }
-          var initArgs = [binary, 'init'];
-
-          if(opts.skipInstall) {
-            initArgs.push('--skip-install');
-          }
-
-          if(opts.type) {
-            initArgs.push('--type', opts.type);
-          }
-
-          return utils.spawn('node', initArgs, options);
-        });
-    });
-
-    utils.log(promise);
-  };
-
-  // donejs init
-  program.command('init [folder]')
-    .option('-S, --skip-install')
-    .option('-T, --type [type]')
-    .description('Initialize a new DoneJS application in a new folder or the current one')
-    .action(runInit);
-
-  // DoneJS plugin
-  program.command('plugin [folder]')
-    .option('-S, --skip-install')
-    .description('Initialize a new DoneJS plugin in a new folder or the current one')
-    .action(function(folder, opts) {
-      opts.type = 'plugin';
-      runInit(folder, opts);
-    });
-
-  program.command('help')
-    .description('Show all DoneJS commands available for this application')
-    .action(function() {
-      runBinary(['--help']);
-    });
-
-  // donejs <anything else>
-  program.command('*')
-    .description('Run DoneJS commands using the current DoneJS application')
-    .action(function() {
-      runBinary(program.rawArgs.slice(2));
-    });
-
-  program.parse(process.argv);
-
-  if (!program.args.length) {
-    program.help();
-  }
-});
-
-exports.program = program;
+if (!program.args.length) {
+  program.help();
+}

lib/cli/cmd-add.js

@@ -0,0 +1,23 @@
+var Q = require('q');
+var runBinary = require('./run-binary');
+
+// `donejs add app [folder]`     => `donejs-cli init [folder]`
+// `donejs add plugin [folder]`  => `donejs-cli init [folder] --type=plugin`
+// `donejs add generator [name]` => `donejs-cli init [folder] --type=generator`
+module.exports = function(type, folder, options) {
+  if (!isValidType(type)) {
+    var msg = 'Invalid [type] value `' + type + '`';
+    return Q.reject(new Error(msg));
+  }
+
+  if (type !== 'app') {
+    options.type = type;
+  }
+
+  return runBinary(['init', folder], options);
+};
+
+function isValidType(type) {
+  var types = ['app', 'plugin', 'generator'];
+  return types.indexOf(type) !== -1;
+}

lib/cli/cmd-help.js

@@ -0,0 +1,5 @@
+var runBinary = require('./run-binary');
+
+module.exports = function() {
+  return runBinary(['--help']);
+};

lib/cli/cmd-init.js

@@ -0,0 +1,50 @@
+var fs = require('fs');
+var path = require('path');
+var utils = require('../utils');
+var runBinary = require('./run-binary');
+var mypkg = require(path.join(__dirname, '..', '..', 'package.json'));
+
+module.exports = function(folder, opts) {
+  return utils.mkdirp(folder)
+    .then(function(folderPath) {
+      var folderModules = path.join(folderPath, 'node_modules');
+
+      // create an empty node_modules inside the target `folder`, this
+      // will prevent npm to install the dependencies in any node_modules
+      // folder but the one inside `folder`.
+      if (!fs.existsSync(folderModules)) {
+        fs.mkdirSync(folderModules);
+      }
+
+      console.log('Initializing new DoneJS application at', folderPath);
+      console.log('Installing donejs-cli');
+
+      return installCli(mypkg.version, { cwd: folderPath })
+        .then(function() {
+          return runCliInit(folderPath, opts);
+        });
+    });
+};
+
+// install donejs-cli
+function installCli(version, options) {
+  var pkg = 'donejs-cli@' + utils.versionRange(version);
+  var npmArgs = [ 'install', pkg, '--loglevel', 'error' ];
+  return utils.spawn('npm', npmArgs, options);
+}
+
+// run donejs-cli init
+function runCliInit(folderPath, options) {
+  var initArgs = ['init'];
+
+  if (options.skipInstall) {
+    initArgs.push('--skip-install');
+  }
+
+  if (options.type) {
+    initArgs.push('--type', options.type);
+  }
+
+  options.cwd = folderPath;
+  return runBinary(initArgs, options);
+}

lib/cli/index.js

@@ -0,0 +1,64 @@
+var program = require('commander');
+var log = require('../utils').log;
+var chalk = require('chalk');
+
+// commands
+var add = require('./cmd-add');
+var init = require('./cmd-init');
+var help = require('./cmd-help');
+
+// donejs add
+program.command('add <type> [folder]')
+  .option('-S, --skip-install')
+  .usage(cmdAddUsage())
+  .action(function(type, folder, options) {
+    log(add(type, folder, options));
+  });
+
+// DEPRECATED: donejs init
+program.command('init [folder]')
+  .option('-S, --skip-install')
+  .option('-T, --type [type]')
+  .description('Initialize a new DoneJS application in a new folder or the current one')
+  .action(function(folder, options) {
+    deprecationNotice('donejs init [folder]', 'donejs add app [folder]');
+    log(init(folder, options));
+  });
+
+// DEPRECATED: donejs plugin
+program.command('plugin [folder]')
+  .option('-S, --skip-install')
+  .description('Initialize a new DoneJS plugin in a new folder or the current one')
+  .action(function(folder, opts) {
+    deprecationNotice('donejs plugin [folder]', 'donejs add plugin [folder]');
+    opts.type = 'plugin';
+    log(init(folder, opts));
+  });
+
+program.command('help')
+  .description('Show all DoneJS commands available for this application')
+  .action(function() {
+    log(help());
+  });
+
+function deprecationNotice(deprecated, instead) {
+  console.log();
+  console.log(chalk.yellow('DEPRECATION NOTICE:'));
+  console.log();
+  console.log('     ' + chalk.gray(deprecated) + ' is deprecated');
+  console.log();
+  console.log('     Use ' + chalk.inverse(instead) + ' instead');
+  console.log();
+}
+
+function cmdAddUsage() {
+  var usage =
+    '[options] <type> [folder] \n\n' +
+    '  Types: \n\n' +
+    '    app,       Initializes a new app\n' +
+    '    plugin,    Initializes a new plugin\n' +
+    '    generator, Initializes a basic generator';
+  return usage;
+}
+
+module.exports = program;

lib/cli/run-binary.js

@@ -0,0 +1,25 @@
+var Q = require('q');
+var fs = require('fs');
+var path = require('path');
+var utils = require('../utils');
+
+module.exports = function(args, options) {
+  options = options || {};
+
+  return utils.projectRoot()
+    .then(function(root) {
+      var doneScript = process.platform === 'win32' ? 'donejs.cmd' : 'donejs';
+      var donejsBinary = path.join(root, 'node_modules', '.bin', doneScript);
+
+      if (!fs.existsSync(donejsBinary)) {
+        var msg = 'Could not find local DoneJS binary (' + donejsBinary + ')';
+        return Q.reject(new Error(msg));
+      }
+
+      if (!options.cwd) {
+        options.cwd = root;
+      }
+
+      return utils.spawn(donejsBinary, args, options);
+    });
+};

lib/utils.js

@@ -73,7 +73,10 @@ exports.log = function(promise) {
   return promise.then(function() {
     process.exit(0);
   }, function(error) {
+    console.log();
     console.error(error.stack || error.message || error);
+    console.log();
+
     process.exit(1);
   });
 };

package.json

@@ -12,15 +12,17 @@
     "test-quickstart": "guide guides/guide/test.js --local",
     "test-pmo": "guide guides/place-my-order/test.js --local",
     "jshint": "jshint lib/. bin/donejs test/. --config",
-    "mocha": "mocha test/ --timeout 120000",
+    "mocha": "mocha test/test --timeout 120000",
     "verify": "echo \"Script ran\"",
     "document:watch": "documentjs --watch",
     "document": "documentjs -f && cp docs/theme/static/favicon.ico site/favicon.ico",
     "publish": "git push origin && git push origin --tags",
     "release:prerelease": "npm version prerelease && npm publish",
     "release:patch": "npm version patch && npm publish",
     "release:minor": "npm version minor && npm publish",
-    "release:major": "npm version major && npm publish"
+    "release:major": "npm version major && npm publish",
+    "coverage": "istanbul cover _mocha -- test/test --timeout 120000",
+    "coverage:upload": "istanbul cover _mocha --report lcovonly -- test/ --timeout 600000 && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
   },
   "repository": {
     "type": "git",
@@ -38,17 +40,23 @@
   },
   "homepage": "https://github.com/donejs/donejs",
   "devDependencies": {
+    "coveralls": "^2.11.9",
     "documentjs": "^0.4.3",
     "dotdotdot": "^1.7.0",
     "es6-promise": "^3.0.2",
     "guide-automation": "^0.2.0",
     "is-appveyor": "^1.0.0",
+    "istanbul": "^0.4.2",
     "jshint": "^2.8.0",
     "mocha": "^2.2.5",
+    "mocha-lcov-reporter": "^1.2.0",
+    "mockery": "^1.4.1",
     "node-fetch": "^1.3.3",
+    "rimraf": "^2.5.2",
     "stream-when": "^1.0.0"
   },
   "dependencies": {
+    "chalk": "^1.1.3",
     "commander": "^2.8.1",
     "cross-spawn-async": "^2.0.0",
     "q": "^1.4.1"