zen-gitsync 1.2.0 → 1.2.2

package/README.md

@@ -7,7 +7,6 @@
 
 - 一键执行 `git add`、`git commit`、`git push`
 - 使用交互式命令行输入提交信息
-- 提交信息颜色随机显示
 
 ## 安装
 

package/package.json

@@ -1,16 +1,21 @@
 {
   "name": "zen-gitsync",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "控制台输入g，回车，输入提交内容，自动执行git add+commit+push",
   "main": "index.js",
+  "type": "module",
   "scripts": {
-    "g": "node ./src/gitCommit.js"
+    "g": "node ./src/gitCommit.js",
+    "g:y": "node ./src/gitCommit.js -y"
   },
   "files": [
     "src/gitCommit.js",
+    "src/utils/index.js",
     "package.json"
   ],
-  "bin": { "g": "./src/gitCommit.js" },
+  "bin": {
+    "g": "./src/gitCommit.js"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/xz333221/zen-gitsync.git"
@@ -21,5 +26,8 @@
   "bugs": {
     "url": "https://github.com/xz333221/zen-gitsync/issues"
   },
-  "homepage": "https://github.com/xz333221/zen-gitsync#readme"
+  "homepage": "https://github.com/xz333221/zen-gitsync#readme",
+  "dependencies": {
+    "string-width": "^7.2.0"
+  }
 }

package/src/gitCommit.js

@@ -1,7 +1,10 @@
 #!/usr/bin/env node
 
-const {exec, execSync} = require('child_process')
-const os = require('os');
+import {exec, execSync} from 'child_process'
+import os from 'os'
+import { coloredLog } from './utils/index.js';
+import readline from 'readline'
+
 
 const judgePlatform = () => {
   // 判断是否是 Windows 系统
@@ -16,7 +19,7 @@ const judgePlatform = () => {
 };
 
 // 有时候有乱码呢123神奇
-const readline = require('readline')
+
 const rl = readline.createInterface({
   input: process.stdin,
   output: process.stdout
@@ -30,62 +33,6 @@ function rlPromisify(fn) {
 
 const question = rlPromisify(rl.question.bind(rl))
 
-const colors = [
-  '\x1b[31m',  // 红色
-  '\x1b[32m',  // 绿色
-  '\x1b[33m',  // 黄色
-  '\x1b[34m',  // 蓝色
-  '\x1b[35m',  // 紫色
-  '\x1b[36m',  // 青色
-];
-
-function getRandomColor() {
-  return `\x1b[0m`;
-  // const randomIndex = Math.floor(Math.random() * colors.length);
-  // return colors[randomIndex];
-}
-
-function resetColor() {
-  return '\x1b[0m';
-}
-
-function coloredLog(...args) {
-  const color = getRandomColor();
-  // 获取控制台的宽度
-  const terminalWidth = process.stdout.columns;
-
-  // 创建与控制台宽度相同的横线
-  const line = '-'.repeat(terminalWidth);
-  let _args = args.map(arg => arg.split('\n')).flat().filter(arg => arg.trim() !== '');
-  console.log(line);
-  _args.map((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 diff' && arg.startsWith('@@ ')) {
-      _color = '\x1b[36m';
-    }
-    if (i === 0) {
-      console.log(`|\x1b[1m\x1b[34m ${arg}⬇️\x1b[22m\x1b[39m`);
-    } else {
-      console.log(`|${_color} ${arg}`, resetColor());
-    }
-  });
-  console.log(line);
-}
-
-
 class GitCommit {
   constructor() {
     this.statusOutput = null
@@ -103,8 +50,14 @@ class GitCommit {
       }
       this.execSyncGitCommand('git diff')
 
-      // 等待用户输入提交信息
-      const commitMessage = await question('请输入提交信息：')
+      // 检查命令行参数，判断是否有 -y 参数
+      const autoCommit = process.argv.includes('-y');
+      let commitMessage = '提交'; // 默认提交信息
+
+      if (!autoCommit) {
+        // 如果没有 -y 参数，则等待用户输入提交信息
+        commitMessage = await question('请输入提交信息：');
+      }
 
       // 执行 git add .
       this.statusOutput.includes('(use "git add <file>') && this.execSyncGitCommand('git add .')
@@ -122,7 +75,7 @@ class GitCommit {
       // 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`)
+        this.execSyncGitCommand(`git log -n 1 --pretty=format:"%B%n%h %d%n%ad" --date=iso`)
         process.exit();
       })
     } catch (e) {
@@ -133,7 +86,7 @@ class GitCommit {
   execSyncGitCommand(command, options = {}) {
     try {
       let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, cwd = process.cwd()} = options
-      cwd = process.argv[2] || cwd
+      // cwd = process.argv[2] || cwd
       const output = execSync(command, {encoding, maxBuffer, cwd})
       let result = output.trim()
       coloredLog(command, result)
@@ -146,7 +99,7 @@ class GitCommit {
 
   execGitCommand(command, options = {}, callback) {
     let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, cwd = process.cwd()} = options
-    cwd = process.argv[2] || cwd
+    // cwd = process.argv[2] || cwd
     exec(command, {encoding, maxBuffer, cwd}, (error, stdout, stderr) => {
       if (error) {
         coloredLog(command, error)

package/src/utils/index.js

@@ -0,0 +1,95 @@
+// const chalk = require('chalk');
+// const boxen = require('boxen');
+// const message = chalk.blue('git diff') + '\n' +
+//   chalk.red('- line1') + '\n' +
+//   chalk.green('+ line2') + '\n' +
+//   chalk.cyan('@@ line diff @@');
+//
+// const options = {
+//   padding: 1,
+//   margin: 1,
+//   borderStyle: 'round',  // 可以选择 'single', 'double', 'round' 等边框样式
+//   borderColor: 'yellow'
+// };
+//
+// const boxedMessage = boxen(message, options);
+// console.log(boxedMessage);
+import stringWidth from 'string-width';
+
+const colors = [
+  '\x1b[31m',  // 红色
+  '\x1b[32m',  // 绿色
+  '\x1b[33m',  // 黄色
+  '\x1b[34m',  // 蓝色
+  '\x1b[35m',  // 紫色
+  '\x1b[36m',  // 青色
+];
+
+function getRandomColor() {
+  return `\x1b[0m`;
+  // const randomIndex = Math.floor(Math.random() * colors.length);
+  // return colors[randomIndex];
+}
+
+function resetColor() {
+  return '\x1b[0m';
+}
+const coloredLog = (...args) =>{
+  const color = getRandomColor();
+  // 获取控制台的宽度
+  const terminalWidth = process.stdout.columns;
+
+  // 创建与控制台宽度相同的横线
+  // const line = '-'.repeat(terminalWidth);
+  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) => {
+    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 diff' && arg.startsWith('@@ ')) {
+      _color = '\x1b[36m';
+    }
+    // 测试边框
+    let fix_end = ''
+    let length = stringWidth(arg);
+    if (length < terminalWidth) {
+      let fix2 = 0
+      if(trim_arg.startsWith('modified:')){
+        fix2 = 6
+      }
+      if (i === 0) {
+        fix2 = 2
+      }
+      fix_end = ' '.repeat(terminalWidth - length - 4 - fix2)
+      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 - 2) + '─┤';
+      console.log(mid);
+    } else {
+      if(arg.trim().length > 0) {
+        console.log(`│${_color} ${arg}${resetColor()}${fix_end}`);
+      }
+    }
+  });
+  console.log(end_line);
+}
+export { coloredLog };