Fix cache-gen command (#608)

* Fix cache-gen command * Add tests for cache-gen
zsh-users · Nov 17, 2017 · c23835d · c23835d
1 parent a1d4a2b
commit c23835d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/bin/antigen.zsh b/bin/antigen.zsh
@@ -1806,7 +1806,8 @@ ${(j::)_sources}
 #--- BUNDLES END
 typeset -gaU _ANTIGEN_BUNDLE_RECORD; _ANTIGEN_BUNDLE_RECORD=($(print ${(qq)_ANTIGEN_BUNDLE_RECORD}))
 typeset -g _ANTIGEN_CACHE_LOADED; _ANTIGEN_CACHE_LOADED=true
-typeset -g ANTIGEN_CACHE_VERSION; ANTIGEN_CACHE_VERSION='develop'
+typeset -ga _ZCACHE_BUNDLE_SOURCE; _ZCACHE_BUNDLE_SOURCE=($(print ${(qq)_ZCACHE_BUNDLE_SOURCE}))
+typeset -g _ANTIGEN_CACHE_VERSION; _ANTIGEN_CACHE_VERSION='develop'
 
 #-- END ZCACHE GENERATED FILE
 EOC
@@ -1875,7 +1876,9 @@ EOC
     -antigen-cache-generate
     [[ -f "$ANTIGEN_CACHE" ]] && source "$ANTIGEN_CACHE";
 
-    unset _ZCACHE_BUNDLE_SOURCE _ZCACHE_CAPTURE_BUNDLE _ZCACHE_CAPTURE_FUNCTIONS
+    # Commented out in order to have a working `cache-gen` command
+    #unset _ZCACHE_BUNDLE_SOURCE
+    unset _ZCACHE_CAPTURE_BUNDLE _ZCACHE_CAPTURE_FUNCTIONS
 
     # Release all hooked functions
     antigen-remove-hook -antigen-load-env-cached

diff --git a/src/ext/cache.zsh b/src/ext/cache.zsh
@@ -58,7 +58,8 @@ ${(j::)_sources}
 #--- BUNDLES END
 typeset -gaU _ANTIGEN_BUNDLE_RECORD; _ANTIGEN_BUNDLE_RECORD=($(print ${(qq)_ANTIGEN_BUNDLE_RECORD}))
 typeset -g _ANTIGEN_CACHE_LOADED; _ANTIGEN_CACHE_LOADED=true
-typeset -g ANTIGEN_CACHE_VERSION; ANTIGEN_CACHE_VERSION='{{ANTIGEN_VERSION}}'
+typeset -ga _ZCACHE_BUNDLE_SOURCE; _ZCACHE_BUNDLE_SOURCE=($(print ${(qq)_ZCACHE_BUNDLE_SOURCE}))
+typeset -g _ANTIGEN_CACHE_VERSION; _ANTIGEN_CACHE_VERSION='{{ANTIGEN_VERSION}}'
 
 #-- END ZCACHE GENERATED FILE
 EOC
@@ -127,7 +128,9 @@ EOC
     -antigen-cache-generate
     [[ -f "$ANTIGEN_CACHE" ]] && source "$ANTIGEN_CACHE";
 
-    unset _ZCACHE_BUNDLE_SOURCE _ZCACHE_CAPTURE_BUNDLE _ZCACHE_CAPTURE_FUNCTIONS
+    # Commented out in order to have a working `cache-gen` command
+    #unset _ZCACHE_BUNDLE_SOURCE
+    unset _ZCACHE_CAPTURE_BUNDLE _ZCACHE_CAPTURE_FUNCTIONS
 
     # Release all hooked functions
     antigen-remove-hook -antigen-load-env-cached

diff --git a/tests/cache.t b/tests/cache.t
@@ -13,3 +13,11 @@ Enable extension.
   $ antigen list
   You don't have any bundles.
   [1]
+
+Can programatically generate cache.
+
+  $ antigen reset &> /dev/null
+  $ antigen cache-gen
+  $ ls $ADOTDIR/init*
+  .*init.zsh.* (re)
+  .*init.zsh.zwc* (re)