zen-gitsync 1.2.7 → 1.3.0

package/README.md

@@ -1,12 +1,7 @@
 
 # zen-gitsync
 
-`zen-gitsync` 是一个简单的命令行工具，用于自动化 Git 提交和推送操作。只需在控制台输入 `g`，即可自动执行 `git add`、`git commit` 和 `git push` 操作，极大提升 Git 工作流程的效率。
-
-## 特性
-
-- 一键执行 `git add`、`git commit`、`git push`
-- 使用交互式命令行输入提交信息
+`zen-gitsync` 是一个简单的命令行工具，用于自动化 Git 提交和推送操作。只需在控制台输入 `g`，并输入提交内容，即可自动执行 `git add`、`git commit` 和 `git push` 操作，极大提升 Git 工作流程的效率。
 
 ## 安装
 
@@ -62,3 +57,8 @@ $ g --cwd=./
 ```shell
 start /min cmd /k "g -y --path=你要同步的文件夹 --interval"
 ```
+
+#### 不显示git diff内容
+```shell
+$ g --no-diff
+```

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zen-gitsync",
-  "version": "1.2.7",
-  "description": "控制台输入g，回车，输入提交内容，自动执行git add+commit+push",
+  "version": "1.3.0",
+  "description": "一个 git 自动查看差异并提交的工具",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -9,7 +9,8 @@
     "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=./"
+    "g:cwd": "node ./src/gitCommit.js --path=./",
+    "g:no-diff": "node ./src/gitCommit.js --no-diff"
   },
   "files": [
     "src/gitCommit.js",
@@ -31,7 +32,9 @@
   },
   "homepage": "https://github.com/xz333221/zen-gitsync#readme",
   "dependencies": {
+    "boxen": "^8.0.1",
     "chalk": "^5.4.1",
+    "cli-table3": "^0.6.5",
     "ora": "^8.1.1",
     "string-width": "^7.2.0"
   }

package/src/gitCommit.js

@@ -6,6 +6,7 @@ import {coloredLog} from './utils/index.js';
 import readline from 'readline'
 import ora from 'ora';
 import chalk from 'chalk';
+import boxen from 'boxen';
 
 let timer = null
 
@@ -50,6 +51,7 @@ class GitCommit {
   constructor(options) {
     this.statusOutput = null
     this.exit = options.exit
+    this.commitMessage = `提交`
     this.init()
   }
 
@@ -72,15 +74,18 @@ class GitCommit {
         }
         return
       }
-      this.execSyncGitCommand('git diff')
+
+      const no_diff = process.argv.find(arg => arg.startsWith('--no-diff'))
+      if(!no_diff){
+        this.execSyncGitCommand('git diff')
+      }
 
       // 检查命令行参数，判断是否有 -y 参数
       const autoCommit = process.argv.includes('-y');
-      let commitMessage = '提交'; // 默认提交信息
 
       if (!autoCommit) {
         // 如果没有 -y 参数，则等待用户输入提交信息
-        commitMessage = await question('请输入提交信息：');
+        this.commitMessage = await question('请输入提交信息：');
       }
 
       // 执行 git add .
@@ -88,7 +93,7 @@ class GitCommit {
 
       // 执行 git commit
       if (this.statusOutput.includes('Untracked files:') || this.statusOutput.includes('Changes not staged for commit') || this.statusOutput.includes('Changes to be committed')) {
-        this.execSyncGitCommand(`git commit -m "${commitMessage || '提交'}"`)
+        this.execSyncGitCommand(`git commit -m "${this.commitMessage || '提交'}"`)
       }
 
       // 检查是否需要拉取更新
@@ -109,8 +114,20 @@ class GitCommit {
     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`)
+
+      // 使用 boxen 绘制带边框的消息
+      let msg = ` SUCCESS: 提交完成 
+ message: ${this.commitMessage || '提交'} 
+ time: ${new Date().toLocaleString()} `
+      const message = chalk.green.bold(msg);
+      const box = boxen(message, {
+        // borderStyle: 'round', // 方框的样式
+        // borderColor: 'whiteBright', // 边框颜色
+        // backgroundColor: 'black', // 背景颜色
+      });
+
+      console.log(box); // 打印带有边框的消息
+      // this.execSyncGitCommand(`git log -n 1 --pretty=format:"%B%n%h %d%n%ad" --date=iso`)
       this.exec_exit();
     })
   }
@@ -140,7 +157,7 @@ class GitCommit {
         options.spinner.stop();
       }
       if (error) {
-        coloredLog(command, error)
+        coloredLog(command, error, 'error')
         return
       }
       if (stdout) {

package/src/utils/index.js

@@ -15,6 +15,48 @@
 // const boxedMessage = boxen(message, options);
 // console.log(boxedMessage);
 import stringWidth from 'string-width';
+import Table from 'cli-table3';
+import chalk from 'chalk';
+
+const printTableWithHeaderUnderline = (head, content, style) => {
+  // 获取终端的列数（宽度）
+  const terminalWidth = process.stdout.columns;
+
+  // 计算表格的宽度，保证至少有 2 个字符留给边框
+  const tableWidth = terminalWidth - 2; // 左右边框和分隔符的宽度
+
+  // 计算每列的宽度
+  const colWidths = [tableWidth]; // 只有一列，因此宽度设置为终端宽度
+
+  if (!style) {
+    style = {
+      // head: ['cyan'], // 表头文字颜色为cyan
+      // border: ['white'],         // 边框颜色
+      compact: true,              // 启用紧凑模式，去掉不必要的空白
+    }
+  }
+  // 创建表格实例
+  const table = new Table({
+    head: [head],  // 只有一个表头
+    colWidths,       // 使用动态计算的列宽
+    style: style,
+    wordWrap: true,  // 启用自动换行
+  });
+
+  // 向表格中添加不同颜色的行
+  // eg:
+  // table.push(
+  //   [chalk.red('张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三')],
+  //   [chalk.green('李四')],
+  // );
+  content.forEach(item => {
+    table.push([item]);
+  })
+
+  console.log(table.toString()); // 输出表格
+};
+
+// printTableWithHeaderUnderline();
 
 const colors = [
   '\x1b[31m',  // 红色
@@ -34,71 +76,76 @@ function getRandomColor() {
 function resetColor() {
   return '\x1b[0m';
 }
-
-const coloredLog = (...args) => {
-  const color = getRandomColor();
-  // 获取控制台的宽度
-  const terminalWidth = process.stdout.columns;
-
-  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) => {
-    let _color = color;
-    let trim_arg = arg.trim();
-    if (_args[0] === 'git diff' && arg.startsWith('-')) {
-      _color = '\x1b[31m';
-    }
-    if (_args[0] === 'git status' && trim_arg.startsWith('new file:')) {
-      _color = '\x1b[31m';
-    }
-    if (_args[0] === 'git diff' && arg.startsWith('+')) {
-      _color = '\x1b[32m';
-    }
-    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) {
-      let fix2 = 0
-      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
+const calcColor = (commandLine, str) => {
+  let color = 'reset'
+  switch (commandLine) {
+    case 'git status':
+      if (str.startsWith('\t')) {
+        color = 'red'
+        if (str.startsWith('new file:')) {
+          color = 'red'
+        }
+        if (str.startsWith('modified:')) {
+          color = 'green'
+        }
+        if (str.startsWith('deleted:')) {
+          color = 'red'
+        }
       }
-      if (i === 0) {
-        fix2 = 2
+      break;
+    case 'git diff':
+      if (str.startsWith('-')) {
+        color = 'red'
       }
-      let repeatLen = terminalWidth - length - 3 - fix2
-      if (repeatLen < 0) {
-        // repeatLen += terminalWidth
-        repeatLen = repeatLen % terminalWidth + terminalWidth
+      if (str.startsWith('+')) {
+        color = 'green'
       }
-      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) + '┤';
-      console.log(mid);
-    } else {
-      if (arg.trim().length > 0) {
-        console.log(`│${_color} ${arg}${resetColor()}${fix_end}`);
+      if (str.startsWith('@@ ')) {
+        color = 'cyan'
       }
-    }
-  });
-  console.log(end_line);
+      break;
+  }
+  return color
+}
+const tableLog = (commandLine, content, type) => {
+  let handle_commandLine = `> ${commandLine}`
+  let head = chalk.bold.blue(handle_commandLine)
+  let style = {
+    // head: ['cyan'], // 表头文字颜色为cyan
+    // border: ['whiteBright'],         // 边框颜色
+    compact: true,              // 启用紧凑模式，去掉不必要的空白
+  }
+  switch (type) {
+    case 'error':
+      style.head = ['red'];
+      content = content.toString().split('\n')
+      head = chalk.bold.red(handle_commandLine)
+      break;
+    case 'log':
+      style.head = ['blue'];
+      content = content.split('\n')
+      break;
+    default:
+      break;
+  }
+  content = content.map(item => {
+    let fontColor = calcColor(commandLine, item)
+    let row = item.replaceAll('\t', '      ')
+    return chalk[fontColor](row)
+  })
+
+  printTableWithHeaderUnderline(head, content, style)
+}
+const coloredLog = (...args) => {
+  // 获取参数内容
+  const commandLine = args[0];
+  const content = args[1];
+  const type = args[2] || 'log';
+
+
+  tableLog(commandLine, content, type);
+
+  // console.log(`args ==> `, args)
+
 }
 export {coloredLog};