Switched addon generation commands to use commander

Author: begedin

index.js

@@ -1,12 +1,6 @@
 /* jshint node: true */
 'use strict';
 
-var commands = require('./lib/commands');
-
 module.exports = {
-  name: 'ember-micro-addon',
-
-  includedCommands: function() {
-    return commands;
-  }
+  name: 'ember-micro-addon'
 };

lib/cli/component.js

@@ -1,7 +1,36 @@
 #! /usr/bin/env node
 
+var program = require('commander');
+
+var dasherize = require('../utils/string').dasherize;
+var Promise = require('../ext/promise');
 var ui = require('../ui');
 
-require('../commands/component').validateAndRun([process.argv[2]])
-  .catch(ui.error)
-  .finally(process.exit);
+function validateOptions(options) {
+  return new Promise(function(resolve, reject) {
+    if (!options.addonName) {
+      reject('You must provide a name of the component you wisth to generate.');
+    } else {
+      resolve(options);
+    }
+  });
+}
+
+function run(options) {
+  return require('../tasks/component')(options);
+}
+
+program
+  .arguments('<addonName>')
+  .action(function(addonName) {
+    program.addonName = addonName;
+  })
+  .parse(process.argv);
+
+var options = {
+  addonName: dasherize(program.addonName)
+};
+
+return validateOptions(options)
+  .then(run)
+  .catch(ui.error);

lib/cli/helper.js

@@ -1,7 +1,36 @@
 #! /usr/bin/env node
 
+var program = require('commander');
+
+var dasherize = require('../utils/string').dasherize;
+var Promise = require('../ext/promise');
 var ui = require('../ui');
 
-require('../commands/helper').validateAndRun([process.argv[2]])
-	.catch(ui.error)
-	.finally(process.exit);
+function validateOptions(options) {
+  return new Promise(function(resolve, reject) {
+    if (!options.addonName) {
+      reject('You must provide a name of the helper you wisth to generate.');
+    } else {
+      resolve(options);
+    }
+  });
+}
+
+function run(options) {
+  return require('../tasks/helper')(options);
+}
+
+program
+  .arguments('<addonName>')
+  .action(function(addonName) {
+    program.addonName = addonName;
+  })
+  .parse(process.argv);
+
+var options = {
+  addonName: dasherize(program.addonName)
+};
+
+return validateOptions(options)
+  .then(run)
+  .catch(ui.error);

lib/cli/library.js

@@ -1,7 +1,36 @@
 #! /usr/bin/env node
 
+var program = require('commander');
+
+var dasherize = require('../utils/string').dasherize;
+var Promise = require('../ext/promise');
 var ui = require('../ui');
 
-require('../commands/library').validateAndRun([process.argv[2]])
-  .catch(ui.error)
-  .finally(process.exit);
+function validateOptions(options) {
+  return new Promise(function(resolve, reject) {
+    if (!options.addonName) {
+      reject('You must provide a name of the library you wisth to generate.');
+    } else {
+      resolve(options);
+    }
+  });
+}
+
+function run(options) {
+  return require('../tasks/library')(options);
+}
+
+program
+  .arguments('<addonName>')
+  .action(function(addonName) {
+    program.addonName = addonName;
+  })
+  .parse(process.argv);
+
+var options = {
+  addonName: dasherize(program.addonName)
+};
+
+return validateOptions(options)
+  .then(run)
+  .catch(ui.error);

lib/commands/component.js

@@ -8,8 +8,8 @@ module.exports = function(options) {
   var blueprintName = "micro-component";
   var blueprintFolderRelativePath = "../../blueprints";
   var blueprintPath = path.resolve(__dirname, blueprintFolderRelativePath, blueprintName);
-  var command = 'ember new ' + options.name + ' --blueprint ' + blueprintPath + ' --skip-npm --skip-bower --skip-git';
-  var msg = 'Creating micro-component in ./' + options.name;
+  var command = 'ember new ' + options.addonName + ' --blueprint ' + blueprintPath + ' --skip-npm --skip-bower --skip-git';
+  var msg = 'Creating micro-component in ./' + options.addonName;
   return runCommand(command, msg, {
     cwd: process.cwd()
   })();

lib/commands/helper.js

@@ -8,8 +8,8 @@ module.exports = function(options) {
   var blueprintName = "micro-helper";
   var blueprintFolderRelativePath = "../../blueprints";
   var blueprintPath = path.resolve(__dirname, blueprintFolderRelativePath, blueprintName);
-  var command = 'ember new ' + options.name + ' --blueprint ' + blueprintPath + ' --skip-npm --skip-bower --skip-git';
-  var msg = 'Creating micro-helper in ./' + options.name;
+  var command = 'ember new ' + options.addonName + ' --blueprint ' + blueprintPath + ' --skip-npm --skip-bower --skip-git';
+  var msg = 'Creating micro-helper in ./' + options.addonName;
   return runCommand(command, msg, {
     cwd: process.cwd()
   })();