zen-gitsync 1.2.3 → 1.2.5

package/README.md

@@ -26,17 +26,25 @@ npm install -g zen-gitsync
     - `git push`
 
 ### 示例：
-
+#### 交互式提交：
 ```bash
 $ g
 请输入你的提交信息: 修复了登录页样式问题
 ```
-直接提交
+#### 直接提交：
 ```bash
 $ g -y
 ```
-定时执行自动提交，默认间隔1小时
+#### 定时执行自动提交，默认间隔1小时
 ```bash
 $ g -y --interval
 $ g -y --interval=秒数 
 ```
+#### 指定目录提交
+```bash
+$ g --path=./
+```
+或
+```bash
+$ g --cwd=./
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zen-gitsync",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "控制台输入g，回车，输入提交内容，自动执行git add+commit+push",
   "main": "index.js",
   "type": "module",
@@ -8,7 +8,8 @@
     "g": "node ./src/gitCommit.js",
     "g:y": "node ./src/gitCommit.js -y",
     "g:y:interval": "node ./src/gitCommit.js -y --interval",
-    "g:y:interval10": "node ./src/gitCommit.js -y --interval=10"
+    "g:y:interval10": "node ./src/gitCommit.js -y --interval=10",
+    "g:cwd": "node ./src/gitCommit.js --path=./"
   },
   "files": [
     "src/gitCommit.js",

package/src/gitCommit.js

@@ -18,6 +18,16 @@ const judgePlatform = () => {
     }
   }
 };
+const getCwd = () => {
+  const cwdArg = process.argv.find(arg => arg.startsWith('--path')) || process.argv.find(arg => arg.startsWith('--cwd'));
+  if (cwdArg) {
+    // console.log(`cwdArg ==> `, cwdArg)
+    const [, value] = cwdArg.split('=')
+    // console.log(`value ==> `, value)
+    return value || process.cwd()
+  }
+  return process.cwd()
+}
 
 // 有时候有乱码呢123神奇
 
@@ -72,7 +82,7 @@ class GitCommit {
       }
 
       // 执行 git add .
-      this.statusOutput.includes('(use "git add <file>') && this.execSyncGitCommand('git add .')
+      this.statusOutput.includes('(use "git add') && this.execSyncGitCommand('git add .')
 
       // 执行 git commit
       if (this.statusOutput.includes('Untracked files:') || this.statusOutput.includes('Changes not staged for commit') || this.statusOutput.includes('Changes to be committed')) {
@@ -102,8 +112,8 @@ class GitCommit {
 
   execSyncGitCommand(command, options = {}) {
     try {
-      let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, cwd = process.cwd()} = options
-      // cwd = process.argv[2] || cwd
+      let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024} = options
+      let cwd = getCwd()
       const output = execSync(command, {encoding, maxBuffer, cwd})
       let result = output.trim()
       coloredLog(command, result)
@@ -115,8 +125,8 @@ class GitCommit {
   }
 
   execGitCommand(command, options = {}, callback) {
-    let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, cwd = process.cwd()} = options
-    // cwd = process.argv[2] || cwd
+    let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024} = options
+    let cwd = getCwd()
     exec(command, {encoding, maxBuffer, cwd}, (error, stdout, stderr) => {
       if (error) {
         coloredLog(command, error)

package/src/utils/index.js

@@ -34,7 +34,8 @@ function getRandomColor() {
 function resetColor() {
   return '\x1b[0m';
 }
-const coloredLog = (...args) =>{
+
+const coloredLog = (...args) => {
   const color = getRandomColor();
   // 获取控制台的宽度
   const terminalWidth = process.stdout.columns;
@@ -43,8 +44,8 @@ const coloredLog = (...args) =>{
   // const line = '-'.repeat(terminalWidth);
   let str = '├─'
   let str2 = '│'
-  const start_line = '┌' + '──'.repeat(terminalWidth / 2 - 1) + '┐';
-  const end_line = '└' + '──'.repeat(terminalWidth / 2 - 1) + '┘';
+  const start_line = '┌' + '─'.repeat(terminalWidth - 2) + '┐';
+  const end_line = '└' + '─'.repeat(terminalWidth - 2) + '┘';
   let _args = args.map(arg => arg.split('\n')).flat().filter(arg => arg.trim() !== '');
   console.log(start_line);
   _args.map(async (arg, i) => {
@@ -62,34 +63,45 @@ const coloredLog = (...args) =>{
     if (_args[0] === 'git status' && trim_arg.startsWith('modified:')) {
       _color = '\x1b[32m';
     }
+    if (_args[0] === 'git status' && trim_arg.startsWith('deleted:')) {
+      _color = '\x1b[31m';
+    }
     if (_args[0] === 'git diff' && arg.startsWith('@@ ')) {
       _color = '\x1b[36m';
     }
     // 测试边框
     let fix_end = ''
     let length = stringWidth(arg);
-    if (length < terminalWidth) {
+    // if (length < terminalWidth) {
       let fix2 = 0
-      if(trim_arg.startsWith('modified:')){
+      if (
+        _args[0] === 'git status' && trim_arg.startsWith('modified:')
+        || _args[0] === 'git status' && trim_arg.startsWith('deleted:')
+      ) {
         fix2 = 6
       }
       if (i === 0) {
         fix2 = 2
       }
-      fix_end = ' '.repeat(terminalWidth - length - 4 - fix2)
+      let repeatLen = terminalWidth - length - 3 - fix2
+      if (repeatLen < 0) {
+        // repeatLen += terminalWidth
+        repeatLen = repeatLen % terminalWidth + terminalWidth
+      }
+      fix_end = ' '.repeat(repeatLen)
       fix_end += "│"
-    }
+    // }
     // console.log(`fix_end ==> `, fix_end)
     if (i === 0) {
       console.log(`│ \x1b[1m\x1b[34m> ${arg}\x1b[22m\x1b[39m${fix_end}`);
-      let mid = '├─' + '──'.repeat(terminalWidth / 2 - 2) + '─┤';
+      let mid = '├' + '─'.repeat(terminalWidth - 2) + '┤';
       console.log(mid);
     } else {
-      if(arg.trim().length > 0) {
+      if (arg.trim().length > 0) {
         console.log(`│${_color} ${arg}${resetColor()}${fix_end}`);
       }
     }
   });
   console.log(end_line);
 }
-export { coloredLog };
+export {coloredLog};