kitchen_hooks 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc604b1b2abab2073d9e568aaa74126476eca24e
-  data.tar.gz: 6f8dab7e189d19fd33a4fa15c4e590b15c831b44
+  metadata.gz: 0fcd91cc1571abd32219e6c42c434d363ecdd6b6
+  data.tar.gz: 2ecee3e126267b8886eafa3913aab9d2b8bb1bdb
 SHA512:
-  metadata.gz: e31f2ac0f8bb6d0e152ace39709ba420b56484f8e3ce22de3ea1d03e9697a352100eb29ff8853d1ccce9e92bc001b1403505df716cc2e8f8527c3048e25ff5cf
-  data.tar.gz: e1ed91030b09ec8dee1a399f316c46c193dd8d6cf9670528ed4f376dc2426cbfea227dcf08e4fd00a95cc568f0b7235e94394a547bb0e611d7c46d5e5e2f6728
+  metadata.gz: bcbff46645c76cec5afd65ffe4af351fb54907eeebdd473b2ba3085d0f049c8ecd0c6cf006cdb315167656de967086fc28e185f9a9f8fa17a6502f99f594cc2b
+  data.tar.gz: d67edc3b6818bdd3dc6524b1a672dbac2a7687b6351022a1584ad52d602315bfe887dd6c2eb156a521f6a921846bfbf2476eb6c2b43cf518d7cd7e3bf4e98806

data/VERSION

@@ -1 +1 @@
-1.5.3
+1.5.4

data/etc/commit.json

@@ -1,7 +1,7 @@
 {
   "before": "08f20548e398f634979047d0c8114260bcc2949a",
   "after": "7b238ce9c6cff250db5a0b727b9661b618b82e1d",
-  "ref": "refs/tags/v1.5.1",
+  "ref": "refs/tags/bjn_test",
   "user_id": 645,
   "user_name": "Sean Clemmer",
   "repository": {

data/lib/kitchen_hooks/app.rb

@@ -117,14 +117,6 @@ module KitchenHooks
     end
 
 
-    def err_out e, msg
-      logger.error msg
-      logger.error e.message
-      logger.error e.backtrace.inspect
-      msg
-    end
-
-
     def process event
       if event.nil? # JSON parse failed
         mark event, 'failure', 'Could not parse WebHook payload'        
@@ -133,9 +125,9 @@ module KitchenHooks
 
       if commit_to_kitchen?(event)
         possible_error = begin
-          perform_kitchen_upload(event, knives)
+          perform_kitchen_upload event, knives
         rescue Exception => e
-          err_out e, 'Could not perform kitchen upload'
+          report_error e, 'Could not perform kitchen upload'
         end
         mark event, 'kitchen upload', possible_error
       end
@@ -143,9 +135,9 @@ module KitchenHooks
       if tagged_commit_to_cookbook?(event) &&
          tag_name(event) =~ /^v\d+/ # Cookbooks tagged with a version
         possible_error = begin
-          perform_cookbook_upload(event, knives)
+          perform_cookbook_upload event, knives
         rescue Exception => e
-          err_out e, 'Could not perform cookbook upload'
+          report_error e, 'Could not perform cookbook upload'
         end
         mark event, 'cookbook upload', possible_error
       end
@@ -153,9 +145,9 @@ module KitchenHooks
       if tagged_commit_to_realm?(event) &&
          tag_name(event) =~ /^bjn_/ # Realms tagged with an environment
         possible_error = begin
-          perform_constraint_application(event, knives)
+          perform_constraint_application event, knives
         rescue Exception => e
-          err_out e, 'Could not apply constraints'
+          report_error e, 'Could not apply constraints'
         end
         mark event, 'constraint application', possible_error
       end

data/lib/kitchen_hooks/helpers.rb

@@ -13,7 +13,19 @@ Berkshelf.logger = Logger.new $stdout
 module KitchenHooks
   module Helpers
 
+    def report_error e, msg=nil
+      msg = e.message if msg.nil?
+      logger.error msg
+      logger.error e.message
+      logger.error e.backtrace.inspect
+      msg
+    end
+
+
     def perform_constraint_application event, knives
+      logger.debug 'started perform_constraint_application event=%s, knives=%s' % [
+        event.inspect, knives.inspect
+      ]
       tmp_clone event, :tagged_commit do |clone|
         Dir.chdir clone do
           logger.info 'Applying constraints'
@@ -25,13 +37,16 @@ module KitchenHooks
         end
       end
 
-      logger.info "finished perform_constraint_application: #{event['after']}"
-      return true # no error
+      logger.debug "finished perform_constraint_application: #{event['after']}"
+      return # no error
     end
 
 
     def perform_kitchen_upload event, knives
       return false unless commit_to_master?(event)
+      logger.debug 'started perform_kitchen_upload event=%s, knives=%s' % [
+        event.inspect, knives.inspect
+      ]
 
       tmp_clone event, :latest_commit do |clone|
         Dir.chdir clone do
@@ -50,12 +65,16 @@ module KitchenHooks
         end
       end
 
-      logger.info "finished perform_kitchen_upload: #{event['after']}"
-      return true # no error
+      logger.debug "finished perform_kitchen_upload: #{event['after']}"
+      return # no error
     end
 
 
     def perform_cookbook_upload event, knives
+      logger.debug 'started perform_cookbook_upload event=%s, knives=%s' % [
+        event.inspect, knives.inspect
+      ]
+
       tmp_clone event, :tagged_commit do |clone|
         Dir.chdir clone do
           tagged_version = tag_name(event).delete('v')
@@ -79,12 +98,15 @@ module KitchenHooks
         end
       end
 
-      logger.info "finished cookbook_upload: #{event['after']}"
-      return true # no error
+      logger.debug "finished cookbook_upload: #{event['after']}"
+      return # no error
     end
 
 
     def berks_upload berksfile, knife, options={}
+      logger.debug 'started berks_upload berksfile=%s, knife=%s' % [
+        berksfile.inspect, knife.inspect
+      ]
       ridley = Ridley::from_chef_config knife
       options.merge! \
         berksfile: berksfile,
@@ -97,24 +119,31 @@ module KitchenHooks
       berksfile = Berkshelf::Berksfile.from_options(options)
       berksfile.install
       berksfile.upload [], options
+      logger.debug 'finished berks_upload: %s' % berksfile
     end
 
 
     def tmp_clone event, commit_method, &block
+      logger.debug 'started tmp_clone event=%s, commit_method=%s' % [
+        event.inspect, commit_method.inspect
+      ]
       Dir.mktmpdir do |tmp|
-        dir = File::join tmp, cookbook_name(event)
+        dir = File::join tmp, Time.now.to_f.to_s, cookbook_name(event)
+        FileUtils.mkdir_p dir
         repo = Git.clone git_daemon_style_url(event), dir, log: $stdout
         commit = self.send(commit_method, event)
         repo.checkout commit
         yield dir
-        FileUtils.rm_rf dir
       end
+      logger.debug 'finished tmp_clone'
     end
 
 
     def with_each_knife command, knives
       knives.map do |k|
-        `knife #{command} --config #{Shellwords::escape k}`
+        cmd = "knife #{command} --config #{Shellwords::escape k}"
+        logger.debug 'with_each_knife: %s' % cmd
+        `#{cmd}`
       end
     end
 
@@ -123,12 +152,16 @@ module KitchenHooks
       # Ripped from Berkshelf::Cli::apply and Berkshelf::Lockfile::apply
       # https://github.com/berkshelf/berkshelf/blob/master/lib/berkshelf/cli.rb
       # https://github.com/berkshelf/berkshelf/blob/master/lib/berkshelf/lockfile.rb
+      logger.debug 'started apply_constraints constraints=%s, environment=%s, knife=%s' % [
+        constraints.inspect, environment.inspect, knife.inspect
+      ]
       Celluloid.logger = nil
       ridley = Ridley::from_chef_config knife
       chef_environment = ridley.environment.find(environment)
-      raise if chef_environment.nil?
+      raise 'Could not find environment "%s"' % environment if chef_environment.nil?
       chef_environment.cookbook_versions = constraints
       chef_environment.save
+      logger.debug 'finished apply_constraints: %s' % environment
     end
 
 
@@ -137,14 +170,19 @@ module KitchenHooks
       # https://github.com/berkshelf/berkshelf/blob/master/lib/berkshelf/cli.rb
       # https://github.com/berkshelf/berkshelf/blob/master/lib/berkshelf/lockfile.rb
       lockfile = Berkshelf::Lockfile.from_file lockfile_path
-      lockfile.graph.locks.inject({}) do |hash, (name, dependency)|
+      constraints = lockfile.graph.locks.inject({}) do |hash, (name, dependency)|
         hash[name] = "= #{dependency.locked_version.to_s}"
         hash
       end
+      logger.debug 'constraints: %s -> %s' % [ lockfile_path, constraints ]
+      return constraints
     end
 
 
     def upload_environment environment, knife
+      logger.debug 'started upload_environment environment=%s, knife=%s' % [
+        environment.inspect, knife.inspect
+      ]
       # Load the local environment from a JSON file
       local_environment = JSON::parse File.read(environment)
       local_environment.delete 'chef_type'
@@ -168,6 +206,7 @@ module KitchenHooks
 
       # Make it so!
       chef_environment.save
+      logger.debug 'finished upload_environment: %s' % environment
     end
 
 

data/lib/kitchen_hooks/main.rb

@@ -1,3 +1,5 @@
+require 'logger'
+
 require 'thor'
 
 require_relative 'app'
@@ -62,6 +64,7 @@ module KitchenHooks
       App.set :raise_errors, true
       App.set :dump_errors, true
       App.set :show_exceptions, true
+      App.set :logging, ::Logger::DEBUG
       App.run!
 
       at_exit do

metadata

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