kitchen_hooks 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ba01245e85b486d5f099f93e5f0ae885b9e3b8b
-  data.tar.gz: 43545a336ce67ed90d2811feabf492241c473dd3
+  metadata.gz: ba54f91fdcaa672cb23cc618b70e3ce6146f7f5e
+  data.tar.gz: 11d5dbebc002f951ed058746c9dd04a4c7a3dcd5
 SHA512:
-  metadata.gz: 92b6f867be7b41dd6656f0eea50fc93959029b65fb533aea29ba31c8a2f597cd2fc5757bc30a8d15aa445b94f4544ac43507435abb319bfb1379a29de97697d7
-  data.tar.gz: 8d4d64798df6bf7e8170375f475efd22b21d8898c4879f37b9615cf1045caceb2084d4b93227dbbab9e345dfdeda1ca753adceaa5c4de28e1be8718b3f0e9465
+  metadata.gz: 3e5b28855dc3075f3ccb71c927d8dcd850d7b2542cdb6db1324a43d3be67d8e1953229901f5c56991bab810d884229150cccb075b9f88cec11ab04ab096d9439
+  data.tar.gz: 12859577b41a687be8f2d37af00dcd220cbfcefc9066185dfdd97ae615cf305b02d0b40564e74c5cf1cc12d282668af012e709b2fa472d6297045a12a989d392

data/Readme.md

@@ -100,6 +100,7 @@ The configuration file is just JSON. Hopefully it's obvious:
         "token": "your_v1_api_token"
       },
       "git_protocol": "daemon",
+      "cookbook_upload_method": "berkshelf",
       "knives": {
         "user": "~/.chef/knife.rb",
         "system": "/etc/chef/knife.rb",

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/kitchen_hooks/app.rb

@@ -65,6 +65,7 @@ module KitchenHooks
         @@hipchat_room = config['hipchat']['room'] || raise('No HipChat "room" provided')
       end
       @@git_protocol = config.fetch('git_protocol', 'daemon')
+      @@cookbook_upload_method = config.fetch('cookbook_upload_method', 'berkshelf')
       @@knives = config['knives'].map do |_, knife|
         Pathname.new(knife).expand_path.realpath.to_s
       end
@@ -208,7 +209,11 @@ 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
+          if @@cookbook_upload_method == 'berkshelf'
+            perform_cookbook_upload event, knives
+          else
+            perform_knife_cookbook_upload event, knives
+          end
         rescue Exception => e
           report_error e, 'Could not perform cookbook upload: <i>%s</i>' % e.message.lines.first
         end

data/lib/kitchen_hooks/helpers.rb

@@ -113,6 +113,39 @@ module KitchenHooks
     end
 
 
+    def self.perform_knife_cookbook_upload event, knives
+      $stdout.puts 'started perform_cookbook_upload event=%s, knives=%s' % [
+        event['after'], knives.inspect
+      ]
+
+      tmp_clone event, :tagged_commit do |clone|
+        tagged_version = tag_name(event).delete('v')
+        if File.exist? File.join(clone, 'VERSION')
+          cookbook_version = File.read(File.join(clone, 'VERSION')).strip
+        else
+          cookbook_version = File.foreach(File.join(clone, 'metadata.rb')).grep(/version/)[0][/\"(.*)\"/,1]
+        end
+        unless tagged_version == cookbook_version
+          raise 'Tagged version does not match cookbook version'
+        end
+
+        Dir.chdir clone do
+          $stdout.puts 'Uploading cookbook'
+          begin
+            with_each_knife_do "cookbook upload #{cookbook_name event} -o .. --freeze", knives
+          rescue => e
+            unless e.to_s =~ /frozen/i # Ignore frozen cookbooks already uploaded
+              raise "Knife exited unsuccessfully: #{e}"
+            end
+          end
+        end
+      end
+
+      $stdout.puts "finished cookbook_upload: #{event['after']}"
+      return # no error
+    end
+
+
     def self.perform_cookbook_upload event, knives
       $stdout.puts 'started perform_cookbook_upload event=%s, knives=%s' % [
         event['after'], knives.inspect
@@ -149,16 +182,6 @@ module KitchenHooks
         end
 
         Dir.chdir clone do
-          # N.B. Knife uploading the cookbook should be unnecessary thanks to Berkshelf...
-          # $stdout.puts 'Uploading cookbook'
-          # begin
-          #   with_each_knife_do "cookbook upload #{cookbook_name event} -o .. --freeze", knives
-          # rescue => e
-          #   unless e.to_s =~ /frozen/i # Ignore frozen cookbooks already uploaded
-          #     raise "Knife exited unsuccessfully: #{e}"
-          #   end
-          # end
-
           if commit_to_realm? event
             $stdout.puts 'Uploading bundled roles, environments, and data bags'
             kitchen_upload knives

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hipchat