Refactor plugin install.

Signed-off-by: Eric Wang <skygragon@gmail.com>

Author: skygragon

lib/commands/plugin.js

@@ -1,8 +1,4 @@
 var fs = require('fs');
-var path = require('path');
-
-var _ = require('underscore');
-var request = require('request');
 
 var h = require('../helper');
 var config = require('../config');
@@ -48,62 +44,17 @@ var cmd = {
   }
 };
 
-function install(src) {
-  var config = require('../config');
-  // assume to be a raw plugin name if not js file.
-  if (path.extname(src) !== '.js') {
-    src = config.sys.urls.plugin.replace('$name', src);
-  }
-
-  // copy to plugins folder
-  var dst = path.join(Plugin.dir, path.basename(src));
-  var dststream = fs.createWriteStream(dst);
-
-  log.debug('copying from ' + src);
-  var srcstream = src.startsWith('https://') ? request(src) : fs.createReadStream(src);
-  srcstream.on('response', function(resp) {
-    if (resp.statusCode !== 200)
-      srcstream.emit('error', 'HTTP Error: ' + resp.statusCode);
-  });
-  srcstream.on('error', function(e) {
-    log.error(e);
-    fs.unlinkSync(dst);
-  });
-
-  var spin = h.spin('Downloading ' + src);
-  srcstream.pipe(dststream);
-  dststream.on('close', function() {
-    spin.stop();
-    log.debug('copied to ' + dst);
-
-    // install dependencies for current platform
-    var plugin = require(path.relative(__dirname, dst));
-    var deps = _.map(plugin.deps, function(x) {
-      var parts = x.split(':');
-      if (parts.length > 1 && parts[1] !== process.platform)
-        return '';
-      else
-        return parts[0];
-    }).join(' ').trim();
-    if (deps.length === 0) return plugin.help();
-
-    var cmd = 'npm install --save ' + deps;
-    spin = h.spin(cmd);
-    log.debug(cmd);
-    require('child_process').exec(cmd, {
-      cwd: path.resolve(__dirname, '../..')
-    }, function() {
-      spin.stop();
-      plugin.help();
-    });
-  });
-}
-
 cmd.handler = function(argv) {
   session.argv = argv;
 
   var name = argv.name;
-  if (argv.install) return install(name);
+  if (argv.install) {
+    Plugin.install(name, function(e, plugin) {
+      if (e) return log.error(e);
+      plugin.help();
+    });
+    return;
+  }
 
   var plugins = Plugin.plugins;
   if (name) {

lib/plugin.js

@@ -1,6 +1,8 @@
+var fs = require('fs');
 var path = require('path');
 
 var _ = require('underscore');
+var request = require('request');
 
 var h = require('./helper');
 var config = require('./config');
@@ -12,7 +14,12 @@ function Plugin(id, name, ver, desc, deps) {
   this.ver = ver || 'default';
   this.desc = desc;
   this.enabled = true;
-  this.deps = deps || [];
+
+  // only need deps for current platform
+  this.deps = _.chain(deps || [])
+    .filter(function(x) { return x.indexOf(':') < 0 || x.indexOf(':' + process.platform) > 0; })
+    .map(function(x) { return x.split(':')[0]; })
+    .value();
 }
 
 Plugin.prototype.init = function() {
@@ -25,12 +32,25 @@ Plugin.prototype.setNext = function(next) {
   this.next = next;
 };
 
+Plugin.prototype.install = function(cb) {
+  if (this.deps.length === 0) return cb();
+
+  var cmd = 'npm install --save ' + this.deps.join(' ');
+  log.debug(cmd);
+  var spin = h.spin(cmd);
+  require('child_process').exec(cmd, {cwd: Plugin.root}, function() {
+    spin.stop();
+    return cb();
+  });
+};
+
 Plugin.prototype.help = function() {};
 
 Plugin.plugins = [];
 
 Plugin.init = function(head) {
-  Plugin.dir = path.resolve(__dirname, '../lib/plugins/');
+  Plugin.dir = path.resolve(__dirname, 'plugins/');
+  Plugin.root = path.resolve(__dirname, '../');
 
   var plugins = [];
   h.getDirData(['lib', 'plugins']).forEach(function(f) {
@@ -66,8 +86,49 @@ Plugin.init = function(head) {
   Plugin.plugins = plugins;
 };
 
-Plugin.fullpath = function(filename) {
-  return path.join(Plugin.dir, filename);
+Plugin.copy = function(src, cb) {
+  // FIXME: remove local file support?
+  if (path.extname(src) !== '.js') {
+    src = config.sys.urls.plugin.replace('$name', src);
+  }
+  var dst = Plugin.fullpath(src);
+
+  var srcstream = src.startsWith('https://') ? request(src) : fs.createReadStream(src);
+  srcstream.on('response', function(resp) {
+    if (resp.statusCode !== 200)
+      srcstream.emit('error', 'HTTP Error: ' + resp.statusCode);
+  });
+  srcstream.on('error', function(e) {
+    spin.stop();
+    fs.unlinkSync(dst);
+    return cb(e);
+  });
+
+  var dststream = fs.createWriteStream(dst);
+  dststream.on('close', function() {
+    spin.stop();
+    return cb(null, dst);
+  });
+
+  log.debug('copying from ' + src);
+  var spin = h.spin('Downloading ' + src);
+  srcstream.pipe(dststream);
+};
+
+Plugin.install = function(name, cb) {
+  Plugin.copy(name, function(e, fullpath) {
+    if (e) return log.error(e);
+    log.debug('copied to ' + fullpath);
+
+    var plugin = require(fullpath);
+    plugin.install(function() {
+      return cb(null, plugin);
+    });
+  });
+};
+
+Plugin.fullpath = function(file) {
+  return path.join(Plugin.dir, path.basename(file));
 };
 
 module.exports = Plugin;