zen-gitsync 1.2.5 → 1.2.8

package/README.md

@@ -48,3 +48,17 @@ $ g --path=./
 ```bash
 $ g --cwd=./
 ```
+
+#### 添加项目script
+```json
+{
+   "scripts": {
+      "g:y": "g -y"
+   }
+}
+```
+
+#### cmd同步文件夹
+```shell
+start /min cmd /k "g -y --path=你要同步的文件夹 --interval"
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zen-gitsync",
-  "version": "1.2.5",
+  "version": "1.2.8",
   "description": "控制台输入g，回车，输入提交内容，自动执行git add+commit+push",
   "main": "index.js",
   "type": "module",
@@ -31,6 +31,10 @@
   },
   "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

@@ -4,6 +4,9 @@ import {exec, execSync} from 'child_process'
 import os from 'os'
 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
 
@@ -103,8 +106,20 @@ class GitCommit {
   exec_push() {
     // 执行 git push
     // this.execSyncGitCommand(`git push`);
-    this.execGitCommand('git push', {}, (error, stdout, stderr) => {
-      console.log('提交完成。')
+    const spinner = ora('正在推送代码...').start();
+    this.execGitCommand('git push', {
+      spinner
+    }, (error, stdout, stderr) => {
+
+      // 使用 boxen 绘制带边框的消息
+      const message = chalk.green.bold(' SUCCESS: 提交完成 ');
+      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();
     })
@@ -115,6 +130,9 @@ class GitCommit {
       let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024} = options
       let cwd = getCwd()
       const output = execSync(command, {encoding, maxBuffer, cwd})
+      if(options.spinner){
+        options.spinner.stop();
+      }
       let result = output.trim()
       coloredLog(command, result)
       return result
@@ -128,6 +146,9 @@ class GitCommit {
     let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024} = options
     let cwd = getCwd()
     exec(command, {encoding, maxBuffer, cwd}, (error, stdout, stderr) => {
+      if(options.spinner){
+        options.spinner.stop();
+      }
       if (error) {
         coloredLog(command, error)
         return

package/src/utils/index.js

@@ -15,6 +15,40 @@
 // const boxedMessage = boxen(message, options);
 // console.log(boxedMessage);
 import stringWidth from 'string-width';
+import Table from 'cli-table3';
+import chalk from 'chalk';
+
+const printTableWithHeaderUnderline = () => {
+  // 获取终端的列数（宽度）
+  const terminalWidth = process.stdout.columns;
+
+  // 计算表格的宽度，保证至少有 2 个字符留给边框
+  const tableWidth = terminalWidth - 4; // 4 是左右边框和分隔符的宽度
+
+  // 计算每列的宽度
+  const colWidths = [tableWidth]; // 只有一列，因此宽度设置为终端宽度
+
+  const table = new Table({
+    head: ['Name'],  // 只有一个表头
+    colWidths,       // 使用动态计算的列宽
+    style: {
+      head: ['cyan'], // 表头文字颜色为cyan
+      border: ['yellow'],         // 边框颜色为黄色
+      compact: true,              // 启用紧凑模式，去掉不必要的空白
+    },
+    wordWrap: true,  // 启用自动换行
+  });
+
+  // 向表格中添加不同颜色的行
+  table.push(
+    [chalk.red('张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三张三')],
+    [chalk.green('李四')],
+  );
+
+  console.log(table.toString()); // 输出表格
+};
+
+// printTableWithHeaderUnderline();
 
 const colors = [
   '\x1b[31m',  // 红色
@@ -40,10 +74,6 @@ const coloredLog = (...args) => {
   // 获取控制台的宽度
   const terminalWidth = process.stdout.columns;
 
-  // 创建与控制台宽度相同的横线
-  // const line = '-'.repeat(terminalWidth);
-  let str = '├─'
-  let str2 = '│'
   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() !== '');
@@ -77,6 +107,7 @@ const coloredLog = (...args) => {
       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
       }