zen-gitsync 1.2.5 → 1.2.7

package/README.md

@@ -48,3 +48,17 @@ $ g --path=./
 ```bash
 $ g --cwd=./
 ```
+
+#### 添加项目script
+```json
+{
+   "scripts": {
+      "g:y": "g -y"
+   }
+}
+```
+
+#### cmd同步文件夹
+```shell
+start /min cmd /k "g -y --path=你要同步的文件夹 --interval"
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zen-gitsync",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "控制台输入g，回车，输入提交内容，自动执行git add+commit+push",
   "main": "index.js",
   "type": "module",
@@ -31,6 +31,8 @@
   },
   "homepage": "https://github.com/xz333221/zen-gitsync#readme",
   "dependencies": {
+    "chalk": "^5.4.1",
+    "ora": "^8.1.1",
     "string-width": "^7.2.0"
   }
 }

package/src/gitCommit.js

@@ -4,6 +4,8 @@ import {exec, execSync} from 'child_process'
 import os from 'os'
 import {coloredLog} from './utils/index.js';
 import readline from 'readline'
+import ora from 'ora';
+import chalk from 'chalk';
 
 let timer = null
 
@@ -103,8 +105,11 @@ class GitCommit {
   exec_push() {
     // 执行 git push
     // this.execSyncGitCommand(`git push`);
-    this.execGitCommand('git push', {}, (error, stdout, stderr) => {
-      console.log('提交完成。')
+    const spinner = ora('正在推送代码...').start();
+    this.execGitCommand('git push', {
+      spinner
+    }, (error, stdout, stderr) => {
+      console.log(chalk.green.bold('✔ SUCCESS: 提交完成。')); // 使用绿色对勾图标
       this.execSyncGitCommand(`git log -n 1 --pretty=format:"%B%n%h %d%n%ad" --date=iso`)
       this.exec_exit();
     })
@@ -115,6 +120,9 @@ class GitCommit {
       let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024} = options
       let cwd = getCwd()
       const output = execSync(command, {encoding, maxBuffer, cwd})
+      if(options.spinner){
+        options.spinner.stop();
+      }
       let result = output.trim()
       coloredLog(command, result)
       return result
@@ -128,6 +136,9 @@ class GitCommit {
     let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024} = options
     let cwd = getCwd()
     exec(command, {encoding, maxBuffer, cwd}, (error, stdout, stderr) => {
+      if(options.spinner){
+        options.spinner.stop();
+      }
       if (error) {
         coloredLog(command, error)
         return

package/src/utils/index.js

@@ -40,10 +40,6 @@ const coloredLog = (...args) => {
   // 获取控制台的宽度
   const terminalWidth = process.stdout.columns;
 
-  // 创建与控制台宽度相同的横线
-  // const line = '-'.repeat(terminalWidth);
-  let str = '├─'
-  let str2 = '│'
   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() !== '');
@@ -77,6 +73,7 @@ const coloredLog = (...args) => {
       if (
         _args[0] === 'git status' && trim_arg.startsWith('modified:')
         || _args[0] === 'git status' && trim_arg.startsWith('deleted:')
+        || _args[0] === 'git status' && trim_arg.startsWith('new file:')
       ) {
         fix2 = 6
       }