kitchen_hooks 1.7.26 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b367aa04721e0b42d406ec83db60d6ddc4db3be7
-  data.tar.gz: 5828d5a22e16ccaca7454764d5326fc48698840a
+  metadata.gz: 10e00dcf0586a32a7acfe37380f22d21ab232f5d
+  data.tar.gz: cb0ab89934f27249a428dd93f61e44692b9d63c4
 SHA512:
-  metadata.gz: ec1e248b5d6df98aafee37227092967fd2c5f0a638a6203985e5bcf59ad4c0083c7bccc61c174a3f39d02a80eb57d61737f25643cc15446f0930c2a47bb615a1
-  data.tar.gz: ab58b723a092d5a08ba0807ed3c623cc443cd735f50a29277cd73eb72fefb8cc1d970cfbe61a6f420f2694a119f070c79af96d1fce1064866bd5eb2fe971450d
+  metadata.gz: db1cb36a1d866f2db7219f56b0ce8fc9df7f7b6a90152889888508b936fc1172061cd40cd541e0c3abb76b5e3ddab6e9c1014a99c03de59e823646e557a1dd48
+  data.tar.gz: ec7b9f5a8156cee490d7eac6209e8bfebba875fd6f13e0c9fbbade0c61f01c99b1641b1735439e92e09c1e740c6481a6457a3f5e0aa80d7c52e2909c13b70772

data/VERSION

@@ -1 +1 @@
-1.7.26
+1.8.0

data/etc/commit-constraint.json

@@ -6,16 +6,16 @@
   "user_name": "Sean Clemmer",
   "repository": {
     "name": "realm_catalyst",
-    "url": "git@git.bluejeansnet.com:chef/realm_catalyst.git",
+    "url": "git@git.bjn.io:chef/realm_catalyst.git",
     "description": "",
-    "homepage": "http://git.bluejeansnet.com/chef/realm_catalyst"
+    "homepage": "http://git.bjn.io/chef/realm_catalyst"
   },
   "commits": [
     {
       "id": "0835e7c74314cfe2aa9f98fe47338031b637ef95",
       "message": "XYZ",
       "timestamp": "2014-11-25T18:30:57-08:00",
-      "url": "http://git.bluejeansnet.com/chef/realm_catalyst/commit/7b238ce9c6cff250db5a0b727b9661b618b82e1d",
+      "url": "http://git.bjn.io/chef/realm_catalyst/commit/7b238ce9c6cff250db5a0b727b9661b618b82e1d",
       "author": {
         "name": "Sean Clemmer",
         "email": "sclemmer@bluejeans.com"

data/etc/commit-cookbook.json

@@ -6,9 +6,9 @@
   "user_name": "Sean Clemmer",
   "repository": {
     "name": "app_graphite",
-    "url": "git@git.bluejeansnet.com:chef/app_graphite.git",
+    "url": "git@git.bjn.io:chef/app_graphite.git",
     "description": "",
-    "homepage": "http://git.bluejeansnet.com/chef/app_graphite"
+    "homepage": "http://git.bjn.io/chef/app_graphite"
   },
   "commits": [
 

data/etc/commit-release.json

@@ -1,21 +1,21 @@
 {
-  "before": "46cb7ed07e5683d6418d4c47ba5d9389cc2d9b19",
-  "after": "a2d9936039782e7e089651f5dced113d00d84d9c",
-  "ref": "refs/tags/v0.2.12",
+  "before": "f9f511eb4e2175d67bc1c02d8b66cb7b1d4c72eb",
+  "after": "b5947da6ab47cc2227406fcd383b146d97a7355e",
+  "ref": "refs/tags/v1.20.18",
   "user_id": 645,
   "user_name": "Sean Clemmer",
   "repository": {
-    "name": "app_cassandra_dse",
-    "url": "git@git.bluejeansnet.com:chef/app_cassandra_dse.git",
+    "name": "realm_logger",
+    "url": "git@git.bjn.io:chef/realm_logger.git",
     "description": "",
-    "homepage": "http://git.bluejeansnet.com/chef/app_cassandra_dse"
+    "homepage": "http://git.bjn.io/chef/realm_logger"
   },
   "commits": [
     {
-      "id": "a2d9936039782e7e089651f5dced113d00d84d9c",
+      "id": "b5947da6ab47cc2227406fcd383b146d97a7355e",
       "message": "XYZ",
       "timestamp": "2014-11-25T18:30:57-08:00",
-      "url": "http://git.bluejeansnet.com/chef/app_cassandra_dse/commit/a2d9936039782e7e089651f5dced113d00d84d9c",
+      "url": "http://git.bjn.io/chef/realm_logger/commit/b5947da6ab47cc2227406fcd383b146d97a7355e",
       "author": {
         "name": "Sean Clemmer",
         "email": "sclemmer@bluejeans.com"

data/kitchen_hooks.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'hipchat', '~> 1.4.0'
   s.add_runtime_dependency 'daybreak', '~> 0.3'
   s.add_runtime_dependency 'retryable', '~> 2'
-  s.add_runtime_dependency 'berkshelf', '~> 3'
+  s.add_runtime_dependency 'berkshelf', '~> 4'
   s.add_runtime_dependency 'thor', '~> 0'
   s.add_runtime_dependency 'git', '~> 1.2'
   s.add_runtime_dependency 'sinatra', '~> 1.4'
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'chef', '< 12.0.0'
   s.add_runtime_dependency 'eventmachine', '= 1.0.4'
   s.add_runtime_dependency 'thin', '= 1.6.3'
+  s.add_runtime_dependency 'pmap', '~> 1'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test/*`.split("\n")

data/lib/kitchen_hooks/helpers.rb

@@ -2,8 +2,10 @@ require 'securerandom'
 require 'shellwords'
 require 'fileutils'
 require 'tempfile'
+require 'tmpdir'
 require 'json'
 
+require 'pmap'
 require 'git'
 require 'ridley'
 require 'berkshelf'
@@ -63,7 +65,7 @@ module KitchenHooks
           $stdout.puts 'Applying constraints'
           constraints = lockfile_constraints 'Berksfile.lock'
           environment = tag_name event
-          knives.each do |k|
+          knives.peach do |k|
             apply_constraints constraints, environment, k
             verify_constraints constraints, environment, k
           end
@@ -110,8 +112,15 @@ module KitchenHooks
         if File.exist? berksfile
           $stdout.puts 'Uploading dependencies'
           berks_install berksfile
-          knives.each do |knife|
-            berks_upload berksfile, knife
+
+          knives.map do |knife|
+            tmp_root = Dir.mktmpdir
+            tmp_path = File.join tmp_root, File.basename(knife, '.rb')
+            FileUtils.copy_entry clone, tmp_path
+            [ knife, tmp_path ]
+          end.peach do |(knife, tmp_path)|
+            tmp_berksfile = File.join tmp_path, 'Berksfile'
+            berks_upload tmp_berksfile, knife
           end
         end
 
@@ -159,13 +168,14 @@ module KitchenHooks
 
       if Dir.exist? 'environments'
         $stdout.puts 'Uploading environments'
-        Dir['environments/*'].each do |e|
-          knives.each do |k|
-            begin
-              upload_environment e, k
-            rescue
-              raise 'Could not upload environments'
+        knives.peach do |k|
+          begin
+            Dir['environments/*'].each do |e|
+              upload_environment e, k # Can't use the default logic, as we
+                                      # maintain our own pins
             end
+          rescue
+            raise 'Could not upload environments'
           end
         end
       end
@@ -277,7 +287,7 @@ module KitchenHooks
     end
 
     def self.with_each_knife command, knives
-      knives.map do |k|
+      knives.pmap do |k|
         cmd = "#{command} 2>&1" % { knife: Shellwords::escape(k) }
         $stdout.puts 'with_each_knife: %s' % cmd
         out = `#{cmd}`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 1.7.26
+  version: 1.8.0
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hipchat
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: pmap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: GitLab WebHoook for automated Chef Server uploads.
 email: sclemmer@bluejeans.com
 executables:
@@ -225,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: GitLab WebHoook for automated Chef Server uploads