vx-builder 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1989736cc1b66813cda1ae8a57efb1111e84fdad
-  data.tar.gz: 6d0bcc32ba4d68e95ff322023d1a3316d009ab01
+  metadata.gz: 0d76a31c69611fa93a6410c556e05ff6c63143d3
+  data.tar.gz: 5f0f05ada71dd94e8190d203f55e0e781cf1cf8c
 SHA512:
-  metadata.gz: 62ddd44ce344851c50e19f8c18ab7e87e37af78b35cc261207c85a9f17b2b975c268f20142f78fa59b94b171a19ec396fdf92073c45fb733d11b5314737ddd5c
-  data.tar.gz: 6cd57acb1671a84bbdf645b475cd535a09eee6a3133df9f63fff62d1a0402eeb28187193f9f741e560576b892f97a3870f08f122320942fcccdaa654fbdf2d41
+  metadata.gz: 75b66e93587fdb7262c5d38d225ff378abed579a9da0b700fb2c1a371edcd8fe63a3d0462c7ca00a50337599a903c8a97b2f80fa9d5c085cd2ec0d0bf9f4084a
+  data.tar.gz: 22d43a1cec6a1fcb2ad27507c8a5f1131a77d65558b70e9e546daa8a2a540d9165966240e8ce43e0396333041a832c6f85061c22d24b678bc7df2ece0883ad9c

data/lib/vx/builder/script_builder/cache.rb

@@ -13,6 +13,7 @@ module Vx
           rs = app.call env
 
           if env.task.cache_url_prefix && enabled?(env)
+
             assign_url_to_env(env)
             prepare(env)
             fetch(env)
@@ -26,7 +27,11 @@ module Vx
         private
 
           def enabled?(env)
-            !env.cached_directories.empty?
+            env.source.cache.enabled? && !cached_directories(env).empty?
+          end
+
+          def cached_directories(env)
+            env.cached_directories + env.source.cached_directories
           end
 
           def casher_cmd
@@ -76,7 +81,7 @@ module Vx
           end
 
           def add(env)
-            env.cached_directories.each do |d|
+            cached_directories(env).each do |d|
               env.init << "#{casher_cmd} add #{d} || true"
             end
             env.init << "unset CASHER_DIR"

data/lib/vx/builder/script_builder.rb

@@ -95,6 +95,10 @@ module Vx
         source.vexor
       end
 
+      def cached_directories
+        env.cached_directories + source.cache.directories
+      end
+
       private
 
         def env

data/lib/vx/builder/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Builder
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-builder
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Dmitry Galinsky