zen-gitsync 1.3.0 → 1.3.1

package/README.md

@@ -62,3 +62,9 @@ start /min cmd /k "g -y --path=你要同步的文件夹 --interval"
 ```shell
 $ g --no-diff
 ```
+
+#### 格式化打印git log
+```shell
+$ g log
+$ g log --n=5
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zen-gitsync",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "一个 git 自动查看差异并提交的工具",
   "main": "index.js",
   "type": "module",
@@ -10,7 +10,9 @@
     "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:no-diff": "node ./src/gitCommit.js --no-diff"
+    "g:no-diff": "node ./src/gitCommit.js --no-diff",
+    "g:log": "node ./src/gitCommit.js log",
+    "g:log5": "node ./src/gitCommit.js log --n=5"
   },
   "files": [
     "src/gitCommit.js",

package/src/gitCommit.js

@@ -65,6 +65,12 @@ class GitCommit {
     try {
       judgePlatform()
 
+      const logArg = process.argv.find(arg => arg === 'log');
+      if (logArg) {
+        await this.printGitLog(); // 如果有 log 参数，打印 Git 提交记录
+        return;
+      }
+
       this.statusOutput = this.execSyncGitCommand('git status')
       if (this.statusOutput.includes('nothing to commit, working tree clean')) {
         if (this.statusOutput.includes('use "git push')) {
@@ -77,7 +83,9 @@ class GitCommit {
 
       const no_diff = process.argv.find(arg => arg.startsWith('--no-diff'))
       if(!no_diff){
-        this.execSyncGitCommand('git diff')
+        this.execSyncGitCommand('git diff --color=always', {
+          head: `git diff`
+        })
       }
 
       // 检查命令行参数，判断是否有 -y 参数
@@ -106,6 +114,29 @@ class GitCommit {
       console.log(`e ==> `, e)
     }
   }
+  async printGitLog() {
+    let n = 20;
+    let logArg = process.argv.find(arg => arg.startsWith('--n='));
+    if (logArg) {
+      n = parseInt(logArg.split('=')[1], 10);
+    }
+    const logCommand = `git log -n ${n} --pretty=format:"%C(green)%h%C(reset) | %C(cyan)%an%C(reset) | %C(yellow)%ad%C(reset) | %C(blue)%D%C(reset) | %C(magenta)%s%C(reset)" --date=format:"%Y-%m-%d %H:%M" --graph --decorate --color`
+    try {
+      const logOutput = this.execSyncGitCommand(logCommand, {
+        head: `git log`
+      });
+      // // 格式化输出 Git 提交记录
+      // const box = boxen(chalk.green.bold(logOutput), {
+      //   borderStyle: 'round',
+      //   borderColor: 'cyan',
+      //   backgroundColor: 'black',
+      // });
+      // console.log(box); // 打印优雅的 Git 提交记录
+    } catch (error) {
+      console.error('无法获取 Git 提交记录:', error.message);
+    }
+    this.exec_exit(); // 打印完成后退出
+  }
 
   exec_push() {
     // 执行 git push
@@ -134,14 +165,14 @@ class GitCommit {
 
   execSyncGitCommand(command, options = {}) {
     try {
-      let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024} = options
+      let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, head = command} = options
       let cwd = getCwd()
       const output = execSync(command, {encoding, maxBuffer, cwd})
       if(options.spinner){
         options.spinner.stop();
       }
       let result = output.trim()
-      coloredLog(command, result)
+      coloredLog(head, result)
       return result
     } catch (e) {
       console.log(`执行命令出错 ==> `, command, e)

package/src/utils/index.js

@@ -31,7 +31,7 @@ const printTableWithHeaderUnderline = (head, content, style) => {
   if (!style) {
     style = {
       // head: ['cyan'], // 表头文字颜色为cyan
-      // border: ['white'],         // 边框颜色
+      border: [chalk.reset()],         // 边框颜色
       compact: true,              // 启用紧凑模式，去掉不必要的空白
     }
   }
@@ -41,6 +41,23 @@ const printTableWithHeaderUnderline = (head, content, style) => {
     colWidths,       // 使用动态计算的列宽
     style: style,
     wordWrap: true,  // 启用自动换行
+    // chars: {
+    //   'top': '═',       // 顶部边框使用长横线
+    //   'top-mid': '╤',   // 顶部连接符
+    //   'top-left': '╔',   // 左上角
+    //   'top-right': '╗',  // 右上角
+    //   'bottom': '═',    // 底部边框
+    //   'bottom-mid': '╧', // 底部连接符
+    //   'bottom-left': '╚',// 左下角
+    //   'bottom-right': '╝',// 右下角
+    //   'left': '║',      // 左边框
+    //   'left-mid': '╟',  // 左连接符
+    //   'mid': '═',       // 中间分隔符
+    //   'mid-mid': '╪',   // 中间连接符
+    //   'right': '║',     // 右边框
+    //   'right-mid': '╢', // 右连接符
+    //   'middle': '│'     // 中间内容的边界
+    // }
   });
 
   // 向表格中添加不同颜色的行
@@ -94,15 +111,15 @@ const calcColor = (commandLine, str) => {
       }
       break;
     case 'git diff':
-      if (str.startsWith('-')) {
-        color = 'red'
-      }
-      if (str.startsWith('+')) {
-        color = 'green'
-      }
-      if (str.startsWith('@@ ')) {
-        color = 'cyan'
-      }
+      // if (str.startsWith('---')) {
+      //   color = 'red'
+      // }
+      // if (str.startsWith('+++')) {
+      //   color = 'green'
+      // }
+      // if (str.startsWith('@@ ')) {
+      //   color = 'cyan'
+      // }
       break;
   }
   return color
@@ -112,7 +129,7 @@ const tableLog = (commandLine, content, type) => {
   let head = chalk.bold.blue(handle_commandLine)
   let style = {
     // head: ['cyan'], // 表头文字颜色为cyan
-    // border: ['whiteBright'],         // 边框颜色
+    border: [chalk.reset()],         // 边框颜色
     compact: true,              // 启用紧凑模式，去掉不必要的空白
   }
   switch (type) {
@@ -121,7 +138,7 @@ const tableLog = (commandLine, content, type) => {
       content = content.toString().split('\n')
       head = chalk.bold.red(handle_commandLine)
       break;
-    case 'log':
+    case 'common':
       style.head = ['blue'];
       content = content.split('\n')
       break;
@@ -140,12 +157,7 @@ const coloredLog = (...args) => {
   // 获取参数内容
   const commandLine = args[0];
   const content = args[1];
-  const type = args[2] || 'log';
-
-
+  const type = args[2] || 'common';
   tableLog(commandLine, content, type);
-
-  // console.log(`args ==> `, args)
-
 }
 export {coloredLog};