@farris/cli 1.0.12 → 1.0.13

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"]);
 }
 
@@ -205,18 +205,15 @@ 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('YYYMMDDHHmmss')}`;
+    childProcess.execSync('git', ['tag', tagVersion, '-m', "publish npm package"]);
     // 提交变更集
     if (commitUrl) {
-        console.log(`git push -o ci.skip ${commitUrl}`);
-        return childProcess.exec("git", ["push", '-o', 'ci.skip', commitUrl]);
+        return childProcess.exec("git", ["push", '--tags', '-o', 'ci.skip', commitUrl]);
     } else {
-        console.log(`git push -o ci.skip`);
-        return childProcess.exec('git', ['push', '-o', 'ci.skip']);
+        return childProcess.exec('git', ['push', '--tags', '-o', 'ci.skip']);
     }
 }
 
@@ -232,55 +229,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) => {
@@ -297,7 +275,6 @@ 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, monoWorkspace));
@@ -313,7 +290,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 +297,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.13",
   "description": "Farris command line interface",
   "main": "index.js",
   "scripts": {