Merge pull request #13466 from chef/jfm/chef16_lint

Correcting gems to support Ruby 2.6

3 files changed, 34 insertions, 42 deletions

diff --git a/Gemfile b/Gemfile
index 187a2e54de..0d8988e841 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,6 +18,10 @@ gem "ohai", git: "https://github.com/chef/ohai.git", branch: "16-stable"
 gem "chef-utils", path: File.expand_path("chef-utils", __dir__) if File.exist?(File.expand_path("chef-utils", __dir__))
 gem "chef-config", path: File.expand_path("chef-config", __dir__) if File.exist?(File.expand_path("chef-config", __dir__))
 
+# gems below are added here for Chef-16 compat. Their modern versions don't support Ruby 2.6
+gem "semverse", "= 3.0.0"
+gem "train-core", "= 3.2"
+
 if File.exist?(File.expand_path("chef-bin", __dir__))
   # bundling in a git checkout
   gem "chef-bin", path: File.expand_path("chef-bin", __dir__)
@@ -26,7 +30,8 @@ else
   gem "chef-bin" # rubocop:disable Bundler/DuplicatedGem
 end
 
-gem "cheffish", ">= 14"
+# gem "cheffish", ">= 14"
+gem "cheffish", "= 16.0.26"
 
 gem "chef-telemetry", ">=1.0.8" # 1.0.8 removes the http dep
 
@@ -37,14 +42,15 @@ group(:omnibus_package) do
   gem "chef-vault"
 end
 
-group(:omnibus_package, :pry) do
-  # Locked because pry-byebug is broken with 13+
-  # some work is ongoing? https://github.com/deivid-rodriguez/pry-byebug/issues/343
-  gem "pry", "= 0.13.0"
-  # byebug does not install on freebsd on ruby 3.0
-  gem "pry-byebug" unless RUBY_PLATFORM =~ /freebsd/i
-  gem "pry-stack_explorer"
-end
+# Why are we installing debugging tools? DENIED.... commenting out because of version conflicts
+# group(:omnibus_package, :pry) do
+#   # Locked because pry-byebug is broken with 13+
+#   # some work is ongoing? https://github.com/deivid-rodriguez/pry-byebug/issues/343
+#   gem "pry", "= 0.13.0"
+#   # byebug does not install on freebsd on ruby 3.0
+#   gem "pry-byebug" unless RUBY_PLATFORM =~ /freebsd/i
+#   gem "pry-stack_explorer"
+# end
 
 # Everything except AIX
 group(:ruby_prof) do
diff --git a/Gemfile.lock b/Gemfile.lock
index b65691c2b1..3968944fb3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -48,7 +48,7 @@ PATH
       diff-lcs (>= 1.2.4, < 1.4.0)
       ed25519 (~> 1.2)
       erubis (~> 2.7)
-      ffi (>= 1.9.25)
+      ffi (>= 1.15)
       ffi-libarchive (~> 1.0, >= 1.0.3)
       ffi-yajl (~> 2.2)
       highline (>= 1.6.9, < 3)
@@ -68,7 +68,6 @@ PATH
       plist (~> 3.2)
       proxifier (~> 1.0)
       syslog-logger (~> 1.6)
-      train-core (~> 3.2, >= 3.2.28)
       train-winrm (>= 0.2.5)
       tty-prompt (~> 0.21)
       tty-screen (~> 0.6)
@@ -86,7 +85,7 @@ PATH
       diff-lcs (>= 1.2.4, < 1.4.0)
       ed25519 (~> 1.2)
       erubis (~> 2.7)
-      ffi (>= 1.9.25)
+      ffi (>= 1.15)
       ffi-libarchive (~> 1.0, >= 1.0.3)
       ffi-yajl (~> 2.2)
       highline (>= 1.6.9, < 3)
@@ -107,7 +106,6 @@ PATH
       plist (~> 3.2)
       proxifier (~> 1.0)
       syslog-logger (~> 1.6)
-      train-core (~> 3.2, >= 3.2.28)
       train-winrm (>= 0.2.5)
       tty-prompt (~> 0.21)
       tty-screen (~> 0.6)
@@ -158,10 +156,7 @@ GEM
     bcrypt_pbkdf (1.1.0)
     bcrypt_pbkdf (1.1.0-x64-mingw32)
     bcrypt_pbkdf (1.1.0-x86-mingw32)
-    binding_of_caller (1.0.0)
-      debug_inspector (>= 0.0.1)
     builder (3.2.4)
-    byebug (11.1.3)
     chef-powershell (1.0.13)
       ffi (~> 1.15)
       ffi-yajl (~> 2.4)
@@ -185,12 +180,11 @@ GEM
     concurrent-ruby (1.1.10)
     crack (0.4.5)
       rexml
-    debug_inspector (1.1.0)
     diff-lcs (1.3)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     ed25519 (1.3.0)
-    erubi (1.11.0)
+    erubi (1.12.0)
     erubis (2.7.0)
     faraday (1.3.1)
       faraday-net_http (~> 1.0)
@@ -281,11 +275,11 @@ GEM
       wmi-lite (~> 1.0)
     multi_json (1.15.0)
     multipart-post (2.2.3)
-    net-scp (4.0.0)
-      net-ssh (>= 2.6.5, < 8.0.0)
+    net-scp (2.0.0)
+      net-ssh (>= 2.6.5, < 6.0.0)
     net-sftp (3.0.0)
       net-ssh (>= 5.0.0, < 7.0.0)
-    net-ssh (6.1.0)
+    net-ssh (5.2.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     net-ssh-multi (1.2.1)
@@ -301,17 +295,11 @@ GEM
       tty-color (~> 0.5)
     plist (3.6.0)
     proxifier (1.0.3)
-    pry (0.13.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.10.1)
-      byebug (~> 11.0)
-      pry (>= 0.13, < 0.15)
-    pry-stack_explorer (0.6.1)
-      binding_of_caller (~> 1.0)
-      pry (~> 0.13)
     public_suffix (5.0.1)
-    rack (2.2.4)
+    rack (2.2.5)
     rainbow (3.1.1)
     rake (13.0.6)
     rb-readline (0.5.5)
@@ -350,7 +338,7 @@ GEM
     ruby2_keywords (0.0.5)
     rubyntlm (0.6.3)
     rubyzip (2.3.2)
-    semverse (3.0.2)
+    semverse (3.0.0)
     sslshake (1.3.1)
     strings (0.2.1)
       strings-ansi (~> 0.2)
@@ -361,13 +349,11 @@ GEM
     syslog-logger (1.6.8)
     thor (1.2.1)
     tomlrb (1.3.0)
-    train-core (3.10.7)
-      addressable (~> 2.5)
-      ffi (!= 1.13.0)
+    train-core (3.2.0)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
-      net-scp (>= 1.2, < 5.0)
-      net-ssh (>= 2.9, < 8.0)
+      net-scp (>= 1.2, < 3.0)
+      net-ssh (>= 2.9, < 6.0)
     train-winrm (0.2.13)
       winrm (>= 2.3.6, < 3.0)
       winrm-elevated (~> 1.2.2)
@@ -460,22 +446,21 @@ DEPENDENCIES
   chef-telemetry (>= 1.0.8)
   chef-utils!
   chef-vault
-  cheffish (>= 14)
+  cheffish (= 16.0.26)
   chefstyle (= 1.5.9)
   fauxhai-ng
   ffi (>= 1.15)
   inspec-core-bin (~> 4.24)
   ohai!
-  pry (= 0.13.0)
-  pry-byebug
-  pry-stack_explorer
   rake
   rb-readline
   rest-client!
   rspec
   ruby-prof (< 1.3.0)
   ruby-shadow
+  semverse (= 3.0.0)
+  train-core (= 3.2)
   webmock
 
 BUNDLED WITH
-   2.3.18
+   2.1.4
diff --git a/chef.gemspec b/chef.gemspec
index 0103a6d9e6..6a6d0125bc 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
   s.add_dependency "chef-utils", "= #{Chef::VERSION}"
-  s.add_dependency "train-core", "~> 3.2", ">= 3.2.28" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635
+  # s.add_dependency "train-core", "~> 3.2", ">= 3.2.28" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635
   s.add_dependency "train-winrm", ">= 0.2.5"
 
   s.add_dependency "license-acceptance", ">= 1.0.5", "< 3"
@@ -38,7 +38,8 @@ Gem::Specification.new do |s|
   s.add_dependency "ohai", "~> 16.0"
   s.add_dependency "inspec-core", "~> 4.23"
 
-  s.add_dependency "ffi", ">= 1.9.25"
+  # s.add_dependency "ffi", ">= 1.9.25"
+  s.add_dependency "ffi", ">= 1.15"
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "net-ssh", ">= 5.1", "< 7"
   s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"