Switched extract command to rely on commander

Author: begedin

lib/cli/extract.js

@@ -1,7 +1,46 @@
 #! /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/extract').validateAndRun([process.argv[2], process.argv[3]])
-  .catch(ui.error)
-  .finally(process.exit);
+function validateOptions(options) {
+  return new Promise(function(resolve, reject) {
+    if (!options.addonType) {
+      reject('You must provide the type of the addon you wish to extract');
+    } else if (!options.addonName) {
+      reject('You must provide a name of the addon you wish to extract');
+    } else {
+      resolve(options);
+    }
+  });
+}
+
+function run(options) {
+  if (options.addonType === 'library') {
+    return require('../tasks/extract-library')(options);
+  } else if (options.addonType === 'helper') {
+    return require('../tasks/extract-helper')(options);
+  } else if (options.addonType === 'component') {
+    return require('../tasks/extract-component')(options);
+  }
+}
+
+program
+  .arguments('<addonType> <addonName>')
+  .action(function(addonType, addonName) {
+    program.addonType = addonType;
+    program.addonName = addonName;
+  })
+  .parse(process.argv);
+
+var options = {
+  addonType: program.addonType,
+  addonName: dasherize(program.addonName)
+};
+
+return validateOptions(options)
+  .then(run)
+  .catch(ui.error);

lib/commands/extract.js

@@ -2,7 +2,6 @@
 'use strict';
 
 var path = require('path');
-var Promise = require('../ext/promise');
 var ui = require('../ui');
 var extractAddon = require('../utils/extract-addon');
 
@@ -26,19 +25,15 @@ var fileMappings = [
   }
 ];
 
-module.exports = function(addonName) {
-  ui.write('Extracting component ' + addonName + ' into ../' + addonName);
+module.exports = function(options) {
+  ui.write('Extracting component ' + options.addonName + ' into ../' + options.addonName);
 
-  var options = {
-    addonName: addonName,
-    blueprintName: blueprintName,
-    placeholder: placeholder,
-    fileList: fileList,
-    fileMappings: fileMappings
-  };
+  options.blueprintName = blueprintName;
+  options.placeholder = placeholder;
+  options.fileList = fileList;
+  options.fileMappings = fileMappings;
 
   return extractAddon(options).then(function() {
-    ui.write('Succesfully extracted component');
-    return Promise.resolve();
+    return ui.write('Component extraction successful!');
   });
 };

lib/tasks/extract-component.js

@@ -1,36 +1,31 @@
 /*jshint node:true*/
 'use strict';
 
-var Promise = require('../ext/promise');
 var path = require('path');
 var ui = require('../ui');
 var extractAddon = require('../utils/extract-addon');
 
 var placeholder = '<%= helperName %>';
 var blueprintName = 'micro-helper';
 
-var fileList = ['index.js', 'package.json', 'helper.js']
+var fileList = ['index.js', 'package.json', 'helper.js'];
 
 var fileMappings = [
   {
     appFile: path.join('app', 'helpers', placeholder + '.js'),
     addonFile: 'helper.js'
   }
-]
+];
 
-module.exports = function(addonName) {
-  ui.write('Extracting helper ' + addonName + ' into ../' + addonName);
+module.exports = function(options) {
+  ui.write('Extracting helper ' + options.addonName + ' into ../' + options.addonName);
 
-  var options = {
-    addonName: addonName,
-    blueprintName: blueprintName,
-    placeholder: placeholder,
-    fileList: fileList,
-    fileMappings: fileMappings
-  };
+  options.blueprintName = blueprintName;
+  options.placeholder = placeholder;
+  options.fileList = fileList;
+  options.fileMappings = fileMappings;
 
   return extractAddon(options).then(function() {
-    ui.write('Succesfully extracted helper');
-    return Promise.resolve();
+    return ui.write('Helper extraction successful!');
   });
 };

lib/tasks/extract-helper.js

@@ -1,7 +1,6 @@
 /*jshint node:true*/
 'use strict';
 
-var Promise = require('../ext/promise');
 var path = require('path');
 var ui = require('../ui');
 var extractAddon = require('../utils/extract-addon');
@@ -18,19 +17,15 @@ var fileMappings = [
   }
 ];
 
-module.exports = function(addonName) {
-  ui.write('Extracting library ' + addonName + ' into ../' + addonName);
+module.exports = function(options) {
+  ui.write('Extracting library ' + options.addonName + ' into ../' + options.addonName);
 
-  var options = {
-    addonName: addonName,
-    blueprintName: blueprintName,
-    placeholder: placeholder,
-    fileList: fileList,
-    fileMappings: fileMappings
-  };
+  options.blueprintName = blueprintName;
+  options.placeholder = placeholder;
+  options.fileList = fileList;
+  options.fileMappings = fileMappings;
 
   return extractAddon(options).then(function() {
-    ui.write('Succesfully extracted library');
-    return Promise.resolve();
+    return ui.write('Library extraction successful!');
   });
 };

lib/tasks/extract-library.js

@@ -60,18 +60,14 @@ function copyAddonFiles(options) {
     var destinationFile = path.join(destination, fileMapping.addonFile);
     return copyFileIfExists(sourceFile, destinationFile);
   });
-};
+}
 
 module.exports = function(options) {
-  console.log('creating folder');
   return createAddonFolder(options).then(function() {
-    console.log('copying blueprint');
     return copyBlueprintFiles(options);
   }).then(function() {
-    console.log('replacing');
     return replaceInFiles(options);
   }).then(function () {
-    console.log('copying addon files');
     return copyAddonFiles(options);
   });
 };