shaf 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cd5f4de074e115c162ce34179fd955eb89552df36af17acfee50972880e78dc
-  data.tar.gz: b35ea49cf8694c6cf8e2b9f73784e2fbedf0143bdff50fb6cd7327bd5bc7d2cd
+  metadata.gz: '028cf2f2137e5f2e08115766a8e7b53e4213005fbc6677a15aa6d86dbe430f80'
+  data.tar.gz: 61b109326927ecb8a74811fd418b3bd8b2124a96820786be90dbcc9d43d578bf
 SHA512:
-  metadata.gz: 61e184c41acc0d3f8feec685996c368d2095511ba94ebc21d190192321342d98debdea5d338b21b376c9611148a7c9cc9b44b6d65d72f96044e796ce2b47d421
-  data.tar.gz: 0ca379168f4a28384fa7a06e8fed88977abe66d259b83bdbe9e08bf312c11063d07abd8885b20d4a547f9bb1bb3ee5b877a7a5c6e4995c7391f776be235b279f
+  metadata.gz: 5da2756d178e7521539c8cc43a8661671434f1ccab7b0c8881905643155cf72eef5569e2d82d7a7c8a89b33e82607f106192c2a882c0c55bd6fab00dd2910ab6
+  data.tar.gz: b9859646533cf4b293e2f6a715f0309619b7ed280ba312cb0cdd6207b9b29e007ae0f5a5629575f929fe7f08ab47a94ad8a063ef0749b70d668102718c5abe71

data/lib/shaf/helpers/cache_control.rb

@@ -1,7 +1,6 @@
 module Shaf
   module CacheControl
     def cache_control(*args, **kwargs)
-      return unless Shaf::Settings.http_cache
       __rewrite_max_age(kwargs)
       super(*args, **kwargs)
     end
@@ -11,7 +10,7 @@ module Shaf
     def __rewrite_max_age(kwargs)
       max_age = kwargs.delete(:http_cache_max_age)
       if max_age.is_a? Symbol
-        key = "http_cache_max_age_#{max_age}".to_sym
+        key = :"http_cache_max_age_#{max_age}"
         max_age = Settings.respond_to?(key) ? Settings.send(key) : 86_400
       end
       kwargs[:max_age] ||= max_age

data/lib/shaf/upgrade/package.rb

@@ -155,12 +155,12 @@ module Shaf
       end
 
       def apply_patches(dir = nil)
-        files_in(dir).all? do |file|
-          @manifest.patches_for(file).all? do |name|
+        files_in(dir).map do |file|
+          @manifest.patches_for(file).map do |name|
             patch = @files[name]
             apply_patch(file, patch)
-          end
-        end
+          end.all?
+        end.all?
       end
 
       def apply_patch(file, patch)
@@ -170,10 +170,9 @@ module Shaf
           puts o.read
           err = e.read
           puts err unless err.empty?
-          t.value.success?.tap do |patch_succeeded|
-            next if patch_succeeded
-            STDERR.puts "Failed to apply patch for: #{file}\n"
-          end
+          result = t.value.success?
+          STDERR.puts "Failed to apply patch for: #{file}\n" unless result
+          result
         end
       end
 
@@ -206,13 +205,13 @@ module Shaf
 
       def apply_substitutes(dir = nil)
         puts '' unless @manifest.regexps.empty?
-        files_in(dir).all? do |file|
-          @manifest.regexps_for(file).all? do |name|
+        files_in(dir).map do |file|
+          @manifest.regexps_for(file).map do |name|
             params = YAML.safe_load(@files[name])
             params.transform_keys!(&:to_sym)
             apply_substitute(file, params)
-          end
-        end
+          end.all?
+        end.all?
       end
 
       def apply_substitute(file, params)

data/lib/shaf/version.rb

@@ -1,3 +1,3 @@
 module Shaf
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaf
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -30,7 +30,7 @@ cert_chain:
   ZMhjYR7sRczGJx+GxGU2EaR0bjRsPVlC4ywtFxoOfRG3WaJcpWGEoAoMJX6Z0bRv
   M40=
   -----END CERTIFICATE-----
-date: 2020-02-09 00:00:00.000000000 Z
+date: 2020-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest