@farris/cli 1.0.25 → 1.0.28

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.`)
             }
@@ -183,78 +183,30 @@ function checkProjectChanges(projectInfo, lastCommit) {
  * @returns 更新后的版本
  */
 function updateProjectVersion(projectInfo, updateVersionType) {
-    let npmCommandArray = [];
     const projectPath = projectInfo.project.path;
     if (!projectPath) {
         throw new Error(`update project version error: you must provide project path by project info object.`)
     }
-    switch (updateVersionType) {
-        case 'prerelease':
-            npmCommandArray = ['version', 'prerelease', '--preid=beta', '--prefix', projectPath];
-            break;
-        case 'patch':
-            npmCommandArray = ['version', 'patch', '--prefix', projectPath];
-            break;
-        case 'minor':
-            npmCommandArray = ['version', 'minor', '--prefix', projectPath];
-            break;
-        case 'major':
-            npmCommandArray = ['version', 'major', '--prefix', projectPath];
-            break;
+    const updateProjectVersion = ['version', updateVersionType, '--force', '--no-git-tag-version', '--prefix', projectPath];
+    if (updateVersionType === 'prerelease') {
+        updateProjectVersion.push('--preid=beta');
     }
     return childProcess
         // 使用 npm version prerelease 更新指定工程的预发布版本
-        .exec('npm', npmCommandArray)
+        .exec('npm', updateProjectVersion)
         .then((returnValue) => {
             // 读取目标工程的package.json文件
             const packageJsonFilePath = `${projectPath}/package.json`;
             const packageConfig = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf-8'));
             // 提取更新后的版本
             const updatedVersion = returnValue.stdout;
-            console.log(`update ${packageConfig.name} prerelease version to ${updatedVersion}`);
+            console.log(`Update ${packageConfig.name} prerelease version to ${updatedVersion}.`);
             const updateResult = {};
             updateResult[packageConfig.name] = updatedVersion;
             return updateResult;
         })
 }
 
-function updateMonoWorkspaceVersion(monoWorkspace, updateVersionType, commitUrl) {
-    let npmCommandArray = [];
-    switch (updateVersionType) {
-        case 'prerelease':
-            npmCommandArray = ['version', 'prerelease', '--preid=beta'];
-            break;
-        case 'patch':
-            npmCommandArray = ['version', 'patch'];
-            break;
-        case 'minor':
-            npmCommandArray = ['version', 'minor'];
-            break;
-        case 'major':
-            npmCommandArray = ['version', 'major'];
-            break;
-    }
-    console.log(`executing npm version --${updateVersionType} in root directory.`)
-    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', ['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 = '') {
     const versionMessage = Object.keys(updatedVersions).reduce((latestMessage, packageName, index, originalArray) => {
         const version = updatedVersions[packageName];
@@ -267,19 +219,26 @@ function builderVersionChangeMessage(prefix, updatedVersions, suffix = '') {
     return `${versionMessage} ${suffix}`;
 }
 
-function commitVersionChanges(updatedVersions, commitUrl) {
-    const commitMessage = builderVersionChangeMessage('Update', updatedVersions, ' [skip ci]');
-
+function commitVersionChanges(updatedVersions, commitUrl, monoWorkspace, updateVersionType) {
+    const commitMessage = builderVersionChangeMessage('update', updatedVersions, '');
     if (commitMessage) {
+        const updateWorkspaceVersion = ['version', '--force', '--no-git-tag-version', updateVersionType];
+        if (updateVersionType === 'prerelease') {
+            updateWorkspaceVersion.push('--preid=beta');
+        }
+        console.log(`executing npm ${updateWorkspaceVersion.join(' ')} in root directory.`)
+        childProcess.execSync('npm', updateWorkspaceVersion);
+
+        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', ['commit', '-m', `${commitMessage}`]);
-
-        console.log(commitMessage);
+        // 提交变更记录
+        childProcess.execSync('git', ['commit', '-m', `Update workspace version to v${packageConfig.version} for ${commitMessage}. [skip ci]`]);
 
         const branch = childProcess.execSync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
-
         // 提交变更集
         if (commitUrl) {
             console.log(`executing git push ${branch} to ${commitUrl}`);
@@ -297,10 +256,7 @@ function buildWorkspace(workspace) {
 }
 
 function addTagToMonoWorkspace(monoWorkspace, commitUrl) {
-    // const tagMessage = builderVersionChangeMessage('Publish npm packages ', monoWorkspace.updateResult, '.');
-    // const date = moment(new Date());
-    // const tagVersion = `v${date.format('YYYYMMDDHHmmss')}`;
-    const monoWorkspaceVersion = monoWorkspace.version;
+    const monoWorkspaceVersion = `v${monoWorkspace.version}`;
     childProcess.execSync('git', ['tag', monoWorkspaceVersion, '-m', 'Publish npm packages. [skip ci]']);
     // 提交变更集
     if (commitUrl) {
@@ -374,9 +330,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;
@@ -402,13 +358,21 @@ function publish(commitUrl, updateVersionType) {
                     return workspace;
                 }, monoWorkspace);
                 const updatedVersions = monoWorkspace.updateResult;
-                return commitVersionChanges(updatedVersions, commitUrl)
-                    .then((result) => {
-                        return updateMonoWorkspaceVersion(monoWorkspace, updateVersionType, commitUrl);
-                    })
-                    .then((reulst) => {
-                        return Promise.resolve(monoWorkspace);
-                    });
+                if (updatedVersions) {
+                    return commitVersionChanges(updatedVersions, commitUrl, monoWorkspace, updateVersionType)
+                        .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工作区
@@ -416,20 +380,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.25",
+  "version": "1.0.28",
   "description": "Farris command line interface",
   "main": "index.js",
   "scripts": {