kitchen_hooks 1.7.14 → 1.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d79c5b35992c0b702d82ca724450adf64d278543
-  data.tar.gz: ffd258c665a0e05c247c226131b3f86a55f7a16d
+  metadata.gz: 0767338529153daae3c90cfa549ce169b0f07046
+  data.tar.gz: 48e21d056a8cc1930d14603c442aa51b299f59e4
 SHA512:
-  metadata.gz: 189e45821445f040498ccce4f56a1d604fa1f3cc8e738ba7c2a025974c27f5a5181901148b0cf9fc117ab24350e6db37b950b6bfb9fcc69ae6fe2c14352f580c
-  data.tar.gz: b5d4cf3c1e4a9651f566f14e21529873ae641d097ccac9621fcfe3f482b6572fc0a882b466913b329356d302b882fdbb63d3a0c662dfc72a316e6de8c9f37ae3
+  metadata.gz: ac75ccfc01f538d04b1e998c1693a468e974a60e619c1e705b215084099fc861081ed243e07e8be1d6ad6f8f1da25fbca8b167e095b4bcc77bae10aec0fc9052
+  data.tar.gz: f4f3bf51efe89bd2ebc25bdb3276460b76805ad37a18b2ad6c15e8de9d58c1b57fe497d8fadeb818a3f3a2b388b51f83e3e00a7a0f19b018e628ee7f70749045

data/VERSION

@@ -1 +1 @@
-1.7.14
+1.7.15

data/lib/kitchen_hooks/helpers.rb

@@ -113,9 +113,9 @@ module KitchenHooks
         do_update = !File::exist?(berksfile_lock)
 
         $stdout.puts 'Uploading dependencies'
-        berks_install berksfile
-        berks_update berksfile if do_update
         knives.peach do |knife|
+          berks_install berksfile, knife
+          # berks_update berksfile, knife if do_update
           berks_upload berksfile, knife
         end
 
@@ -162,21 +162,26 @@ module KitchenHooks
           verify: false
         }
       }
+      $stdout.puts 'Berkshelf config: %s' % JSON::pretty_generate(config)
       config_path = File.join tmp, "#{SecureRandom.hex}-berkshelf.json"
       File.open(config_path, 'w') do |f|
-        f.puts JSON::pretty_generate config
+        f.puts JSON::generate(config)
       end
       return config_path
     end
 
 
-    def self.berks_update berksfile
+    def self.berks_update berksfile, knife=nil
       $stdout.puts 'started berks_update berksfile=%s' % berksfile.inspect
       env_git_dir = ENV.delete 'GIT_DIR'
       env_git_work_tree = ENV.delete 'GIT_WORK_TREE'
 
-      cmd = "berks update --debug --berksfile %s" % [
-        Shellwords::escape(berksfile)
+      knife_args = if knife
+        '--config %s' % Shellwords::escape(berkshelf_config knife)
+      end
+
+      cmd = "berks update --debug --berksfile %s %s" % [
+        Shellwords::escape(berksfile), knife_args
       ]
       begin
         $stdout.puts "berks_update: %s" % cmd
@@ -194,13 +199,17 @@ module KitchenHooks
     end
 
 
-    def self.berks_install berksfile
+    def self.berks_install berksfile, knife=nil
       $stdout.puts '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)
+      knife_args = if knife
+        '--config %s' % Shellwords::escape(berkshelf_config knife)
+      end
+
+      cmd = "berks install --debug --berksfile %s %s" % [
+        Shellwords::escape(berksfile), knife_args
       ]
       begin
         $stdout.puts "berks_install: %s" % cmd

metadata

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