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>

1 files changed, 39 insertions, 27 deletions

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)