vx-builder 0.5.0 → 0.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1989736cc1b66813cda1ae8a57efb1111e84fdad
4
- data.tar.gz: 6d0bcc32ba4d68e95ff322023d1a3316d009ab01
3
+ metadata.gz: 0d76a31c69611fa93a6410c556e05ff6c63143d3
4
+ data.tar.gz: 5f0f05ada71dd94e8190d203f55e0e781cf1cf8c
5
5
  SHA512:
6
- metadata.gz: 62ddd44ce344851c50e19f8c18ab7e87e37af78b35cc261207c85a9f17b2b975c268f20142f78fa59b94b171a19ec396fdf92073c45fb733d11b5314737ddd5c
7
- data.tar.gz: 6cd57acb1671a84bbdf645b475cd535a09eee6a3133df9f63fff62d1a0402eeb28187193f9f741e560576b892f97a3870f08f122320942fcccdaa654fbdf2d41
6
+ metadata.gz: 75b66e93587fdb7262c5d38d225ff378abed579a9da0b700fb2c1a371edcd8fe63a3d0462c7ca00a50337599a903c8a97b2f80fa9d5c085cd2ec0d0bf9f4084a
7
+ data.tar.gz: 22d43a1cec6a1fcb2ad27507c8a5f1131a77d65558b70e9e546daa8a2a540d9165966240e8ce43e0396333041a832c6f85061c22d24b678bc7df2ece0883ad9c
@@ -13,6 +13,7 @@ module Vx
13
13
  rs = app.call env
14
14
 
15
15
  if env.task.cache_url_prefix && enabled?(env)
16
+
16
17
  assign_url_to_env(env)
17
18
  prepare(env)
18
19
  fetch(env)
@@ -26,7 +27,11 @@ module Vx
26
27
  private
27
28
 
28
29
  def enabled?(env)
29
- !env.cached_directories.empty?
30
+ env.source.cache.enabled? && !cached_directories(env).empty?
31
+ end
32
+
33
+ def cached_directories(env)
34
+ env.cached_directories + env.source.cached_directories
30
35
  end
31
36
 
32
37
  def casher_cmd
@@ -76,7 +81,7 @@ module Vx
76
81
  end
77
82
 
78
83
  def add(env)
79
- env.cached_directories.each do |d|
84
+ cached_directories(env).each do |d|
80
85
  env.init << "#{casher_cmd} add #{d} || true"
81
86
  end
82
87
  env.init << "unset CASHER_DIR"
@@ -95,6 +95,10 @@ module Vx
95
95
  source.vexor
96
96
  end
97
97
 
98
+ def cached_directories
99
+ env.cached_directories + source.cache.directories
100
+ end
101
+
98
102
  private
99
103
 
100
104
  def env
@@ -1,5 +1,5 @@
1
1
  module Vx
2
2
  module Builder
3
- VERSION = "0.5.0"
3
+ VERSION = "0.5.1"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vx-builder
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.0
4
+ version: 0.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Galinsky