kitchen_hooks 1.7.18 → 1.7.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 472d46fc5fb8843093e2a48f636544675cb0ed40
-  data.tar.gz: 2f8efd36c2383c9fb8ed4d6225134ce6cb4387b4
+  metadata.gz: 90cf6269ccff702ef06f59870579a1aa1352281c
+  data.tar.gz: c340a7e6d74b942edbf388681a6ece6b90d06de0
 SHA512:
-  metadata.gz: 4bc693ee14e9feb5a2447f1bd039975395196c0123bdd555387d8272a759996c83905ef060e76501ff6f912ca88dc7efbad4bb8b20764d8421d2ad806134a2df
-  data.tar.gz: ea6fa9651d53110cd3c32d6d5c0a465f5c163166451be663fac84ddce315c88d0136ed1566b2290e9d15fcba37093c3405fbf0d46273f5845522ffe1b0e61466
+  metadata.gz: 821019eed8e3fd76fe6f4c34e100306cde5e51e332edf58d3ef777b798729db3aeef8ef3dd14df58eaf835475b7e23948f257635e6acf3e9fce636e1155025a7
+  data.tar.gz: 97e4690b0424e8c7d3277c06fef0bffe06d790d15189d02d2fc196fe9e493ea0cce67d797b9c033385c2fe9b01be64825766eab75a1c0f01b7049f4b8102d0fc

data/VERSION

@@ -1 +1 @@
-1.7.18
+1.7.19

data/lib/kitchen_hooks/app.rb

@@ -145,9 +145,13 @@ module KitchenHooks
         db[Time.now.to_f] = entry
       end
       db.flush
+      $stderr.puts '*********************************************'
+      $stderr.puts '#############################################'
       $stderr.puts 'MARK "%s": event=%s error=%s' % [
         type, event.inspect, error.inspect
       ]
+      $stderr.puts '#############################################'
+      $stderr.puts '*********************************************'
       notify entry
     end
 

data/lib/kitchen_hooks/helpers.rb

@@ -107,13 +107,14 @@ module KitchenHooks
         end
 
         berksfile = File::join clone, 'Berksfile'
-        berksfile_lock = "#{berksfile}.lock"
+        # berksfile_lock = "#{berksfile}.lock"
 
-        $stdout.puts 'Uploading dependencies'
-        FileUtils.rm_rf File.join(ENV['HOME'], '.berkshelf')
-        berks_install berksfile
-        knives.peach do |knife|
-          berks_upload berksfile, knife
+        if File.exist? berksfile
+          $stdout.puts 'Uploading dependencies'
+          berks_install berksfile
+          knives.peach do |knife|
+            berks_upload berksfile, knife
+          end
         end
 
         Dir.chdir clone do
@@ -132,16 +133,22 @@ module KitchenHooks
 
 
     def self.kitchen_upload knives
-      $stdout.puts 'Uploading data_bags'
-      with_each_knife_do 'upload data_bags --chef-repo-path .', knives
+      if Dir.exist? 'data_bags'
+        $stdout.puts 'Uploading data_bags'
+        with_each_knife_do 'upload data_bags --chef-repo-path .', knives
+      end
 
-      $stdout.puts 'Uploading roles'
-      with_each_knife_do 'upload roles --chef-repo-path .', knives
+      if Dir.exist? 'roles'
+        $stdout.puts 'Uploading roles'
+        with_each_knife_do 'upload roles --chef-repo-path .', knives
+      end
 
-      $stdout.puts 'Uploading environments'
-      Dir['environments/*'].peach do |e|
-        knives.peach do |k|
-          upload_environment e, k
+      if Dir.exist? 'environments'
+        $stdout.puts 'Uploading environments'
+        Dir['environments/*'].peach do |e|
+          knives.peach do |k|
+            upload_environment e, k
+          end
         end
       end
     end
@@ -168,34 +175,6 @@ module KitchenHooks
     end
 
 
-    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'
-
-      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
-        system cmd
-        raise unless $?.exitstatus.zero?
-      rescue
-        raise 'Could not perform berks_update with config %s' % [
-          berksfile.inspect
-        ]
-      end
-
-      ENV['GIT_DIR'] = env_git_dir
-      ENV['GIT_WORK_TREE'] = env_git_work_tree
-      $stdout.puts 'finished berks_update: %s' % berksfile
-    end
-
-
     def self.berks_install berksfile, knife=nil
       $stdout.puts 'started berks_install berksfile=%s' % berksfile.inspect
       env_git_dir = ENV.delete 'GIT_DIR'

metadata

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