feat: check upgrade and force update when not compatible

Tencent · Nov 9, 2017 · 529568d · 529568d
1 parent fd2038b
commit 529568d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/lib/core/index.js b/lib/core/index.js
@@ -61,8 +61,8 @@ class Feflow {
 
     // Init client and load external plugins
     return Promise.each([
-      'initClient',
       'upgrade',
+      'initClient',
       'loadPlugins'
     ], function (name) {
       return require('./' + name)(self);

diff --git a/lib/core/upgrade.js b/lib/core/upgrade.js
@@ -18,10 +18,13 @@ class Upgrade {
     const registry = config && config.registry;
 
     log.debug('正在检查更新...');
-    pkgJson('feflow-cli', 'latest', registry).then(json => {
+    return pkgJson('feflow-cli', 'latest', registry).then(json => {
       const version = pkg.version;
-      //const compatibleVersion = json.configs && json.configs.compatiableVersion;
-      const compatibleVersion = '>=0.10.0';
+      const configs = json.configs;
+      const ltsVersion = configs && configs.version;
+      const compatibleVersion = configs && configs.compatibleVersion;
+      log.debug(`本地版本:  ${version}, 兼容版本 ${compatibleVersion}`);
+
       // If local installed felfow version not compatible with remote, it will be force update to latest version.
       if (!semver.satisfies(version, compatibleVersion)) {
         log.info(`您当前使用的feflow版本 ${version}, feflow要求使用的版本为 ${compatibleVersion}, 将会使用全量更新策略`);
@@ -30,14 +33,17 @@ class Upgrade {
         return self.execNpmCommand('install', 'feflow-cli').then(function (result) {
           if (!result.code) {
             loading.success();
-            log.info(`已经自动升级到feflow的最新版本`);
+            log.info(`已经自动升级到feflow的最新版本${ltsVersion}`);
           } else {
             const err = `feflow-cli安装失败，失败码为${result.code}，错误日志为${result.data}`;
             loading.fail(err);
             log.error(err);
           }
         });
+      } else {
+        log.debug(`当前安装的版本 ${version} 和最新版本 ${ltsVersion} 兼容`);
       }
+      return false;
     });
   }
 
@@ -75,10 +81,6 @@ class Upgrade {
       });
     });
   }
-
-  forceUpdate() {
-
-  }
 }
 
 module.exports = function (ctx) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "feflow-cli",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "A command line tool aims to improve front-end engineer workflow.",
   "main": "lib/index.js",
   "scripts": {