kitchen_hooks 1.7.24 → 1.7.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77f315094c7ca18377a87131e71646f79a400e96
-  data.tar.gz: 7a4a64f2189e8586806c2dbc5f695e7e395f1640
+  metadata.gz: 97e2d20d5e0c40c5b7381bdb64a3eec801139d87
+  data.tar.gz: d539e4c063b40aa4008a894fb35163af62fed485
 SHA512:
-  metadata.gz: ee1305af7d390d128df5f1035d13556588794f5e5ee8ebe1b32c593481385478ca349246c2a241cbd48e2aac2e8d965a4eae7ce9e25e8f3d7017a671e30dab78
-  data.tar.gz: 3a8d689cdc2cdacc3c3d2abee0a56adcfa69b4ad7889dfecadc2c4a26a2d1105182e6d771d29c07fafeb60f6c8aaa4b5a914c02ccba9bf52a04afdb4e937313b
+  metadata.gz: 65f8821d13a18f650ab6ec10493c9503d35ee6760ecd0c321e63f91d7ab4ec815b28ffd76de140bf16e39f6148e053d15577f4029393dd453ab3f7cae9795a08
+  data.tar.gz: 713125333608a8ad4d446f6926fe7938348319c01f81962e8c16411d98f047d1742b8e6491996f9e15e3cd732fcb015e7b5a3069fd1553ced7f628e7ea2a2b6b

data/VERSION

@@ -1 +1 @@
-1.7.24
+1.7.25

data/lib/kitchen_hooks/helpers.rb

@@ -118,10 +118,10 @@ module KitchenHooks
         Dir.chdir clone do
           $stdout.puts 'Uploading cookbook'
           begin
-            outs = with_each_knife_do "cookbook upload #{cookbook_name event} -o .. --freeze", knives
-          rescue
-            unless outs =~ /is frozen/ # Ignore frozen cookbooks already uploaded
-              raise 'Knife exited unsuccessfully. Check out the Kitchen Hooks logs.'
+            with_each_knife_do "cookbook upload #{cookbook_name event} -o .. --freeze", knives
+          rescue => e
+            unless e.to_s =~ /frozen/i # Ignore frozen cookbooks already uploaded
+              raise "Knife exited unsuccessfully: #{e}"
             end
           end
 
@@ -205,8 +205,8 @@ module KitchenHooks
       ]
       begin
         $stdout.puts "berks_install: %s" % cmd
-        system cmd
-        raise unless $?.exitstatus.zero?
+        out = `#{cmd}`
+        raise out unless $?.exitstatus.zero?
       rescue
         raise 'Could not perform berks_install with config %s' % [
           berksfile.inspect
@@ -231,8 +231,8 @@ module KitchenHooks
 
       begin
         $stdout.puts "berks_upload: %s" % cmd
-        system cmd
-        raise unless $?.exitstatus.zero?
+        out = `#{cmd}`
+        raise out unless $?.exitstatus.zero?
       rescue
         raise 'Could not perform berks_upload with config %s, knife %s' % [
           berksfile.inspect, knife.inspect
@@ -278,7 +278,7 @@ module KitchenHooks
       knives.map do |k|
         cmd = "#{command} 2>&1" % { knife: Shellwords::escape(k) }
         $stdout.puts 'with_each_knife: %s' % cmd
-        out = system cmd
+        out = `#{cmd}`
         raise out unless $?.exitstatus.zero?
         out
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 1.7.24
+  version: 1.7.25
 platform: ruby
 authors:
 - Sean Clemmer