pan-stack-cli 0.1.4 → 0.2.1

package/lib/git/git-pull.js

@@ -1,39 +1,80 @@
 #!/usr/bin/env node
 /*
- * Pull latest changes for PAN Stack project repositories from a clone manifest.
- *
- * Skips repositories that do not exist or are not git checkouts. Failures warn
- * and continue so one broken repo does not block the rest.
+ * Pull latest changes for PAN Stack project repositories.
+ * In compact summary table: repo · branch · result · changes · conflict.
  */
 
 const { parseCommonArgs, loadManifestRepos, printCommonOptions } = require("./helpers/cli");
-const { ensureRepoExists, runGit } = require("./helpers/git");
+const { ensureRepoExists } = require("./helpers/git");
+const {
+  runGitSilent, parsePullOutput, printSummary, statusBadge, bulkColumns, pullModeLabel,
+  getCurrentBranch, listConflictedFiles,
+} = require("./helpers/bulk-report");
+const colors = require("./helpers/colors");
+const { t } = require("../i18n");
 
 function pullRepo({ name, destination, dryRun, rebase }) {
   if (!ensureRepoExists({ name, destination })) {
-    return;
+    return { name, skipped: true };
   }
+  const branch = getCurrentBranch(destination) || t("GST_DETACHED");
+  const gitArgs = ["pull", "--stat"];
+  if (rebase) gitArgs.push("--rebase");
 
-  const gitArgs = ["pull"];
-  if (rebase) {
-    gitArgs.push("--rebase");
+  if (dryRun) {
+    console.log(colors.dim(`[dry-run] (in ${destination}) git ${gitArgs.join(" ")}`));
+    return { name, branch, dryRun: true };
   }
 
-  const status = runGit(gitArgs, {
-    cwd: destination,
-    dryRun,
-    action: "pull",
-    name,
-  });
-  if (status !== 0) {
-    console.log(`[warn] ${name}: pull failed, check branch state or remote access`);
-  }
+  process.stdout.write(colors.dim(`  ↻ ${name} (${branch}) ... `));
+  const res = runGitSilent(gitArgs, destination);
+  const parsed = parsePullOutput(res.stdout, res.stderr);
+  const conflictFiles = parsed.conflict ? listConflictedFiles(destination) : [];
+  const ok = res.status === 0 && !parsed.conflict;
+
+  const shortMsg = parsed.upToDate ? t("BULK_STATUS_UP_TO_DATE")
+    : parsed.conflict ? t("BULK_STATUS_CONFLICT")
+    : parsed.mode !== "unknown" ? pullModeLabel(parsed.mode)
+    : ok ? t("BULK_STATUS_PULLED") : t("BULK_STATUS_FAILED");
+  console.log((ok ? colors.green : parsed.conflict ? colors.yellow : colors.red)(shortMsg));
+
+  return {
+    name, branch,
+    status: res.status,
+    upToDate: parsed.upToDate,
+    conflict: parsed.conflict,
+    conflictFiles,
+    mode: parsed.mode,
+    filesChanged: parsed.filesChanged,
+    insertions: parsed.insertions,
+    deletions: parsed.deletions,
+    error: res.status !== 0 && !parsed.conflict ? (res.stderr.split("\n")[0] || "").slice(0, 80) : "",
+  };
+}
+
+function row(r) {
+  if (r.skipped) return { repo: colors.dim(r.name), branch: "", result: colors.dim(t("BULK_STATUS_SKIPPED")), changes: "", conflict: "" };
+  if (r.dryRun) return { repo: r.name, branch: r.branch, result: colors.dim(t("BULK_STATUS_DRY_RUN")), changes: "", conflict: "" };
+  const result =
+    r.upToDate ? statusBadge("ok", t("BULK_STATUS_UP_TO_DATE"))
+    : r.conflict ? statusBadge("warn", t("BULK_STATUS_CONFLICT"))
+    : r.error ? statusBadge("fail", t("BULK_STATUS_FAILED"))
+    : statusBadge("ok", r.mode && r.mode !== "unknown" ? pullModeLabel(r.mode) : t("BULK_STATUS_PULLED"));
+  const filesLabel = r.filesChanged === 1 ? t("BULK_FILES_ONE") : t("BULK_FILES_MANY");
+  const changes = r.filesChanged
+    ? `${r.filesChanged} ${filesLabel} ${colors.green("+" + r.insertions)} ${colors.red("−" + r.deletions)}`
+    : colors.dim("—");
+  const conflict = r.conflict
+    ? colors.yellow(`${r.conflictFiles.length} ${r.conflictFiles.length === 1 ? t("BULK_FILES_ONE") : t("BULK_FILES_MANY")}`)
+    : colors.dim("—");
+  return { repo: r.name, branch: r.branch, result, changes, conflict };
 }
 
 function printHelp() {
   console.log(`usage: git-pull.js [--base-dir BASE_DIR] [--dry-run] [--rebase] [manifest]
 
 Pull latest changes for repositories listed in a PAN Stack clone manifest.
+Prints a compact summary table (repo · branch · result · changes · conflict).
 
 ${printCommonOptions()}
   --rebase             Use git pull --rebase`);
@@ -42,35 +83,55 @@ ${printCommonOptions()}
 function main() {
   const args = parseCommonArgs(process.argv.slice(2), {
     defaults: { rebase: false },
-    handlers: {
-      "--rebase": (parsed) => {
-        parsed.rebase = true;
-      },
-    },
+    handlers: { "--rebase": (p) => { p.rebase = true; } },
   });
-  if (args.help) {
-    printHelp();
-    return;
-  }
+  if (args.help) { printHelp(); return; }
 
-  const { repos } = loadManifestRepos({
-    manifestPath: args.manifest,
-    baseDir: args.baseDir,
-  });
+  const { repos } = loadManifestRepos({ manifestPath: args.manifest, baseDir: args.baseDir });
+  const results = repos.map((r) => pullRepo({ name: r.name, destination: r.destination, dryRun: args.dryRun, rebase: args.rebase }));
+
+  const conflicts = results.filter((r) => r.conflict);
+  const pulled = results.filter((r) => !r.skipped && !r.dryRun && !r.upToDate && !r.conflict && !r.error);
+  const failed = results.filter((r) => r.error);
+  const upToDate = results.filter((r) => r.upToDate);
+  // Chỉ đưa vào bảng những repo có thay đổi / conflict / lỗi / dry-run (bỏ up-to-date).
+  const shown = results.filter((r) => r.dryRun || (!r.skipped && !r.upToDate));
+  const rows = shown.map(row);
+
+  const footer = [];
+  footer.push(colors.dim(t("PULL_FOOTER_COUNTS__TOTAL_CHANGED_UPTODATE_CONFLICT_FAILED", {
+    total: results.length, changed: pulled.length, upToDate: upToDate.length,
+    conflict: conflicts.length, failed: failed.length,
+  })));
+  if (conflicts.length) {
+    footer.push("");
+    footer.push(colors.bold(colors.yellow(t("PULL_CONFLICT_HEADER"))));
+    for (const c of conflicts) {
+      footer.push(`  ${colors.cyan(c.name)} (${c.branch}): ${c.conflictFiles.join(", ") || "(git status)"}`);
+    }
+  }
 
-  for (const repo of repos) {
-    pullRepo({
-      name: repo.name,
-      destination: repo.destination,
-      dryRun: args.dryRun,
-      rebase: args.rebase,
+  if (rows.length === 0) {
+    console.log("");
+    console.log(colors.bold(`─── ${t("PULL_TITLE")} ───`));
+    console.log(colors.green(t("PULL_ALL_UP_TO_DATE__N", { n: results.length })));
+    for (const line of footer) console.log(line);
+  } else {
+    printSummary({
+      title: t("PULL_TITLE"),
+      rows,
+      columns: bulkColumns([
+        { key: "repo", labelKey: "BULK_COL_REPO" },
+        { key: "branch", labelKey: "BULK_COL_BRANCH" },
+        { key: "result", labelKey: "BULK_COL_RESULT" },
+        { key: "changes", labelKey: "BULK_COL_CHANGES" },
+        { key: "conflict", labelKey: "BULK_COL_CONFLICT" },
+      ]),
+      footerLines: footer,
     });
   }
-}
 
-try {
-  main();
-} catch (error) {
-  console.error(error.message);
-  process.exit(1);
+  if (conflicts.length || failed.length) process.exitCode = 1;
 }
+
+try { main(); } catch (error) { console.error(error.message); process.exit(1); }

package/lib/git/git-push.js

@@ -1,39 +1,104 @@
 #!/usr/bin/env node
 /*
- * Push local commits for PAN Stack project repositories from a clone manifest.
- *
- * Skips repositories that do not exist or are not git checkouts. Failures warn
- * and continue so one broken repo does not block the rest.
+ * Push local commits for PAN Stack project repositories.
+ * Compact summary table: repo · branch · result · commits · MR/PR link.
  */
 
 const { parseCommonArgs, loadManifestRepos, printCommonOptions } = require("./helpers/cli");
-const { ensureRepoExists, runGit } = require("./helpers/git");
+const { ensureRepoExists } = require("./helpers/git");
+const {
+  runGitSilent, parsePushOutput, printSummary, statusBadge, bulkColumns,
+  aheadBehind, aheadLineStats, getCurrentBranch,
+} = require("./helpers/bulk-report");
+const colors = require("./helpers/colors");
+const { t } = require("../i18n");
+
+function formatChanges(r) {
+  if (!r.filesChanged && !r.insertions && !r.deletions) return colors.dim("—");
+  const filesLabel = r.filesChanged === 1 ? t("BULK_FILES_ONE") : t("BULK_FILES_MANY");
+  const filesPart = r.filesChanged
+    ? `${r.filesChanged} ${filesLabel} `
+    : "";
+  return `${filesPart}${colors.green("+" + (r.insertions || 0))} ${colors.red("−" + (r.deletions || 0))}`;
+}
 
 function pushRepo({ name, destination, dryRun, setUpstream }) {
   if (!ensureRepoExists({ name, destination })) {
-    return;
+    return { name, skipped: true };
   }
+  const branch = getCurrentBranch(destination) || t("GST_DETACHED");
+  // Đếm commit + line change chờ push TRƯỚC push (sau push @{u} đã bắt kịp HEAD).
+  const ab = aheadBehind(destination);
+  const commitsAhead = ab ? ab.ahead : 0;
+  const lines = commitsAhead > 0
+    ? aheadLineStats(destination)
+    : { insertions: 0, deletions: 0, filesChanged: 0 };
 
   const gitArgs = ["push"];
-  if (setUpstream) {
-    gitArgs.push("-u", "origin", "HEAD");
+  if (setUpstream) gitArgs.push("-u", "origin", "HEAD");
+
+  if (dryRun) {
+    console.log(colors.dim(`[dry-run] (in ${destination}) git ${gitArgs.join(" ")}`));
+    return { name, branch, dryRun: true, commitsAhead, ...lines };
   }
 
-  const status = runGit(gitArgs, {
-    cwd: destination,
-    dryRun,
-    action: "push",
-    name,
-  });
-  if (status !== 0) {
-    console.log(`[warn] ${name}: push failed, check branch state or remote access`);
+  process.stdout.write(colors.dim(`  ↑ ${name} (${branch}) ... `));
+  const res = runGitSilent(gitArgs, destination);
+  const parsed = parsePushOutput(res.stdout, res.stderr);
+  const ok = res.status === 0 && !parsed.rejected;
+  const shortMsg = parsed.rejected ? t("BULK_STATUS_REJECTED")
+    : parsed.upToDate ? t("BULK_STATUS_UP_TO_DATE")
+    : parsed.pushed ? t("BULK_STATUS_PUSHED")
+    : ok ? t("BULK_STATUS_OK")
+    : t("BULK_STATUS_FAILED");
+  console.log((ok ? (parsed.upToDate ? colors.dim : colors.green) : colors.red)(shortMsg));
+
+  return {
+    name, branch, commitsAhead,
+    insertions: lines.insertions,
+    deletions: lines.deletions,
+    filesChanged: lines.filesChanged,
+    status: res.status,
+    pushed: parsed.pushed,
+    upToDate: parsed.upToDate,
+    rejected: parsed.rejected,
+    mrLink: parsed.mrLink,
+    refs: parsed.refs,
+    error: res.status !== 0 && !parsed.rejected ? (res.stderr.split("\n")[0] || "").slice(0, 80) : "",
+  };
+}
+
+function row(r) {
+  if (r.skipped) {
+    return {
+      repo: colors.dim(r.name), branch: "", result: colors.dim(t("BULK_STATUS_SKIPPED")),
+      commits: "", changes: "", link: "",
+    };
   }
+  if (r.dryRun) {
+    return {
+      repo: r.name, branch: r.branch, result: colors.dim(t("BULK_STATUS_DRY_RUN")),
+      commits: String(r.commitsAhead || 0), changes: formatChanges(r), link: "",
+    };
+  }
+  const result =
+    r.rejected ? statusBadge("fail", t("BULK_STATUS_REJECTED"))
+    : r.upToDate ? statusBadge("skip", t("BULK_STATUS_UP_TO_DATE"))
+    : r.error ? statusBadge("fail", t("BULK_STATUS_FAILED"))
+    : r.pushed ? statusBadge("ok", t("BULK_STATUS_PUSHED"))
+    : statusBadge("ok", t("BULK_STATUS_OK"));
+  const commits = r.commitsAhead
+    ? colors.cyan(String(r.commitsAhead))
+    : colors.dim("—");
+  const link = r.mrLink ? colors.cyan(r.mrLink) : colors.dim("—");
+  return { repo: r.name, branch: r.branch, result, commits, changes: formatChanges(r), link };
 }
 
 function printHelp() {
   console.log(`usage: git-push.js [--base-dir BASE_DIR] [--dry-run] [--set-upstream] [manifest]
 
 Push local commits for repositories listed in a PAN Stack clone manifest.
+Prints a compact summary table (repo · branch · result · commits · changes · MR/PR link).
 
 ${printCommonOptions()}
   --set-upstream       Use git push -u origin HEAD for new branches`);
@@ -42,35 +107,79 @@ ${printCommonOptions()}
 function main() {
   const args = parseCommonArgs(process.argv.slice(2), {
     defaults: { setUpstream: false },
-    handlers: {
-      "--set-upstream": (parsed) => {
-        parsed.setUpstream = true;
-      },
-    },
+    handlers: { "--set-upstream": (p) => { p.setUpstream = true; } },
   });
-  if (args.help) {
-    printHelp();
-    return;
-  }
+  if (args.help) { printHelp(); return; }
 
-  const { repos } = loadManifestRepos({
-    manifestPath: args.manifest,
-    baseDir: args.baseDir,
-  });
+  const { repos } = loadManifestRepos({ manifestPath: args.manifest, baseDir: args.baseDir });
+  const results = repos.map((r) => pushRepo({ name: r.name, destination: r.destination, dryRun: args.dryRun, setUpstream: args.setUpstream }));
+
+  const pushed = results.filter((r) => r.pushed);
+  const rejected = results.filter((r) => r.rejected);
+  const failed = results.filter((r) => r.error);
+  const upToDate = results.filter((r) => r.upToDate);
+  const withLink = results.filter((r) => r.mrLink);
+  // Chỉ đưa vào bảng: pushed / rejected / có MR link / lỗi / dry-run (bỏ up-to-date).
+  const shown = results.filter((r) => r.dryRun || r.pushed || r.rejected || r.error || r.mrLink);
+  const rows = shown.map(row);
+
+  const linesOf = (list) => list.reduce(
+    (acc, r) => ({
+      commits: acc.commits + (r.commitsAhead || 0),
+      insertions: acc.insertions + (r.insertions || 0),
+      deletions: acc.deletions + (r.deletions || 0),
+    }),
+    { commits: 0, insertions: 0, deletions: 0 }
+  );
+  const pushedLines = linesOf(pushed.length ? pushed : shown.filter((r) => r.dryRun && r.commitsAhead));
 
-  for (const repo of repos) {
-    pushRepo({
-      name: repo.name,
-      destination: repo.destination,
-      dryRun: args.dryRun,
-      setUpstream: args.setUpstream,
+  const footer = [];
+  footer.push(colors.dim(t("PUSH_FOOTER_COUNTS__TOTAL_PUSHED_UPTODATE_REJECTED_FAILED", {
+    total: results.length, pushed: pushed.length, upToDate: upToDate.length,
+    rejected: rejected.length, failed: failed.length,
+  })));
+  if (pushedLines.commits > 0 || pushedLines.insertions > 0 || pushedLines.deletions > 0) {
+    footer.push(colors.dim(t("PUSH_FOOTER_LINES__COMMITS_ADD_DEL", {
+      commits: pushedLines.commits,
+      add: pushedLines.insertions,
+      del: pushedLines.deletions,
+    })));
+  }
+  if (withLink.length) {
+    footer.push("");
+    footer.push(colors.bold(t("PUSH_LINKS_HEADER")));
+    for (const r of withLink) {
+      footer.push(`  ${colors.cyan(r.name)} (${r.branch}): ${r.mrLink}`);
+    }
+  }
+  if (rejected.length) {
+    footer.push("");
+    footer.push(colors.yellow(t("PUSH_REJECTED_HEADER")));
+    for (const r of rejected) footer.push(`  ${r.name}`);
+  }
+
+  if (rows.length === 0) {
+    console.log("");
+    console.log(colors.bold(`─── ${t("PUSH_TITLE")} ───`));
+    console.log(colors.green(t("PUSH_ALL_UP_TO_DATE__N", { n: results.length })));
+    for (const line of footer) console.log(line);
+  } else {
+    printSummary({
+      title: t("PUSH_TITLE"),
+      rows,
+      columns: bulkColumns([
+        { key: "repo", labelKey: "BULK_COL_REPO" },
+        { key: "branch", labelKey: "BULK_COL_BRANCH" },
+        { key: "result", labelKey: "BULK_COL_RESULT" },
+        { key: "commits", labelKey: "BULK_COL_COMMITS", align: "r" },
+        { key: "changes", labelKey: "BULK_COL_CHANGES" },
+        { key: "link", labelKey: "BULK_COL_LINK" },
+      ]),
+      footerLines: footer,
     });
   }
-}
 
-try {
-  main();
-} catch (error) {
-  console.error(error.message);
-  process.exit(1);
+  if (rejected.length || failed.length) process.exitCode = 1;
 }
+
+try { main(); } catch (error) { console.error(error.message); process.exit(1); }