sparrow-ci 1.1.3 → 1.1.4

package/README.md

@@ -2,7 +2,7 @@
  * @Author: wangqi
  * @Date: 2022-08-12 15:36:41
  * @LastEditors: wangqi
- * @LastEditTime: 2022-09-24 13:15:49
+ * @LastEditTime: 2023-02-13 10:50:34
  * @FilePath: /sparrow-ci/README.md
  * @Description: README
 -->
@@ -27,7 +27,7 @@ npm install sparrow-ci --save-dev
 ```json
   "scripts": {
     ...
-    "ci": "ci "
+    "ci": "ci"
   },
 ```
 
@@ -39,7 +39,7 @@ npm install sparrow-ci --save-dev
 
 设置 -> 安全设置 ->  服务端口
 
-2.执行`cli`指令初始化之后，会生成一个`cli.js`文件，文件内容是这样的：
+2.执行`ci`指令初始化之后，会生成一个`cli.js`文件，文件内容是这样的：
 
 ```javascript
 module.exports = {
@@ -47,7 +47,8 @@ module.exports = {
   "version": "版本号",
   "description": "描述文本",
   "projectRoot": "电脑里面项目的路径",
-  "needCheckNpmPackages": ["需要检查的包的名字"]
+  "needCheckNpmPackages": ["需要检查的包的名字"],
+  "robotNum": 2,
 };
 ```
 
@@ -59,14 +60,11 @@ module.exports = {
 
 | 选项            | 简写 | 作用                        |
 | --------------- | ---- | --------------------------- |
-| --publish       | -pub | 上传正式代码                |
 | --upload        | -u   | 上传测试代码                |
 | --preview       | -p   | 预览                        |
 | --switch        | -s   | 切换环境                    |
 | --build-npm     | -b   | npm构建                     |
 | --help          | -h   | 描述如何使用                |
-| --edit-live     | -e   | 编辑live直播插件json        |
-| --git-pull      | -g   | 拉取远端master代码          |
 | --clone         | -c   | 克隆文件夹                  |
 | --robot         | -r   | 修改开发者机器人id           |
 

package/bin/ci.js

@@ -2,17 +2,17 @@
  * @Author: wangqi
  * @Date: 2022-08-12 15:56:29
  * @LastEditors: wangqi
- * @LastEditTime: 2023-02-10 16:17:16
+ * @LastEditTime: 2023-02-14 11:06:15
  * @FilePath: /sparrow-ci/bin/ci.js
- * @Description: 
+ * @Description: ci
 */
 
 const path = require('path');
 const fs = require('fs');
 const inquirer = require('inquirer');
 const chalk = require('chalk');
-const { getProInfo, commonFilePath, configOutPut, createVersion, handleList, printSuccess, printFail, printWarnning, handleVersion } = require('./utils/index');
-const { isDependentExisted, writeToFile, installAndBuild, installPackages, handleLivePlugin, handleExecFile, handleFolder } = require('./utils/node_utils.js');
+const { getProInfo, commonFilePath, configOutPut, handleList, printSuccess, printFail, printWarnning } = require('./utils/index');
+const { isDependentExisted, writeToFile, installAndBuild, installPackages, handleExecFile, handleFolder } = require('./utils/node_utils.js');
 const { environment, helpDescription, robotList } = require('../ci.config');
 const { uploadCi, packNpmCi, previewCi } = require('./command');
 
@@ -43,7 +43,6 @@ class Ci {
   subPackages = '';
   mainCliFilePath = '';
   packageJSONPath = '';
-  versionJSONPath = '';
   cliFileExisted = false;
   needCheckNpmPackages = [];
   appid = '';
@@ -66,7 +65,6 @@ class Ci {
     this.independentSubPackages = this.subPackages.filter(inPackage => inPackage.independent);
     this.mainCliFilePath = path.join(this.miniprogramRoot, 'cli.js');
     this.packageJSONPath = path.join(this.projectRoot, 'package.json');
-    this.versionJSONPath = path.join(this.projectRoot, 'version.json');
     // 独立分包是否存在
     isDependentExisted(this.miniprogramRoot, this.independentSubPackages);
     // cli.js是否存在
@@ -95,7 +93,7 @@ class Ci {
       version: this.version,
       description: this.description,
       projectRoot: this.projectRoot,
-      needCheckNpmPackages: this.needCheckNpmPackages,
+      needCheckNpmPackages: this.needCheckNpmPackages || [],
       robotNum: this.robotNum,
     };
   }
@@ -115,7 +113,7 @@ class Ci {
     this.version = version;
     this.description = description;
     this.projectRoot = projectRoot;
-    this.needCheckNpmPackages = needCheckNpmPackages;
+    this.needCheckNpmPackages = needCheckNpmPackages || [];
     this.robotNum = robotNum;
   }
 
@@ -154,11 +152,9 @@ class Ci {
   // 读取cli.js文件的信息
   readCliFile(filePath) {
     const cliFileData = require(filePath);
-    const { version, description } = require(this.versionJSONPath);
     // 把package里的版本和版本描述同步到cli中，当使用cli -u时写入到cli
-    // 22.1.8新加miniapp_version
-    cliFileData.version = version;
-    cliFileData.description = description || ''
+    cliFileData.version = this.version || '';
+    cliFileData.description = this.description || ''
     this.setConfigInfo(cliFileData);
   }
 
@@ -220,6 +216,9 @@ class Ci {
             resolve(false);
             return;
           }
+          if (this.robotNum === 1 && type === 'upload') {
+            answers.robotNum = robotList['default'];
+          }
           await this.writeCliFile(answers);
           resolve(answers);
         })
@@ -251,17 +250,6 @@ class Ci {
     await this.upload('online');
   }
 
-  async publish() {
-    // 拉取master
-    await this.pull();
-    // 处理直播插件 默认添加
-    const writeFileSuccess = await handleLivePlugin(this.miniprogramRoot);
-    if (writeFileSuccess) {
-      printSuccess(`直播插件${writeFileSuccess}`);
-    }
-    await this.upload('publish');
-  }
-
   // 读取git tag 修改配置
   async changeVerConfig() {
     try {
@@ -304,9 +292,14 @@ class Ci {
       if (version && description) {
         this.version = version;
         this.description = description;
+        await this.writeCliFile();
       }
-      await this.writeCliFile();
     }
+
+    // if (this.robotNum === 1 && type === 'upload') {
+    //   this.robotNum = robotList['default'];
+    //   await this.writeCliFile();
+    // }
     
     await uploadCi({
       projectPath: this.projectRoot,
@@ -318,11 +311,7 @@ class Ci {
     });
 
     if (type === 'online') return;
-    const packageObj = require(this.versionJSONPath);
-    packageObj.version = handleVersion(this.version);
-    packageObj.description = this.description;
-    const packageStr = JSON.stringify(packageObj, null, 2);
-    writeToFile(this.versionJSONPath, packageStr);
+
     console.log(`上传成功后可至微信小程序管理后台 ${chalk.blue('https://mp.weixin.qq.com/wxamp/wacodepage/getcodepage')} 将上传的版本选为体验版`);
   }
 
@@ -347,30 +336,6 @@ class Ci {
     })
   }
 
-  // 添加/删除直播插件
-  subscribe() {
-    let promptArr = handleList(['status'], { status: 'add' });
-    inquirer
-      .prompt(promptArr)
-      .then(async (answers) => {
-        const writeFileSuccess = await handleLivePlugin(this.miniprogramRoot, answers.status);
-        if (writeFileSuccess) {
-          printSuccess(`直播插件${writeFileSuccess}`);
-        }
-      })
-      .catch(error => {
-        printFail(`${error}`);
-      });
-  }
-
-  // 拉取远端代码
-  async pull() {
-    //获取文件路径
-    const filepath = path.join(__dirname, '../git.sh');
-    // 执行拉取
-    await handleExecFile(filepath);
-  }
-
   // 克隆文件夹(克隆到独立分包)
   clone() {
     handleFolder(this.independentSubPackages, this.miniprogramRoot);

package/bin/main.js

@@ -3,7 +3,7 @@
 /*
  * @Author: wangqi
  * @Date: 2020-11-06 13:33:56
- * @LastEditTime: 2022-09-24 11:35:50
+ * @LastEditTime: 2023-02-13 10:56:18
  * @LastEditor: wangqi
  * @Description: 脚手架的类
 */
@@ -13,14 +13,11 @@ const Ci = require('./ci');
 
 // 设置命令行的选项
 program
-  .option('-o, --online', '自动发布代码')
-  .option('-pub, --publish', '发布正式环境代码')
+  .option('-onlinePublishCode, --online-publish-code', '自动发布代码')
   .option('-u, --upload', '上传代码')
   .option('-p, --preview', '预览')
   .option('-s, --switch', '切换环境')
   .option('-b, --build-npm', 'npm构建')
-  .option('-e, --edit-live', '编辑live直播插件json')
-  .option('-g, --git-pull', '拉取远端master代码')
   .option('-c, --clone', '克隆文件夹')
   .option('-r, --robot', '初始化个人上传账号')
   .option('-h, --help', '描述如何使用')
@@ -32,12 +29,9 @@ async function main () {
   // 等待实例初始化完成
   await ci.init();
   switch (true) {
-    case Boolean(program.online): // 自动发布代码
+    case Boolean(program.onlinePublishCode): // 自动发布代码
       ci.online();
       break;
-    case Boolean(program.publish): // 发布正式环境代码
-      ci.publish();
-      break;
     case Boolean(program.upload): // 上传
       ci.upload();
       break;
@@ -50,16 +44,10 @@ async function main () {
     case Boolean(program.buildNpm): // npm构建
       ci.buildNpm();
       break;
-    case Boolean(program.editLive): // 编辑直播插件
-      ci.subscribe();
-      break;
-    case Boolean(program.gitPull): // 编辑直播插件
-      ci.pull();
-      break;
-    case Boolean(program.clone): // 编辑直播插件
+    case Boolean(program.clone): // 克隆
       ci.clone();
       break;
-    case Boolean(program.robot): // 编辑直播插件
+    case Boolean(program.robot): // 修改上传机器人
       ci.robot(program.args[0]);
       break;  
     case Boolean(program.help): // 查看帮助

package/bin/utils/index.js

@@ -2,7 +2,7 @@
  * @Author: wangqi
  * @Date: 2022-08-12 17:10:25
  * @LastEditors: wangqi
- * @LastEditTime: 2023-02-07 17:22:11
+ * @LastEditTime: 2023-02-13 14:02:17
  * @FilePath: /sparrow-ci/bin/utils/index.js
  * @Description: 公用方法
  */
@@ -35,11 +35,18 @@ function handleVersion(miniappVersion) {
 
 // 获取项目版本和描述
 function getProInfo(projectRoot) {
-  const versionJson = commonFilePath(projectRoot, 'version.json'); // 项目versionJson的路径
-  const { version, description } = versionJson;
-  return {
-    version, 
-    description,
+  try {
+    const config = commonFilePath(projectRoot, '/src/cli.js'); // 项目versionJson的路径
+    const { version, description } = config;
+    return {
+      version, 
+      description,
+    }
+  } catch (err) {
+    return {
+      version: '', 
+      description: '',
+    }
   }
 }
 

package/bin/utils/node_utils.js

@@ -2,7 +2,7 @@
  * @Author: wangqi
  * @Date: 2022-08-26 10:39:50
  * @LastEditors: wangqi
- * @LastEditTime: 2023-02-10 12:55:39
+ * @LastEditTime: 2023-02-13 10:44:24
  * @FilePath: /sparrow-ci/bin/utils/node_utils.js
  * @Description: 工具方法
  */
@@ -159,46 +159,6 @@ async function installPackages(packageJSONPath, packageNames = []) {
   });
 }
 
-// 处理直播插件
-function handleLivePlugin(pathFile, status = 'add') {
-  return new Promise((resolve, reject) => {
-    liveJsonArr.forEach(item => {
-      readFile(path.join(pathFile, item), 'utf8', (err, data) => {
-        if (err) {
-          reject(err);
-          return
-        }
-
-        const configComponent = JSON.parse(data);
-        let { usingComponents } = configComponent;
-
-        if (!usingComponents) reject(err);
-
-        if (status === 'add') { // 添加
-          if (usingComponents.subscribe) {
-            resolve('已添加！');
-            return;
-          }
-          usingComponents.subscribe = liveUrl;
-        } else { // 删除
-          if (!usingComponents.subscribe) {
-            resolve('已删除！');
-            return;
-          };
-          delete usingComponents.subscribe;
-        }
-        writeFile(path.join(pathFile, item), JSON.stringify(configComponent, null, "\t"), "utf8", (err1) => {
-          if (err1) {
-            reject(err1);
-            return;
-          }
-          resolve(status === 'add' ? '添加成功' : '删除成功');
-        })
-      });
-    });
-  });
-}
-
 async function handleExecFile(filePath) {
   const { stdout, stderr } = await execFile(filePath, { cwd: '.' });
   console.log('===================================');
@@ -273,7 +233,6 @@ module.exports = {
   askUsersInitQuestions,
   installAndBuild,
   installPackages,
-  handleLivePlugin,
   handleExecFile,
   handleFolder,
 }

package/ci.config.js

@@ -2,7 +2,7 @@
  * @Author: wangqi
  * @Date: 2022-04-29 17:18:33
  * @LastEditors: wangqi
- * @LastEditTime: 2022-09-24 13:10:55
+ * @LastEditTime: 2023-02-13 10:20:52
  * @FilePath: /sparrow-ci/ci.config.js
  * @Description: 全局配置文件
 */
@@ -36,14 +36,11 @@ module.exports = {
 
     | 选项            | 简写 | 作用                        |
     | --------------- | ---- | --------------------------- |
-    | --publish       | -pub | 上传正式代码                |
     | --upload        | -u   | 上传测试代码                |
     | --preview       | -p   | 预览                        |
     | --switch        | -s   | 切换环境                    |
     | --build-npm     | -b   | npm构建                     |
     | --help          | -h   | 描述如何使用                |
-    | --edit-live     | -e   | 编辑live直播插件json        |
-    | --git-pull      | -g   | 拉取远端master代码          |
     | --clone         | -c   | 克隆文件夹                  |
     | --robot         | -r   | 修改开发者机器人id          |
   `,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sparrow-ci",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "基于miniprogram-ci开发的小程序命令行工具",
   "main": "",
   "bin": {