Remove travis gem dep and bump versions of multiple components

Bring in many newly released gems that loosen mixlib gem deps. This allows us to bring in the new major releases of these gems. The major version bumps were done to allow for the dropping of Ruby 2.1/2.2 so this is not a breaking change for Chef 14. It does get us some bug fixes we've made since the major bumps though.

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

5 files changed, 65 insertions, 100 deletions

diff --git a/Gemfile b/Gemfile
index 124b631320..0699d99cc2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -58,10 +58,6 @@ group(:development, :test) do
   gem "chefstyle", "=0.11.2"
 end
 
-group(:travis) do
-  gem "travis"
-end
-
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
 
 # If you want to load debugging tools into the bundle exec sandbox,
diff --git a/Gemfile.lock b/Gemfile.lock
index 6f07540358..978af48632 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,9 +14,9 @@ PATH
       iniparse (~> 1.4)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (~> 2.1)
-      mixlib-cli (~> 1.7)
-      mixlib-log (~> 2.0, >= 2.0.3)
-      mixlib-shellout (~> 2.4)
+      mixlib-cli (>= 1.7, < 3.0)
+      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-multi (~> 1.2, >= 1.2.1)
@@ -45,9 +45,9 @@ PATH
       iso8601 (~> 0.12.1)
       mixlib-archive (>= 0.4, < 2.0)
       mixlib-authentication (~> 2.1)
-      mixlib-cli (~> 1.7)
-      mixlib-log (~> 2.0, >= 2.0.3)
-      mixlib-shellout (~> 2.4)
+      mixlib-cli (>= 1.7, < 3.0)
+      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-multi (~> 1.2, >= 1.2.1)
@@ -81,8 +81,8 @@ PATH
     chef-config (14.11.24)
       addressable
       fuzzyurl
-      mixlib-config (>= 2.2.12, < 3.0)
-      mixlib-shellout (~> 2.0)
+      mixlib-config (>= 2.2.12, < 4.0)
+      mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
 
 GEM
@@ -90,20 +90,19 @@ GEM
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    appbundler (0.11.6)
-      mixlib-cli (~> 1.4)
-      mixlib-shellout (~> 2.0)
+    appbundler (0.12.0)
+      mixlib-cli (>= 1.4, < 3.0)
+      mixlib-shellout (>= 2.0, < 4.0)
     ast (2.4.0)
-    backports (3.12.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (11.0.0)
+    byebug (11.0.1)
     chef-vault (3.4.3)
-    chef-zero (14.0.11)
+    chef-zero (14.0.12)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
-      mixlib-log (~> 2.0)
+      mixlib-log (>= 2.0, < 4.0)
       rack (~> 2.0, >= 2.0.6)
       uuidtools (~> 2.1)
     cheffish (14.0.4)
@@ -119,12 +118,8 @@ GEM
     docile (1.3.1)
     equatable (0.5.0)
     erubis (2.7.0)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
     ffi (1.10.0)
     ffi (1.10.0-x64-mingw32)
     ffi (1.10.0-x86-mingw32)
@@ -133,13 +128,6 @@ GEM
     ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
     fuzzyurl (0.9.0)
-    gh (0.15.1)
-      addressable (~> 2.4.0)
-      backports
-      faraday (~> 0.8)
-      multi_json (~> 1.0)
-      net-http-persistent (~> 2.9)
-      net-http-pipeline
     hashdiff (0.3.8)
     hashie (3.6.0)
     highline (1.7.10)
@@ -171,8 +159,6 @@ GEM
     ipaddress (0.8.3)
     iso8601 (0.12.1)
     json (2.2.0)
-    launchy (2.4.3)
-      addressable (~> 2.3)
     libyajl2 (1.2.0)
     method_source (0.9.2)
     mixlib-archive (1.0.1)
@@ -180,10 +166,10 @@ GEM
     mixlib-archive (1.0.1-universal-mingw32)
       mixlib-log
     mixlib-authentication (2.1.1)
-    mixlib-cli (1.7.0)
+    mixlib-cli (2.0.1)
     mixlib-config (2.2.18)
       tomlrb
-    mixlib-log (2.0.9)
+    mixlib-log (3.0.1)
     mixlib-shellout (2.4.4)
     mixlib-shellout (2.4.4-universal-mingw32)
       win32-process (~> 0.8.2)
@@ -191,8 +177,6 @@ GEM
     multi_json (1.13.1)
     multipart-post (2.0.0)
     necromancer (0.4.0)
-    net-http-persistent (2.9.4)
-    net-http-pipeline (1.0.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
@@ -207,15 +191,15 @@ GEM
     netrc (0.11.0)
     octokit (4.13.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (14.8.10)
+    ohai (14.8.11)
       chef-config (>= 12.8, < 15)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
       mixlib-cli (>= 1.7.0)
-      mixlib-config (~> 2.0)
-      mixlib-log (~> 2.0, >= 2.0.1)
-      mixlib-shellout (~> 2.0)
+      mixlib-config (>= 2.0, < 4.0)
+      mixlib-log (>= 2.0.1, < 4.0)
+      mixlib-shellout (>= 2.0, < 4.0)
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
@@ -242,9 +226,6 @@ GEM
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
     public_suffix (3.0.3)
-    pusher-client (0.6.2)
-      json
-      websocket (~> 1.0)
     rack (2.0.6)
     rainbow (3.0.0)
     rake (12.3.0)
@@ -316,18 +297,9 @@ GEM
     timers (4.3.0)
     tins (1.20.2)
     tomlrb (1.2.8)
-    train-core (1.7.4)
+    train-core (1.7.6)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
-    travis (1.8.9)
-      backports
-      faraday (~> 0.9)
-      faraday_middleware (~> 0.9, >= 0.9.1)
-      gh (~> 0.13)
-      highline (~> 1.6)
-      launchy (~> 2.1)
-      pusher-client (~> 0.4)
-      typhoeus (~> 0.6, >= 0.6.8)
     tty-color (0.4.3)
     tty-cursor (0.6.1)
     tty-prompt (0.18.1)
@@ -347,8 +319,6 @@ GEM
       pastel (~> 0.7.2)
       strings (~> 0.1.0)
       tty-screen (~> 0.6.4)
-    typhoeus (0.8.0)
-      ethon (>= 0.8.0)
     unicode-display_width (1.4.1)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
@@ -356,7 +326,6 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket (1.2.8)
     win32-api (1.5.3-universal-mingw32)
     win32-certstore (0.3.0)
       ffi
@@ -412,7 +381,6 @@ DEPENDENCIES
   ruby-shadow
   simplecov
   tomlrb
-  travis
   webmock
   yard
 
diff --git a/chef-config/chef-config.gemspec b/chef-config/chef-config.gemspec
index 547735bb55..b6bc5da1c9 100644
--- a/chef-config/chef-config.gemspec
+++ b/chef-config/chef-config.gemspec
@@ -15,8 +15,8 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mixlib-shellout", "~> 2.0"
-  spec.add_dependency "mixlib-config", ">= 2.2.12", "< 3.0"
+  spec.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
+  spec.add_dependency "mixlib-config", ">= 2.2.12", "< 4.0"
   spec.add_dependency "fuzzyurl"
   spec.add_dependency "addressable"
   spec.add_dependency "tomlrb", "~> 1.2"
diff --git a/chef.gemspec b/chef.gemspec
index 0268c1da81..2c6de4803f 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -17,10 +17,10 @@ Gem::Specification.new do |s|
 
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
 
-  s.add_dependency "mixlib-cli", "~> 1.7"
-  s.add_dependency "mixlib-log", "~> 2.0", ">= 2.0.3"
+  s.add_dependency "mixlib-cli", ">= 1.7", "< 3.0"
+  s.add_dependency "mixlib-log", ">= 2.0.3", "< 4.0"
   s.add_dependency "mixlib-authentication", "~> 2.1"
-  s.add_dependency "mixlib-shellout", "~> 2.4"
+  s.add_dependency "mixlib-shellout", ">= 2.4", "< 4.0"
   s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
   s.add_dependency "ohai", "~> 14.0"
 
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 93b3d2fb8f..05148f153b 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,24 +1,24 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 10151d127fef039839ce0e6072b68fe695b1d3c5
+  revision: 7c1e039856513835f728b4e0c5a4106c339e99c2
   branch: master
   specs:
-    omnibus (6.0.19)
+    omnibus (6.0.20)
       aws-sdk-s3 (~> 1)
       chef-sugar (>= 3.3)
       cleanroom (~> 1.0)
       ffi-yajl (~> 2.2)
       license_scout (~> 1.0)
-      mixlib-shellout (~> 2.0)
+      mixlib-shellout (>= 2.0, < 4.0)
       mixlib-versioning
-      ohai (>= 13, < 15)
+      ohai (>= 13, < 16)
       pedump
       ruby-progressbar (~> 1.7)
       thor (~> 0.18)
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 44f52c320c3fe866e4d4186319fb6b5537f0656f
+  revision: 93d8f49c8a5add0efd03a05c3311e49eea82b5ed
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -31,42 +31,43 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     awesome_print (1.8.0)
-    aws-eventstream (1.0.1)
-    aws-partitions (1.141.0)
-    aws-sdk-core (3.46.2)
-      aws-eventstream (~> 1.0)
+    aws-eventstream (1.0.2)
+    aws-partitions (1.144.0)
+    aws-sdk-core (3.48.1)
+      aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.0)
+      aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.13.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.30.1)
-      aws-sdk-core (~> 3, >= 3.39.0)
+    aws-sdk-kms (1.15.0)
+      aws-sdk-core (~> 3, >= 3.48.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.33.0)
+      aws-sdk-core (~> 3, >= 3.48.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.3)
-    berkshelf (7.0.7)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+    berkshelf (7.0.8)
       chef (>= 13.6.52)
       chef-config
       cleanroom (~> 1.0)
       concurrent-ruby (~> 1.0)
       minitar (>= 0.6)
-      mixlib-archive (~> 0.4)
+      mixlib-archive (>= 0.4, < 2.0)
       mixlib-config (>= 2.2.5)
-      mixlib-shellout (~> 2.0)
+      mixlib-shellout (>= 2.0, < 4.0)
       octokit (~> 4.0)
-      retryable (~> 2.0)
+      retryable (>= 2.0, < 4.0)
       solve (~> 4.0)
       thor (>= 0.20)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    byebug (11.0.0)
-    chef (14.10.9)
+    byebug (11.0.1)
+    chef (14.11.21)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.10.9)
+      chef-config (= 14.11.21)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -93,10 +94,10 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (14.10.9-universal-mingw32)
+    chef (14.11.21-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.10.9)
+      chef-config (= 14.11.21)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -125,7 +126,7 @@ GEM
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
       win32-api (~> 1.5.3)
-      win32-certstore (>= 0.1.8)
+      win32-certstore (~> 0.2.4)
       win32-dir (~> 0.5.0)
       win32-event (~> 0.6.1)
       win32-eventlog (= 0.6.3)
@@ -136,23 +137,23 @@ GEM
       win32-taskscheduler (~> 2.0)
       windows-api (~> 0.4.4)
       wmi-lite (~> 1.0)
-    chef-config (14.10.9)
+    chef-config (14.11.21)
       addressable
       fuzzyurl
       mixlib-config (>= 2.2.12, < 3.0)
       mixlib-shellout (~> 2.0)
       tomlrb (~> 1.2)
-    chef-sugar (5.0.0)
-    chef-zero (14.0.11)
+    chef-sugar (5.0.1)
+    chef-zero (14.0.12)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
-      mixlib-log (~> 2.0)
+      mixlib-log (>= 2.0, < 4.0)
       rack (~> 2.0, >= 2.0.6)
       uuidtools (~> 2.1)
     citrus (3.0.2)
     cleanroom (1.0.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
     erubis (2.7.0)
@@ -191,9 +192,9 @@ GEM
       multi_json (~> 1.10)
     method_source (0.9.2)
     minitar (0.8)
-    mixlib-archive (0.4.20)
+    mixlib-archive (1.0.1)
       mixlib-log
-    mixlib-archive (0.4.20-universal-mingw32)
+    mixlib-archive (1.0.1-universal-mingw32)
       mixlib-log
     mixlib-authentication (2.1.1)
     mixlib-cli (1.7.0)
@@ -226,15 +227,15 @@ GEM
     nori (2.6.0)
     octokit (4.13.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (14.8.10)
+    ohai (14.8.11)
       chef-config (>= 12.8, < 15)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
       mixlib-cli (>= 1.7.0)
-      mixlib-config (~> 2.0)
-      mixlib-log (~> 2.0, >= 2.0.1)
-      mixlib-shellout (~> 2.0)
+      mixlib-config (>= 2.0, < 4.0)
+      mixlib-log (>= 2.0.1, < 4.0)
+      mixlib-shellout (>= 2.0, < 4.0)
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
@@ -258,7 +259,7 @@ GEM
       pry (>= 0.9.11)
     public_suffix (3.0.3)
     rack (2.0.6)
-    retryable (2.0.4)
+    retryable (3.0.4)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)