zen-gitsync 1.2.2 → 1.2.4

package/README.md

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

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "zen-gitsync",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "控制台输入g，回车，输入提交内容，自动执行git add+commit+push",
   "main": "index.js",
   "type": "module",
   "scripts": {
     "g": "node ./src/gitCommit.js",
-    "g:y": "node ./src/gitCommit.js -y"
+    "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:cwd": "node ./src/gitCommit.js --path=./"
   },
   "files": [
     "src/gitCommit.js",

package/src/gitCommit.js

@@ -2,9 +2,10 @@
 
 import {exec, execSync} from 'child_process'
 import os from 'os'
-import { coloredLog } from './utils/index.js';
+import {coloredLog} from './utils/index.js';
 import readline from 'readline'
 
+let timer = null
 
 const judgePlatform = () => {
   // 判断是否是 Windows 系统
@@ -17,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神奇
 
@@ -34,18 +45,29 @@ function rlPromisify(fn) {
 const question = rlPromisify(rl.question.bind(rl))
 
 class GitCommit {
-  constructor() {
+  constructor(options) {
     this.statusOutput = null
+    this.exit = options.exit
     this.init()
   }
 
+  exec_exit() {
+    if (this.exit) {
+      process.exit()
+    }
+  }
+
   async init() {
     try {
       judgePlatform()
 
       this.statusOutput = this.execSyncGitCommand('git status')
       if (this.statusOutput.includes('nothing to commit, working tree clean')) {
-        process.exit();
+        if (this.statusOutput.includes('use "git push')) {
+          this.exec_push()
+        } else {
+          this.exec_exit();
+        }
         return
       }
       this.execSyncGitCommand('git diff')
@@ -67,26 +89,31 @@ class GitCommit {
         this.execSyncGitCommand(`git commit -m "${commitMessage || '提交'}"`)
       }
 
-
       // 检查是否需要拉取更新
       this.statusOutput.includes('use "git pull') && this.execSyncGitCommand('git pull')
 
-      // 执行 git push
-      // this.execSyncGitCommand(`git push`);
-      this.execGitCommand('git push', {}, (error, stdout, stderr) => {
-        console.log('提交完成。')
-        this.execSyncGitCommand(`git log -n 1 --pretty=format:"%B%n%h %d%n%ad" --date=iso`)
-        process.exit();
-      })
+      this.exec_push()
+
+
     } catch (e) {
       console.log(`e ==> `, e)
     }
   }
 
+  exec_push() {
+    // 执行 git push
+    // this.execSyncGitCommand(`git push`);
+    this.execGitCommand('git push', {}, (error, stdout, stderr) => {
+      console.log('提交完成。')
+      this.execSyncGitCommand(`git log -n 1 --pretty=format:"%B%n%h %d%n%ad" --date=iso`)
+      this.exec_exit();
+    })
+  }
+
   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)
@@ -98,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)
@@ -116,4 +143,38 @@ class GitCommit {
   }
 }
 
-new GitCommit()
+const judgeInterval = () => {
+  // 判断是否有 --interval 参数
+  const intervalArg = process.argv.find(arg => arg.startsWith('--interval'));
+  if (intervalArg) {
+    // console.log(`intervalArg ==> `, intervalArg)
+    let interval = intervalArg.split('=')[1] || 60 * 60; // 默认间隔为1小时
+    // console.log(`interval ==> `, interval)
+    interval = parseInt(interval, 10) * 1000; // 将间隔时间转换为毫秒
+    // console.log(`interval ==> `, interval)
+    if (isNaN(interval)) {
+      console.log('无效的间隔时间，请使用 --interval=秒数');
+      process.exit(1);
+    }
+    if (timer) {
+      console.log(`清空定时器`)
+      clearInterval(timer);
+      timer = null;
+    }
+    new GitCommit({
+      exit: false
+    })
+    timer = setInterval(() => {
+      // console.log(`定时执行`)
+      new GitCommit({
+        exit: false
+      })
+    }, interval)
+  } else {
+    new GitCommit({
+      exit: true
+    })
+  }
+};
+
+judgeInterval()