@farris/cli 1.0.15 → 1.0.18

package/ci/cli.js

@@ -34,14 +34,45 @@ cli
         (argv) => {
             const project = argv.project;
             const url = argv.url;
-            let chain = Promise.resolve();
-
-            chain = chain.then(() => checkProjectChanges(project));
-            chain = chain.then((hasChanged) => {
-                if (hasChanged) {
-                    return updateProjectPrereleaseVersion(project, url)
-                }
-            });
+            const prereleaseAll = argv.all;
+            if (prereleaseAll) {
+                return publish(url, 'prerelease');
+            } else if (project) {
+                let chain = Promise.resolve();
+                chain = chain.then(() => checkProjectChanges(project));
+                chain = chain.then((hasChanged) => {
+                    if (hasChanged) {
+                        return updateProjectVersion(project, 'prerelease')
+                    }
+                });
+            }else{
+                console.log('You must provide param of either --all or --project.')
+            }
+        }
+    )
+    .command(
+        'patch',
+        'Update package patch version when package has changed.',
+        (yargs) => {
+            return yargs;
+        },
+        (argv) => {
+            const project = argv.project;
+            const url = argv.url;
+            const patchAll = argv.all;
+            if (patchAll) {
+                return publish(url, 'patch');
+            } else if (project) {
+                let chain = Promise.resolve();
+                chain = chain.then(() => checkProjectChanges(project));
+                chain = chain.then((hasChanged) => {
+                    if (hasChanged) {
+                        return updateProjectVersion(project, 'patch')
+                    }
+                });
+            }else{
+                console.log('You must provide param of either --all or --project.')
+            }
         }
     )
     .command(
@@ -81,10 +112,10 @@ cli
  */
 function getLastCommit() {
     if (hasTags()) {
-        log.silly("getLastTagInBranch");
+        console.log("getLastTagInBranch");
         return childProcess.execSync("git", ["describe", "--tags", "--abbrev=0"]);
     }
-    log.silly("getFirstCommit");
+    console.log("getFirstCommit");
     return childProcess.execSync("git", ["rev-list", "--max-parents=0", "HEAD"]);
 }
 
@@ -111,6 +142,7 @@ function hasTags() {
  */
 function checkProjectChanges(projectPath) {
     const lastCommit = getLastCommit();
+    console.log(`last commit ${lastCommit}`);
     return childProcess
         // 使用 git diff 命令查询自上传提交以来，目标工程路径下是否有变更的文件
         .exec("git", ["diff", "--name-only", lastCommit, projectPath])
@@ -134,10 +166,25 @@ function checkProjectChanges(projectPath) {
  * @param {string} projectPath 目标工程路径
  * @returns 更新后的版本
  */
-function updateProjectPrereleaseVersion(projectPath) {
+function updateProjectVersion(projectPath, updateVersionType) {
+    let npmCommandArray = [];
+    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;
+    }
     return childProcess
         // 使用 npm version prerelease 更新指定工程的预发布版本
-        .exec('npm', ['version', 'prerelease', '--preid=beta', '--prefix', projectPath])
+        .exec('npm', npmCommandArray)
         .then((returnValue) => {
             // 读取目标工程的package.json文件
             const packageJsonFilePath = `${projectPath}/package.json`;
@@ -161,23 +208,10 @@ 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缓冲区中添加变更
@@ -191,9 +225,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']);
         }
     }
 }
@@ -208,14 +242,14 @@ function tagMonoWorkspace(monoWorkspace, commitUrl) {
     // const tagMessage = builderVersionChangeMessage('Publish npm packages ', monoWorkspace.updateResult, '.');
     const date = moment(new Date());
     const tagVersion = `v${date.format('YYYYMMDDHHmmss')}`;
-    childProcess.execSync('git', ['tag', tagVersion, '-m', 'Publish npm packages']);
+    childProcess.execSync('git', ['tag', tagVersion, '-m', 'Publish npm packages. [skip ci]']);
     // 提交变更集
     if (commitUrl) {
-        console.log(`git push --tags -o ci.skip ${commitUrl}`);
-        return childProcess.exec("git", ["push", '--tags', '-o', 'ci.skip', commitUrl]);
+        console.log(`git push --tags ${commitUrl}`);
+        return childProcess.exec("git", ["push", '--tags', commitUrl]);
     } else {
-        console.log(`git push --tags -o ci.skip`);
-        return childProcess.exec('git', ['push', '--tags', '-o', 'ci.skip']);
+        console.log(`git push --tags`);
+        return childProcess.exec('git', ['push', '--tags',]);
     }
 }
 
@@ -224,17 +258,17 @@ function tagMonoWorkspace(monoWorkspace, commitUrl) {
  * @param {string} projectPath 目标工程路径
  * @returns 发布结果
  */
-function publish(projectPath) {
-    // 读取目标工程的package.json文件
-    const ngPackageJsonFilePath = `${projectPath}/ng-package.json`;
-    const ngPackageConfig = JSON.parse(fs.readFileSync(ngPackageJsonFilePath, 'utf-8'));
-    const dest = ngPackageConfig.dest;
-    const packagePath = path.normalize(`${projectPath}/${dest}`);
-    // 调用 npm publish 发布指定路径下的npm包
-    return childProcess.exec('npm', ['publish', packagePath])
-}
+// function publish(projectPath) {
+//     // 读取目标工程的package.json文件
+//     const ngPackageJsonFilePath = `${projectPath}/ng-package.json`;
+//     const ngPackageConfig = JSON.parse(fs.readFileSync(ngPackageJsonFilePath, 'utf-8'));
+//     const dest = ngPackageConfig.dest;
+//     const packagePath = path.normalize(`${projectPath}/${dest}`);
+//     // 调用 npm publish 发布指定路径下的npm包
+//     return childProcess.exec('npm', ['publish', packagePath])
+// }
 
-function publishAll(commitUrl) {
+function publish(commitUrl, updateVersionType) {
     const monoRepoProject = new Project(process.cwd());
     let chain = Promise.resolve();
     chain = chain.then(() => {
@@ -279,7 +313,7 @@ function publishAll(commitUrl) {
     });
     chain = chain.then(monoWorkspace => {
         const changedProjects = monoWorkspace.changedProjects;
-        const prereleasePromise = changedProjects.map(projectInfo => updateProjectPrereleaseVersion(projectInfo.project.path, monoWorkspace));
+        const prereleasePromise = changedProjects.map(projectInfo => updateProjectVersion(projectInfo.project.path, updateVersionType));
         return Promise.all(prereleasePromise)
             .then((results) => {
                 results.reduce((workspace, updateResult) => {

package/package.json

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