@farris/cli 1.0.1 → 1.0.4

package/README.md

@@ -1,2 +1,2 @@
-# farris-cli
-
+# farris-cli
+

package/ci/cli.js

@@ -1,107 +1,124 @@
-#!/usr/bin/env node
-
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const childProcess = require("@lerna/child-process");
-
-const yargs = require('yargs/yargs');
-const cli = yargs(process.argv.slice(2), process.cwd())
-
-cli
-    .command(
-        'prerelease',
-        'Update package prerelease version when package has changed.',
-        (yargs) => {
-            return yargs;
-        },
-        (argv) => {
-            const project = argv.project;
-            let chain = Promise.resolve();
-
-            chain = chain.then(() => checkProjectChanges(project));
-            chain = chain.then((hasChanged) => {
-                if (hasChanged) {
-                    return updateProjectPrereleaseVersion(project)
-                }
-            });
-        }
-    )
-    .command(
-        'publish',
-        'Publish package which has changed sence last commit.',
-        (yargs) => {
-            return yargs;
-        },
-        (argv) => {
-            const project = argv.project;
-            let chain = Promise.resolve();
-
-            chain = chain.then(() => checkProjectChanges(project));
-            chain = chain.then((hasChanged) => {
-                if (hasChanged) {
-                    return publish(project)
-                }
-            });
-        }
-    )
-    .argv;
-
-/**
- * 检查指定工程目录下是否存在变更文件
- * @param {string} projectPath 目标工程路径
- * @returns 检查结果
- */
-function checkProjectChanges(projectPath) {
-    return childProcess
-        // 使用 git diff 命令查询自上传提交以来，目标工程路径下是否有变更的文件
-        .exec("git", ["diff", "--name-only", "HEAD^", projectPath])
-        .then((returnValue) => {
-            // 提取命令输出结果中的文件集合
-            const changedFiles = returnValue.stdout.split("\n").filter(Boolean);
-            // 根据文件个数确定是否存在变更
-            const hasChanges = changedFiles.length > 0;
-            // 返回检测结果
-            return hasChanges;
-        });
-}
-
-/**
- * 更新指定工程的预发布版本
- * @param {string} projectPath 目标工程路径
- * @returns 更新后的版本
- */
-function updateProjectPrereleaseVersion(projectPath) {
-    return childProcess
-        // 使用 npm version prerelease 更新指定工程的预发布版本
-        .exec('npm', ['version', 'prerelease', '--preid=beta', '--prefix', projectPath])
-        .then((returnValue) => {
-            // 读取目标工程的package.json文件
-            const packageJsonFilePath = `${projectPath}/package.json`;
-            const packageConfig = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf-8'));
-            // 提取更新后的版本
-            const updatedVersion = returnValue.stdout;
-            // 向git缓冲区中添加变更
-            childProcess.execSync('git', ['add', '.']);
-            // 提交变更记录
-            childProcess.execSync('git', ['commit', '-m', `update ${packageConfig.name} prerelease version to ${updatedVersion}`]);
-            // 提交变更集
-            return childProcess.exec('git', ['push']);
-        })
-}
-
-/**
- * 发布指定路径下的npm包
- * @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])
-}
+#!/usr/bin/env node
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const childProcess = require("@lerna/child-process");
+
+const yargs = require('yargs/yargs');
+const cli = yargs(process.argv.slice(2), process.cwd())
+
+cli
+    .command(
+        'check',
+        'check file changes from last commit.',
+        (yargs) => {
+            return yargs;
+        },
+        (argv) => {
+            const project = argv.project;
+            checkProjectChanges(project);
+        }
+    )
+    .command(
+        'prerelease',
+        'Update package prerelease version when package has changed.',
+        (yargs) => {
+            return yargs;
+        },
+        (argv) => {
+            const project = argv.project;
+            let chain = Promise.resolve();
+
+            chain = chain.then(() => checkProjectChanges(project));
+            chain = chain.then((hasChanged) => {
+                if (hasChanged) {
+                    return updateProjectPrereleaseVersion(project)
+                }
+            });
+        }
+    )
+    .command(
+        'publish',
+        'Publish package which has changed sence last commit.',
+        (yargs) => {
+            return yargs;
+        },
+        (argv) => {
+            const project = argv.project;
+            let chain = Promise.resolve();
+
+            chain = chain.then(() => checkProjectChanges(project));
+            chain = chain.then((hasChanged) => {
+                if (hasChanged) {
+                    return publish(project)
+                }
+            });
+        }
+    )
+    .argv;
+
+/**
+ * 检查指定工程目录下是否存在变更文件
+ * @param {string} projectPath 目标工程路径
+ * @returns 检查结果
+ */
+function checkProjectChanges(projectPath) {
+    return childProcess
+        // 使用 git diff 命令查询自上传提交以来，目标工程路径下是否有变更的文件
+        .exec("git", ["diff", "--name-only", "HEAD^", projectPath])
+        .then((returnValue) => {
+            // 提取命令输出结果中的文件集合
+            const changedFiles = returnValue.stdout.split("\n").filter(Boolean);
+            // 根据文件个数确定是否存在变更
+            const hasChanges = changedFiles.length > 0;
+            if (hasChanges) {
+                console.log(`${projectPath} has changed.`)
+            } else {
+                console.log(`Did not detect any changes from ${projectPath} sence last commit.`)
+            }
+            // 返回检测结果
+            return hasChanges;
+        });
+}
+
+/**
+ * 更新指定工程的预发布版本
+ * @param {string} projectPath 目标工程路径
+ * @returns 更新后的版本
+ */
+function updateProjectPrereleaseVersion(projectPath) {
+    return childProcess
+        // 使用 npm version prerelease 更新指定工程的预发布版本
+        .exec('npm', ['version', 'prerelease', '--preid=beta', '--prefix', projectPath])
+        .then((returnValue) => {
+            // 读取目标工程的package.json文件
+            const packageJsonFilePath = `${projectPath}/package.json`;
+            const packageConfig = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf-8'));
+            // 提取更新后的版本
+            const updatedVersion = returnValue.stdout;
+            // 向git缓冲区中添加变更
+            childProcess.execSync('git', ['add', '.']);
+            // 提交变更记录
+            childProcess.execSync('git', ['commit', '-m', `update ${packageConfig.name} prerelease version to ${updatedVersion}`]);
+            console.log(`update ${packageConfig.name} prerelease version to ${updatedVersion}`);
+            // 提交变更集
+            return childProcess.exec('git', ['push']);
+        })
+}
+
+/**
+ * 发布指定路径下的npm包
+ * @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])
+}

package/package.json

@@ -1,25 +1,25 @@
-{
-  "name": "@farris/cli",
-  "version": "1.0.1",
-  "description": "Farris command line interface",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://git.iec.io/webadp/farris-cli.git"
-  },
-  "keywords": [
-    "Farris",
-    "CLI"
-  ],
-  "bin": {
-    "farris": "ci/cli.js"
-  },
-  "author": "Sagi Chen",
-  "license": "ISC",
-  "dependencies": {
-    "lerna": "^4.0.0"
-  }
-}
+{
+  "name": "@farris/cli",
+  "version": "1.0.4",
+  "description": "Farris command line interface",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://git.iec.io/webadp/farris-cli.git"
+  },
+  "keywords": [
+    "Farris",
+    "CLI"
+  ],
+  "bin": {
+    "farris": "ci/cli.js"
+  },
+  "author": "Sagi Chen",
+  "license": "ISC",
+  "dependencies": {
+    "lerna": "^4.0.0"
+  }
+}