shaf 1.5.1 → 1.5.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data.tar.gz.sig +0 -0
- data/lib/shaf/helpers/cache_control.rb +1 -2
- data/lib/shaf/upgrade/package.rb +11 -12
- data/lib/shaf/version.rb +1 -1
- metadata +2 -2
- metadata.gz.sig +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: '028cf2f2137e5f2e08115766a8e7b53e4213005fbc6677a15aa6d86dbe430f80'
|
4
|
+
data.tar.gz: 61b109326927ecb8a74811fd418b3bd8b2124a96820786be90dbcc9d43d578bf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5da2756d178e7521539c8cc43a8661671434f1ccab7b0c8881905643155cf72eef5569e2d82d7a7c8a89b33e82607f106192c2a882c0c55bd6fab00dd2910ab6
|
7
|
+
data.tar.gz: b9859646533cf4b293e2f6a715f0309619b7ed280ba312cb0cdd6207b9b29e007ae0f5a5629575f929fe7f08ab47a94ad8a063ef0749b70d668102718c5abe71
|
checksums.yaml.gz.sig
CHANGED
Binary file
|
data.tar.gz.sig
CHANGED
Binary file
|
@@ -1,7 +1,6 @@
|
|
1
1
|
module Shaf
|
2
2
|
module CacheControl
|
3
3
|
def cache_control(*args, **kwargs)
|
4
|
-
return unless Shaf::Settings.http_cache
|
5
4
|
__rewrite_max_age(kwargs)
|
6
5
|
super(*args, **kwargs)
|
7
6
|
end
|
@@ -11,7 +10,7 @@ module Shaf
|
|
11
10
|
def __rewrite_max_age(kwargs)
|
12
11
|
max_age = kwargs.delete(:http_cache_max_age)
|
13
12
|
if max_age.is_a? Symbol
|
14
|
-
key = "http_cache_max_age_#{max_age}"
|
13
|
+
key = :"http_cache_max_age_#{max_age}"
|
15
14
|
max_age = Settings.respond_to?(key) ? Settings.send(key) : 86_400
|
16
15
|
end
|
17
16
|
kwargs[:max_age] ||= max_age
|
data/lib/shaf/upgrade/package.rb
CHANGED
@@ -155,12 +155,12 @@ module Shaf
|
|
155
155
|
end
|
156
156
|
|
157
157
|
def apply_patches(dir = nil)
|
158
|
-
files_in(dir).
|
159
|
-
@manifest.patches_for(file).
|
158
|
+
files_in(dir).map do |file|
|
159
|
+
@manifest.patches_for(file).map do |name|
|
160
160
|
patch = @files[name]
|
161
161
|
apply_patch(file, patch)
|
162
|
-
end
|
163
|
-
end
|
162
|
+
end.all?
|
163
|
+
end.all?
|
164
164
|
end
|
165
165
|
|
166
166
|
def apply_patch(file, patch)
|
@@ -170,10 +170,9 @@ module Shaf
|
|
170
170
|
puts o.read
|
171
171
|
err = e.read
|
172
172
|
puts err unless err.empty?
|
173
|
-
t.value.success
|
174
|
-
|
175
|
-
|
176
|
-
end
|
173
|
+
result = t.value.success?
|
174
|
+
STDERR.puts "Failed to apply patch for: #{file}\n" unless result
|
175
|
+
result
|
177
176
|
end
|
178
177
|
end
|
179
178
|
|
@@ -206,13 +205,13 @@ module Shaf
|
|
206
205
|
|
207
206
|
def apply_substitutes(dir = nil)
|
208
207
|
puts '' unless @manifest.regexps.empty?
|
209
|
-
files_in(dir).
|
210
|
-
@manifest.regexps_for(file).
|
208
|
+
files_in(dir).map do |file|
|
209
|
+
@manifest.regexps_for(file).map do |name|
|
211
210
|
params = YAML.safe_load(@files[name])
|
212
211
|
params.transform_keys!(&:to_sym)
|
213
212
|
apply_substitute(file, params)
|
214
|
-
end
|
215
|
-
end
|
213
|
+
end.all?
|
214
|
+
end.all?
|
216
215
|
end
|
217
216
|
|
218
217
|
def apply_substitute(file, params)
|
data/lib/shaf/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: shaf
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.5.
|
4
|
+
version: 1.5.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sammy Henningsson
|
@@ -30,7 +30,7 @@ cert_chain:
|
|
30
30
|
ZMhjYR7sRczGJx+GxGU2EaR0bjRsPVlC4ywtFxoOfRG3WaJcpWGEoAoMJX6Z0bRv
|
31
31
|
M40=
|
32
32
|
-----END CERTIFICATE-----
|
33
|
-
date: 2020-02-
|
33
|
+
date: 2020-02-29 00:00:00.000000000 Z
|
34
34
|
dependencies:
|
35
35
|
- !ruby/object:Gem::Dependency
|
36
36
|
name: minitest
|
metadata.gz.sig
CHANGED
Binary file
|