kitchen_hooks 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de9b45ecc75ea9db7978e4a39238acc8b640b723
-  data.tar.gz: 8e95dd39e38199cba2024dd230249f0043795683
+  metadata.gz: 6a1d5107cae4e7385d9eaedc0b4d03ee1214d254
+  data.tar.gz: 99d466d56fbfe8364614ca8e46c8c3ac9890bf31
 SHA512:
-  metadata.gz: d2950c8af1f35ec2ab5c27eef6d1e7f17704e51d3eb966d4ee6067b55a710669ca07f3e298303b2ea5f1a505474b2f60d88dd4b2bce921f72dab476bf80e2ab4
-  data.tar.gz: 3db27dfd022ed749f4c6f09104d33140c1b85cf51d3a897fbc026f7e12d7844d71933bb69c215d4331dd4142ec1d125fdc5ca953978e9c64d841bb8d0231c140
+  metadata.gz: d9b299caa2e7b337ca016f0bd2a04d61e7010ce3767c31f8c6ff9976891ec000620e6e2dfae902867245fc6c1370bdeba13b6f9088a1ae9cc60f89b78474f609
+  data.tar.gz: 87f4f6ea67fd3ffc02c8fcc597ff6c96041303f07729f29575b9d97a9d070de9213963fbc422e97789f590efefa8ef064d0228bb9a7299cf753f104606de2f7b

data/VERSION

@@ -1 +1 @@
-1.5.5
+1.5.6

data/lib/kitchen_hooks/app.rb

@@ -128,7 +128,7 @@ module KitchenHooks
         possible_error = begin
           perform_kitchen_upload event, knives
         rescue Exception => e
-          report_error e, 'Could not perform kitchen upload: <i>%s</i>' % e.message
+          report_error e, 'Could not perform kitchen upload: <i>%s</i>' % e.message.lines.first
         end
         mark event, 'kitchen upload', possible_error
       end
@@ -138,7 +138,7 @@ module KitchenHooks
         possible_error = begin
           perform_cookbook_upload event, knives
         rescue Exception => e
-          report_error e, 'Could not perform cookbook upload: <i>%s</i>' % e.message
+          report_error e, 'Could not perform cookbook upload: <i>%s</i>' % e.message.lines.first
         end
         mark event, 'cookbook upload', possible_error
       end
@@ -148,7 +148,7 @@ module KitchenHooks
         possible_error = begin
           perform_constraint_application event, knives
         rescue Exception => e
-          report_error e, 'Could not apply constraints: <i>%s</i>' % e.message
+          report_error e, 'Could not apply constraints: <i>%s</i>' % e.message.lines.first
         end
         mark event, 'constraint application', possible_error
       end

data/lib/kitchen_hooks/helpers.rb

@@ -57,10 +57,10 @@ module KitchenHooks
       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
+          with_each_knife_do 'upload data_bags --chef-repo-path .', knives
 
           logger.info 'Uploading roles'
-          with_each_knife 'upload roles --chef-repo-path .', knives
+          with_each_knife_do 'upload roles --chef-repo-path .', knives
 
           logger.info 'Uploading environments'
           Dir['environments/*'].each do |e|
@@ -90,7 +90,7 @@ module KitchenHooks
           end
 
           logger.info 'Uploading cookbook'
-          with_each_knife "cookbook upload #{cookbook_name event} -o .. --freeze", knives
+          with_each_knife_do "cookbook upload #{cookbook_name event} -o .. --freeze", knives
         end
 
         berksfile = File::join clone, 'Berksfile'
@@ -109,22 +109,45 @@ module KitchenHooks
     end
 
 
+    def berkshelf_config knife
+      ridley = Ridley::from_chef_config knife
+      config = {
+        chef: {
+          node_name: ridley.client_name,
+          client_key: ridley.client_key,
+          chef_server_url: ridley.server_url
+        },
+        ssl: {
+          verify: false
+        }
+      }
+      config_path = File.join tmp, "#{SecureRandom.hex}-berkshelf.json"
+      File.open(config_path, 'w') do |f|
+        f.puts JSON::pretty_generate config
+      end
+      return config_path
+    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,
-        debug: true,
-        freeze: true,
-        validate: true,
-        server_url: ridley.server_url,
-        client_name: ridley.client_name,
-        client_key: ridley.client_key
-      berksfile = Berkshelf::Berksfile.from_options(options)
-      berksfile.install
-      berksfile.upload [], options
+      config_path = berkshelf_config(knife)
+
+      cmd = "berks install --debug --berksfile %s" % [
+        Shellwords::escape(berksfile)
+      ]
+      logger.debug "berks_install: %s" % cmd
+      system cmd
+
+      cmd = "berks upload --debug --berksfile %s --config %s" % [
+        Shellwords::escape(berksfile), Shellwords::escape(config_path)
+      ]
+      logger.debug "berks_upload: %s" % cmd
+      system cmd
+
+      FileUtils.rm_rf config_path
       logger.debug 'finished berks_upload: %s' % berksfile
     end
 
@@ -155,9 +178,13 @@ module KitchenHooks
     end
 
 
+    def with_each_knife_do command, knives
+      with_each_knife "knife #{command} --config %{knife}", knives
+    end
+
     def with_each_knife command, knives
       knives.map do |k|
-        cmd = "knife #{command} --config #{Shellwords::escape k}"
+        cmd = command % { knife: Shellwords::escape(k) }
         logger.debug 'with_each_knife: %s' % cmd
         `#{cmd}`
       end

metadata

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