batch-exec-cli 1.2.2 → 1.3.0

package/README.md

@@ -4,7 +4,7 @@
 
 ## 功能特性
 
-- 🚀 高效遍历目标目录的所有直接子目录
+- 🚀 高效遍历目标目录的所有直接子目录, 默认并行执行
 - 📁 支持绝对路径和相对路径
 - 🚫 可配置忽略目录（支持 `.gitignore` 风格的模式匹配）
 - 📊 提供执行摘要和失败目录列表
@@ -64,6 +64,7 @@ batch-exec ./repos ls -la
 | `-s, --skip <文件>` |      | 指定忽略文件路径（默认：`./.batchexecignore`） |
 | `-v, --verbose`     |      | 显示详细输出                                   |
 | `--no-progress`     |      | 禁用进度条显示                                 |
+| `--no-parallel`     |      | 禁用并行执行, 按顺序执行                       |
 | `-h, --help`        |      | 显示帮助信息                                   |
 
 ### 使用自定义忽略文件

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "batch-exec-cli",
-  "version": "1.2.2",
-  "description": "Efficiently iterate through directories and execute commands with progress display",
+  "version": "1.3.0",
+  "description": "Efficiently iterate through directories and execute commands with progress display and parallel execution",
   "type": "module",
   "main": "src/index.js",
   "bin": {

package/src/cli.js

@@ -10,7 +10,7 @@ $.verbose = false;
 
 async function main() {
   const argv = minimist(process.argv.slice(2), {
-    boolean: ['v', 'verbose', 'h', 'help', 'no-progress'],
+    boolean: ['v', 'verbose', 'h', 'help', 'no-progress', 'no-parallel'],
     string: ['s', 'skip'],
     alias: {
       s: 'skip',
@@ -45,6 +45,7 @@ async function main() {
     console.log(bold('\n🚀 Batch Executor\n'));
     console.log(`Target directory: ${cyan(targetDir)}`);
     console.log(`Command: ${yellow(command)} ${args.join(' ')}`);
+    console.log(`Parallel mode: ${argv.parallel === false ? red('Disabled') : green('Enabled')}`);
     if (skipPaths.length > 0) {
       console.log(`Skipping directories: ${gray(skipPaths.join(', '))}`);
     }
@@ -55,7 +56,8 @@ async function main() {
     const results = await batchExecute(targetDir, command, args, {
       skipPaths,
       verbose: argv.verbose,
-      showProgress: argv.progress !== false
+      showProgress: argv.progress !== false,
+      parallel: argv.parallel !== false
     });
 
     printSummary(results);
@@ -67,7 +69,7 @@ async function main() {
 
 function printHelp() {
   console.log(`
-${bold('Batch Executor')} ${dim('v1.1.0')}
+${bold('Batch Executor')} ${dim('v1.3.0')}
 
 ${cyan('Usage:')} batch-exec [options] <directory> <command> [args...]
 
@@ -82,12 +84,14 @@ ${magenta('Options:')}
   -s, --skip <file>  Ignore file path (default: ./.batchexecignore)
   -v, --verbose      Show verbose output
       --no-progress  Disable progress bar
+      --no-parallel  Disable parallel execution (use sequential mode)
   -h, --help         Show this help message
 
 ${green('Examples:')}
   ${green('batch-exec')} ./my-projects git pull
   ${green('batch-exec')} ./my-projects npm update lodash -S
   ${green('batch-exec')} --skip ./custom-ignore.txt ./repos ls -la
+  ${green('batch-exec')} --no-parallel ./my-projects npm install
 `);
 }
 

package/src/index.js

@@ -1,5 +1,5 @@
 import path from 'path';
-import { $, cd } from 'zx';
+import { $, within, cd } from 'zx';
 import { parseIgnoreFile } from './ignoreParser.js';
 import { listDirectSubdirectories } from './directoryLister.js';
 import { cyan, red, ProgressBar, clearLine } from './utils/colors.js';
@@ -7,8 +7,55 @@ import { cyan, red, ProgressBar, clearLine } from './utils/colors.js';
 export { parseIgnoreFile };
 export { listDirectSubdirectories };
 
+async function executeInDirectory(subdirPath, command, args, verbose) {
+  try {
+    if (verbose) {
+      console.log(`=== Executing in: ${cyan(subdirPath)} ===`);
+    }
+
+    let result;
+
+    await within(async () => {
+      cd(subdirPath);
+      if (verbose) {
+        result = await $`${command} ${args}`;
+      } else {
+        result = await $`${command} ${args}`.quiet();
+      }
+      if (verbose) {
+        console.log(`${cyan(subdirPath)}: `, result.stdout);
+        if (result.stderr) {
+          console.error(`${cyan(subdirPath)}: `, result.stderr);
+        }
+      }
+    });
+
+    return {
+      success: true,
+      stdout: result.stdout,
+      stderr: result.stderr
+    };
+  } catch (error) {
+    if (verbose) {
+      console.error(red(`Error in ${cyan(subdirPath)}: ${error.message}`));
+      if (error.stdout) {
+        console.log(`${cyan(subdirPath)}: `, error.stdout);
+      }
+      if (error.stderr) {
+        console.error(`${cyan(subdirPath)}: `, error.stderr);
+      }
+    }
+    return {
+      success: false,
+      error: error.message,
+      stdout: error.stdout || '',
+      stderr: error.stderr || ''
+    };
+  }
+}
+
 export async function batchExecute(targetDir, command, args, options = {}) {
-  const { skipPaths = [], verbose = false, showProgress = true } = options;
+  const { skipPaths = [], verbose = false, showProgress = true, parallel = true } = options;
 
   const absoluteTargetDir = path.resolve(targetDir);
 
@@ -22,60 +69,54 @@ export async function batchExecute(targetDir, command, args, options = {}) {
     progressBar.start();
   }
 
-  for (let i = 0; i < subdirs.length; i++) {
-    const subdir = subdirs[i];
-    const subdirPath = path.join(absoluteTargetDir, subdir);
+  if (parallel) {
+    const promises = subdirs.map(async (subdir, index) => {
+      const subdirPath = path.join(absoluteTargetDir, subdir);
+      const result = await executeInDirectory(subdirPath, command, args, verbose);
 
-    try {
-      if (verbose) {
-        console.log(`=== Executing in: ${cyan(subdirPath)} ===`);
+      if (progressBar) {
+        progressBar.increment();
       }
 
-      let result;
+      return { directory: subdir, ...result };
+    });
 
-      cd(subdirPath);
+    const resolvedResults = await Promise.all(promises);
 
-      if (verbose) {
-        result = await $`${command} ${args}`;
-      } else {
-        result = await $`${command} ${args}`.quiet();
-      }
-
-      results.push({
-        directory: subdir,
-        success: true,
-        stdout: result.stdout,
-        stderr: result.stderr
-      });
-
-      if (verbose) {
-        console.log(result.stdout);
-        if (result.stderr) {
-          console.error(result.stderr);
-        }
-      }
-    } catch (error) {
-      results.push({
-        directory: subdir,
-        success: false,
-        error: error.message,
-        stdout: error.stdout || '',
-        stderr: error.stderr || ''
-      });
-
-      if (verbose) {
-        console.error(red(`Error in ${cyan(subdir)}: ${error.message}`));
-        if (error.stdout) {
-          console.log(error.stdout);
-        }
-        if (error.stderr) {
-          console.error(error.stderr);
-        }
+    for (const subdir of subdirs) {
+      const result = resolvedResults.find(r => r.directory === subdir);
+      if (result) {
+        results.push(result);
       }
     }
-
-    if (progressBar) {
-      progressBar.update(i + 1);
+  } else {
+    for (let i = 0; i < subdirs.length; i++) {
+      const subdir = subdirs[i];
+      const subdirPath = path.join(absoluteTargetDir, subdir);
+      const result = await executeInDirectory(subdirPath, command, args, verbose);
+
+      results.push({ directory: subdir, ...result });
+
+      // if (verbose) {
+      //   if (result.success) {
+      //     console.log(result.stdout);
+      //     if (result.stderr) {
+      //       console.error(result.stderr);
+      //     }
+      //   } else {
+      //     console.error(red(`Error in ${cyan(subdir)}: ${result.error}`));
+      //     if (result.stdout) {
+      //       console.log(result.stdout);
+      //     }
+      //     if (result.stderr) {
+      //       console.error(result.stderr);
+      //     }
+      //   }
+      // }
+
+      if (progressBar) {
+        progressBar.update(i + 1);
+      }
     }
   }