Pull in the new tty-table to unlock new license-acceptancetty-table

tty-table was holding back a bunch of deps. This will resolve several Ruby 2.7 warnings and lets use use the optimized license-acceptance gem that also had pete's better error handling. This also nukes a few deps to make chef/chef smaller.

Includes misc chefstyle fixes for the new version

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

6 files changed, 71 insertions, 67 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 915217ce96..ff4723db61 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
 GIT
   remote: https://github.com/chef/chefstyle.git
-  revision: 1fe8123d8f783bf6855a0fe3424b471e5654f7d7
+  revision: 1155f0044aca2fb7776d28f5adbe523a4705527f
   branch: master
   specs:
-    chefstyle (1.3.4)
-      rubocop (= 0.90)
+    chefstyle (1.4.0)
+      rubocop (= 0.91.0)
 
 GIT
   remote: https://github.com/chef/ohai.git
@@ -61,7 +61,7 @@ PATH
       train-winrm (>= 0.2.5)
       tty-prompt (~> 0.21)
       tty-screen (~> 0.6)
-      tty-table (~> 0.11.0)
+      tty-table (~> 0.11)
       uuidtools (~> 2.1.5)
     chef (16.5.65-universal-mingw32)
       addressable
@@ -98,7 +98,7 @@ PATH
       train-winrm (>= 0.2.5)
       tty-prompt (~> 0.21)
       tty-screen (~> 0.6)
-      tty-table (~> 0.11.0)
+      tty-table (~> 0.11)
       uuidtools (~> 2.1.5)
       win32-api (~> 1.5.3)
       win32-certstore (~> 0.3)
@@ -171,7 +171,6 @@ GEM
     ecma-re-validator (0.2.1)
       regexp_parser (~> 1.2)
     ed25519 (1.2.4)
-    equatable (0.6.1)
     erubi (1.9.0)
     erubis (2.7.0)
     faraday (1.0.1)
@@ -232,11 +231,11 @@ GEM
       regexp_parser (~> 1.5)
       uri_template (~> 0.7)
     libyajl2 (1.2.0)
-    license-acceptance (1.0.19)
+    license-acceptance (2.1.2)
       pastel (~> 0.7)
       tomlrb (~> 1.2)
-      tty-box (~> 0.3)
-      tty-prompt (~> 0.18)
+      tty-box (~> 0.6)
+      tty-prompt (~> 0.20)
     little-plugger (1.1.4)
     logging (2.3.0)
       little-plugger (~> 1.1)
@@ -259,7 +258,6 @@ GEM
       wmi-lite (~> 1.0)
     multi_json (1.15.0)
     multipart-post (2.1.1)
-    necromancer (0.5.1)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-sftp (3.0.0)
@@ -275,8 +273,7 @@ GEM
     parser (2.7.1.4)
       ast (~> 2.4.1)
     parslet (1.8.2)
-    pastel (0.7.4)
-      equatable (~> 0.6)
+    pastel (0.8.0)
       tty-color (~> 0.5)
     plist (3.5.0)
     proxifier (1.0.3)
@@ -297,7 +294,7 @@ GEM
     rainbow (3.0.0)
     rake (13.0.1)
     rb-readline (0.5.5)
-    regexp_parser (1.7.1)
+    regexp_parser (1.8.0)
     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -318,16 +315,16 @@ GEM
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.90.0)
+    rubocop (0.91.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 0.4.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.4.1)
+    rubocop-ast (0.4.2)
       parser (>= 2.7.1.4)
     ruby-prof (1.2.0)
     ruby-progressbar (1.10.1)
@@ -337,8 +334,8 @@ GEM
     semverse (3.0.0)
     slop (3.6.0)
     sslshake (1.3.1)
-    strings (0.1.8)
-      strings-ansi (~> 0.1)
+    strings (0.2.0)
+      strings-ansi (~> 0.2)
       unicode-display_width (~> 1.5)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
@@ -356,27 +353,24 @@ GEM
     train-winrm (0.2.6)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    tty-box (0.5.0)
-      pastel (~> 0.7.2)
-      strings (~> 0.1.6)
+    tty-box (0.6.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)
       tty-cursor (~> 0.7)
     tty-color (0.5.2)
     tty-cursor (0.7.1)
-    tty-prompt (0.21.0)
-      necromancer (~> 0.5.0)
-      pastel (~> 0.7.0)
-      tty-reader (~> 0.7.0)
-    tty-reader (0.7.0)
+    tty-prompt (0.22.0)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.8.0)
       tty-cursor (~> 0.7)
-      tty-screen (~> 0.7)
-      wisper (~> 2.0.0)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
     tty-screen (0.8.1)
-    tty-table (0.11.0)
-      equatable (~> 0.6)
-      necromancer (~> 0.5)
-      pastel (~> 0.7.2)
-      strings (~> 0.1.5)
-      tty-screen (~> 0.7)
+    tty-table (0.12.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)
+      tty-screen (~> 0.8)
     unicode-display_width (1.7.0)
     unicode_utils (1.4.0)
     uri_template (0.7.0)
diff --git a/chef.gemspec b/chef.gemspec
index 77140a6b15..965981fee7 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_dependency "highline", ">= 1.6.9", "< 3"
   s.add_dependency "tty-prompt", "~> 0.21" # knife ui.ask prompt
   s.add_dependency "tty-screen", "~> 0.6" # knife list
-  s.add_dependency "tty-table", "~> 0.11.0" # knife render table output
+  s.add_dependency "tty-table", "~> 0.11" # knife render table output.
   s.add_dependency "pastel" # knife ui.color
   s.add_dependency "erubis", "~> 2.7"
   s.add_dependency "diff-lcs", ">= 1.2.4", "< 1.4.0" # 1.4 breaks output
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index fcb3be0c13..6b061fffce 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 22ce15145e83cefbe8ae8603bacf8a340e274715
+  revision: 0f9a7a996f9bb783d7f6faac05959c2d9a295b03
   branch: master
   specs:
-    omnibus (7.0.24)
+    omnibus (7.0.25)
       aws-sdk-s3 (~> 1)
       chef-cleanroom (~> 1.0)
       chef-sugar (>= 3.3)
@@ -32,7 +32,7 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.8.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.371.0)
+    aws-partitions (1.373.0)
     aws-sdk-core (3.107.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -64,12 +64,12 @@ GEM
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.4)
-    chef (16.4.41)
+    chef (16.5.64)
       addressable
       bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 16.4.41)
-      chef-utils (= 16.4.41)
+      chef-config (= 16.5.64)
+      chef-utils (= 16.5.64)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (>= 1.2.4, < 1.4.0)
@@ -80,7 +80,7 @@ GEM
       ffi-yajl (~> 2.2)
       highline (>= 1.6.9, < 3)
       iniparse (~> 1.4)
-      license-acceptance (~> 1.0, >= 1.0.5)
+      license-acceptance (>= 1.0.5, < 3)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (>= 2.1, < 4)
       mixlib-cli (>= 2.1.1, < 3.0)
@@ -98,13 +98,14 @@ GEM
       train-winrm (>= 0.2.5)
       tty-prompt (~> 0.21)
       tty-screen (~> 0.6)
+      tty-table (~> 0.11.0)
       uuidtools (~> 2.1.5)
-    chef (16.4.41-universal-mingw32)
+    chef (16.5.64-universal-mingw32)
       addressable
       bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 16.4.41)
-      chef-utils (= 16.4.41)
+      chef-config (= 16.5.64)
+      chef-utils (= 16.5.64)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (>= 1.2.4, < 1.4.0)
@@ -116,7 +117,7 @@ GEM
       highline (>= 1.6.9, < 3)
       iniparse (~> 1.4)
       iso8601 (>= 0.12.1, < 0.14)
-      license-acceptance (~> 1.0, >= 1.0.5)
+      license-acceptance (>= 1.0.5, < 3)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (>= 2.1, < 4)
       mixlib-cli (>= 2.1.1, < 3.0)
@@ -134,6 +135,7 @@ GEM
       train-winrm (>= 0.2.5)
       tty-prompt (~> 0.21)
       tty-screen (~> 0.6)
+      tty-table (~> 0.11.0)
       uuidtools (~> 2.1.5)
       win32-api (~> 1.5.3)
       win32-certstore (~> 0.3)
@@ -146,15 +148,15 @@ GEM
       win32-taskscheduler (~> 2.0)
       wmi-lite (~> 1.0)
     chef-cleanroom (1.0.2)
-    chef-config (16.4.41)
+    chef-config (16.5.64)
       addressable
-      chef-utils (= 16.4.41)
+      chef-utils (= 16.5.64)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
     chef-sugar (5.1.11)
-    chef-utils (16.4.41)
+    chef-utils (16.5.64)
     chef-vault (4.0.11)
     chef-zero (15.0.2)
       ffi-yajl (~> 2.2)
@@ -167,6 +169,7 @@ GEM
     concurrent-ruby (1.1.7)
     diff-lcs (1.3)
     ed25519 (1.2.4)
+    equatable (0.6.1)
     erubi (1.9.0)
     erubis (2.7.0)
     faraday (1.0.1)
@@ -234,6 +237,7 @@ GEM
     molinillo (0.6.6)
     multi_json (1.15.0)
     multipart-post (2.1.1)
+    necromancer (0.5.1)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-sftp (3.0.0)
@@ -248,7 +252,7 @@ GEM
     octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (16.5.0)
+    ohai (16.5.4)
       chef-config (>= 12.8, < 17)
       chef-utils (>= 16.0, < 17)
       ffi (~> 1.9)
@@ -260,7 +264,8 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
       plist (~> 3.1)
       wmi-lite (~> 1.0)
-    pastel (0.8.0)
+    pastel (0.7.4)
+      equatable (~> 0.6)
       tty-color (~> 0.5)
     pedump (0.6.1)
       awesome_print
@@ -284,8 +289,8 @@ GEM
     solve (4.0.4)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 4.0)
-    strings (0.2.0)
-      strings-ansi (~> 0.2)
+    strings (0.1.8)
+      strings-ansi (~> 0.1)
       unicode-display_width (~> 1.5)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
@@ -318,20 +323,27 @@ GEM
     train-winrm (0.2.6)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    tty-box (0.6.0)
-      pastel (~> 0.8)
-      strings (~> 0.2.0)
+    tty-box (0.5.0)
+      pastel (~> 0.7.2)
+      strings (~> 0.1.6)
       tty-cursor (~> 0.7)
     tty-color (0.5.2)
     tty-cursor (0.7.1)
-    tty-prompt (0.22.0)
-      pastel (~> 0.8)
-      tty-reader (~> 0.8)
-    tty-reader (0.8.0)
+    tty-prompt (0.21.0)
+      necromancer (~> 0.5.0)
+      pastel (~> 0.7.0)
+      tty-reader (~> 0.7.0)
+    tty-reader (0.7.0)
       tty-cursor (~> 0.7)
-      tty-screen (~> 0.8)
-      wisper (~> 2.0)
+      tty-screen (~> 0.7)
+      wisper (~> 2.0.0)
     tty-screen (0.8.1)
+    tty-table (0.11.0)
+      equatable (~> 0.6)
+      necromancer (~> 0.5)
+      pastel (~> 0.7.2)
+      strings (~> 0.1.5)
+      tty-screen (~> 0.7)
     unicode-display_width (1.7.0)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5766af8954..b0a56f4b7f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -68,7 +68,7 @@ end
 
 # If you want to load anything into the testing environment
 # without versioning it, add it to spec/support/local_gems.rb
-require "spec/support/local_gems.rb" if File.exist?(File.join(File.dirname(__FILE__), "support", "local_gems.rb"))
+require "spec/support/local_gems" if File.exist?(File.join(File.dirname(__FILE__), "support", "local_gems.rb"))
 
 # Explicitly require spec helpers that need to load first
 require "spec/support/platform_helpers"
@@ -309,8 +309,6 @@ RSpec.configure do |config|
 end
 
 require "webrick/utils"
-require "thread"
-
 #    Webrick uses a centralized/synchronized timeout manager. It works by
 #    starting a thread to check for timeouts on an interval. The timeout
 #    checker thread cannot be stopped or canceled in any easy way, and it
diff --git a/spec/unit/chef_fs/config_spec.rb b/spec/unit/chef_fs/config_spec.rb
index 848e789d3c..fc44374ae7 100644
--- a/spec/unit/chef_fs/config_spec.rb
+++ b/spec/unit/chef_fs/config_spec.rb
@@ -18,7 +18,7 @@
 
 require "spec_helper"
 require "chef/exceptions"
-require "lib/chef/chef_fs/config.rb"
+require "lib/chef/chef_fs/config"
 
 describe Chef::ChefFS::Config do
   describe "initialize" do
diff --git a/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb b/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb
index a0c7d540ec..b85d811003 100644
--- a/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb
+++ b/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb
@@ -17,7 +17,7 @@
 #
 
 require "spec_helper"
-require "lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb"
+require "lib/chef/chef_fs/data_handler/data_bag_item_data_handler"
 
 class TestDataBag < Mash
   attr_accessor :name