@repokit/core 3.0.5 → 3.0.7

package/Cargo.lock

@@ -900,7 +900,7 @@ checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c"
 
 [[package]]
 name = "repokit"
-version = "3.0.5"
+version = "3.0.7"
 dependencies = [
  "alphanumeric-sort",
  "colored",

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "repokit"
-version = "3.0.5"
+version = "3.0.7"
 edition = "2024"
 
 [[bin]]

package/installation/install.sh

@@ -1,4 +1,4 @@
-CURRENT_VERSION="3.0.5"
+CURRENT_VERSION="3.0.7"
 CWD=$(pwd)
 
 REPLACEMENT="/node_modules"
@@ -31,36 +31,47 @@ ROOT_COMMIT=$(git rev-list --parents HEAD | tail -1) || ROOT_COMMIT=""
 
 cd
 
-CACHE_FILE_OR_DIRECTORY=".repokit";
-NEW_VERSION_FILE=".repokit_version"
-NEW_SETTINGS_FILE=".repokit_settings"
-REPO_CACHE_DIRECTORY="$CACHE_FILE_OR_DIRECTORY/$ROOT_COMMIT";
+CACHE_FILE=".repokit";
+CACHE_DIRECTORY=".repokit_cache";
+NEW_SETTINGS_FILE=".settings"
+NEW_VERSION_FILE=".version"
+REPO_CACHE_DIRECTORY="$CACHE_DIRECTORY/$ROOT_COMMIT"
+LAST_THEME_USED=""
+NEW_CACHE_PATH_VERSION="$CURRENT_VERSION"
+BACK_PORTING=0
+
+if [ -n "$ROOT_COMMIT" ] && [ -f "$REPO_CACHE_DIRECTORY/$NEW_SETTINGS_FILE" ]; then
+    BACK_PORTING=1
+    cd "$REPO_CACHE_DIRECTORY"
+    read -r LAST_THEME_USED < "$NEW_SETTINGS_FILE"
+    rm "$NEW_SETTINGS_FILE"
+    cd
+fi
 
-CACHED_THEME=""
+if [ -f "$CACHE_DIRECTORY/$NEW_VERSION_FILE" ]; then
+    read -r NEW_CACHE_PATH_VERSION < "$CACHE_DIRECTORY/$NEW_VERSION_FILE"
+fi
 
-if [ -d "$CACHE_FILE_OR_DIRECTORY" ]; then
-    if [ -n "$ROOT_COMMIT" ] && [ -d "$REPO_CACHE_DIRECTORY" ]; then
-        {
-            read -r CACHED_THEME
-        } < "$REPO_CACHE_DIRECTORY/$NEW_SETTINGS_FILE"
-    fi
-    rm -rf "$CACHE_FILE_OR_DIRECTORY"
-elif [ -f "$CACHE_FILE_OR_DIRECTORY" ]; then
-    read -r PREVIOUS_VERSION < "$CACHE_FILE_OR_DIRECTORY"
-    if [ "$PREVIOUS_VERSION" == "$CURRENT_VERSION" ]; then
-        exit 0;    
+if [ ! -f "$CACHE_FILE" ]; then
+    touch "$CACHE_FILE"
+elif [ "$BACK_PORTING" == 0 ]; then
+    read -r LAST_VERSION_USED < "$CACHE_FILE"
+    if [ "$LAST_VERSION_USED" == "$CURRENT_VERSION" ] && [ "$LAST_VERSION_USED" == "$NEW_CACHE_PATH_VERSION" ]; then
+        exit 0
     fi
 fi
 
-touch "$CACHE_FILE_OR_DIRECTORY"
-
-if [ -n "$CACHED_THEME" ]; then
-    printf "$CURRENT_VERSION\n$CACHED_THEME\n" > "$CACHE_FILE_OR_DIRECTORY"
-else 
+if [ -n "$LAST_THEME_USED" ]; then 
+    echo "$CURRENT_VERSION\n$LAST_THEME_USED\n" > "$CACHE_FILE"
+else
     TEMP_FILE=".repokit_tmp";
     printf "$CURRENT_VERSION\n" > "$TEMP_FILE"
-    tail +2 "$CACHE_FILE_OR_DIRECTORY" >> "$TEMP_FILE"
-    mv "$TEMP_FILE" "$CACHE_FILE_OR_DIRECTORY"
+    tail +2 "$CACHE_FILE" >> "$TEMP_FILE"
+    mv "$TEMP_FILE" "$CACHE_FILE"
+fi
+
+if [ -f "$CACHE_DIRECTORY/$NEW_VERSION_FILE" ]; then
+    echo "$CURRENT_VERSION\n" > "$CACHE_DIRECTORY/$NEW_VERSION_FILE"
 fi
 
 

package/internals/internal_filesystem/internal_filesystem.rs

@@ -292,17 +292,30 @@ impl InternalFileSystem {
 
     pub fn runtime_repokit_version() -> Option<String> {
         if let Some(home) = InternalFileSystem::home() {
-            let version = Executor::exec(
-                format!(
-                    "head -n 1 {}",
-                    home.join(".repokit").normalize().to_str().unwrap()
-                ),
-                |cmd| cmd,
-            );
-            if VERSION_REGEX.is_match(&version) {
-                return Some(version);
+            let path = home.join(".repokit");
+            return InternalFileSystem::get_version_at_path(&path);
+        }
+        None
+    }
+
+    pub fn new_cache_path_version() -> Option<String> {
+        if let Some(home) = InternalFileSystem::home() {
+            let path = home.join(".repokit_cache/.version");
+            if (&*path).exists() && path.is_file() {
+                return InternalFileSystem::get_version_at_path(&path);
             }
         }
         None
     }
+
+    fn get_version_at_path(path: &PathBuf) -> Option<String> {
+        let version = Executor::exec(
+            format!("head -n 1 {}", path.normalize().to_str().unwrap()),
+            |cmd| cmd,
+        );
+        if VERSION_REGEX.is_match(&version) {
+            return Some(version);
+        }
+        None
+    }
 }

package/internals/repokit/runtime_compiler.rs

@@ -34,12 +34,15 @@ impl RuntimeCompiler {
     }
 
     fn with_version_mismatch(root: &str, func: impl Fn(&str, InternalFileSystem)) {
-        let scoped_fs = InternalFileSystem::new(root);
-        if let Some(installed_version) = scoped_fs.installed_repokit_version()
-            && let Some(runtime_version) = InternalFileSystem::runtime_repokit_version()
-            && runtime_version != installed_version
-        {
-            func(&installed_version, scoped_fs);
+        let scoped_fs: InternalFileSystem = InternalFileSystem::new(root);
+        if let Some(installed_version) = scoped_fs.installed_repokit_version() {
+            let runtime_version = InternalFileSystem::runtime_repokit_version();
+            let new_cache_path_version = InternalFileSystem::new_cache_path_version();
+            if runtime_version.is_some_and(|value| value != installed_version)
+                || new_cache_path_version.is_some_and(|value| value != installed_version)
+            {
+                func(&installed_version, scoped_fs);
+            }
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@repokit/core",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "A knowledgebase for your repository - wrapped in a CLI",
   "keywords": [
     "cli",