Bump highline and net-ssh pins and pull inspec from git

Highline 1.7 is out and seems reasonable for our minimal highline usage
Pulling inspec from git for now allows us to use the latest train which allows for the new net-ssh
New net-ssh allows for new key formats

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

1 files changed, 53 insertions, 37 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index e533f66366..2800ff3a5a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,48 @@
 GIT
   remote: https://github.com/chef/chefstyle.git
-  revision: 97710fcf8164ce11c64bf0d524e75eadca8c0c75
+  revision: 0f3c0afe4e875c8c17627b8986f23bd4e4dc75cb
   branch: master
   specs:
     chefstyle (0.12.0)
       rubocop (= 0.62.0)
 
 GIT
+  remote: https://github.com/chef/inspec.git
+  revision: e76978cd679155938242499860645ecaa17fef37
+  branch: master
+  specs:
+    inspec-core (4.1.0)
+      addressable (~> 2.4)
+      faraday (>= 0.9.0)
+      faraday_middleware (~> 0.12.2)
+      hashie (~> 3.4)
+      htmlentities
+      json (>= 1.8, < 3.0)
+      license-acceptance (~> 0.2)
+      method_source (~> 0.8)
+      mixlib-log
+      multipart-post
+      parallel (~> 1.9)
+      parslet (~> 1.5)
+      pry (~> 0)
+      rspec (~> 3)
+      rspec-its (~> 1.2)
+      rubyzip (~> 1.1)
+      semverse
+      sslshake (~> 1.2)
+      term-ansicolor
+      thor (~> 0.20)
+      tomlrb (~> 1.2)
+      train-core (~> 2.0)
+      tty-prompt (~> 0.17)
+      tty-table (~> 0.10)
+
+GIT
   remote: https://github.com/chef/ohai.git
-  revision: 05e507952d8dbff8e31528f1ebcab72664e99aa2
+  revision: 3cbf90d12abb2fe11bc486b87449a98ea02988d2
   branch: master
   specs:
-    ohai (15.0.30)
+    ohai (15.0.32)
       chef-config (>= 12.8, < 16)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -37,7 +68,7 @@ PATH
       ffi (~> 1.9, >= 1.9.25)
       ffi-libarchive
       ffi-yajl (~> 2.2)
-      highline (~> 1.6, >= 1.6.9)
+      highline (>= 1.6.9, < 2)
       iniparse (~> 1.4)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (~> 2.1)
@@ -45,7 +76,7 @@ PATH
       mixlib-log (>= 2.0.3, < 4.0)
       mixlib-shellout (>= 2.4, < 4.0)
       net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (~> 4.2)
+      net-ssh (>= 4.2, < 6)
       net-ssh-multi (~> 1.2, >= 1.2.1)
       ohai (~> 15.0)
       plist (~> 3.2)
@@ -63,7 +94,7 @@ PATH
       ffi (~> 1.9, >= 1.9.25)
       ffi-libarchive
       ffi-yajl (~> 2.2)
-      highline (~> 1.6, >= 1.6.9)
+      highline (>= 1.6.9, < 2)
       iniparse (~> 1.4)
       iso8601 (~> 0.12.1)
       mixlib-archive (>= 0.4, < 2.0)
@@ -72,7 +103,7 @@ PATH
       mixlib-log (>= 2.0.3, < 4.0)
       mixlib-shellout (>= 2.4, < 4.0)
       net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (~> 4.2)
+      net-ssh (>= 4.2, < 6)
       net-ssh-multi (~> 1.2, >= 1.2.1)
       ohai (~> 15.0)
       plist (~> 3.2)
@@ -152,35 +183,16 @@ GEM
     highline (1.7.10)
     htmlentities (4.3.4)
     iniparse (1.4.4)
-    inspec-core (3.9.0)
-      addressable (~> 2.4)
-      faraday (>= 0.9.0)
-      faraday_middleware (~> 0.12.2)
-      hashie (~> 3.4)
-      htmlentities
-      json (>= 1.8, < 3.0)
-      method_source (~> 0.8)
-      mixlib-log
-      multipart-post
-      parallel (~> 1.9)
-      parslet (~> 1.5)
-      pry (~> 0)
-      rspec (~> 3)
-      rspec-its (~> 1.2)
-      rubyzip (~> 1.1)
-      semverse
-      sslshake (~> 1.2)
-      term-ansicolor
-      thor (~> 0.20)
-      tomlrb (~> 1.2)
-      train-core (~> 1.5, >= 1.7.2)
-      tty-prompt (~> 0.17)
-      tty-table (~> 0.10)
     ipaddress (0.8.3)
     iso8601 (0.12.1)
     jaro_winkler (1.5.2)
     json (2.2.0)
     libyajl2 (1.2.0)
+    license-acceptance (0.2.8)
+      pastel (~> 0.7)
+      tomlrb (~> 1.2)
+      tty-box (~> 0.3)
+      tty-prompt (~> 0.18)
     method_source (0.9.2)
     mixlib-archive (1.0.1)
       mixlib-log
@@ -199,7 +211,7 @@ GEM
     necromancer (0.4.0)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (4.2.0)
+    net-ssh (5.2.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     net-ssh-multi (1.2.1)
@@ -209,7 +221,7 @@ GEM
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.17.0)
-    parser (2.6.2.0)
+    parser (2.6.2.1)
       ast (~> 2.4.0)
     parslet (1.8.2)
     pastel (0.7.2)
@@ -244,7 +256,7 @@ GEM
     rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-its (1.2.0)
+    rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
     rspec-mocks (3.8.0)
@@ -292,9 +304,13 @@ GEM
     timers (4.3.0)
     tins (1.20.2)
     tomlrb (1.2.8)
-    train-core (1.7.6)
+    train-core (2.0.5)
       json (>= 1.8, < 3.0)
-      mixlib-shellout (~> 2.0)
+      mixlib-shellout (>= 2.0, < 4.0)
+    tty-box (0.3.0)
+      pastel (~> 0.7.2)
+      strings (~> 0.1.4)
+      tty-cursor (~> 0.6.0)
     tty-color (0.4.3)
     tty-cursor (0.6.1)
     tty-prompt (0.18.1)
@@ -361,7 +377,7 @@ DEPENDENCIES
   chef-vault
   cheffish (~> 14)
   chefstyle!
-  inspec-core (~> 3)
+  inspec-core!
   netrc
   octokit
   ohai!