kitchen_hooks 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a1d5107cae4e7385d9eaedc0b4d03ee1214d254
-  data.tar.gz: 99d466d56fbfe8364614ca8e46c8c3ac9890bf31
+  metadata.gz: 046154a4b88d80717a736a92fe23ef563a8ad0c6
+  data.tar.gz: 9b744168be0fb82f447e1671d252fe67ff273989
 SHA512:
-  metadata.gz: d9b299caa2e7b337ca016f0bd2a04d61e7010ce3767c31f8c6ff9976891ec000620e6e2dfae902867245fc6c1370bdeba13b6f9088a1ae9cc60f89b78474f609
-  data.tar.gz: 87f4f6ea67fd3ffc02c8fcc597ff6c96041303f07729f29575b9d97a9d070de9213963fbc422e97789f590efefa8ef064d0228bb9a7299cf753f104606de2f7b
+  metadata.gz: 45cacae260772d904a5891f561cdcdb90aa82622b11b85c105361a0937b16605c8002fc06fd583ccafa03153038fe6a35671b823f55c856eb65b48c107e8ec20
+  data.tar.gz: c9a2d6ffd3c7161f80fc2cc92669e6a7c0b4e7e6e3826441720833b7771977762e8edb72c62dda6d737f55384489a265e8f6179ef3db5d5e877b9ce1dd1093ff

data/VERSION

@@ -1 +1 @@
-1.5.6
+1.5.7

data/lib/kitchen_hooks/helpers.rb

@@ -98,6 +98,7 @@ module KitchenHooks
 
         if File::exist? berksfile_lock
           logger.info 'Uploading dependencies'
+          berks_install berksfile
           knives.each do |knife|
             berks_upload berksfile, knife
           end
@@ -129,23 +130,40 @@ module KitchenHooks
     end
 
 
-    def berks_upload berksfile, knife, options={}
-      logger.debug 'started berks_upload berksfile=%s, knife=%s' % [
-        berksfile.inspect, knife.inspect
-      ]
-      config_path = berkshelf_config(knife)
+    def berks_install berksfile
+      logger.debug 'started berks_install berksfile=%s' % berksfile.inspect
+      env_git_dir = ENV.delete 'GIT_DIR'
+      env_git_work_tree = ENV.delete 'GIT_WORK_TREE'
 
       cmd = "berks install --debug --berksfile %s" % [
         Shellwords::escape(berksfile)
       ]
       logger.debug "berks_install: %s" % cmd
       system cmd
+      raise 'Could not perform berks_install with config %s' % [
+        berksfile.inspect
+      ] unless $?.exitstatus.zero?
+
+      ENV['GIT_DIR'] = env_git_dir
+      ENV['GIT_WORK_TREE'] = env_git_work_tree
+      logger.debug 'finished berks_install: %s' % berksfile
+    end
+
+
+    def berks_upload berksfile, knife, options={}
+      logger.debug 'started berks_upload berksfile=%s, knife=%s' % [
+        berksfile.inspect, knife.inspect
+      ]
+      config_path = berkshelf_config(knife)
 
       cmd = "berks upload --debug --berksfile %s --config %s" % [
         Shellwords::escape(berksfile), Shellwords::escape(config_path)
       ]
       logger.debug "berks_upload: %s" % cmd
       system cmd
+      raise 'Could not perform berks_upload with config %s, knife %s' % [
+        berksfile.inspect, knife.inspect
+      ] unless $?.exitstatus.zero?
 
       FileUtils.rm_rf config_path
       logger.debug 'finished berks_upload: %s' % berksfile
@@ -186,7 +204,8 @@ module KitchenHooks
       knives.map do |k|
         cmd = command % { knife: Shellwords::escape(k) }
         logger.debug 'with_each_knife: %s' % cmd
-        `#{cmd}`
+        system cmd
+        # No error handling here; do that on "berks upload"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Kelly Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hipchat