bump tk in acceptance and omnibus-software for ruby patch

3 files changed, 31 insertions, 37 deletions

diff --git a/acceptance/Gemfile b/acceptance/Gemfile
index 1cd1d990eb..7b210da1a0 100644
--- a/acceptance/Gemfile
+++ b/acceptance/Gemfile
@@ -8,7 +8,7 @@ gem "inspec"
 gem "kitchen-vagrant"
 gem "windows_chef_zero"
 gem "kitchen-inspec", :github => "mwrock/kitchen-inspec", :branch => "winrm-v2"
-gem "test-kitchen", :github => "test-kitchen", :branch => "winrm-v2"
+gem "test-kitchen"
 gem "train", :github => "chef/train", :branch => "winrm-v2"
 gem "winrm-elevated"
 gem "berkshelf", "4.3.5"
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index c62d98c020..d58c01c239 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
 
 GIT
   remote: git://github.com/chef/train.git
-  revision: 11ec2db8a2c06757335660a2704ca140b24b7ec3
+  revision: 0d380fd0e25466287710408c796623170e02f677
   branch: winrm-v2
   specs:
-    train (0.15.1)
+    train (0.15.0)
       docker-api (~> 1.26)
       json (~> 1.8)
       mixlib-shellout (~> 2.0)
@@ -22,38 +22,24 @@ GIT
 
 GIT
   remote: git://github.com/mwrock/kitchen-inspec.git
-  revision: 5c00e1d66fa3b459e0a504ed08d0550c31f35b06
+  revision: e422f994d666500286ddf837a85c808390d7e24e
   branch: winrm-v2
   specs:
-    kitchen-inspec (0.14.0)
+    kitchen-inspec (0.15.0)
       inspec (>= 0.22.0, < 1.0.0)
       test-kitchen (~> 1.6)
 
-GIT
-  remote: git://github.com/test-kitchen/test-kitchen.git
-  revision: aec5b1e64258c1d33b10e530e4c030a1023d09fb
-  branch: winrm-v2
-  specs:
-    test-kitchen (1.11.1)
-      mixlib-install (~> 1.0, >= 1.0.4)
-      mixlib-shellout (>= 1.2, < 3.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.9, < 4.0)
-      net-ssh-gateway (~> 1.2.0)
-      safe_yaml (~> 1.0)
-      thor (~> 0.18)
-
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
     artifactory (2.3.3)
-    aws-sdk (2.5.7)
-      aws-sdk-resources (= 2.5.7)
-    aws-sdk-core (2.5.7)
+    aws-sdk (2.5.8)
+      aws-sdk-resources (= 2.5.8)
+    aws-sdk-core (2.5.8)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.5.7)
-      aws-sdk-core (= 2.5.7)
+    aws-sdk-resources (2.5.8)
+      aws-sdk-core (= 2.5.8)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -113,7 +99,7 @@ GEM
     hashie (3.4.4)
     hitimes (1.2.4)
     httpclient (2.7.2)
-    inspec (0.28.1)
+    inspec (0.26.0)
       hashie (~> 3.4)
       json (~> 1.8)
       method_source (~> 0.8)
@@ -123,7 +109,7 @@ GEM
       rspec-its (~> 1.2)
       rubyzip (~> 1.1)
       thor (~> 0.19)
-      train (>= 0.15.1, < 1.0)
+      train (~> 0.13)
     jmespath (1.3.1)
     json (1.8.3)
     kitchen-ec2 (1.1.0)
@@ -192,7 +178,7 @@ GEM
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.2)
+    rspec-core (3.5.3)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -215,6 +201,14 @@ GEM
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
+    test-kitchen (1.12.0)
+      mixlib-install (~> 1.0, >= 1.0.4)
+      mixlib-shellout (>= 1.2, < 3.0)
+      net-scp (~> 1.1)
+      net-ssh (>= 2.9, < 4.0)
+      net-ssh-gateway (~> 1.2.0)
+      safe_yaml (~> 1.0)
+      thor (~> 0.18)
     thor (0.19.1)
     timers (4.0.4)
       hitimes
@@ -251,7 +245,7 @@ DEPENDENCIES
   kitchen-ec2
   kitchen-inspec!
   kitchen-vagrant
-  test-kitchen!
+  test-kitchen
   train!
   windows_chef_zero
   winrm-elevated
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 15f10baf24..5d51fe6e4a 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,14 +1,14 @@
 GIT
   remote: git://github.com/chef/license_scout.git
-  revision: bd8e0da834e45c51e3957598d8a9238ca19187d5
+  revision: 6e501d31d3957a95388422595db8fe5937092b15
   specs:
-    license_scout (0.1.0)
+    license_scout (0.1.2)
       ffi-yajl (~> 2.2)
       mixlib-shellout (~> 2.2)
 
 GIT
   remote: git://github.com/chef/omnibus-software.git
-  revision: c1daa55c0a17b2f3192f22edcc0909b685aa4591
+  revision: f0f4bb4beab18a9b6adbc0a34bcd2f0caf10be5c
   branch: lcg/ruby23
   specs:
     omnibus-software (4.0.0)
@@ -50,12 +50,12 @@ GEM
     addressable (2.4.0)
     artifactory (2.3.3)
     awesome_print (1.7.0)
-    aws-sdk (2.5.7)
-      aws-sdk-resources (= 2.5.7)
-    aws-sdk-core (2.5.7)
+    aws-sdk (2.5.8)
+      aws-sdk-resources (= 2.5.8)
+    aws-sdk-core (2.5.8)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.5.7)
-      aws-sdk-core (= 2.5.7)
+    aws-sdk-resources (2.5.8)
+      aws-sdk-core (= 2.5.8)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -216,7 +216,7 @@ GEM
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
     systemu (2.6.5)
-    test-kitchen (1.11.1)
+    test-kitchen (1.12.0)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)