fixes plugin init order issue.

Signed-off-by: Eric Wang <[email protected]>

Author: skygragon

lib/commands/plugin.js

@@ -79,10 +79,11 @@ cmd.handler = function(argv) {
   const name = argv.name;
 
   if (argv.install) {
-    const cb = function(e) {
+    const cb = function(e, p) {
       if (e) return log.error(e);
+      p.help();
+      p.save();
       Plugin.init();
-      Plugin.save();
       print();
     };
 

lib/plugin.js

@@ -84,8 +84,8 @@ Plugin.init = function(head) {
 
   const stats = cache.get(h.KEYS.plugins) || {};
 
-  // 1. check installed plugins
-  let plugins = [];
+  // 1. find installed plugins
+  let installed = [];
   for (let f of file.listCodeDir('lib/plugins')) {
     const p = f.data;
     if (!p) continue;
@@ -98,39 +98,41 @@ Plugin.init = function(head) {
       log.trace('new plugin, enable by default');
       p.enabled = true;
     }
+    installed.push(p);
+  }
+  // the one with bigger `id` comes first
+  installed = _.sortBy(installed, x => -x.id);
 
+  // 2. init all in reversed order
+  for (let i = installed.length - 1; i >= 0; --i) {
+    const p = installed[i];
     if (p.enabled) {
       p.init();
       log.trace('inited plugin: ' + p.name);
     } else {
       log.trace('skipped plugin: ' + p.name);
     }
-
-    plugins.push(p);
   }
 
-  // chain the plugins together
-  // the one has bigger `id` comes first
-  plugins = _.sortBy(plugins, x => -x.id);
-
+  // 3. chain together
+  const plugins = installed.filter(x => x.enabled);
   let last = head;
   for (let p of plugins) {
-    if (!p.enabled) continue;
     last.setNext(p);
     last = p;
   }
 
-  // 2. check saved plugins
+  // 4. check missing plugins
   const missings = [];
   for (let k of _.keys(stats)) {
-    if (plugins.find(x => x.name === k)) continue;
+    if (installed.find(x => x.name === k)) continue;
     const p = new Plugin(-1, k, 'missing');
     p.enabled = stats[k];
     missings.push(p);
+    log.trace('missing plugin:' + p.name);
   }
-  log.trace('missing plugins: ' + missings.length);
 
-  Plugin.plugins = plugins.concat(missings);
+  Plugin.plugins = installed.concat(missings);
   return missings.length === 0;
 };