@farris/cli 1.0.9 → 1.0.12

package/ci/cli.js

@@ -4,9 +4,12 @@
 
 const fs = require('fs');
 const path = require('path');
+const log = require("npmlog");
+const moment = require("moment");
 const childProcess = require("@lerna/child-process");
 const { Project } = require("@lerna/project");
 
+
 const yargs = require('yargs/yargs');
 const cli = yargs(process.argv.slice(2), process.cwd())
 
@@ -73,24 +76,53 @@ cli
     )
     .argv;
 
+/**
+ * @param {import("@lerna/child-process").ExecOpts} execOpts
+ */
+function getLastCommit() {
+    if (hasTags()) {
+        console.log("getLastTagInBranch");
+        return childProcess.execSync("git", ["describe", "--tags", "--abbrev=0"]);
+    }
+    console.log("getFirstCommit");
+    return childProcess.execSync("git", ["rev-list", "--max-parents=0", "HEAD"]);
+}
+
+/**
+ * @param {import("@lerna/child-process").ExecOpts} opts
+ */
+function hasTags() {
+    let result = false;
+    try {
+        result = !!childProcess.execSync("git", ["tag"]);
+    } catch (err) {
+        log.warn("ENOTAGS", "No git tags were reachable from this branch!");
+        log.verbose("hasTags error", err);
+    }
+    log.verbose("hasTags", result);
+    return result;
+}
+
+
 /**
  * 检查指定工程目录下是否存在变更文件
  * @param {string} projectPath 目标工程路径
  * @returns 检查结果
  */
 function checkProjectChanges(projectPath) {
+    const lastCommit = getLastCommit();
     return childProcess
         // 使用 git diff 命令查询自上传提交以来，目标工程路径下是否有变更的文件
-        .exec("git", ["diff", "--name-only", "HEAD^", projectPath])
+        .exec("git", ["diff", "--name-only", lastCommit, projectPath])
         .then((returnValue) => {
-            // 提取命令输出结果中的文件集合
+            // 提取命令输出结果中的文件集合ß
             const changedFiles = returnValue.stdout.split("\n").filter(Boolean);
             // 根据文件个数确定是否存在变更
             const hasChanges = changedFiles.length > 0;
             if (hasChanges) {
-                console.log(`${projectPath} has changed.`)
+                console.log(`${projectPath} has changed sence last commit ${lastCommit}.`)
             } else {
-                console.log(`Did not detect any changes from ${projectPath} sence last commit`)
+                console.log(`Did not detect any changes from ${projectPath} sence last commit ${lastCommit}.`)
             }
             // 返回检测结果
             return hasChanges;
@@ -102,7 +134,7 @@ function checkProjectChanges(projectPath) {
  * @param {string} projectPath 目标工程路径
  * @returns 更新后的版本
  */
-function updateProjectPrereleaseVersion(projectPath, projectUrl) {
+function updateProjectPrereleaseVersion(projectPath) {
     return childProcess
         // 使用 npm version prerelease 更新指定工程的预发布版本
         .exec('npm', ['version', 'prerelease', '--preid=beta', '--prefix', projectPath])
@@ -119,25 +151,39 @@ function updateProjectPrereleaseVersion(projectPath, projectUrl) {
         })
 }
 
-function commitChanges(updatedVersions, commitUrl) {
-    const commitMessage = updatedVersions.reduce((latestMessage, updateVersion, index, originalArray) => {
-        if (Object.keys(updateVersion).length) {
-            const packageName = Object.keys(updateVersion)[0];
-            const version = updateVersion[packageName];
-            let message = `${packageName} to ${version}`;
-            if (index <= originalArray.length - 2) {
-                message = message + ', ';
-            }
-            latestMessage = latestMessage + message;
+function builderVersionChangeMessage(prefix, updatedVersions, suffix = '') {
+    const versionMessage = Object.keys(updatedVersions).reduce((latestMessage, packageName, index, originalArray) => {
+        const version = updatedVersions[packageName];
+        let message = `${packageName} to ${version}`;
+        if (index <= originalArray.length - 2) {
+            message = message + ', ';
         }
-        return latestMessage;
-    }, 'update ');
+        return latestMessage = latestMessage + message;
+    }, `${prefix} `)
+    return `${versionMessage} ${suffix}`;
+    // const versionMessage = updatedVersions.reduce((latestMessage, updateVersion, index, originalArray) => {
+    //     if (Object.keys(updateVersion).length) {
+    //         const packageName = Object.keys(updateVersion)[0];
+    //         const version = updateVersion[packageName];
+    //         let message = `${packageName} to ${version}`;
+    //         if (index <= originalArray.length - 2) {
+    //             message = message + ', ';
+    //         }
+    //         latestMessage = latestMessage + message;
+    //     }
+    //     return latestMessage;
+    // }, `${prefix} `);
+    // return `${versionMessage} ${suffix}`;
+}
+
+function commitChanges(updatedVersions, commitUrl) {
+    const commitMessage = builderVersionChangeMessage('Update', updatedVersions, '.');
 
     if (commitMessage) {
         // 向git缓冲区中添加变更
         childProcess.execSync('git', ['add', '.']);
         // // 提交变更记录
-        childProcess.execSync('git', ['commit', '-m', `${commitMessage}. [skip ci]`]);
+        childProcess.execSync('git', ['commit', '-m', `${commitMessage} [skip ci]`]);
 
         console.log(commitMessage);
 
@@ -153,10 +199,27 @@ function commitChanges(updatedVersions, commitUrl) {
 }
 
 function buildWorkspace(workspace) {
+    console.log(`executing lerna run build --scope=${workspace.packageName}`)
     return childProcess.exec('lerna', ['run', 'build', `--scope=${workspace.packageName}`]);
     // lerna run build --scope=@farris/ide-framework
 }
 
+function tagMonoWorkspace(monoWorkspace, commitUrl) {
+    const tagMessage = builderVersionChangeMessage('Publish npm packages ', monoWorkspace.updateResult, '.');
+    const date = moment(new Date());
+    const tagVersion = `v${date.format('yyyyMMddhhmmss')}`;
+    console.log(`git tag ${tagVersion} -m ${tagMessage}`);
+    childProcess.execSync('git', ['tag', tagVersion, '-m', tagMessage]);
+    // 提交变更集
+    if (commitUrl) {
+        console.log(`git push -o ci.skip ${commitUrl}`);
+        return childProcess.exec("git", ["push", '-o', 'ci.skip', commitUrl]);
+    } else {
+        console.log(`git push -o ci.skip`);
+        return childProcess.exec('git', ['push', '-o', 'ci.skip']);
+    }
+}
+
 /**
  * 发布指定路径下的npm包
  * @param {string} projectPath 目标工程路径
@@ -169,36 +232,55 @@ function publish(projectPath) {
     const dest = ngPackageConfig.dest;
     const packagePath = path.normalize(`${projectPath}/${dest}`);
     // 调用 npm publish 发布指定路径下的npm包
+    console.log(`npm publish ${packagePath}`);
     return childProcess.exec('npm', ['publish', packagePath])
 }
 
+/**
+ * 将所有变更发布为新的npm包
+ * @param {string} commitUrl commit api 地址
+ */
 function publishAll(commitUrl) {
+    // 初始化当前工作目录下的多代码仓库项目
     const monoRepoProject = new Project(process.cwd());
     let chain = Promise.resolve();
+    // 1. 提取当前多代码仓库中的所有子项目，创建多项目工作区
     chain = chain.then(() => {
+        // 提取所有子项目
         return monoRepoProject.getPackages()
             .then(packages => {
+                // 创建并返回多项目工作区
                 const monoWorkspace = { packages };
                 return monoWorkspace;
             })
     });
+    // 2. 读取多项目工作区下的Angular工作区和所有Angular项目
     chain = chain.then((monoWorkspace) => {
+        // 提取所有子仓库项目
         const packages = monoWorkspace.packages;
+        // 初始化Angular工作区集合
         monoWorkspace.workspaces = [];
+        // 初始化Angular工程集合
         monoWorkspace.projects = [];
+        // 遍历所有子仓库
         packages.forEach(packageJson => {
+            // 读取Angular工作区路径
             const workspacePath = packageJson.location;
+            // 读取Angular工作区下的angular.json文件内容
             const angularJson = readAngularJson(workspacePath)
+            // 构造Angular工作区
             const workspace = readWorkspace(angularJson, packageJson);
+            // 记录Angular工作区对象
             monoWorkspace.workspaces.push(workspace);
+            // 遍历Angular工作区下的Angular项目，归集到根工作区中
             workspace.projects.reduce((monoWorkspace, projectInfo) => {
                 monoWorkspace.projects.push(projectInfo);
                 return monoWorkspace;
             }, monoWorkspace);
-            // .forEach((projectInfo) => monoWorkspace.projects.push(projectInfo));
         });
         return monoWorkspace;
     });
+    // 3. 检查代码提交记录，获取自上次发布以来所有发生变化的Angular工程
     chain = chain.then(monoWorkspace => {
         const projects = monoWorkspace.projects;
         const checkProjects = projects.map((projectInfo) => {
@@ -215,29 +297,38 @@ function publishAll(commitUrl) {
                 return Promise.resolve(monoWorkspace);
             });
     });
+    // 4. 更新所有变更项目预发布版本，提交代码仓库，供发布时使用
     chain = chain.then(monoWorkspace => {
         const changedProjects = monoWorkspace.changedProjects;
-        const prereleasePromise = changedProjects.map(projectInfo => updateProjectPrereleaseVersion(projectInfo.project.path));
+        const prereleasePromise = changedProjects.map(projectInfo => updateProjectPrereleaseVersion(projectInfo.project.path, monoWorkspace));
         return Promise.all(prereleasePromise)
-            .then((updatedVersions) => {
+            .then((results) => {
+                results.reduce((workspace, updateResult) => {
+                    workspace.updateResult = workspace.updateResult || {};
+                    Object.assign(workspace.updateResult, updateResult);
+                    return workspace;
+                }, monoWorkspace);
+                const updatedVersions = monoWorkspace.updateResult;
                 commitChanges(updatedVersions, commitUrl);
                 return Promise.resolve(monoWorkspace);
             });
     });
+    // 5. 编译所有Angular工作区
     chain = chain.then(monoWorkspace => {
         const buildPromises = monoWorkspace.workspaces.map((workspace) => buildWorkspace(workspace));
         return Promise.all(buildPromises)
-            .then(() => {
+            .then((results) => {
                 return Promise.resolve(monoWorkspace);
             });
     });
+    // 6. 将变更项目的内容发布为npm包，并增加发布Tag标签
     chain = chain.then(monoWorkspace => {
         const changedProjects = monoWorkspace.changedProjects;
         const publishPromises = changedProjects.map(projectInfo => publish(projectInfo.project.path));
         Promise.all(publishPromises)
             .then(() => {
-                console.log('published');
-            })
+                return tagMonoWorkspace(monoWorkspace, commitUrl);
+            });
     });
 }
 
@@ -262,7 +353,7 @@ function readWorkspace(angularJson, packageJson) {
                 // workspace.set(projectName, projectInfo);
                 workspace.projects.push(projectInfo);
             }
-            return workspace; ßß
+            return workspace;
         }, workspace);
     return workspace;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farris/cli",
-  "version": "1.0.9",
+  "version": "1.0.12",
   "description": "Farris command line interface",
   "main": "index.js",
   "scripts": {
@@ -20,6 +20,7 @@
   "author": "Sagi Chen",
   "license": "ISC",
   "dependencies": {
-    "lerna": "^4.0.0"
+    "lerna": "^4.0.0",
+    "moment": "^2.29.3"
   }
 }