[plugin] enable/disable wont touch plugins js.

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

Author: skygragon

.gitignore

@@ -36,6 +36,7 @@ jspm_packages
 # Optional REPL history
 .node_repl_history
 
+dist/
 tmp/
 *.swp
 .DS_Store

lib/commands/plugin.js

@@ -70,7 +70,6 @@ function print(plugins) {
     log.printf('   %s     %-18s %-15s %s',
       h.prettyText('', p.enabled && !p.missing),
       p.name, p.ver, p.desc);
-  Plugin.save();
 }
 
 cmd.handler = function(argv) {
@@ -83,6 +82,7 @@ cmd.handler = function(argv) {
     const cb = function(e) {
       if (e) return log.error(e);
       Plugin.init();
+      Plugin.save();
       print();
     };
 
@@ -102,11 +102,11 @@ cmd.handler = function(argv) {
     return log.error('Plugin missing, install it first');
 
   if (argv.enable) {
-    p.enable(true);
+    p.enabled = true;
     p.save();
     print();
   } else if (argv.disable) {
-    p.enable(false);
+    p.enabled = false;
     p.save();
     print();
   } else if (argv.delete) {

lib/plugin.js

@@ -40,22 +40,6 @@ Plugin.prototype.setNext = function(next) {
   this.next = next;
 };
 
-Plugin.prototype.setFile = function(f) {
-  this.file = f;
-  this.enabled = (this.file[0] !== '.');
-};
-
-Plugin.prototype.enable = function(enabled) {
-  if (this.enabled === enabled) return;
-  const newfile = enabled ? this.file.substr(1) : '.' + this.file;
-  try {
-    file.mv(file.pluginFile(this.file), file.pluginFile(newfile));
-  } catch(e) {
-    log.error(e.message);
-  }
-  this.setFile(newfile);
-};
-
 Plugin.prototype.delete = function() {
   if (!this.missing) {
     try {
@@ -69,13 +53,13 @@ Plugin.prototype.delete = function() {
 };
 
 Plugin.prototype.save = function() {
-  const data = cache.get(h.KEYS.plugins) || {};
+  const stats = cache.get(h.KEYS.plugins) || {};
 
-  if (this.deleted) delete data[this.name];
+  if (this.deleted) delete stats[this.name];
   else if (this.missing) return;
-  else data[this.name] = this.enabled;
+  else stats[this.name] = this.enabled;
 
-  cache.set(h.KEYS.plugins, data);
+  cache.set(h.KEYS.plugins, stats);
 };
 
 Plugin.prototype.install = function(cb) {
@@ -84,9 +68,9 @@ Plugin.prototype.install = function(cb) {
   const cmd = 'npm install --save ' + this.deps.join(' ');
   log.debug(cmd);
   const spin = h.spin(cmd);
-  cp.exec(cmd, {cwd: file.codeDir()}, function() {
+  cp.exec(cmd, {cwd: file.codeDir()}, function(e) {
     spin.stop();
-    return cb();
+    return cb(e);
   });
 };
 
@@ -98,14 +82,23 @@ Plugin.init = function(head) {
   log.trace('initializing all plugins');
   head = head || require('./core');
 
+  const stats = cache.get(h.KEYS.plugins) || {};
+
   // 1. check installed plugins
   let plugins = [];
   for (let f of file.listCodeDir('lib/plugins')) {
     const p = f.data;
     if (!p) continue;
-
-    p.setFile(f.file);
     log.trace('found plugin: ' + p.name + '=' + p.ver);
+
+    p.file = f.file;
+    p.enabled = stats[p.name];
+    // not saved before? enable it by default
+    if (!(p.name in stats)) {
+      log.trace('new plugin, enable by default');
+      p.enabled = true;
+    }
+
     if (p.enabled) {
       p.init();
       log.trace('inited plugin: ' + p.name);
@@ -129,11 +122,10 @@ Plugin.init = function(head) {
 
   // 2. check saved plugins
   const missings = [];
-  const data = cache.get(h.KEYS.plugins) || {};
-  for (let k of _.keys(data)) {
+  for (let k of _.keys(stats)) {
     if (plugins.find(x => x.name === k)) continue;
     const p = new Plugin(-1, k, 'missing');
-    p.enabled = data[k];
+    p.enabled = stats[k];
     missings.push(p);
   }
   log.trace('missing plugins: ' + missings.length);
@@ -177,6 +169,7 @@ Plugin.install = function(name, cb) {
     log.debug('copied to ' + fullpath);
 
     const p = require(fullpath);
+    p.file = path.basename(fullpath);
     p.install(function() {
       return cb(null, p);
     });
@@ -187,19 +180,19 @@ Plugin.installMissings = function(cb) {
   function doTask(plugin, queue, cb) {
     Plugin.install(plugin.name, function(e, p) {
       if (!e) {
-        p.enable(plugin.enabled);
+        p.enabled = plugin.enabled;
         p.save();
         p.help();
       }
       return cb(e, p);
     });
   }
 
-  const plugins = Plugin.plugins.filter(x => x.missing);
-  if (plugins.length === 0) return cb();
+  const missings = Plugin.plugins.filter(x => x.missing);
+  if (missings.length === 0) return cb();
 
   log.warn('Installing missing plugins, might take a while ...');
-  const q = new Queue(plugins, {}, doTask);
+  const q = new Queue(missings, {}, doTask);
   q.run(1, cb);
 };
 

test/test_plugin.js

@@ -35,32 +35,35 @@ describe('plugin', function() {
   });
 
   describe('#Plugin.init', function() {
-    const p1 = new Plugin(0, 'Leetcode', '2.0');
-    const p2 = new Plugin(1, 'Cache', '1.0');
-    const p3 = new Plugin(2, 'Retry', '3.0');
-    const p4 = new Plugin(3, 'Core', '4.0');
+    const p1 = new Plugin(0, 'leetcode', '2.0');
+    const p2 = new Plugin(1, 'cache', '1.0');
+    const p3 = new Plugin(2, 'retry', '3.0');
+    const p4 = new Plugin(3, 'core', '4.0');
 
     before(function() {
       p1.init = p2.init = p3.init = p4.init = NOOP;
       file.listCodeDir = function() {
         return [
           {name: 'cache', data: p2, file: 'cache.js'},
-          {name: 'leetcode', data: p1, file: '.leetcode.js'},  // disabled
+          {name: 'leetcode', data: p1, file: 'leetcode.js'},
           {name: 'retry', data: p3, file: 'retry.js'},
           {name: 'bad', data: null}
         ];
       };
     });
 
     it('should init ok', function() {
+      cache.get = () => {
+        return {cache: true, leetcode: false, retry: true};
+      };
       assert.deepEqual(Plugin.plugins, []);
 
       const res = Plugin.init(p4);
       assert.equal(res, true);
       assert.deepEqual(Plugin.plugins.length, 3);
 
       const names = Plugin.plugins.map(p => p.name);
-      assert.deepEqual(names, ['Retry', 'Cache', 'Leetcode']);
+      assert.deepEqual(names, ['retry', 'cache', 'leetcode']);
 
       assert.equal(p4.next, p3);
       assert.equal(p3.next, p2);
@@ -70,15 +73,15 @@ describe('plugin', function() {
 
     it('should find missing ok', function() {
       cache.get = () => {
-        return {company: true, solution: true};
+        return {company: true, leetcode: false, solution: true};
       };
 
       const res = Plugin.init(p4);
       assert.equal(res, false);
       assert.deepEqual(Plugin.plugins.length, 5);
 
       const names = Plugin.plugins.map(p => p.name);
-      assert.deepEqual(names, ['Retry', 'Cache', 'Leetcode', 'company', 'solution']);
+      assert.deepEqual(names, ['retry', 'cache', 'leetcode', 'company', 'solution']);
 
       assert.equal(p4.next, p3);
       assert.equal(p3.next, p2);
@@ -179,33 +182,6 @@ describe('plugin', function() {
     });
   }); // #Plugin.installMissings
 
-  describe('#enable', function() {
-    const FILE = path.resolve(th.DIR, 'leetcode.js');
-
-    before(function() {
-      file.pluginFile = () => FILE;
-    });
-
-    it('should ok', function() {
-      const p = new Plugin(0, 'Leetcode', '2.0', '');
-      assert.equal(p.enabled, true);
-
-      p.setFile('.leetcode.js');
-      fs.writeFileSync(FILE, '');
-      assert.equal(p.enabled, false);
-      assert.equal(p.file, '.leetcode.js');
-      p.enable(false);
-      assert.equal(p.enabled, false);
-      assert.equal(p.file, '.leetcode.js');
-      p.enable(true);
-      assert.equal(p.enabled, true);
-      assert.equal(p.file, 'leetcode.js');
-      p.enable(false);
-      assert.equal(p.enabled, false);
-      assert.equal(p.file, '.leetcode.js');
-    });
-  }); // #enable
-
   describe('#delete', function() {
     it('should ok', function() {
       file.pluginFile = x => th.DIR + x;