Small fixes in caching logic (#12)

See particular commits for details
software-mansion · Aug 11, 2023 · 67ef98b · 67ef98b
1 parent 608d5f2
commit 67ef98b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/dist/cache-save/index.js b/dist/cache-save/index.js
@@ -59372,11 +59372,11 @@ function getCacheDirectory() {
     case "linux":
       return external_path_default().join(home, ".cache/scarb");
     case "darwin":
-      return external_path_default().join(home, `Library/Caches/com.swmansion.Scarb`);
+      return external_path_default().join(home, `Library/Caches/com.swmansion.scarb`);
     case "win32":
-      return external_path_default().join(process.env.APPDATA, "swmansion/Scarb/config");
+      return external_path_default().join(process.env.APPDATA, "swmansion/scarb/config");
     default:
-      throw new Error(`Caching not available for ${platform} platform.`);
+      throw new Error(`caching is not available on this platform: ${platform}`);
   }
 }
 
@@ -59386,7 +59386,7 @@ async function getCacheKey() {
 
   if (!fileHash) {
     throw new Error(
-      "Unable to hash Scarb.toml file, cannot cache dependencies.",
+      "failed to cache dependencies: unable to hash Scarb.toml file",
     );
   }
 
@@ -59397,7 +59397,9 @@ async function getScarbManifestPath() {
   const { stdout, exitCode } = await exec.getExecOutput("scarb manifest-path");
 
   if (exitCode > 0) {
-    throw new Error("Unable to resolve Scarb.toml path.");
+    throw new Error(
+      "failed to find Scarb.toml: command `scarb manifest-path` failed",
+    );
   }
 
   return stdout.trim();

diff --git a/dist/cache-save/index.js.map b/dist/cache-save/index.js.map
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -60534,11 +60534,11 @@ function getCacheDirectory() {
     case "linux":
       return external_path_default().join(home, ".cache/scarb");
     case "darwin":
-      return external_path_default().join(home, `Library/Caches/com.swmansion.Scarb`);
+      return external_path_default().join(home, `Library/Caches/com.swmansion.scarb`);
     case "win32":
-      return external_path_default().join(process.env.APPDATA, "swmansion/Scarb/config");
+      return external_path_default().join(process.env.APPDATA, "swmansion/scarb/config");
     default:
-      throw new Error(`Caching not available for ${platform} platform.`);
+      throw new Error(`caching is not available on this platform: ${platform}`);
   }
 }
 
@@ -60548,7 +60548,7 @@ async function getCacheKey() {
 
   if (!fileHash) {
     throw new Error(
-      "Unable to hash Scarb.toml file, cannot cache dependencies.",
+      "failed to cache dependencies: unable to hash Scarb.toml file",
     );
   }
 
@@ -60559,7 +60559,9 @@ async function getScarbManifestPath() {
   const { stdout, exitCode } = await exec.getExecOutput("scarb manifest-path");
 
   if (exitCode > 0) {
-    throw new Error("Unable to resolve Scarb.toml path.");
+    throw new Error(
+      "failed to find Scarb.toml: command `scarb manifest-path` failed",
+    );
   }
 
   return stdout.trim();

diff --git a/dist/setup/index.js.map b/dist/setup/index.js.map
diff --git a/lib/cache-utils.js b/lib/cache-utils.js
@@ -17,11 +17,11 @@ export function getCacheDirectory() {
     case "linux":
       return path.join(home, ".cache/scarb");
     case "darwin":
-      return path.join(home, `Library/Caches/com.swmansion.Scarb`);
+      return path.join(home, `Library/Caches/com.swmansion.scarb`);
     case "win32":
-      return path.join(process.env.APPDATA, "swmansion/Scarb/config");
+      return path.join(process.env.APPDATA, "swmansion/scarb/config");
     default:
-      throw new Error(`Caching not available for ${platform} platform.`);
+      throw new Error(`caching is not available on this platform: ${platform}`);
   }
 }
 
@@ -31,7 +31,7 @@ export async function getCacheKey() {
 
   if (!fileHash) {
     throw new Error(
-      "Unable to hash Scarb.toml file, cannot cache dependencies.",
+      "failed to cache dependencies: unable to hash Scarb.toml file",
     );
   }
 
@@ -42,7 +42,9 @@ async function getScarbManifestPath() {
   const { stdout, exitCode } = await exec.getExecOutput("scarb manifest-path");
 
   if (exitCode > 0) {
-    throw new Error("Unable to resolve Scarb.toml path.");
+    throw new Error(
+      "failed to find Scarb.toml: command `scarb manifest-path` failed",
+    );
   }
 
   return stdout.trim();