@aspruyt/xfg 3.9.2 → 3.9.4

package/dist/cli/settings-command.js

@@ -192,7 +192,7 @@ async function processRulesets(repos, config, options, processor, repoProcessor,
 /**
  * Process repo settings for all configured repositories.
  */
-async function processRepoSettings(repos, config, options, processorFactory, results, collector, lifecycleSkipped) {
+async function processRepoSettings(repos, config, options, processorFactory, results, collector, lifecycleSkipped, indexOffset) {
     if (repos.length === 0) {
         return;
     }
@@ -200,6 +200,7 @@ async function processRepoSettings(repos, config, options, processorFactory, res
     console.log(`\nProcessing repo settings for ${repos.length} repositories\n`);
     for (let i = 0; i < repos.length; i++) {
         const repoConfig = repos[i];
+        const current = indexOffset + i + 1;
         if (lifecycleSkipped.has(repoConfig.git)) {
             continue;
         }
@@ -210,7 +211,7 @@ async function processRepoSettings(repos, config, options, processorFactory, res
             });
         }
         catch (error) {
-            logger.error(i + 1, repoConfig.git, String(error));
+            logger.error(current, repoConfig.git, String(error));
             collector.appendError(repoConfig.git, error);
             continue;
         }
@@ -220,14 +221,14 @@ async function processRepoSettings(repos, config, options, processorFactory, res
                 dryRun: options.dryRun,
             });
             if (result.planOutput && result.planOutput.lines.length > 0) {
-                console.log(`\n  ${chalk.bold(repoName)}:`);
-                console.log("  Repo Settings:");
+                logger.info("");
+                logger.info(chalk.bold(`${repoName} - Repo Settings:`));
                 for (const line of result.planOutput.lines) {
-                    console.log(line);
+                    logger.info(line);
                 }
                 if (result.warnings && result.warnings.length > 0) {
                     for (const warning of result.warnings) {
-                        console.log(chalk.yellow(`  ⚠️  Warning: ${warning}`));
+                        logger.info(chalk.yellow(`Warning: ${warning}`));
                     }
                 }
             }
@@ -235,10 +236,10 @@ async function processRepoSettings(repos, config, options, processorFactory, res
                 // Silent skip
             }
             else if (result.success) {
-                console.log(chalk.green(`  ✓ ${repoName}: ${result.message}`));
+                logger.success(current, repoName, result.message);
             }
             else {
-                console.log(chalk.red(`  ✗ ${repoName}: ${result.message}`));
+                logger.error(current, repoName, result.message);
             }
             if (!result.skipped) {
                 const existing = results.find((r) => r.repoName === repoName);
@@ -259,7 +260,7 @@ async function processRepoSettings(repos, config, options, processorFactory, res
             }
         }
         catch (error) {
-            logger.error(i + 1, repoName, String(error));
+            logger.error(current, repoName, String(error));
             collector.appendError(repoName, error);
         }
     }
@@ -312,7 +313,7 @@ export async function runSettings(options, processorFactory = defaultRulesetProc
     const allRepos = [...reposWithRulesets, ...reposWithRepoSettings];
     const lifecycleSkipped = await runLifecycleChecks(allRepos, config, options, lm, results, collector, tokenManager);
     await processRulesets(reposWithRulesets, config, options, processor, repoProcessor, results, collector, lifecycleSkipped);
-    await processRepoSettings(reposWithRepoSettings, config, options, repoSettingsProcessorFactory, results, collector, lifecycleSkipped);
+    await processRepoSettings(reposWithRepoSettings, config, options, repoSettingsProcessorFactory, results, collector, lifecycleSkipped, reposWithRulesets.length);
     console.log("");
     const report = buildSettingsReport(collector.getAll());
     const lines = formatSettingsReportCLI(report);

package/dist/output/unified-summary.js

@@ -7,6 +7,7 @@ import { formatValuePlain, formatRulesetConfigPlain, } from "./settings-report.j
 // =============================================================================
 function formatCombinedSummary(input) {
     const parts = [];
+    const dry = input.dryRun;
     // Lifecycle totals
     if (input.lifecycle) {
         const t = input.lifecycle.totals;
@@ -14,11 +15,11 @@ function formatCombinedSummary(input) {
         if (repoTotal > 0) {
             const repoParts = [];
             if (t.created > 0)
-                repoParts.push(`${t.created} to create`);
+                repoParts.push(`${t.created} ${dry ? "to create" : "created"}`);
             if (t.forked > 0)
-                repoParts.push(`${t.forked} to fork`);
+                repoParts.push(`${t.forked} ${dry ? "to fork" : "forked"}`);
             if (t.migrated > 0)
-                repoParts.push(`${t.migrated} to migrate`);
+                repoParts.push(`${t.migrated} ${dry ? "to migrate" : "migrated"}`);
             const repoWord = repoTotal === 1 ? "repo" : "repos";
             parts.push(`${repoTotal} ${repoWord} (${repoParts.join(", ")})`);
         }
@@ -30,11 +31,11 @@ function formatCombinedSummary(input) {
         if (fileTotal > 0) {
             const fileParts = [];
             if (t.files.create > 0)
-                fileParts.push(`${t.files.create} to create`);
+                fileParts.push(`${t.files.create} ${dry ? "to create" : "created"}`);
             if (t.files.update > 0)
-                fileParts.push(`${t.files.update} to update`);
+                fileParts.push(`${t.files.update} ${dry ? "to update" : "updated"}`);
             if (t.files.delete > 0)
-                fileParts.push(`${t.files.delete} to delete`);
+                fileParts.push(`${t.files.delete} ${dry ? "to delete" : "deleted"}`);
             const fileWord = fileTotal === 1 ? "file" : "files";
             parts.push(`${fileTotal} ${fileWord} (${fileParts.join(", ")})`);
         }
@@ -47,9 +48,9 @@ function formatCombinedSummary(input) {
             const settingWord = settingsTotal === 1 ? "setting" : "settings";
             const actions = [];
             if (t.settings.add > 0)
-                actions.push(`${t.settings.add} to add`);
+                actions.push(`${t.settings.add} ${dry ? "to add" : "added"}`);
             if (t.settings.change > 0)
-                actions.push(`${t.settings.change} to change`);
+                actions.push(`${t.settings.change} ${dry ? "to change" : "changed"}`);
             parts.push(`${settingsTotal} ${settingWord} (${actions.join(", ")})`);
         }
         const rulesetsTotal = t.rulesets.create + t.rulesets.update + t.rulesets.delete;
@@ -57,18 +58,19 @@ function formatCombinedSummary(input) {
             const rulesetWord = rulesetsTotal === 1 ? "ruleset" : "rulesets";
             const actions = [];
             if (t.rulesets.create > 0)
-                actions.push(`${t.rulesets.create} to create`);
+                actions.push(`${t.rulesets.create} ${dry ? "to create" : "created"}`);
             if (t.rulesets.update > 0)
-                actions.push(`${t.rulesets.update} to update`);
+                actions.push(`${t.rulesets.update} ${dry ? "to update" : "updated"}`);
             if (t.rulesets.delete > 0)
-                actions.push(`${t.rulesets.delete} to delete`);
+                actions.push(`${t.rulesets.delete} ${dry ? "to delete" : "deleted"}`);
             parts.push(`${rulesetsTotal} ${rulesetWord} (${actions.join(", ")})`);
         }
     }
     if (parts.length === 0) {
         return "No changes";
     }
-    return `Plan: ${parts.join(", ")}`;
+    const prefix = dry ? "Plan" : "Applied";
+    return `${prefix}: ${parts.join(", ")}`;
 }
 function hasAnyChanges(input) {
     if (input.lifecycle && hasLifecycleChanges(input.lifecycle))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspruyt/xfg",
-  "version": "3.9.2",
+  "version": "3.9.4",
   "description": "CLI tool for repository-as-code: sync files and manage settings across GitHub, Azure DevOps, and GitLab",
   "type": "module",
   "main": "dist/index.js",