kitchen_hooks 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57e367c61cc0d252a78fa6a7a934347f702b59bd
-  data.tar.gz: e3c96ae9eb5a51e064f968d564c7f90772ffd57e
+  metadata.gz: c55fcb4b71fbb2010f6d46b256f2d84b4953dd9c
+  data.tar.gz: 3efdac0901f9b235e3c237dff23e52e99fae879f
 SHA512:
-  metadata.gz: 0448e0bd79eddca8a029766ee64bfb6ce9767795492be28e13a91925c06b59ad1bfbe387d43f13097ffc4ddf6e01d06500db95e34124dd4c641a6222ebc7ab08
-  data.tar.gz: 37295349df30512542481063ddc17cf69a3c7fb0a171ddf7dcbe5bf664336fd1b72e4fe7420a5082fea59458b51e41dc071c1b9325a79efd17f0901116d85224
+  metadata.gz: 6648b4f9e50981912b9d0199bf09d45ec9d970b125131832a0534dda5c70c8e5e5d002f13c5459adf4d0f3e966e6a933641f8d7f8b73018419fcf142217fc7fe
+  data.tar.gz: 9186ae05a8d2d515b3a6ba1a1e89268bbdd3650507fa736ef0b6968c5aab3c00f3a75529974cefd2adfe95c6c351fdf501ff5ba40605d9bb777ec826bdd46235

data/Readme.md

@@ -119,6 +119,10 @@ The `server` command also exposes some options for Sinatra configuration. See
 
 ### Changelog
 
+### 1.7
+
+* Sync nodes between Chef servers
+
 ### 1.6
 
 * First public release

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.7.1

data/kitchen_hooks.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'daybreak', '~> 0.3'
   s.add_runtime_dependency 'retryable', '~> 2'
   s.add_runtime_dependency 'berkshelf', '~> 3'
-  s.add_runtime_dependency 'chef', '~> 12.0.0'
+  s.add_runtime_dependency 'chef', '< 12'
   s.add_runtime_dependency 'thor', '~> 0'
   s.add_runtime_dependency 'git', '~> 1.2'
   s.add_runtime_dependency 'sinatra', '~> 1.4'

data/lib/kitchen_hooks/helpers/sync_servers.rb

@@ -8,10 +8,10 @@ class SyncServers
 
 
   def initialize knives
-    @knives = knives
+    @knives  = knives
     @started = Time.now
-    @status = sync_servers.merge \
-      elapsed: Time.now - @started
+    @status  = sync_servers.merge \
+      elapsed: Time.now - @started rescue nil
   end
 
 
@@ -24,14 +24,22 @@ private
   end
 
   def all_nodes
+    @clients ||= {}
     @all_nodes ||= ridleys.flat_map do |ridley|
-      ridley.partial_search(:node, '*:*', %w[ ohai_time ])
+      clients = ridley.client.all
+      nodes = ridley.partial_search(:node, '*:*', %w[ ohai_time ])
+
+      nodes.each do |n|
+        c = clients.select { |c| c.name == n.name }.shift
+        @clients[n.name] = c unless c.nil?
+      end
+
+      nodes
     end
   end
 
-
   def merged_nodes
-    @merged_nodes ||= all_nodes.group_by(&:name).pmap do |name, copies|
+    @merged_nodes ||= all_nodes.group_by(&:name).pmap do |_, copies|
       copies.sort_by { |c| c.automatic.ohai_time }.last
     end
   end
@@ -41,13 +49,21 @@ private
     nodes = merged_nodes
     failures = Set.new
 
-    nodes.peach(8) do |n|
+    nodes.peach(16) do |n|
       n.reload
+
       ridleys.peach(4) do |ridley|
         ridley.node.create(n) \
         rescue ridley.node.update(n) \
         rescue failures << n.name
+
+        c = @clients[n.name]
+        next if c.nil?
+        ridley.client.create(c) \
+        rescue ridley.client.update(c) \
+        rescue puts('WARNING: Client sync failed for node "%s"' % n.name)
       end
+
       puts 'Synced node "%s"' % n.name
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hipchat
@@ -70,16 +70,16 @@ dependencies:
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: '12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement