kitchen_hooks 1.7.19 → 1.7.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90cf6269ccff702ef06f59870579a1aa1352281c
-  data.tar.gz: c340a7e6d74b942edbf388681a6ece6b90d06de0
+  metadata.gz: fac70dd576d36fc397b807e4f26b0285213308aa
+  data.tar.gz: 11ac93017b9d37f78932895c592c96c1d43e23d5
 SHA512:
-  metadata.gz: 821019eed8e3fd76fe6f4c34e100306cde5e51e332edf58d3ef777b798729db3aeef8ef3dd14df58eaf835475b7e23948f257635e6acf3e9fce636e1155025a7
-  data.tar.gz: 97e4690b0424e8c7d3277c06fef0bffe06d790d15189d02d2fc196fe9e493ea0cce67d797b9c033385c2fe9b01be64825766eab75a1c0f01b7049f4b8102d0fc
+  metadata.gz: 5acb685a916dccac38f28cd80033a6165b0bdaeb53815f0aa11783083df7b6b94e7cf638d7130e79156c2271d3e44b28919b3c868c62b0e47c4f062452baa38c
+  data.tar.gz: 2f20573519ee2a9e05116809c15b2c3949e27a341ce7ff653806a48a27efd592d77d2842d5e165330389183191fcc7f29c3a1669f49d1c0dc591f00dba1cc595

data/VERSION

@@ -1 +1 @@
-1.7.19
+1.7.20

data/etc/commit-cookbook.json

@@ -0,0 +1,17 @@
+{
+  "before": "0000000000000000000000000000000000000000",
+  "after": "34c97335f185916293d5cd3fc41fb5fc0b9535d1",
+  "ref": "refs/tags/v0.2.13",
+  "user_id": 645,
+  "user_name": "Sean Clemmer",
+  "repository": {
+    "name": "app_graphite",
+    "url": "git@git.bluejeansnet.com:chef/app_graphite.git",
+    "description": "",
+    "homepage": "http://git.bluejeansnet.com/chef/app_graphite"
+  },
+  "commits": [
+
+  ],
+  "total_commits_count": 0
+}

data/etc/config.json

@@ -1,8 +1,7 @@
 {
-  "sync_interval": null,
+  "sync_interval": 60,
   "hipchat": null,
   "knives": {
-    "sj1": "~/.chef/sj1.rb",
     "dc1": "~/.chef/dc1.rb",
     "bng11": "~/.chef/bng11.rb"
   }

data/lib/kitchen_hooks/app.rb

@@ -166,15 +166,10 @@ module KitchenHooks
 
 
     def self.process_sync
-      cached_nodes = db['meta_cached_nodes']
-      cached_nodes ||= {}
-      sync_servers = SyncServers.new knives, cached_nodes
-      db.lock do
-        db.set! 'meta_cached_nodes', sync_servers.cached_nodes
-      end
+      db!
+      sync_servers = SyncServers.new knives
       sync = sync_servers.status
       puts 'Sync completed'
-      db!
       sync_tag = sync[:num_failures].zero? ? 'synced' : 'unsynced'
       mark sync, sync_tag
       db!

data/lib/kitchen_hooks/helpers.rb

@@ -119,7 +119,11 @@ module KitchenHooks
 
         Dir.chdir clone do
           $stdout.puts 'Uploading cookbook'
-          with_each_knife_do "cookbook upload #{cookbook_name event} -o .. --freeze", knives
+          begin
+            outs = with_each_knife_do "cookbook upload #{cookbook_name event} -o .. --freeze", knives
+          rescue
+            raise 'Knife exited unsuccessfully. Perhaps the cookbook is frozen'
+          end
 
           $stdout.puts 'Uploading bundled roles, environments, and data bags'
           kitchen_upload knives
@@ -135,19 +139,31 @@ module KitchenHooks
     def self.kitchen_upload knives
       if Dir.exist? 'data_bags'
         $stdout.puts 'Uploading data_bags'
-        with_each_knife_do 'upload data_bags --chef-repo-path .', knives
+        begin
+          with_each_knife_do 'upload data_bags --chef-repo-path .', knives
+        rescue
+          raise 'Could not upload data bags'
+        end
       end
 
       if Dir.exist? 'roles'
         $stdout.puts 'Uploading roles'
-        with_each_knife_do 'upload roles --chef-repo-path .', knives
+        begin
+          with_each_knife_do 'upload roles --chef-repo-path .', knives
+        rescue
+          raise 'Could not upload roles'
+        end
       end
 
       if Dir.exist? 'environments'
         $stdout.puts 'Uploading environments'
         Dir['environments/*'].peach do |e|
           knives.peach do |k|
-            upload_environment e, k
+            begin
+              upload_environment e, k
+            rescue
+              raise 'Could not upload environments'
+            end
           end
         end
       end
@@ -184,7 +200,7 @@ module KitchenHooks
         '--config %s' % Shellwords::escape(berkshelf_config knife)
       end
 
-      cmd = "berks install --debug --berksfile %s %s" % [
+      cmd = 'bundle exec berks install --debug --berksfile %s %s' % [
         Shellwords::escape(berksfile), knife_args
       ]
       begin
@@ -209,7 +225,7 @@ module KitchenHooks
       ]
       config_path = berkshelf_config(knife)
 
-      cmd = "berks upload --debug --berksfile %s --config %s" % [
+      cmd = 'bundle exec berks upload --debug --berksfile %s --config %s' % [
         Shellwords::escape(berksfile), Shellwords::escape(config_path)
       ]
 
@@ -255,15 +271,16 @@ module KitchenHooks
 
 
     def self.with_each_knife_do command, knives
-      with_each_knife "knife #{command} --config %{knife}", knives
+      with_each_knife "bundle exec knife #{command} --config %{knife}", knives
     end
 
     def self.with_each_knife command, knives
       knives.pmap do |k|
         cmd = command % { knife: Shellwords::escape(k) }
         $stdout.puts 'with_each_knife: %s' % cmd
-        system cmd
-        # No error handling here; do that on "berks upload"
+        out = system cmd
+        raise out unless $?.exitstatus.zero?
+        out
       end
     end
 

data/lib/kitchen_hooks/helpers/sync_servers.rb

@@ -110,19 +110,22 @@ private
       successes << n.name
     end
 
-    deleted = [] # Don't delete node objects
-
+    # Don't delete node objects, but do remove them from the cache
     deleted.each do |n|
-      puts 'Deleting node "%s"' % n
-      ridleys.peach(4) do |ridley|
-        begin
-          ridley.node.delete n
-          @cached_nodes.delete n
-        rescue \
-          puts('WARNING: Could not delete node "%s"' % n)
-        end
-      end
+      @cached_nodes.delete n.name
     end
+    deleted = []
+    # deleted.each do |n|
+    #   puts 'Deleting node "%s"' % n
+    #   ridleys.peach(4) do |ridley|
+    #     begin
+    #       ridley.node.delete n
+    #       @cached_nodes.delete n
+    #     rescue \
+    #       puts('WARNING: Could not delete node "%s"' % n)
+    #     end
+    #   end
+    # end
 
     return {
       deleted: deleted,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 1.7.19
+  version: 1.7.20
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hipchat
@@ -193,6 +193,7 @@ files:
 - VERSION
 - bin/kitchen_hooks
 - etc/commit-constraint.json
+- etc/commit-cookbook.json
 - etc/commit-release.json
 - etc/config.json
 - kitchen_hooks.gemspec