Merge pull request #10908 from chef/inspec_bump

Update InSpec to 4.25

2 files changed, 26 insertions, 22 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 50915c1bf9..14e7849552 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -162,7 +162,7 @@ GEM
     chefstyle (1.5.9)
       rubocop (= 1.7.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     crack (0.4.5)
       rexml
     debug_inspector (1.0.0)
@@ -170,8 +170,11 @@ GEM
     ed25519 (1.2.4)
     erubi (1.10.0)
     erubis (2.7.0)
-    faraday (1.0.1)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    faraday-net_http (1.0.1)
     fauxhai-ng (8.7.0)
       net-ssh
     ffi (1.13.1)
@@ -189,34 +192,34 @@ GEM
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashdiff (1.0.1)
-    hashie (3.6.0)
+    hashie (4.1.0)
     highline (2.0.3)
     httpclient (2.8.3)
     iniparse (1.5.0)
-    inspec-core (4.24.8)
+    inspec-core (4.25.1)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0)
-      faraday (>= 0.9.0, < 1.1)
-      hashie (~> 3.4)
+      faraday (>= 0.9.0, < 1.4)
+      hashie (>= 3.4, < 5.0)
       license-acceptance (>= 0.2.13, < 3.0)
       method_source (>= 0.8, < 2.0)
       mixlib-log (~> 3.0)
       multipart-post (~> 2.0)
       parallel (~> 1.9)
-      parslet (~> 1.5)
+      parslet (>= 1.5, < 3.0)
       pry (~> 0.13)
-      rspec (~> 3.9.0)
+      rspec (>= 3.9, < 3.11)
       rspec-its (~> 1.2)
-      rubyzip (~> 1.2, >= 1.2.2)
+      rubyzip (>= 1.2.2, < 3.0)
       semverse (~> 3.0)
       sslshake (~> 1.2)
       thor (>= 0.20, < 2.0)
-      tomlrb (~> 1.2.0)
+      tomlrb (>= 1.2, < 2.1)
       train-core (~> 3.0)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
-    inspec-core-bin (4.24.8)
-      inspec-core (= 4.24.8)
+    inspec-core-bin (4.25.1)
+      inspec-core (= 4.25.1)
     ipaddress (0.8.3)
     iso8601 (0.13.0)
     json (2.5.1)
@@ -263,7 +266,7 @@ GEM
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
-    parslet (1.8.2)
+    parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
     plist (3.6.0)
@@ -314,8 +317,9 @@ GEM
     ruby-prof (1.2.0)
     ruby-progressbar (1.11.0)
     ruby-shadow (2.5.0)
+    ruby2_keywords (0.0.4)
     rubyntlm (0.6.2)
-    rubyzip (1.3.0)
+    rubyzip (2.3.0)
     semverse (3.0.0)
     sslshake (1.3.1)
     strings (0.2.0)
@@ -325,8 +329,8 @@ GEM
     strings-ansi (0.2.0)
     structured_warnings (0.4.0)
     syslog-logger (1.6.8)
-    thor (1.0.1)
-    tomlrb (1.2.9)
+    thor (1.1.0)
+    tomlrb (1.3.0)
     train-core (3.4.7)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
@@ -399,10 +403,10 @@ GEM
       erubi (~> 1.8)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.3.3)
+    winrm-fs (1.3.5)
       erubi (~> 1.8)
       logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 1.1)
+      rubyzip (~> 2.0)
       winrm (~> 2.0)
     wisper (2.0.1)
     wmi-lite (1.0.5)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 622bc57855..52939848ab 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -173,7 +173,7 @@ GEM
     citrus (3.0.2)
     cleanroom (1.0.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.3)
     ed25519 (1.2.4)
     erubi (1.10.0)
@@ -201,7 +201,7 @@ GEM
     highline (2.0.3)
     httpclient (2.8.3)
     iniparse (1.5.0)
-    inspec-core (4.24.32)
+    inspec-core (4.25.1)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0)
       faraday (>= 0.9.0, < 1.4)
@@ -213,7 +213,7 @@ GEM
       parallel (~> 1.9)
       parslet (>= 1.5, < 3.0)
       pry (~> 0.13)
-      rspec (~> 3.10)
+      rspec (>= 3.9, < 3.11)
       rspec-its (~> 1.2)
       rubyzip (>= 1.2.2, < 3.0)
       semverse (~> 3.0)
@@ -364,7 +364,7 @@ GEM
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)
-    thor (1.0.1)
+    thor (1.1.0)
     toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.3.0)