kitchen_hooks 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 046154a4b88d80717a736a92fe23ef563a8ad0c6
-  data.tar.gz: 9b744168be0fb82f447e1671d252fe67ff273989
+  metadata.gz: 50100dd02824f80b639343180a6ff96e82570f1b
+  data.tar.gz: 410484be1fde8357b5340607b61b06fcc9ec27b6
 SHA512:
-  metadata.gz: 45cacae260772d904a5891f561cdcdb90aa82622b11b85c105361a0937b16605c8002fc06fd583ccafa03153038fe6a35671b823f55c856eb65b48c107e8ec20
-  data.tar.gz: c9a2d6ffd3c7161f80fc2cc92669e6a7c0b4e7e6e3826441720833b7771977762e8edb72c62dda6d737f55384489a265e8f6179ef3db5d5e877b9ce1dd1093ff
+  metadata.gz: f53fdb8d519a757f5e19fa6a700c269062efcdfc6483b99318ffecd3b3fe62695c0530686cab0099c13a1e3eee3a2cb5b2d7cb7d19e660180b863cd4872e40d7
+  data.tar.gz: bb8df9b4cce3a81a690949fef12553c805791a94ec51f79e28c0bd2139a93aa63eeba64e01be34c2ffea2028cc98f4f798e25b908d2c8e3443a089c8395a9017

data/Rakefile

@@ -25,7 +25,6 @@ end
 # "rake build"
 require 'rubygems/tasks'
 Gem::Tasks.new({
-  push: false,
   sign: {}
 }) do |tasks|
   tasks.console.command = 'pry'

data/VERSION

@@ -1 +1 @@
-1.5.7
+1.5.8

data/lib/kitchen_hooks/helpers.rb

@@ -24,6 +24,7 @@ module KitchenHooks
     end
 
 
+
     def perform_constraint_application event, knives
       logger.debug 'started perform_constraint_application event=%s, knives=%s' % [
         event['after'], knives.inspect
@@ -56,18 +57,7 @@ module KitchenHooks
 
       tmp_clone event, :latest_commit do |clone|
         Dir.chdir clone do
-          logger.info 'Uploading data_bags'
-          with_each_knife_do 'upload data_bags --chef-repo-path .', knives
-
-          logger.info 'Uploading roles'
-          with_each_knife_do 'upload roles --chef-repo-path .', knives
-
-          logger.info 'Uploading environments'
-          Dir['environments/*'].each do |e|
-            knives.each do |k|
-              upload_environment e, k
-            end
-          end
+          kitchen_upload knives
         end
       end
 
@@ -91,6 +81,9 @@ module KitchenHooks
 
           logger.info 'Uploading cookbook'
           with_each_knife_do "cookbook upload #{cookbook_name event} -o .. --freeze", knives
+
+          logger.info 'Uploading bundled roles, environments, and data bags'
+          kitchen_upload knives
         end
 
         berksfile = File::join clone, 'Berksfile'
@@ -110,6 +103,23 @@ module KitchenHooks
     end
 
 
+
+    def kitchen_upload knives
+      logger.info 'Uploading data_bags'
+      with_each_knife_do 'upload data_bags --chef-repo-path .', knives
+
+      logger.info 'Uploading roles'
+      with_each_knife_do 'upload roles --chef-repo-path .', knives
+
+      logger.info 'Uploading environments'
+      Dir['environments/*'].each do |e|
+        knives.each do |k|
+          upload_environment e, k
+        end
+      end
+    end
+
+
     def berkshelf_config knife
       ridley = Ridley::from_chef_config knife
       config = {

metadata

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