kitchen_hooks 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fcd91cc1571abd32219e6c42c434d363ecdd6b6
-  data.tar.gz: 2ecee3e126267b8886eafa3913aab9d2b8bb1bdb
+  metadata.gz: de9b45ecc75ea9db7978e4a39238acc8b640b723
+  data.tar.gz: 8e95dd39e38199cba2024dd230249f0043795683
 SHA512:
-  metadata.gz: bcbff46645c76cec5afd65ffe4af351fb54907eeebdd473b2ba3085d0f049c8ecd0c6cf006cdb315167656de967086fc28e185f9a9f8fa17a6502f99f594cc2b
-  data.tar.gz: d67edc3b6818bdd3dc6524b1a672dbac2a7687b6351022a1584ad52d602315bfe887dd6c2eb156a521f6a921846bfbf2476eb6c2b43cf518d7cd7e3bf4e98806
+  metadata.gz: d2950c8af1f35ec2ab5c27eef6d1e7f17704e51d3eb966d4ee6067b55a710669ca07f3e298303b2ea5f1a505474b2f60d88dd4b2bce921f72dab476bf80e2ab4
+  data.tar.gz: 3db27dfd022ed749f4c6f09104d33140c1b85cf51d3a897fbc026f7e12d7844d71933bb69c215d4331dd4142ec1d125fdc5ca953978e9c64d841bb8d0231c140

data/VERSION

@@ -1 +1 @@
-1.5.4
+1.5.5

data/lib/kitchen_hooks/app.rb

@@ -22,9 +22,9 @@ module KitchenHooks
       @@db = Daybreak::DB.new path
     end
 
-    def self.close!
-      @@db.close
-    end
+    def self.tmp! dir ; @@tmp = dir end
+
+    def self.close! ; @@db.close end
 
     def self.config! config
       @@hipchat = nil
@@ -71,6 +71,7 @@ module KitchenHooks
 
 
   private
+    def tmp ; @@tmp ||= '/tmp' end
 
     def knives ; @@knives ||= [] end
 
@@ -119,7 +120,7 @@ module KitchenHooks
 
     def process event
       if event.nil? # JSON parse failed
-        mark event, 'failure', 'Could not parse WebHook payload'        
+        mark event, 'failure', 'Could not parse WebHook payload'
         return
       end
 
@@ -127,7 +128,7 @@ module KitchenHooks
         possible_error = begin
           perform_kitchen_upload event, knives
         rescue Exception => e
-          report_error e, 'Could not perform kitchen upload'
+          report_error e, 'Could not perform kitchen upload: <i>%s</i>' % e.message
         end
         mark event, 'kitchen upload', possible_error
       end
@@ -137,7 +138,7 @@ module KitchenHooks
         possible_error = begin
           perform_cookbook_upload event, knives
         rescue Exception => e
-          report_error e, 'Could not perform cookbook upload'
+          report_error e, 'Could not perform cookbook upload: <i>%s</i>' % e.message
         end
         mark event, 'cookbook upload', possible_error
       end
@@ -147,7 +148,7 @@ module KitchenHooks
         possible_error = begin
           perform_constraint_application event, knives
         rescue Exception => e
-          report_error e, 'Could not apply constraints'
+          report_error e, 'Could not apply constraints: <i>%s</i>' % e.message
         end
         mark event, 'constraint application', possible_error
       end

data/lib/kitchen_hooks/helpers.rb

@@ -1,3 +1,4 @@
+require 'securerandom'
 require 'shellwords'
 require 'fileutils'
 require 'tempfile'
@@ -8,6 +9,7 @@ require 'ridley'
 require 'berkshelf'
 
 
+Celluloid.logger = nil
 Berkshelf.logger = Logger.new $stdout
 
 module KitchenHooks
@@ -24,16 +26,20 @@ module KitchenHooks
 
     def perform_constraint_application event, knives
       logger.debug 'started perform_constraint_application event=%s, knives=%s' % [
-        event.inspect, knives.inspect
+        event['after'], knives.inspect
       ]
+
       tmp_clone event, :tagged_commit do |clone|
         Dir.chdir clone do
+
           logger.info 'Applying constraints'
           constraints = lockfile_constraints 'Berksfile.lock'
           environment = tag_name event
           knives.each do |k|
             apply_constraints constraints, environment, k
+            verify_constraints constraints, environment, k
           end
+
         end
       end
 
@@ -45,7 +51,7 @@ module KitchenHooks
     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
+        event['after'], knives.inspect
       ]
 
       tmp_clone event, :latest_commit do |clone|
@@ -72,7 +78,7 @@ module KitchenHooks
 
     def perform_cookbook_upload event, knives
       logger.debug 'started perform_cookbook_upload event=%s, knives=%s' % [
-        event.inspect, knives.inspect
+        event['after'], knives.inspect
       ]
 
       tmp_clone event, :tagged_commit do |clone|
@@ -124,17 +130,27 @@ module KitchenHooks
 
 
     def tmp_clone event, commit_method, &block
-      logger.debug 'started tmp_clone event=%s, commit_method=%s' % [
-        event.inspect, commit_method.inspect
+      logger.debug 'starting tmp_clone event=%s, commit_method=%s' % [
+        event['after'], commit_method.inspect
       ]
-      Dir.mktmpdir do |tmp|
-        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
-      end
+
+      root = File::join tmp, SecureRandom.hex
+      dir = File::join root, 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)
+
+      logger.debug 'creating tmp_clone dir=%s, commit=%s' % [
+        dir.inspect, commit.inspect
+      ]
+
+      repo.checkout commit
+
+      yield dir
+
+      FileUtils.rm_rf root
       logger.debug 'finished tmp_clone'
     end
 
@@ -148,16 +164,32 @@ module KitchenHooks
     end
 
 
+    def get_environment environment, knife
+      ridley = Ridley::from_chef_config knife
+      ridley.environment.find environment
+    end
+
+
+    def verify_constraints constraints, environment, knife
+      logger.debug 'started verify_constraints environment=%s, knife=%s' % [
+        environment.inspect, knife.inspect
+      ]
+      chef_environment = get_environment environment, knife
+      unless constraints == chef_environment.cookbook_versions
+        raise 'Environment did not match constraints'
+      end
+      logger.debug 'finished verify_constraints: %s' % environment
+    end
+
+
     def apply_constraints constraints, environment, knife
       # 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
+      logger.debug 'started apply_constraints environment=%s, knife=%s' % [
+        environment.inspect, knife.inspect
       ]
-      Celluloid.logger = nil
-      ridley = Ridley::from_chef_config knife
-      chef_environment = ridley.environment.find(environment)
+      chef_environment = get_environment environment, knife
       raise 'Could not find environment "%s"' % environment if chef_environment.nil?
       chef_environment.cookbook_versions = constraints
       chef_environment.save

data/lib/kitchen_hooks/main.rb

@@ -55,8 +55,14 @@ module KitchenHooks
       aliases: %w[ -d ],
       desc: 'Location of application database',
       default: '/etc/kitchen_hooks/app.db'
+    option :tmpdir, \
+      type: :string,
+      aliases: %w[ -t ],
+      desc: 'Location of temporary directory',
+      default: '/tmp'
     def server
       App.db! options.database
+      App.tmp! options.tmpdir
       App.config! JSON::parse(File.read(options.config))
       App.set :environment, options.environment
       App.set :port, options.port

metadata

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