fix: cleaner reporting (#6)

AlecVision · Aug 20, 2023 · 2cd09ae · 2cd09ae
1 parent a383aef
commit 2cd09ae
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -6,7 +6,7 @@ import {
   readFileSync,
   readdirSync
 } from "fs";
-import { relative, resolve, join } from "path";
+import { basename, resolve, join } from "path";
 import { spawnSync } from "child_process";
 import { program, createArgument } from "@commander-js/extra-typings";
 import { watermark } from "./watermark";
@@ -263,37 +263,37 @@ function makeCallBackQueueReducer(opts: {
       const { destinationPath, generated, sourcePath } = generateEnv(item);
       const backupPath = `${destinationPath}${backup}`;
       const exists = existsSync(destinationPath);
-      const relativeDestination = relative(process.cwd(), destinationPath);
-      const relativeSource = relative(process.cwd(), sourcePath);
-      const relativeBackup = relative(process.cwd(), backupPath);
+      const destinationName = basename(destinationPath);
+      const sourceName = basename(sourcePath);
+      const backupName = basename(backupPath);
 
       const reportGenerated = () =>
         console.log(
-          `${current.relativeDir}:  📦 Generated ${relativeDestination} from ${relativeSource}`
+          `${current.relativeDir}:  📦 Generated ${destinationName} from ${sourceName}`
         );
       const reportExisting = () =>
         console.log(
-          `${current.relativeDir}:  ⛔️ ${relativeDestination} already exists`
+          `${current.relativeDir}:  ⛔️ ${destinationName} already exists`
         );
       const reportPrevious = () =>
         console.log(
-          `${current.relativeDir}:  ✅ ${relativeDestination} was previously generated by hotenv`
+          `${current.relativeDir}:  ✅ ${destinationName} was previously generated by hotenv`
         );
       const reportBackup = () =>
         console.log(
-          `${current.relativeDir}:  📦 Backing up ${relativeDestination} to ${relativeBackup}...`
+          `${current.relativeDir}:  📦 Backing up ${destinationName} to ${backupName}...`
         );
       const reportOverWrite = () =>
         console.log(
-          `${current.relativeDir}:  🧨 Overwriting ${relativeDestination}...`
+          `${current.relativeDir}:  🧨 Overwriting ${destinationName}...`
         );
       const reportFailed = () =>
         console.log(
-          `${current.relativeDir}:  ❌ ${relativeDestination} already exists, use --force to overwrite or --backup to backup`
+          `${current.relativeDir}:  ❌ ${destinationName} already exists, use --force to overwrite or --backup to backup`
         );
       const reportWrite = () =>
         console.log(
-          `${current.relativeDir}:  📦 Writing ${relativeDestination} with platform-specific public variables...`
+          `${current.relativeDir}:  📦 Writing ${destinationName} with platform-specific public variables...`
         );
       const doBackup = () =>
         dryRun ? void 0 : copyFileSync(destinationPath, backupPath);
@@ -396,7 +396,7 @@ if (import.meta.vitest) {
 
       testDir = mkdtempSync(resolve(__dirname, "tmp-"));
       relativeTestDir = relative(__dirname, testDir);
-      cwd = testDir;
+      cwd = __dirname;
 
       testEnvPaths = [
         join(relativeTestDir, ".env.production.local"),
@@ -507,7 +507,7 @@ if (import.meta.vitest) {
       const actions: (() => void)[] = [];
       const reducer = makeCallBackQueueReducer({ dryRun, backup, force });
 
-      const result = [testDir].map(readDotEnvs).reduce(reducer, actions);
+      const result = [relativeTestDir].map(readDotEnvs).reduce(reducer, actions);
       expect(result).toHaveLength(13);
 
       result.forEach(action => {
@@ -519,18 +519,18 @@ if (import.meta.vitest) {
         (console as any)
           .getOutput()
           .filter(Boolean)
-          .map((output: string) => output.replace(/^.*:/, "").trim())
+          .map((output: string) => output/* .replace(/^.*:/, "").trim() */)
           .join("\n")
       ).toEqual(
-        `Found 4 .env*.local file(s)
-📦 Generated .env.development from .env.development.local
-📦 Writing .env.development with platform-specific public variables...
-📦 Generated .env from .env.local
-📦 Writing .env with platform-specific public variables...
-📦 Generated .env.production from .env.production.local
-📦 Writing .env.production with platform-specific public variables...
-📦 Generated .env.test from .env.test.local
-📦 Writing .env.test with platform-specific public variables...`
+        `${basename(testDir)}: Found 4 .env*.local file(s)
+${basename(testDir)}:  📦 Generated .env.development from .env.development.local
+${basename(testDir)}:  📦 Writing .env.development with platform-specific public variables...
+${basename(testDir)}:  📦 Generated .env from .env.local
+${basename(testDir)}:  📦 Writing .env with platform-specific public variables...
+${basename(testDir)}:  📦 Generated .env.production from .env.production.local
+${basename(testDir)}:  📦 Writing .env.production with platform-specific public variables...
+${basename(testDir)}:  📦 Generated .env.test from .env.test.local
+${basename(testDir)}:  📦 Writing .env.test with platform-specific public variables...`
       );
     });
   });