kitchen_hooks 1.7.12 → 1.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 879271b60f7ed3278914667f77ff0fa78522ff73
-  data.tar.gz: 24b0ef026b048413be1abe56c52638d04bd502b3
+  metadata.gz: 7547b532dfd1f1769211d8d0dfbaff80c9cc9ec4
+  data.tar.gz: 11b5bd99de0c8b841daf1b4b41c3af944ebbe362
 SHA512:
-  metadata.gz: 24fe45ff786b42532a7c718f205aaf16700bed28a03d05fa4d8a81a45a62523c0a9b77cd2b3f7dcebb03d52d5908d3e33a58f943e199a704124cda81965a8d13
-  data.tar.gz: bf8c45907d3eba179a909d154fe886776b297c6c03038d77f416377e48c79709a731141549d8691d5faec5084b690b57998724be702e228524c766d0790764f3
+  metadata.gz: 5bc83fafd03deb3f8ed2c583d8106544fde41061325d8f396d78cd214031d49cfd122275b68d10bc8d8b112a88410ae805a44aad0b8b6265c39cb58d171b9ce3
+  data.tar.gz: 7f3773e3589c928837199b2b1e609eb65809e6a44705607e7e8be55e69032641bb0366a8683a7e4cafb5bae656c80efbc7b0638902ead4336774caaf30de7374

data/VERSION

@@ -1 +1 @@
-1.7.12
+1.7.13

data/etc/commit-release.json

@@ -1,21 +1,21 @@
 {
   "before": "52398401e005ec9003e932571147366cdaa3ce4b",
   "after": "52398401e005ec9003e932571147366cdaa3ce4b",
-  "ref": "refs/tags/v0.10.1",
+  "ref": "refs/tags/v0.2.5",
   "user_id": 645,
   "user_name": "Sean Clemmer",
   "repository": {
-    "name": "realm_bitcouncil",
-    "url": "git@git.bluejeansnet.com:chef/realm_bitcouncil.git",
+    "name": "app_cassandra_dse",
+    "url": "git@git.bluejeansnet.com:chef/app_cassandra_dse.git",
     "description": "",
-    "homepage": "http://git.bluejeansnet.com/chef/realm_bitcouncil"
+    "homepage": "http://git.bluejeansnet.com/chef/app_cassandra_dse"
   },
   "commits": [
     {
       "id": "52398401e005ec9003e932571147366cdaa3ce4b",
       "message": "XYZ",
       "timestamp": "2014-11-25T18:30:57-08:00",
-      "url": "http://git.bluejeansnet.com/chef/realm_bitcouncil/commit/52398401e005ec9003e932571147366cdaa3ce4b",
+      "url": "http://git.bluejeansnet.com/chef/app_cassandra_dse/commit/bbdfcc13233ca0173c75896155c8013e08fa81e6",
       "author": {
         "name": "Sean Clemmer",
         "email": "sclemmer@bluejeans.com"

data/lib/kitchen_hooks/helpers.rb

@@ -100,30 +100,26 @@ module KitchenHooks
       ]
 
       tmp_clone event, :tagged_commit do |clone|
-        Dir.chdir clone do
-          tagged_version = tag_name(event).delete('v')
-          cookbook_version = File.read('VERSION').strip
-          unless tagged_version == cookbook_version
-            raise 'Tagged version does not match cookbook version'
-          end
+        tagged_version = tag_name(event).delete('v')
+        cookbook_version = File.read(File.join(clone, 'VERSION')).strip
+        unless tagged_version == cookbook_version
+          raise 'Tagged version does not match cookbook version'
+        end
+
+        berksfile = File::join clone, 'Berksfile'
+        $stdout.puts 'Uploading dependencies'
+        berks_install berksfile
+        knives.peach do |knife|
+          berks_upload berksfile, knife
+        end
 
+        Dir.chdir clone do
           $stdout.puts 'Uploading cookbook'
           with_each_knife_do "cookbook upload #{cookbook_name event} -o .. --freeze", knives
 
           $stdout.puts 'Uploading bundled roles, environments, and data bags'
           kitchen_upload knives
         end
-
-        berksfile = File::join clone, 'Berksfile'
-        berksfile_lock = berksfile + '.lock'
-
-        if File::exist? berksfile_lock
-          $stdout.puts 'Uploading dependencies'
-          berks_install berksfile
-          knives.peach do |knife|
-            berks_upload berksfile, knife
-          end
-        end
       end
 
       $stdout.puts "finished cookbook_upload: #{event['after']}"
@@ -179,6 +175,7 @@ module KitchenHooks
       begin
         $stdout.puts "berks_install: %s" % cmd
         system cmd
+        raise unless $?.exitstatus.zero?
       rescue
         raise 'Could not perform berks_install with config %s' % [
           berksfile.inspect
@@ -204,6 +201,7 @@ module KitchenHooks
       begin
         $stdout.puts "berks_upload: %s" % cmd
         system cmd
+        raise unless $?.exitstatus.zero?
       rescue
         raise 'Could not perform berks_upload with config %s, knife %s' % [
           berksfile.inspect, knife.inspect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 1.7.12
+  version: 1.7.13
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hipchat