style: fix some spec errors

Tencent · Nov 27, 2019 · a10c8ba · a10c8ba
1 parent 073bfc2
commit a10c8ba
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 70 deletions.
diff --git a/packages/feflow-cli/src/cli/index.ts b/packages/feflow-cli/src/cli/index.ts
@@ -36,7 +36,7 @@ const printBanner = () => {
     console.log(chalk.green(data));
     console.log(chalk.green(` Feflow，current version: v${pkg.version}, homepage: https://github.com/Tencent/feflow             `));
     console.log(chalk.green(' (c) powered by Tencent, aims to improve front end workflow.                                       '));
-    console.log(chalk.green(' Run feflow --help to see usage.                                                                   '));
+    console.log(chalk.green(' Run fef --help to see usage.                                                                      '));
   });
 }
 
@@ -58,7 +58,7 @@ export default function entry() {
 
   let cmd: any = args._.shift();
 
-  if (!cmd) {
+  if (!cmd && !args.h && !args.help) {
       printBanner();
       return;
   }

diff --git a/packages/feflow-cli/src/cli/upgrade.ts b/packages/feflow-cli/src/cli/upgrade.ts
diff --git a/packages/feflow-cli/src/core/index.ts b/packages/feflow-cli/src/core/index.ts
@@ -47,12 +47,11 @@ export default class Feflow {
     async init(cmd: string) {
         if (cmd === 'config') {
             await this.initClient();
-            await this.checkCliUpdate()
             await this.loadNative();
         } else {
             await this.initClient();
-            await this.checkCliUpdate()
             await this.initPackageManager();
+            await this.checkCliUpdate();
             await this.checkUpdate();
             await this.loadNative();
             await loadPlugins(this);
@@ -85,7 +84,7 @@ export default class Feflow {
     }
 
     initPackageManager() {
-        const { root } = this;
+        const { root, logger } = this;
 
         return new Promise<any>((resolve, reject) => {
             if (!this.config || !this.config.packageManager) {
@@ -137,6 +136,8 @@ export default class Feflow {
                     });
                 }
                 return;
+            } else {
+                logger.debug('Use packageManager is: ', this.config.packageManager);
             }
             resolve();
         });
@@ -295,22 +296,25 @@ export default class Feflow {
 
     async  checkCliUpdate() {
         const { version, config, configPath } = this;
+        if (!config) {
+            return;
+        }
         if (config.lastUpdateCheck && (+new Date() - parseInt(config.lastUpdateCheck, 10)) <= 1000 * 3600 * 24) {
             return;
         }
         const packageManager = config.packageManager;
         const registryUrl = await getRegistryUrl(packageManager);
-        const latestVersion: any = await packageJson('@feflow/cli', 'latest', registryUrl)
+        const latestVersion: any = await packageJson('@feflow/cli', 'latest', registryUrl);
         if (semver.gt(latestVersion, version)) {
             const askIfUpdateCli = [{
                 type: "confirm",
                 name: "ifUpdate",
-                message: `${chalk.yellow(`@feflow/cli's latest version is ${chalk.green(`${latestVersion}`)} but your version is ${chalk.red(`${version}`)}, Do your want to update it?`)}`,
+                message: `${chalk.yellow(`@feflow/cli's latest version is ${chalk.green(`${latestVersion}`)}, but your version is ${chalk.red(`${version}`)}, Do you want to update it?`)}`,
                 default: true
             }]
-            const answer = await inquirer.prompt(askIfUpdateCli)
+            const answer = await inquirer.prompt(askIfUpdateCli);
             if (answer.ifUpdate) {
-                await this.updateCli(packageManager)
+                await this.updateCli(packageManager);
             } else {
                 safeDump({
                     ...config,

diff --git a/packages/feflow-cli/src/core/native/help.ts b/packages/feflow-cli/src/core/native/help.ts
@@ -17,7 +17,7 @@ const showHelp = (commands: Array<Object>) => {
   const sections = [
     {
       header: 'Usage',
-      content: '$ feflow [options] [command]'
+      content: '$ fef [options] [command]'
     },
     {
       header: 'Commands',