@farris/cli 1.0.12 → 1.0.16

package/ci/cli.js

@@ -81,10 +81,10 @@ cli
  */
 function getLastCommit() {
     if (hasTags()) {
-        console.log("getLastTagInBranch");
+        log.silly("getLastTagInBranch");
         return childProcess.execSync("git", ["describe", "--tags", "--abbrev=0"]);
     }
-    console.log("getFirstCommit");
+    log.silly("getFirstCommit");
     return childProcess.execSync("git", ["rev-list", "--max-parents=0", "HEAD"]);
 }
 
@@ -161,29 +161,16 @@ function builderVersionChangeMessage(prefix, updatedVersions, suffix = '') {
         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, '.');
+    const commitMessage = builderVersionChangeMessage('Update', updatedVersions, '. [skip ci]');
 
     if (commitMessage) {
         // 向git缓冲区中添加变更
         childProcess.execSync('git', ['add', '.']);
         // // 提交变更记录
-        childProcess.execSync('git', ['commit', '-m', `${commitMessage} [skip ci]`]);
+        childProcess.execSync('git', ['commit', '-m', `${commitMessage}`]);
 
         console.log(commitMessage);
 
@@ -191,9 +178,9 @@ function commitChanges(updatedVersions, commitUrl) {
         console.log(`executing git push ${branch}`);
         // 提交变更集
         if (commitUrl) {
-            return childProcess.exec("git", ["push", '-o', 'ci.skip', commitUrl]);
+            return childProcess.exec("git", ["push",  commitUrl]);
         } else {
-            return childProcess.exec('git', ['push', '-o', 'ci.skip']);
+            return childProcess.exec('git', ['push']);
         }
     }
 }
@@ -205,18 +192,17 @@ function buildWorkspace(workspace) {
 }
 
 function tagMonoWorkspace(monoWorkspace, commitUrl) {
-    const tagMessage = builderVersionChangeMessage('Publish npm packages ', monoWorkspace.updateResult, '.');
+    // 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]);
+    const tagVersion = `v${date.format('YYYYMMDDHHmmss')}`;
+    childProcess.execSync('git', ['tag', tagVersion, '-m', 'Publish npm packages. [skip ci]']);
     // 提交变更集
     if (commitUrl) {
-        console.log(`git push -o ci.skip ${commitUrl}`);
-        return childProcess.exec("git", ["push", '-o', 'ci.skip', commitUrl]);
+        console.log(`git push --tags ${commitUrl}`);
+        return childProcess.exec("git", ["push", '--tags', commitUrl]);
     } else {
-        console.log(`git push -o ci.skip`);
-        return childProcess.exec('git', ['push', '-o', 'ci.skip']);
+        console.log(`git push --tags`);
+        return childProcess.exec('git', ['push', '--tags',]);
     }
 }
 
@@ -232,55 +218,36 @@ 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) => {
@@ -292,12 +259,11 @@ function publishAll(commitUrl) {
             return changedPromise;
         });
         return Promise.all(checkProjects)
-            .then(changedProjects => {
-                monoWorkspace.changedProjects = changedProjects;
+            .then((checkResults) => {
+                monoWorkspace.changedProjects = checkResults.filter((projectInfo) => projectInfo.hasChanged);
                 return Promise.resolve(monoWorkspace);
             });
     });
-    // 4. 更新所有变更项目预发布版本，提交代码仓库，供发布时使用
     chain = chain.then(monoWorkspace => {
         const changedProjects = monoWorkspace.changedProjects;
         const prereleasePromise = changedProjects.map(projectInfo => updateProjectPrereleaseVersion(projectInfo.project.path, monoWorkspace));
@@ -313,7 +279,6 @@ function publishAll(commitUrl) {
                 return Promise.resolve(monoWorkspace);
             });
     });
-    // 5. 编译所有Angular工作区
     chain = chain.then(monoWorkspace => {
         const buildPromises = monoWorkspace.workspaces.map((workspace) => buildWorkspace(workspace));
         return Promise.all(buildPromises)
@@ -321,7 +286,6 @@ function publishAll(commitUrl) {
                 return Promise.resolve(monoWorkspace);
             });
     });
-    // 6. 将变更项目的内容发布为npm包，并增加发布Tag标签
     chain = chain.then(monoWorkspace => {
         const changedProjects = monoWorkspace.changedProjects;
         const publishPromises = changedProjects.map(projectInfo => publish(projectInfo.project.path));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farris/cli",
-  "version": "1.0.12",
+  "version": "1.0.16",
   "description": "Farris command line interface",
   "main": "index.js",
   "scripts": {