@farris/cli 1.0.9 → 1.0.10

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()) {
+        log.silly("getLastTagInBranch");
+        return childProcess.execSync("git", ["describe", "--tags", "--abbrev=0"]);
+    }
+    log.silly("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,8 @@ function checkProjectChanges(projectPath) {
  * @param {string} projectPath 目标工程路径
  * @returns 更新后的版本
  */
-function updateProjectPrereleaseVersion(projectPath, projectUrl) {
+function updateProjectPrereleaseVersion(projectPath, monoWorkspace) {
+    monoWorkspace.updateResult = monoWorkspace.updateResult || {};
     return childProcess
         // 使用 npm version prerelease 更新指定工程的预发布版本
         .exec('npm', ['version', 'prerelease', '--preid=beta', '--prefix', projectPath])
@@ -113,14 +146,13 @@ function updateProjectPrereleaseVersion(projectPath, projectUrl) {
             // 提取更新后的版本
             const updatedVersion = returnValue.stdout;
             console.log(`update ${packageConfig.name} prerelease version to ${updatedVersion}`);
-            const updateResult = {};
-            updateResult[packageConfig.name] = updatedVersion;
-            return updateResult;
+            monoWorkspace.updateResult[packageConfig.name] = updatedVersion;
+            return monoWorkspace;
         })
 }
 
-function commitChanges(updatedVersions, commitUrl) {
-    const commitMessage = updatedVersions.reduce((latestMessage, updateVersion, index, originalArray) => {
+function builderVersionChangeMessage(prefix, updatedVersions, suffix = '') {
+    const versionMessage = updatedVersions.reduce((latestMessage, updateVersion, index, originalArray) => {
         if (Object.keys(updateVersion).length) {
             const packageName = Object.keys(updateVersion)[0];
             const version = updateVersion[packageName];
@@ -131,13 +163,18 @@ function commitChanges(updatedVersions, commitUrl) {
             latestMessage = latestMessage + message;
         }
         return latestMessage;
-    }, 'update ');
+    }, `${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);
 
@@ -157,6 +194,20 @@ function buildWorkspace(workspace) {
     // lerna run build --scope=@farris/ide-framework
 }
 
+function tagMonoWorkspace(monoWorkspace, commitUrl) {
+    const tagMessage = builderVersionChangeMessage('Publish npm packages ', monoWorkspace.updateResult, '.');
+    /*from   www.w3cschool.cn*/
+    const date = moment(new Date());
+    const tagVersion = `v${date.format('yyyyMMddhhmmss')}`;
+    childProcess.execSync('git', ['tag', tagVersion, '-m', tagMessage]);
+    // 提交变更集
+    if (commitUrl) {
+        return childProcess.exec("git", ["push", '-o', 'ci.skip', commitUrl]);
+    } else {
+        return childProcess.exec('git', ['push', '-o', 'ci.skip']);
+    }
+}
+
 /**
  * 发布指定路径下的npm包
  * @param {string} projectPath 目标工程路径
@@ -217,9 +268,10 @@ function publishAll(commitUrl) {
     });
     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((monoWorkspace) => {
+                const updatedVersions = monoWorkspace.updateResult;
                 commitChanges(updatedVersions, commitUrl);
                 return Promise.resolve(monoWorkspace);
             });
@@ -236,8 +288,8 @@ function publishAll(commitUrl) {
         const publishPromises = changedProjects.map(projectInfo => publish(projectInfo.project.path));
         Promise.all(publishPromises)
             .then(() => {
-                console.log('published');
-            })
+                return tagMonoWorkspace(monoWorkspace, commitUrl);
+            });
     });
 }
 
@@ -262,7 +314,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.10",
   "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"
   }
 }