@farris/cli 1.0.23 → 1.0.26

package/ci/cli.js

@@ -168,7 +168,7 @@ function checkProjectChanges(projectInfo, lastCommit) {
             const hasChanges = changedFiles.length > 0;
             if (hasChanges) {
                 projectInfo.workspace.hasChanged = hasChanges;
-                console.log(`${packageName} has changed sence last commit ${lastCommit}.`)
+                console.log(`${packageName} has changed since latest tag ${lastCommit}.`)
             } else {
                 console.log(`${packageName} has not changed.`)
             }
@@ -218,7 +218,7 @@ function updateProjectVersion(projectInfo, updateVersionType) {
         })
 }
 
-function updateMonoWorkspaceVersion(monoWorkspace, updateVersionType) {
+function updateMonoWorkspaceVersion(monoWorkspace, updateVersionType, commitUrl) {
     let npmCommandArray = [];
     switch (updateVersionType) {
         case 'prerelease':
@@ -238,12 +238,21 @@ function updateMonoWorkspaceVersion(monoWorkspace, updateVersionType) {
     childProcess.execSync('npm', npmCommandArray);
     const packageJsonFilePath = `./package.json`;
     const packageConfig = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf-8'));
+    monoWorkspace.version = packageConfig.version;
     // 向git缓冲区中添加变更
-    childProcess.execSync('git', ['add', '.']);
+    // childProcess.execSync('git', ['add', '.']);
     // // 提交变更记录
-    childProcess.execSync('git', ['commit', '-m', `Update MonoWorkspace version to v${packageConfig.version}`]);
-    console.log(`Update MonoWorkspace version to v${packageConfig.version}`);
-    monoWorkspace.version = packageConfig.version;
+    // childProcess.execSync('git', ['commit', '-m', `Update MonoWorkspace version to v${packageConfig.version}. [skip ci]`]);
+    // console.log(`Update MonoWorkspace version to v${packageConfig.version}`);
+    const branch = childProcess.execSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
+    // 提交变更集
+    if (commitUrl) {
+        console.log(`executing git push ${branch} to ${commitUrl}`);
+        return childProcess.exec("git", ["push", commitUrl]);
+    } else {
+        console.log(`executing git push ${branch}`);
+        return childProcess.exec('git', ['push']);
+    }
 }
 
 function builderVersionChangeMessage(prefix, updatedVersions, suffix = '') {
@@ -258,8 +267,8 @@ function builderVersionChangeMessage(prefix, updatedVersions, suffix = '') {
     return `${versionMessage} ${suffix}`;
 }
 
-function commitVersionChanges(updatedVersions) {
-    const commitMessage = builderVersionChangeMessage('Update', updatedVersions, '. [skip ci]');
+function commitVersionChanges(updatedVersions, commitUrl) {
+    const commitMessage = builderVersionChangeMessage('Update', updatedVersions, ' [skip ci]');
 
     if (commitMessage) {
         // 向git缓冲区中添加变更
@@ -267,25 +276,22 @@ function commitVersionChanges(updatedVersions) {
         // // 提交变更记录
         childProcess.execSync('git', ['commit', '-m', `${commitMessage}`]);
 
-        console.log(commitMessage);
-    }
-}
+        const branch = childProcess.execSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
 
-function pushCommits(commitUrl) {
-    const branch = childProcess.execSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
-    console.log(`executing git push ${branch}`);
-    // 提交变更集
-    if (commitUrl) {
-        return childProcess.exec("git", ["push", commitUrl]);
-    } else {
-        return childProcess.exec('git', ['push']);
+        // 提交变更集
+        if (commitUrl) {
+            console.log(`executing git push ${branch} to ${commitUrl}`);
+            return childProcess.exec("git", ["push", commitUrl]);
+        } else {
+            console.log(`executing git push ${branch}`);
+            return childProcess.exec('git', ['push']);
+        }
     }
 }
 
 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 addTagToMonoWorkspace(monoWorkspace, commitUrl) {
@@ -366,9 +372,9 @@ function publish(commitUrl, updateVersionType) {
     // 3. 检查代码提交记录，获取自上次发布以来所有发生变化的Angular工程
     chain = chain.then(monoWorkspace => {
         const projects = monoWorkspace.projects;
+        const lastCommit = getLastCommit();
+        console.log(`last commit ${lastCommit}`);
         const checkProjects = projects.map((projectInfo) => {
-            const lastCommit = getLastCommit();
-            console.log(`last commit ${lastCommit}`);
             let checkPromise = checkProjectChanges(projectInfo, lastCommit);
             let changedPromise = checkPromise.then(hasChanged => {
                 projectInfo.hasChanged = hasChanged;
@@ -394,10 +400,30 @@ function publish(commitUrl, updateVersionType) {
                     return workspace;
                 }, monoWorkspace);
                 const updatedVersions = monoWorkspace.updateResult;
-                commitVersionChanges(updatedVersions, commitUrl);
-                updateMonoWorkspaceVersion(monoWorkspace, updateVersionType);
-                pushCommits(commitUrl);
-                return Promise.resolve(monoWorkspace);
+                if (updatedVersions) {
+                    return commitVersionChanges(updatedVersions, commitUrl)
+                        .then((result) => {
+                            if (result.stderr) {
+                                console.log(result.stderr);
+                            }
+                            if (result.stdout) {
+                                console.log(result.stdout);
+                            }
+                            return updateMonoWorkspaceVersion(monoWorkspace, updateVersionType, commitUrl);
+                        })
+                        .then((result) => {
+                            if (result.stderr) {
+                                console.log(result.stderr);
+                            }
+                            if (result.stdout) {
+                                console.log(result.stdout);
+                            }
+                            return Promise.resolve(monoWorkspace);
+                        });
+                } else {
+                    return Promise.resolve(monoWorkspace);
+                }
+
             });
     });
     // 5. 编译所有Angular工作区
@@ -405,20 +431,38 @@ function publish(commitUrl, updateVersionType) {
         const buildPromises = monoWorkspace.workspaces
             .filter(workspace => workspace.hasChanged)
             .map((workspace) => buildWorkspace(workspace));
-        return Promise.all(buildPromises)
-            .then((results) => {
-                console.log(results.stdout);
-                return Promise.resolve(monoWorkspace);
-            });
+        if (buildPromises.length) {
+            return Promise.all(buildPromises)
+                .then((results) => {
+                    if (results) {
+                        results.map((result) => {
+                            if (result.stderr) {
+                                console.log(result.stderr);
+                            }
+                            if (result.stdout) {
+                                console.log(result.stdout);
+                            }
+                        });
+                    }
+                    return Promise.resolve(monoWorkspace);
+                });
+        } else {
+            return Promise.resolve(monoWorkspace);
+        }
     });
     // 6. 将变更项目的内容发布为npm包，并增加发布Tag标签
     chain = chain.then(monoWorkspace => {
         const changedProjects = monoWorkspace.changedProjects;
-        const publishPromises = changedProjects.map(projectInfo => publishToNpmRepository(projectInfo.project.path));
-        Promise.all(publishPromises)
-            .then(() => {
-                return addTagToMonoWorkspace(monoWorkspace, commitUrl);
-            });
+        if (changedProjects.length) {
+            const publishPromises = changedProjects.map(projectInfo => publishToNpmRepository(projectInfo.project.path));
+            Promise.all(publishPromises)
+                .then(() => {
+                    return addTagToMonoWorkspace(monoWorkspace, commitUrl);
+                });
+        } else {
+            return Promise.resolve(monoWorkspace);
+        }
+
     });
 }
 

package/package.json

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