zen-gitsync 1.2.1 → 1.2.3

package/README.md

@@ -7,7 +7,6 @@
 
 - 一键执行 `git add`、`git commit`、`git push`
 - 使用交互式命令行输入提交信息
-- 提交信息颜色随机显示
 
 ## 安装
 
@@ -32,5 +31,12 @@ npm install -g zen-gitsync
 $ g
 请输入你的提交信息: 修复了登录页样式问题
 ```
-
-完成提交后，你会看到一个随机颜色的提交信息确认
+直接提交
+```bash
+$ g -y
+```
+定时执行自动提交，默认间隔1小时
+```bash
+$ g -y --interval
+$ g -y --interval=秒数 
+```

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "zen-gitsync",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "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"
   },
   "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 系统
@@ -34,18 +35,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,22 +79,27 @@ 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:"%H %d %ad%n%B" --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
@@ -116,4 +133,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()

package/src/utils/index.js

@@ -41,8 +41,10 @@ const coloredLog = (...args) =>{
 
   // 创建与控制台宽度相同的横线
   // const line = '-'.repeat(terminalWidth);
-  const start_line = '┌' + '——'.repeat(terminalWidth / 2 - 1) + '┐';
-  const end_line = '└' + '——'.repeat(terminalWidth / 2 - 1) + '┘';
+  let str = '├─'
+  let str2 = '│'
+  const start_line = '┌' + '──'.repeat(terminalWidth / 2 - 1) + '┐';
+  const end_line = '└' + '──'.repeat(terminalWidth / 2 - 1) + '┘';
   let _args = args.map(arg => arg.split('\n')).flat().filter(arg => arg.trim() !== '');
   console.log(start_line);
   _args.map(async (arg, i) => {
@@ -75,14 +77,16 @@ const coloredLog = (...args) =>{
         fix2 = 2
       }
       fix_end = ' '.repeat(terminalWidth - length - 4 - fix2)
-      fix_end += "|"
+      fix_end += "│"
     }
     // console.log(`fix_end ==> `, fix_end)
     if (i === 0) {
-      console.log(`| \x1b[1m\x1b[34m> ${arg}\x1b[22m\x1b[39m${fix_end}`);
+      console.log(`│ \x1b[1m\x1b[34m> ${arg}\x1b[22m\x1b[39m${fix_end}`);
+      let mid = '├─' + '──'.repeat(terminalWidth / 2 - 2) + '─┤';
+      console.log(mid);
     } else {
       if(arg.trim().length > 0) {
-        console.log(`|${_color} ${arg}${fix_end}`, resetColor());
+        console.log(`│${_color} ${arg}${resetColor()}${fix_end}`);
       }
     }
   });