zen-gitsync 1.0.3 → 1.2.1

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2024 xz333221
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2024 xz333221
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,36 +1,36 @@
-
-# zen-gitsync
-
-`zen-gitsync` 是一个简单的命令行工具，用于自动化 Git 提交和推送操作。只需在控制台输入 `g`，即可自动执行 `git add`、`git commit` 和 `git push` 操作，极大提升 Git 工作流程的效率。
-
-## 特性
-
-- 一键执行 `git add`、`git commit`、`git push`
-- 使用交互式命令行输入提交信息
-- 提交信息颜色随机显示
-
-## 安装
-
-通过 npm 安装 `zen-gitsync`，并进行全局安装：
-
-```bash
-npm install -g zen-gitsync
-```
-
-## 使用方法
-
-1. 在终端中，输入 `g` 并按回车。
-2. 输入提交信息，按回车确认提交。
-3. 工具将自动执行以下操作：
-    - `git add .`
-    - `git commit -m "你的提交信息"`
-    - `git push`
-
-### 示例：
-
-```bash
-$ g
-请输入你的提交信息: 修复了登录页样式问题
-```
-
-完成提交后，你会看到一个随机颜色的提交信息确认
+
+# zen-gitsync
+
+`zen-gitsync` 是一个简单的命令行工具，用于自动化 Git 提交和推送操作。只需在控制台输入 `g`，即可自动执行 `git add`、`git commit` 和 `git push` 操作，极大提升 Git 工作流程的效率。
+
+## 特性
+
+- 一键执行 `git add`、`git commit`、`git push`
+- 使用交互式命令行输入提交信息
+- 提交信息颜色随机显示
+
+## 安装
+
+通过 npm 安装 `zen-gitsync`，并进行全局安装：
+
+```bash
+npm install -g zen-gitsync
+```
+
+## 使用方法
+
+1. 在终端中，输入 `g` 并按回车。
+2. 输入提交信息，按回车确认提交。
+3. 工具将自动执行以下操作：
+    - `git add .`
+    - `git commit -m "你的提交信息"`
+    - `git push`
+
+### 示例：
+
+```bash
+$ g
+请输入你的提交信息: 修复了登录页样式问题
+```
+
+完成提交后，你会看到一个随机颜色的提交信息确认

package/package.json

@@ -1,16 +1,21 @@
 {
   "name": "zen-gitsync",
-  "version": "1.0.3",
+  "version": "1.2.1",
   "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,121 +1,119 @@
-#!/usr/bin/env node
-
-const { exec, execSync } = require('child_process')
-
-// 有时候有乱码呢123神奇
-const readline = require('readline')
-const rl = readline.createInterface({
-  input: process.stdin,
-  output: process.stdout
-})
-
-function rlPromisify (fn) {
-  return async (...args) => {
-    return new Promise((resolve,reject) => fn(...args, resolve, reject))
-  }
-}
-
-const question = rlPromisify(rl.question.bind(rl))
-
-const colors = [
-  '\x1b[31m',  // 红色
-  '\x1b[32m',  // 绿色
-  '\x1b[33m',  // 黄色
-  '\x1b[34m',  // 蓝色
-  '\x1b[35m',  // 紫色
-  '\x1b[36m',  // 青色
-];
-
-function getRandomColor() {
-  const randomIndex = Math.floor(Math.random() * colors.length);
-  return colors[randomIndex];
-}
-
-function resetColor() {
-  return '\x1b[0m';
-}
-
-function coloredLog(...args) {
-  const color = getRandomColor();
-  console.log(color, ...args.map(arg => `\n${arg}`), resetColor());
-}
-
-
-class GitCommit {
-  constructor () {
-    this.statusOutput = null
-    this.init()
-  }
-
-  async init () {
-    try {
-      // 设置终端字符编码为UTF-8
-      execSync('chcp 65001')
-
-      this.statusOutput = this.execSyncGitCommand('git status')
-      if (this.statusOutput.includes('nothing to commit, working tree clean')) {
-        return
-      }
-      this.execSyncGitCommand('git diff')
-
-      // 等待用户输入提交信息
-      const commitMessage = await question('请输入提交信息：')
-
-      // 执行 git add .
-      this.statusOutput.includes('(use "git add <file>') && this.execSyncGitCommand('git add .')
-
-      // 执行 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.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();
-      })
-    } catch (e) {
-      console.log(`e ==> `, e)
-    }
-  }
-
-  execSyncGitCommand (command, options = {}) {
-    try {
-      let { encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, cwd = process.cwd() } = options
-      cwd = process.argv[2] || cwd
-      const output = execSync(command, { encoding, maxBuffer, cwd })
-      let result = output.trim()
-      coloredLog(command, result)
-      return result
-    } catch (e) {
-      console.log(`执行命令出错 ==> `, command, e)
-      throw new Error(e)
-    }
-  }
-
-  execGitCommand (command, options = {}, callback) {
-    let { encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, cwd = process.cwd() } = options
-    cwd = process.argv[2] || cwd
-    exec(command, { encoding, maxBuffer, cwd }, (error, stdout, stderr) => {
-      if (error) {
-        coloredLog(command, error)
-        return
-      }
-      if (stdout) {
-        coloredLog(command, stdout)
-      }
-      if (stderr) {
-        coloredLog(command, stderr)
-      }
-      callback && callback(error, stdout, stderr)
-    })
-  }
-}
-
-new GitCommit()
+#!/usr/bin/env node
+
+import {exec, execSync} from 'child_process'
+import os from 'os'
+import { coloredLog } from './utils/index.js';
+import readline from 'readline'
+
+
+const judgePlatform = () => {
+  // 判断是否是 Windows 系统
+  if (os.platform() === 'win32') {
+    try {
+      // 设置终端字符编码为 UTF-8
+      execSync('chcp 65001');
+    } catch (e) {
+      console.error('设置字符编码失败:', e.message);
+    }
+  }
+};
+
+// 有时候有乱码呢123神奇
+
+const rl = readline.createInterface({
+  input: process.stdin,
+  output: process.stdout
+})
+
+function rlPromisify(fn) {
+  return async (...args) => {
+    return new Promise((resolve, reject) => fn(...args, resolve, reject))
+  }
+}
+
+const question = rlPromisify(rl.question.bind(rl))
+
+class GitCommit {
+  constructor() {
+    this.statusOutput = null
+    this.init()
+  }
+
+  async init() {
+    try {
+      judgePlatform()
+
+      this.statusOutput = this.execSyncGitCommand('git status')
+      if (this.statusOutput.includes('nothing to commit, working tree clean')) {
+        process.exit();
+        return
+      }
+      this.execSyncGitCommand('git diff')
+
+      // 检查命令行参数，判断是否有 -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 .')
+
+      // 执行 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.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();
+      })
+    } catch (e) {
+      console.log(`e ==> `, e)
+    }
+  }
+
+  execSyncGitCommand(command, options = {}) {
+    try {
+      let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, cwd = process.cwd()} = options
+      // cwd = process.argv[2] || cwd
+      const output = execSync(command, {encoding, maxBuffer, cwd})
+      let result = output.trim()
+      coloredLog(command, result)
+      return result
+    } catch (e) {
+      console.log(`执行命令出错 ==> `, command, e)
+      throw new Error(e)
+    }
+  }
+
+  execGitCommand(command, options = {}, callback) {
+    let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, cwd = process.cwd()} = options
+    // cwd = process.argv[2] || cwd
+    exec(command, {encoding, maxBuffer, cwd}, (error, stdout, stderr) => {
+      if (error) {
+        coloredLog(command, error)
+        return
+      }
+      if (stdout) {
+        coloredLog(command, stdout)
+      }
+      if (stderr) {
+        coloredLog(command, stderr)
+      }
+      callback && callback(error, stdout, stderr)
+    })
+  }
+}
+
+new GitCommit()

package/src/utils/index.js

@@ -0,0 +1,91 @@
+// 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);
+  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}`);
+    } else {
+      if(arg.trim().length > 0) {
+        console.log(`|${_color} ${arg}${fix_end}`, resetColor());
+      }
+    }
+  });
+  console.log(end_line);
+}
+export { coloredLog };