zen-gitsync 2.1.3 → 2.1.6

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,96 +1,96 @@
-# zen-gitsync
-
-`zen-gitsync` 是一个简单的命令行工具，用于自动化 Git 提交和推送操作。只需在控制台输入 `g`，并输入提交内容，即可自动执行 `git add`、`git commit` 和 `git push` 操作，极大提升 Git 工作流程的效率。
-
-## 安装
-
-通过 npm 安装 `zen-gitsync`，并进行全局安装：
-
-```bash
-npm install -g zen-gitsync
-```
-
-## 使用方法
-
-1. 在终端中，输入 `g` 并按回车。
-2. 输入提交信息，按回车确认提交。
-3. 工具将自动查看远程分支并自动提交
-
-
-### 示例：
-#### 交互式提交：
-```bash
-$ g
-请输入你的提交信息: 修复了登录页样式问题
-```
-#### 直接提交：
-```bash
-$ g -y
-```
-#### 设置默认提交信息：
-```bash
-$ g --set-default-message="提交"
-```
-#### 获取默认提交信息：
-```bash
-$ g get-config
-```
-#### 传入message直接提交：
-```bash
-$ g -m <message>
-$ g -m=<message>
-```
-
-#### 查看帮助
-```shell
-$ g -h
-$ g --help
-```
-
-#### 定时执行自动提交，默认间隔1小时
-```bash
-$ g -y --interval
-$ g -y --interval=<seconds> 
-```
-#### 指定目录提交
-```bash
-$ g --path=<path> 
-```
-或
-```bash
-$ g --cwd=<path> 
-```
-
-#### 添加项目script
-```json
-{
-   "scripts": {
-      "g:y": "g -y"
-   }
-}
-```
-
-#### cmd同步文件夹
-```shell
-start /min cmd /k "g -y --path=你要同步的文件夹 --interval"
-```
-
-#### 不显示git diff内容
-```shell
-$ g --no-diff
-```
-
-#### 格式化打印git log
-```shell
-$ g log
-$ g log --n=5
-```
-
-## ✨ 新特性 (v2.0.0)
-- 新增图形用户界面(GUI)模式
-- 支持标准化的提交信息格式
-
-### 启动图形界面：
-```shell
-$ g ui
-```
+# zen-gitsync
+
+`zen-gitsync` 是一个简单的命令行工具，用于自动化 Git 提交和推送操作。只需在控制台输入 `g`，并输入提交内容，即可自动执行 `git add`、`git commit` 和 `git push` 操作，极大提升 Git 工作流程的效率。
+
+## 安装
+
+通过 npm 安装 `zen-gitsync`，并进行全局安装：
+
+```bash
+npm install -g zen-gitsync
+```
+
+## 使用方法
+
+1. 在终端中，输入 `g` 并按回车。
+2. 输入提交信息，按回车确认提交。
+3. 工具将自动查看远程分支并自动提交
+
+
+### 示例：
+#### 交互式提交：
+```bash
+$ g
+请输入你的提交信息: 修复了登录页样式问题
+```
+#### 直接提交：
+```bash
+$ g -y
+```
+#### 设置默认提交信息：
+```bash
+$ g --set-default-message="提交"
+```
+#### 获取默认提交信息：
+```bash
+$ g get-config
+```
+#### 传入message直接提交：
+```bash
+$ g -m <message>
+$ g -m=<message>
+```
+
+#### 查看帮助
+```shell
+$ g -h
+$ g --help
+```
+
+#### 定时执行自动提交，默认间隔1小时
+```bash
+$ g -y --interval
+$ g -y --interval=<seconds> 
+```
+#### 指定目录提交
+```bash
+$ g --path=<path> 
+```
+或
+```bash
+$ g --cwd=<path> 
+```
+
+#### 添加项目script
+```json
+{
+   "scripts": {
+      "g:y": "g -y"
+   }
+}
+```
+
+#### cmd同步文件夹
+```shell
+start /min cmd /k "g -y --path=你要同步的文件夹 --interval"
+```
+
+#### 不显示git diff内容
+```shell
+$ g --no-diff
+```
+
+#### 格式化打印git log
+```shell
+$ g log
+$ g log --n=5
+```
+
+## ✨ 新特性 (v2.0.0)
+- 新增图形用户界面(GUI)模式
+- 支持标准化的提交信息格式
+
+### 启动图形界面：
+```shell
+$ g ui
+```

package/index.js

@@ -1,2 +1,2 @@
-import config from './src/config.js'
-export default config
+import config from './src/config.js'
+export default config

package/package.json

@@ -1,66 +1,69 @@
-{
-  "name": "zen-gitsync",
-  "version": "2.1.3",
-  "description": "一个 git 自动查看差异并提交的工具",
-  "main": "index.js",
-  "type": "module",
-  "scripts": {
-    "g": "node ./src/gitCommit.js",
-    "g:m": "node ./src/gitCommit.js -m='test'",
-    "g:m2": "node ./src/gitCommit.js -m testmsg",
-    "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:cwd2": "node ./src/gitCommit.js --path=../",
-    "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",
-    "g:h": "node ./src/gitCommit.js -h",
-    "g:get-config": "node ./src/gitCommit.js get-config",
-    "g:addScript": "node ./src/gitCommit.js addScript",
-    "g:addResetScript": "node ./src/gitCommit.js addResetScript",
-    "g:set-default-message": "node ./src/gitCommit.js --set-default-message=\"提交\"",
-    "g:y": "g -y",
-    "g:reset": "git reset --hard origin/main",
-    "g:ui": "node ./src/gitCommit.js ui",
-    "start:vue": "cd ./src/ui/client && npm run dev",
-    "start:server": "node -e \"import('./src/ui/server/index.js').then(module => module.default())\""
-  },
-  "files": [
-    "src/*",
-    "!src/ui/client/**",
-    "package.json",
-    "index.js"
-  ],
-  "bin": {
-    "g": "./src/gitCommit.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/xz333221/zen-gitsync.git"
-  },
-  "keywords": [
-    "gitsync",
-    "git"
-  ],
-  "author": "",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/xz333221/zen-gitsync/issues"
-  },
-  "homepage": "https://github.com/xz333221/zen-gitsync#readme",
-  "dependencies": {
-    "boxen": "^8.0.1",
-    "chalk": "^5.4.1",
-    "chokidar": "^4.0.3",
-    "cli-table3": "^0.6.5",
-    "date-fns": "^4.1.0",
-    "express": "^5.1.0",
-    "log-update": "^6.1.0",
-    "open": "^10.1.2",
-    "ora": "^8.1.1",
-    "socket.io": "^4.8.1",
-    "socket.io-client": "^4.8.1",
-    "string-width": "^7.2.0"
-  }
-}
+{
+  "name": "zen-gitsync",
+  "version": "2.1.6",
+  "description": "一个 git 自动查看差异并提交的工具",
+  "main": "index.js",
+  "type": "module",
+  "scripts": {
+    "g": "node ./src/gitCommit.js",
+    "g:m": "node ./src/gitCommit.js -m='test'",
+    "g:m2": "node ./src/gitCommit.js -m testmsg",
+    "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:cwd2": "node ./src/gitCommit.js --path=../",
+    "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",
+    "g:h": "node ./src/gitCommit.js -h",
+    "g:get-config": "node ./src/gitCommit.js get-config",
+    "g:addScript": "node ./src/gitCommit.js addScript",
+    "g:addResetScript": "node ./src/gitCommit.js addResetScript",
+    "g:set-default-message": "node ./src/gitCommit.js --set-default-message=\"提交\"",
+    "g:y": "g -y",
+    "g:reset": "git reset --hard origin/main",
+    "g:ui": "node ./src/gitCommit.js ui",
+    "start:vue": "cd ./src/ui/client && npm run dev",
+    "start:server": "node -e \"import('./src/ui/server/index.js').then(module => module.default())\""
+  },
+  "files": [
+    "src/ui/public/**",
+    "src/ui/server/**",
+    "src/utils/**",
+    "src/gitCommit.js",
+    "src/config.js",
+    "package.json",
+    "index.js"
+  ],
+  "bin": {
+    "g": "./src/gitCommit.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/xz333221/zen-gitsync.git"
+  },
+  "keywords": [
+    "gitsync",
+    "git"
+  ],
+  "author": "",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/xz333221/zen-gitsync/issues"
+  },
+  "homepage": "https://github.com/xz333221/zen-gitsync#readme",
+  "dependencies": {
+    "boxen": "^8.0.1",
+    "chalk": "^5.4.1",
+    "chokidar": "^4.0.3",
+    "cli-table3": "^0.6.5",
+    "date-fns": "^4.1.0",
+    "express": "^5.1.0",
+    "log-update": "^6.1.0",
+    "open": "^10.1.2",
+    "ora": "^8.1.1",
+    "socket.io": "^4.8.1",
+    "socket.io-client": "^4.8.1",
+    "string-width": "^7.2.0"
+  }
+}

package/src/config.js

@@ -1,51 +1,51 @@
-import { promises as fs } from 'fs';
-import path from 'path';
-import os from 'os';
-import chalk from 'chalk';
-
-const configPath = path.join(os.homedir(), '.git-commit-tool.json');
-
-// 默认配置
-const defaultConfig = {
-  defaultCommitMessage: "submit",
-  descriptionTemplates: []  // 添加描述模板数组
-};
-
-// 异步读取配置文件
-async function loadConfig() {
-  try {
-    const data = await fs.readFile(configPath, 'utf-8');
-    return { ...defaultConfig, ...JSON.parse(data) };
-  } catch (error) {
-    return defaultConfig;
-  }
-}
-
-// 异步保存配置
-async function saveConfig(config) {
-  await fs.writeFile(configPath, JSON.stringify(config, null, 2), 'utf-8');
-}
-// 添加配置管理函数
-async function handleConfigCommands() {
-  if (process.argv.includes('get-config')) {
-    const currentConfig = await loadConfig();
-    console.log('Current configuration:');
-    console.log(currentConfig);
-    process.exit();
-  }
-
-  const setMsgArg = process.argv.find(arg => arg.startsWith('--set-default-message='));
-  if (setMsgArg) {
-    const newMessage = setMsgArg.split('=')[1];
-    const currentConfig = await loadConfig();
-    currentConfig.defaultCommitMessage = newMessage;
-    await saveConfig(currentConfig);
-    console.log(chalk.green(`✓ 默认提交信息已设置为: "${newMessage}"`));
-    process.exit();
-  }
-}
-export default {
-  loadConfig,
-  saveConfig,
-  handleConfigCommands
-};
+import { promises as fs } from 'fs';
+import path from 'path';
+import os from 'os';
+import chalk from 'chalk';
+
+const configPath = path.join(os.homedir(), '.git-commit-tool.json');
+
+// 默认配置
+const defaultConfig = {
+  defaultCommitMessage: "submit",
+  descriptionTemplates: []  // 添加描述模板数组
+};
+
+// 异步读取配置文件
+async function loadConfig() {
+  try {
+    const data = await fs.readFile(configPath, 'utf-8');
+    return { ...defaultConfig, ...JSON.parse(data) };
+  } catch (error) {
+    return defaultConfig;
+  }
+}
+
+// 异步保存配置
+async function saveConfig(config) {
+  await fs.writeFile(configPath, JSON.stringify(config, null, 2), 'utf-8');
+}
+// 添加配置管理函数
+async function handleConfigCommands() {
+  if (process.argv.includes('get-config')) {
+    const currentConfig = await loadConfig();
+    console.log('Current configuration:');
+    console.log(currentConfig);
+    process.exit();
+  }
+
+  const setMsgArg = process.argv.find(arg => arg.startsWith('--set-default-message='));
+  if (setMsgArg) {
+    const newMessage = setMsgArg.split('=')[1];
+    const currentConfig = await loadConfig();
+    currentConfig.defaultCommitMessage = newMessage;
+    await saveConfig(currentConfig);
+    console.log(chalk.green(`✓ 默认提交信息已设置为: "${newMessage}"`));
+    process.exit();
+  }
+}
+export default {
+  loadConfig,
+  saveConfig,
+  handleConfigCommands
+};