kitchen_hooks 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7740f833b5741e558154e506e2d14edfcd8b8a9b
-  data.tar.gz: 8e2be0c8495189ff45ef569de3bc60db6d0688a1
+  metadata.gz: b114594beb93d413071b7f04b20d984b013fee6d
+  data.tar.gz: d2147026142adc61ea75fcf348a95c1dcd2c1381
 SHA512:
-  metadata.gz: 2a711accc2f2e45abf641c821f2413ab00d8b5b6625c755cc5623da8eba5e8ca4226be5207acdeb5771d463131549f738ef047bc9afa07273cf62e8d817a3747
-  data.tar.gz: bc248d2f54a32439bc72eb45d719eaddb6671ecfd3e6c7e3b6b433bd42ae0ed1906af4d913d2e06b014022f106b3ce554f77d1b4d708b507d57055997d3cac24
+  metadata.gz: 6c47b13b5c82f3ff7d75896a3287ff6204c961690504958364d7452e97eb6c277a6b065a0d87980303b7b1058dcb9e8d99e825e16cc159569b0577c8e6ecbf8a
+  data.tar.gz: 74c879521204d4df768cc1df41a43bdc47f9db4d3584d33496553c56217839ff6bb8d8ccce089231663d1c1a55df2da7a52a16593bc41495aa39234d28deea76

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kitchen_hooks (1.4.2)
+    kitchen_hooks (1.4.3)
       berkshelf (~> 3)
       chef (~> 11.16.4)
       daybreak (~> 0.3)

data/Readme.md

@@ -35,6 +35,7 @@ Use the `server` command to start the WebHook receiver:
 * Add indication of success or failure
 * Add custom timeline icons to distinguish event types
 * Use Ridley for data bag, role, and environment uploads to remove Chef dependency
+* Only make changes on commits to `master` branches
 
 
 ## Changelog
@@ -45,6 +46,7 @@ Use the `server` command to start the WebHook receiver:
 * Added support for HipChat notifications when configured
 * Linked to tag name with `.../commits/TAG` where appropriate
 * Replaced "modified" with more appropriate verb where appropriate
+* Corrected `berks upload` functionality (`berks install` first)
 
 ### 1.3
 

data/VERSION

@@ -1 +1 @@
-1.4.3
+1.4.4

data/lib/kitchen_hooks/helpers.rb

@@ -1,4 +1,5 @@
 require 'shellwords'
+require 'tempfile'
 require 'json'
 
 require 'git'
@@ -12,54 +13,68 @@ module KitchenHooks
   module Helpers
     def perform_constraint_application event, knives
       tag = tag_name event
-      tmp_clone event, :tagged_commit do
-        logger.info 'Applying constraints'
-        constraints = lockfile_constraints 'Berksfile.lock'
-        environment = tag_name event
-        knives.each do |k|
-          apply_constraints constraints, environment, k
+      tmp_clone event, :tagged_commit do |dir|
+        Dir.chdir dir do
+          logger.info 'Applying constraints'
+          constraints = lockfile_constraints 'Berksfile.lock'
+          environment = tag_name event
+          knives.each do |k|
+            apply_constraints constraints, environment, k
+          end
         end
       end
     end
 
     def perform_kitchen_upload event, knives
-      tmp_clone event, :latest_commit do
-        logger.info 'Uploading data_bags'
-        with_each_knife 'upload data_bags --chef-repo-path .', knives
-
-        logger.info 'Uploading roles'
-        with_each_knife 'upload roles --chef-repo-path .', knives
-
-        logger.info 'Uploading environments'
-        Dir['environments/*'].each do |e|
-          knives.each do |k|
-            upload_environment e, k
+      tmp_clone event, :latest_commit do |clone|
+        Dir.chdir clone do
+          logger.info 'Uploading data_bags'
+          with_each_knife 'upload data_bags --chef-repo-path .', knives
+
+          logger.info 'Uploading roles'
+          with_each_knife '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
       end
     end
 
     def perform_cookbook_upload event, knives
-      tmp_clone event, :tagged_commit do
-        tagged_version = tag_name(event).delete('v')
-        cookbook_version = File.read('VERSION').strip
-        raise unless tagged_version == cookbook_version
-        logger.info 'Uploading cookbook'
-        with_each_knife "cookbook upload #{cookbook_name event} -o .. --freeze", knives
-
-        if File::exist?('Berksfile.lock')
+      berksfile = nil
+
+      tmp_clone event, :tagged_commit do |clone|
+
+        Dir.chdir clone do
+          tagged_version = tag_name(event).delete('v')
+          cookbook_version = File.read('VERSION').strip
+          raise unless tagged_version == cookbook_version
+
+          logger.info 'Uploading cookbook'
+          with_each_knife "cookbook upload #{cookbook_name event} -o .. --freeze", knives
+        end
+
+        berksfile = File::join clone, 'Berksfile'
+        berksfile_lock = berksfile + '.lock'
+
+        if File::exist? berksfile_lock
           logger.info 'Uploading dependencies'
           knives.each do |knife|
-            berks_upload knife
+            berks_upload berksfile, knife
           end
         end
       end
     end
 
-    def berks_upload knife, options={}
+    def berks_upload berksfile, knife, options={}
       ridley = Ridley::from_chef_config knife
       options.merge! \
-        berksfile: 'Berksfile',
+        berksfile: berksfile,
+        debug: true,
         freeze: true,
         validate: true,
         server_url: ridley.server_url,
@@ -75,9 +90,7 @@ module KitchenHooks
         dir = File::join tmp, cookbook_name(event)
         repo = Git.clone git_daemon_style_url(event), dir, log: $stdout
         repo.checkout self.send(commit_method, event)
-        Dir.chdir dir do
-          yield
-        end
+        yield dir
       end
     end
 

data/lib/kitchen_hooks/main.rb

@@ -59,6 +59,7 @@ module KitchenHooks
       App.set :environment, options.environment
       App.set :port, options.port
       App.set :bind, options.bind
+      App.set :raise_errors, true
       App.run!
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Kelly Wong