Update InSpec to 4.12 and Train to 3.0

InSpec 4.12 pulls in Train 3.0, which removes the winrm functionality. We're adding  it back via the new dep on train-winrm. The updated train also includes several bugfixes we need for bootstrapping.

Signed-off-by: Tim Smith <tsmith@chef.io>

3 files changed, 28 insertions, 24 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index d300fdfc84..2a82b6aaa7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
 
 GIT
   remote: https://github.com/chef/ohai.git
-  revision: f76c5f583736a5731e2fb6e92c21dc8419655d95
+  revision: 15315e3e36f07062111faede26f2667ead8c723f
   branch: master
   specs:
-    ohai (15.2.5)
+    ohai (15.2.7)
       chef-config (>= 12.8, < 16)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -54,7 +54,8 @@ PATH
       plist (~> 3.2)
       proxifier (~> 1.0)
       syslog-logger (~> 1.6)
-      train-core (~> 2.0, >= 2.0.12)
+      train-core (~> 3.0)
+      train-winrm
       tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
     chef (15.2.31-universal-mingw32)
@@ -85,7 +86,8 @@ PATH
       plist (~> 3.2)
       proxifier (~> 1.0)
       syslog-logger (~> 1.6)
-      train-core (~> 2.0, >= 2.0.12)
+      train-core (~> 3.0)
+      train-winrm
       tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
       win32-api (~> 1.5.3)
@@ -175,7 +177,7 @@ GEM
     htmlentities (4.3.4)
     httpclient (2.8.3)
     iniparse (1.4.4)
-    inspec-core (4.10.4)
+    inspec-core (4.12.0)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       faraday_middleware (~> 0.12.2)
@@ -197,11 +199,11 @@ GEM
       term-ansicolor
       thor (~> 0.20)
       tomlrb (~> 1.2)
-      train-core (~> 2.0)
+      train-core (~> 3.0)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
-    inspec-core-bin (4.10.4)
-      inspec-core (= 4.10.4)
+    inspec-core-bin (4.12.0)
+      inspec-core (= 4.12.0)
     ipaddress (0.8.3)
     iso8601 (0.12.1)
     jaro_winkler (1.5.3)
@@ -312,7 +314,7 @@ GEM
     simplecov-html (0.10.2)
     slop (3.6.0)
     sslshake (1.3.0)
-    strings (0.1.5)
+    strings (0.1.6)
       strings-ansi (~> 0.1)
       unicode-display_width (~> 1.5)
       unicode_utils (~> 1.4)
@@ -325,16 +327,17 @@ GEM
     thor (0.20.3)
     tins (1.21.1)
     tomlrb (1.2.8)
-    train-core (2.1.19)
+    train-core (3.0.3)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 3.0)
       net-ssh (>= 2.9, < 6.0)
+    train-winrm (0.2.3)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    tty-box (0.4.0)
+    tty-box (0.4.1)
       pastel (~> 0.7.2)
-      strings (~> 0.1.5)
+      strings (~> 0.1.6)
       tty-cursor (~> 0.7)
     tty-color (0.5.0)
     tty-cursor (0.7.0)
@@ -356,7 +359,7 @@ GEM
     unicode-display_width (1.6.0)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
-    webmock (3.6.2)
+    webmock (3.7.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
diff --git a/chef.gemspec b/chef.gemspec
index a89cf4ceb2..e78237b31d 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -16,7 +16,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.5.0"
 
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
-  s.add_dependency "train-core", "~> 2.0", ">= 2.0.12"
+  s.add_dependency "train-core", "~> 3.0"
+  s.add_dependency "train-winrm"
 
   s.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.5"
   s.add_dependency "mixlib-cli", ">= 2.1.1", "< 3.0"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index a25b39a95e..74bd1ddd09 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: c4c0c518caf5c559ddf3d0ae773013d5dbc6bd3c
+  revision: c872e61c30d2b3f88ead03bd1254ff96d37059a3
   branch: master
   specs:
-    omnibus (6.1.2)
+    omnibus (6.1.3)
       aws-sdk-s3 (~> 1)
       chef-sugar (>= 3.3)
       cleanroom (~> 1.0)
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 5fa35959f6efb0a5a745c46e4b0431a2826934da
+  revision: 75f8868a794508d6b567162f13924c9d21ce5dfa
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -33,8 +33,8 @@ GEM
     artifactory (3.0.5)
     awesome_print (1.8.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.202.0)
-    aws-sdk-core (3.62.0)
+    aws-partitions (1.207.0)
+    aws-sdk-core (3.65.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.1)
@@ -42,7 +42,7 @@ GEM
     aws-sdk-kms (1.24.0)
       aws-sdk-core (~> 3, >= 3.61.1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.46.0)
+    aws-sdk-s3 (1.47.0)
       aws-sdk-core (~> 3, >= 3.61.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -271,7 +271,7 @@ GEM
     solve (4.0.2)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 4.0)
-    strings (0.1.5)
+    strings (0.1.6)
       strings-ansi (~> 0.1)
       unicode-display_width (~> 1.5)
       unicode_utils (~> 1.4)
@@ -279,7 +279,7 @@ GEM
     structured_warnings (0.3.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (2.2.5)
+    test-kitchen (2.3.1)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       license-acceptance (~> 1.0, >= 1.0.11)
@@ -303,9 +303,9 @@ GEM
       net-ssh (>= 2.9, < 6.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    tty-box (0.4.0)
+    tty-box (0.4.1)
       pastel (~> 0.7.2)
-      strings (~> 0.1.5)
+      strings (~> 0.1.6)
       tty-cursor (~> 0.7)
     tty-color (0.5.0)
     tty-cursor (0.7.0)