sparrow-ci 1.0.7 → 1.0.9

package/README.md

@@ -2,7 +2,7 @@
  * @Author: wangqi
  * @Date: 2022-08-12 15:36:41
  * @LastEditors: wangqi
- * @LastEditTime: 2022-09-01 17:17:29
+ * @LastEditTime: 2022-09-24 13:11:54
  * @FilePath: /sparrow-ci/README.md
  * @Description: README
 -->
@@ -68,11 +68,12 @@ module.exports = {
 | --edit-live     | -e   | 编辑live直播插件json        |
 | --git-pull      | -g   | 拉取远端master代码          |
 | --clone         | -c   | 克隆文件夹                  |
-
+| --robot         | -r   | 修改开发者机器人id           |
 比如，上传测试代码：
 
 ```shell
 ci --upload
+ci --robot xxx
 ```
 
 4.注意：

package/bin/ci.js

@@ -2,7 +2,7 @@
  * @Author: wangqi
  * @Date: 2022-08-12 15:56:29
  * @LastEditors: wangqi
- * @LastEditTime: 2022-09-03 10:15:33
+ * @LastEditTime: 2022-09-24 13:05:17
  * @FilePath: /sparrow-ci/bin/ci.js
  * @Description: 
 */
@@ -13,7 +13,7 @@ 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 { environment, helpDescription } = require('../ci.config');
+const { environment, helpDescription, robotList } = require('../ci.config');
 const { uploadCi, packNpmCi, previewCi } = require('./command');
 
 const currentWorkingDirectory = process.cwd(); // 命令执行位置的路径
@@ -33,7 +33,8 @@ class Ci {
     packageJSONPath 项目中package.json文件的位置
     cliFileExisted cli.js文件是否已经创建了，默认为false
     needCheckNpmPackages 需要检查更新的包
-    appid
+    appid 小程序id
+    robotNum 上传机器人
   */
   version = '';
   description = '';
@@ -43,9 +44,10 @@ class Ci {
   mainCliFilePath = '';
   packageJSONPath = '';
   cliFileExisted = false;
-  needCheckNpmPackages = '';
+  needCheckNpmPackages = [];
   appid = '';
   environment = environment.DEV;
+  robotNum = robotList['default'];
   constructor() {
     this.projectRoot = currentWorkingDirectory;
     const { version, description } = getProInfo(currentWorkingDirectory);
@@ -92,6 +94,7 @@ class Ci {
       description: this.description,
       projectRoot: this.projectRoot,
       needCheckNpmPackages: this.needCheckNpmPackages,
+      robotNum: this.robotNum,
     };
   }
 
@@ -103,6 +106,7 @@ class Ci {
       description,
       projectRoot,
       needCheckNpmPackages,
+      robotNum,
     } = data;
     // 给相应属性赋值
     this.environment = environment;
@@ -110,6 +114,7 @@ class Ci {
     this.description = description;
     this.projectRoot = projectRoot;
     this.needCheckNpmPackages = needCheckNpmPackages;
+    this.robotNum = robotNum;
   }
 
   // 检查配置文件是否已经创建过了;TODO 如果主包存在，就以主包为准;如果主包不存在，就提示创建;然后复制到所有独立分包中
@@ -165,6 +170,7 @@ class Ci {
         description = this.description,
         projectRoot = this.projectRoot,
         needCheckNpmPackages = this.needCheckNpmPackages.join(','),
+        robotNum = this.robotNum,
       } = data;
 
       // 这个对象是为了用来初始化cli实例的
@@ -174,6 +180,7 @@ class Ci {
         description,
         projectRoot,
         needCheckNpmPackages,
+        robotNum,
       };
 
       const configDataString = this.formatData('', false, configData);
@@ -224,17 +231,18 @@ class Ci {
   // 组合文件要写的内容
   formatData(filePath, isTrue = true, configParams) {
     if (isTrue) this.readCliFile(filePath);
-    const needCheckNpmPackages = isTrue ? this.needCheckNpmPackages.join(',') : configParams.needCheckNpmPackages;
+    let needCheckNpmPackages = isTrue ? this.needCheckNpmPackages.join(',') : configParams.needCheckNpmPackages;
+    
     let needCheckNpmPackagesArr = [];
-    if (needCheckNpmPackages) {
+    if (needCheckNpmPackages.length) {
       needCheckNpmPackagesArr = needCheckNpmPackages.split(',');
     }
     const needCheckNpmPackagesString = JSON.stringify(needCheckNpmPackagesArr);
     if (!isTrue) {
-      const { environment, version, description, projectRoot } = configParams;
-      return configOutPut(environment, version, description, projectRoot, needCheckNpmPackagesString)
+      const { environment, version, description, projectRoot, robotNum } = configParams;
+      return configOutPut(environment, version, description, projectRoot, needCheckNpmPackagesString, robotNum)
     };
-    return configOutPut(this.environment, this.version, this.description, this.projectRoot, needCheckNpmPackagesString);
+    return configOutPut(this.environment, this.version, this.description, this.projectRoot, needCheckNpmPackagesString, this.robotNum);
   }
 
   async online() {
@@ -262,12 +270,18 @@ class Ci {
       const answers = await this.showSimpleCliConfig(type);
       if (!answers) return;
     }
+
+    if (type === 'online') {
+      this.robotNum = robotList['online']; // 如果是online, 上传着变为1
+    }
+
     await uploadCi({
       projectPath: this.projectRoot,
       version: this.version,
       description: this.description,
       keyPath: this.miniprogramRoot,
       appid: this.appid,
+      robotNum: this.robotNum,
     });
     if (type === 'online') return;
     const packageObj = require(this.packageJSONPath);
@@ -294,8 +308,9 @@ class Ci {
       version: this.version,
       description: this.description,
       projectPath: this.projectRoot,
-      keyPath: __dirname,
-      projectRoot: this.projectRoot
+      keyPath: this.miniprogramRoot,
+      projectRoot: this.projectRoot,
+      appid: this.appid,
     })
   }
 
@@ -345,6 +360,15 @@ class Ci {
       });
   }
 
+  // 初始化个人上传账号
+  async robot(name) {
+    let robotNum = robotList[name] || robotList['default'];
+    const writeFileSuccess = await this.writeCliFile({ robotNum });
+    if (writeFileSuccess) {
+      printSuccess(`上传用户成功切换为${robotNum}`);
+    }
+  }
+
   // 帮助
   // 查看帮助
   help() {

package/bin/command/index.js

@@ -2,7 +2,7 @@
  * @Author: wangqi
  * @Date: 2022-08-12 10:20:19
  * @LastEditors: wangqi
- * @LastEditTime: 2022-09-01 17:17:37
+ * @LastEditTime: 2022-09-24 11:57:03
  * @FilePath: /sparrow-ci/bin/command/index.js
  * @Description: 上传代码
  */
@@ -28,7 +28,7 @@ function project(params) {
 async function uploadCi(params) {
   const spinner = ora(`${chalk.blue('准备上传')}\n`).start();
   spinner.color = 'blue';
-  const { version, description } = params;
+  const { version, description, robotNum } = params;
   try {
     const { subPackageInfo } = await ci.upload({
       project: project(params),
@@ -42,7 +42,7 @@ async function uploadCi(params) {
         minifyWXSS: true, // 压缩 WXSS 代码
         minifyJS: true, // 压缩 JS 代码
       },
-      robot: 1,
+      robot: robotNum,
       onProgressUpdate: (res) => {
         const { _status } = res;
         if (_status === 'doing') {
@@ -91,42 +91,44 @@ function packNpmCi(params) {
 }
 
 async function previewCi(params) {
-  const { version, description, pagePath, searchQuery, scene, projectRoot, keyPath } = params;
-  const previewResult = await ci.preview({
-    project: project(params),
-    desc: description,
-    version,
-    setting: {
-      es6: true, // 对应小程序开发者工具的 "es6 转 es5"
-      minify: true, // 压缩所有代码，对应小程序开发者工具的 "压缩代码"
-      autoPrefixWXSS: true, // 对应小程序开发者工具的 "样式自动补全"
-      minifyWXML: true, // 压缩 WXML 代码
-      minifyWXSS: true, // 压缩 WXSS 代码
-      minifyJS: true, // 压缩 JS 代码
-    },
-    qrcodeFormat: 'base64',
-    qrcodeOutputDest: '/Users/wq/Desktop/qrcode/destination.jpg',
-    onProgressUpdate: (res) => {
-      const { _status, subPackageInfo } = res;
-      if (_status === 'doing') {
-        console.log('==============');
-        console.log('_status', _status);
-        console.log('==============');
-      }
-      if (_status === 'done') {
-        console.log('==============');
-        console.log('_status', _status, subPackageInfo);
-        console.log('==============');
-      }
-    },
-    pagePath, // 预览页面 pages/index/index
-    searchQuery,  // 预览参数 [注意!]这里的`&`字符在命令行中应写成转义字符`\&` a=1&b=2
-    scene, // 场景值 1011
-  })
-  const { subPackageInfo } = previewResult;
-  console.log('==============');
-  console.log('subPackageInfo', subPackageInfo);
-  console.log('==============');
+  const spinner = ora(`${chalk.blue('准备中...')}\n`).start();
+  spinner.color = 'blue';
+  const { version, description, pagePath, searchQuery, scene } = params;
+  try {
+    const previewResult = await ci.preview({
+      project: project(params),
+      desc: description,
+      version,
+      setting: {
+        es6: true, // 对应小程序开发者工具的 "es6 转 es5"
+        minify: true, // 压缩所有代码，对应小程序开发者工具的 "压缩代码"
+        autoPrefixWXSS: true, // 对应小程序开发者工具的 "样式自动补全"
+        minifyWXML: true, // 压缩 WXML 代码
+        minifyWXSS: true, // 压缩 WXSS 代码
+        minifyJS: true, // 压缩 JS 代码
+      },
+      qrcodeFormat: 'image',
+      qrcodeOutputDest: path.join('../', `qrcode${version}.jpg`),
+      onProgressUpdate: (res) => {
+        const { _status } = res;
+        if (_status === 'doing') {
+          spinner.text = `${chalk.blue('生成预览中')}\n`;
+          spinner.color = 'blue';
+        }
+        if (_status === 'done') {
+          spinner.text = `${chalk.green('生成预览成功')}\n`;
+          spinner.color = 'green';
+          spinner.succeed();
+        }
+      },
+      pagePath, // 预览页面 pages/index/index
+      searchQuery,  // 预览参数 [注意!]这里的`&`字符在命令行中应写成转义字符`\&` a=1&b=2
+      scene, // 场景值 1011
+    })
+  } catch(err) {
+    spinner.text = `${chalk.red('生成预览失败')}\n${chalk.yellow(err)}`;
+    spinner.fail();
+  }
 }
 
 module.exports = {

package/bin/main.js

@@ -3,7 +3,7 @@
 /*
  * @Author: wangqi
  * @Date: 2020-11-06 13:33:56
- * @LastEditTime: 2022-08-31 17:23:47
+ * @LastEditTime: 2022-09-24 11:35:50
  * @LastEditor: wangqi
  * @Description: 脚手架的类
 */
@@ -22,6 +22,7 @@ program
   .option('-e, --edit-live', '编辑live直播插件json')
   .option('-g, --git-pull', '拉取远端master代码')
   .option('-c, --clone', '克隆文件夹')
+  .option('-r, --robot', '初始化个人上传账号')
   .option('-h, --help', '描述如何使用')
 
 program.parse(process.argv); // 处理传入的参数
@@ -58,6 +59,9 @@ async function main () {
     case Boolean(program.clone): // 编辑直播插件
       ci.clone();
       break;
+    case Boolean(program.robot): // 编辑直播插件
+      ci.robot(program.args[0]);
+      break;  
     case Boolean(program.help): // 查看帮助
       ci.help();
       break;

package/bin/utils/index.js

@@ -2,7 +2,7 @@
  * @Author: wangqi
  * @Date: 2022-08-12 17:10:25
  * @LastEditors: wangqi
- * @LastEditTime: 2022-09-01 18:13:11
+ * @LastEditTime: 2022-09-24 12:18:53
  * @FilePath: /sparrow-ci/bin/utils/index.js
  * @Description: 公用方法
  */
@@ -48,14 +48,15 @@ function commonFilePath(pathUrl, file) {
 }
 
 // 输出需要的配置
-function configOutPut(environment, version, description, projectRoot, needCheckNpmPackagesString) {
+function configOutPut(environment, version, description, projectRoot, needCheckNpmPackagesString, robotNum) {
   const configDataString =
     `module.exports = {
   "environment": "${environment}",
   "version": "${version}",
   "description": "${description}",
   "projectRoot": "${projectRoot}",
-  "needCheckNpmPackages": ${needCheckNpmPackagesString}
+  "needCheckNpmPackages": ${needCheckNpmPackagesString},
+  "robotNum": ${robotNum},
 };
 `;
   return configDataString;

package/bin/utils/node_utils.js

@@ -2,7 +2,7 @@
  * @Author: wangqi
  * @Date: 2022-08-26 10:39:50
  * @LastEditors: wangqi
- * @LastEditTime: 2022-09-01 17:16:49
+ * @LastEditTime: 2022-09-24 12:54:56
  * @FilePath: /sparrow-ci/bin/utils/node_utils.js
  * @Description: 工具方法
  */
@@ -14,7 +14,9 @@ const fs = require('fs');
 const logSymbols = require('log-symbols');
 const inquirer = require('inquirer');
 const { spawnSync } = require('child_process');
-const { mkdirSync, existsSync, writeFile, readFile, execFile } = require('fs');
+const { mkdirSync, existsSync, writeFile, readFile } = require('fs');
+const util = require('util');
+const execFile = util.promisify(require('child_process').execFile);
 const { handleList, printSuccess, printWarnning, printFail } = require('./index');
 const { packNpmCi } = require('../command');
 const { liveJsonArr, liveUrl, folderSrc } = require('../../ci.config');

package/ci.config.js

@@ -2,7 +2,7 @@
  * @Author: wangqi
  * @Date: 2022-04-29 17:18:33
  * @LastEditors: wangqi
- * @LastEditTime: 2022-08-31 17:35:45
+ * @LastEditTime: 2022-09-24 13:10:55
  * @FilePath: /sparrow-ci/ci.config.js
  * @Description: 全局配置文件
 */
@@ -12,6 +12,14 @@ module.exports = {
     DEV: 'DEV', // 开发环境
     PRO: 'PRO', // 生产环境
   },
+  robotList: { // 个人机器人编号
+    'online': 1, // 线上发布
+    'default': 2, // 默认本地测试
+    '史明华': 30,
+    '马坤坤': 29,
+    '王其': 28,
+    '丁宇': 27,
+  },
   miniShopPath: '/Users/wq/Desktop/company/miniapp_shop',
   // 直播插件地址
   liveUrl: 'plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe',
@@ -37,5 +45,6 @@ module.exports = {
     | --edit-live     | -e   | 编辑live直播插件json        |
     | --git-pull      | -g   | 拉取远端master代码          |
     | --clone         | -c   | 克隆文件夹                  |
+    | --robot         | -r   | 修改开发者机器人id          |
   `,
 };

package/git.sh

@@ -2,8 +2,8 @@
  # @Author: wangqi
  # @Date: 2022-05-06 10:24:20
  # @LastEditors: wangqi
- # @LastEditTime: 2022-08-12 15:54:14
- # @FilePath: /sparrow-ci/git.sh
+ # @LastEditTime: 2022-05-07 14:22:20
+ # @FilePath: /miniapp_cli/git.sh
  # @Description: git拉取脚本命令
 ### 
 

package/package.json

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