@docker-doctor/cli 0.5.2 → 0.6.0

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as runDockerfileRules, c as createComposeLocator, d as discoverProject, f as version, i as runComposeRules, l as parseCompose, n as calculateScore, o as allRules, r as loadConfig, s as findRule, t as toJsonReport, u as parseDockerfile } from "./src-BOGzkp17.mjs";
+import { a as runDockerfileRules, c as createComposeLocator, d as discoverProject, f as version, i as runComposeRules, l as parseCompose, n as calculateScore, o as allRules, r as loadConfig, s as findRule, t as toJsonReport, u as parseDockerfile } from "./src-BLeXr_hR.mjs";
 import fs from "node:fs/promises";
 import path from "node:path";
 import os from "node:os";
@@ -580,6 +580,10 @@ const writeDiagnosticsDirectory = async (diagnostics, report, rootDir) => {
 			...d,
 			file: sanitizePath(d.file),
 			message: sanitizeMessage(d.message)
+		})),
+		failures: report.failures.map((failure) => ({
+			file: sanitizePath(failure.file),
+			message: sanitizeMessage(failure.message)
 		}))
 	};
 	await fs.writeFile(path.join(dir, "diagnostics.json"), JSON.stringify({
@@ -790,13 +794,24 @@ const printDiagnostics = (diagnostics, verbose, fileContents, categoryIssueCount
 			console.log(`  ${cat} › ${chalk.dim(issueLabel)}`);
 		}
 		console.log(`\n  Run ${chalk.cyan("docker-doctor --verbose")} to list every error and warning`);
-		const ruleCounts = {};
-		for (const d of diagnostics) ruleCounts[d.rule] = (ruleCounts[d.rule] || 0) + 1;
-		const migrationRules = Object.entries(ruleCounts).filter(([, count]) => count >= 5);
+		const findingsByRule = /* @__PURE__ */ new Map();
+		for (const d of diagnostics) {
+			const findings = findingsByRule.get(d.rule) ?? {
+				count: 0,
+				files: /* @__PURE__ */ new Set()
+			};
+			findings.count += 1;
+			findings.files.add(d.file);
+			findingsByRule.set(d.rule, findings);
+		}
+		const migrationRules = [...findingsByRule].filter(([, { count }]) => count >= 5);
 		if (migrationRules.length > 0) {
 			console.log();
 			console.log(`  ${chalk.yellow("⚠ Migration-scale change: sample before you sweep")}`);
-			for (const [rule, count] of migrationRules) console.log(`    ${chalk.cyan(rule)} ×${count} across ${count} files`);
+			for (const [rule, { count, files }] of migrationRules) {
+				const fileWord = files.size === 1 ? "file" : "files";
+				console.log(`    ${chalk.cyan(rule)} ×${count} across ${files.size} ${fileWord}`);
+			}
 			console.log(`    Fixing all of them at once is hard to review and prone to`);
 			console.log(`    subtle mistakes across the whole repo. Fix a representative`);
 			console.log(`    few first and confirm the recipe holds. Then get the code`);
@@ -851,7 +866,7 @@ const getWhaleMascot = (score, border) => {
 	];
 };
 const easeOutCubic = (x) => 1 - (1 - x) ** 3;
-const printScoreBox = async (score, label, categoryIssueCounts, warningsCount, errorsCount) => {
+const printScoreBox = async (score, label, warningsCount, errorsCount) => {
 	const { isTTY } = process.stdout;
 	const shouldAnimate = isTTY && !process.env.CI && !process.env.NO_ANIMATION && process.env.TERM !== "dumb" && process.env.NODE_ENV !== "test";
 	let scoreColor = chalk.red.bold;
@@ -925,7 +940,7 @@ const formatTerminal = async (diagnostics, score, label, project, verbose = fals
 		else if (d.severity === "error") errorsCount += 1;
 	}
 	printDiagnostics(diagnostics, verbose, fileContents, categoryIssueCounts);
-	await printScoreBox(score, label, categoryIssueCounts, warningsCount, errorsCount);
+	await printScoreBox(score, label, warningsCount, errorsCount);
 };
 
 //#endregion
@@ -951,11 +966,12 @@ permissions:
   contents: read
   pull-requests: write
   issues: write
+  statuses: write
 jobs:
   docker-doctor:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
       - uses: ${options.actionRef}
 `;
 	await fs.mkdir(workflowDir, { recursive: true });
@@ -1260,6 +1276,31 @@ const reportScanFailures = (failures) => {
 	console.error(`Docker Doctor could not analyze ${failures.length} ${fileWord}; the score below covers only the files that were analyzed.`);
 	for (const failure of failures) console.error(`  - ${failure.file}: ${flattenMessage(failure.message)}`);
 };
+const pathExists = async (filePath) => {
+	try {
+		await fs.access(filePath);
+		return true;
+	} catch {
+		return false;
+	}
+};
+const resolveConfigPath = async (configOption, rootDir) => {
+	if (!configOption) return;
+	const fromCwd = path.resolve(process.cwd(), configOption);
+	if (await pathExists(fromCwd)) return fromCwd;
+	const fromRoot = path.resolve(rootDir, configOption);
+	if (fromRoot !== fromCwd && await pathExists(fromRoot)) {
+		console.error(`Warning: --config ${configOption} was found relative to the scanned directory, not the current directory. Pass a path relative to the current directory or an absolute path.`);
+		return fromRoot;
+	}
+	return fromCwd;
+};
+const findScanTargetProblem = async (rootDir) => {
+	const rootStat = await fs.stat(rootDir).catch(() => null);
+	if (rootStat === null) return `Directory not found: ${rootDir}`;
+	if (!rootStat.isDirectory()) return `${rootDir} is not a directory. Pass the directory that contains your Dockerfile or Compose file.`;
+	return null;
+};
 const program = new Command();
 program.name("docker-doctor").description("Static analysis for Dockerfile and Docker Compose files").version(version, "-V, --version", "display the version number");
 program.argument("[dir]", "directory to scan", ".").option("-v, --verbose", "show verbose diagnostics description", false).option("-s, --score", "only output numeric health score", false).option("-j, --json", "output results as JSON report", false).option("-c, --config <path>", "custom config file path").action(async (dir, options) => {
@@ -1278,6 +1319,12 @@ program.argument("[dir]", "directory to scan", ".").option("-v, --verbose", "sho
 	});
 	try {
 		const rootDir = path.resolve(dir);
+		const scanTargetProblem = await findScanTargetProblem(rootDir);
+		if (scanTargetProblem !== null) {
+			console.error(`Error: ${scanTargetProblem}`);
+			process.exitCode = 1;
+			return;
+		}
 		const startTime = Date.now();
 		let statusText = "Discovering workspace...";
 		const spinnerFrames = [
@@ -1308,11 +1355,17 @@ program.argument("[dir]", "directory to scan", ".").option("-v, --verbose", "sho
 		try {
 			if (process.stdout.isTTY && !isSilent) await setTimeout(150);
 			setStatus("Loading configuration...");
-			const config = await loadConfig(rootDir, options.config, (message) => {
+			const configPath = await resolveConfigPath(options.config, rootDir);
+			const config = await loadConfig(rootDir, configPath, (message) => {
 				console.error(`Warning: ${message}`);
 			});
 			setStatus("Scanning workspace files...");
-			const project = await discoverProject(rootDir, { ignoreFiles: config.ignore?.files });
+			const project = await discoverProject(rootDir, {
+				ignoreFiles: config.ignore?.files,
+				onSkippedDirectory: (skippedDir) => {
+					console.error(`Warning: skipped unreadable directory ${skippedDir} (permission denied)`);
+				}
+			});
 			const fileContents = {};
 			const projectFilesList = [
 				...project.dockerfiles,
@@ -1337,7 +1390,7 @@ program.argument("[dir]", "directory to scan", ".").option("-v, --verbose", "sho
 				process.exitCode = scanExitCode(scanIncomplete, hasErrors);
 				return;
 			} else if (options.json) {
-				const report = toJsonReport(diagnostics, score, label, project);
+				const report = toJsonReport(diagnostics, score, label, project, failures);
 				console.log(JSON.stringify(report, null, 2));
 				process.exitCode = scanExitCode(scanIncomplete, hasErrors);
 				return;
@@ -1346,7 +1399,7 @@ program.argument("[dir]", "directory to scan", ".").option("-v, --verbose", "sho
 			let wizardOk = true;
 			if (process.stdout.isTTY && process.stdin.isTTY) wizardOk = await runInteractiveWizard({
 				diagnostics,
-				report: toJsonReport(diagnostics, score, label, project),
+				report: toJsonReport(diagnostics, score, label, project, failures),
 				rootDir
 			});
 			const exitCode = scanExitCode(scanIncomplete, hasErrors);
@@ -1434,7 +1487,7 @@ rules.command("list").description("list all available rules").action(() => {
 	}
 });
 rules.command("explain <rule>").description("explain a specific rule in detail").action((ruleKey) => {
-	const rule = findRule(ruleKey);
+	const rule = findRule(ruleKey) ?? findRule(`docker-doctor/${ruleKey}`);
 	if (!rule) {
 		console.error(`Rule '${ruleKey}' not found.`);
 		process.exitCode = 1;