From 42ab71638324016ef1fa6ee308b467cf34e0a36a Mon Sep 17 00:00:00 2001
From: tyler-ball <tball@chef.io>
Date: Tue, 28 Apr 2020 18:51:42 -0700
Subject: [PATCH] Updating rake and minitest to version embedded in Ruby

Also cleans up a rake error

Signed-off-by: tyler-ball <tball@chef.io>
---
 components/gems/Gemfile                              | 4 ++--
 components/gems/Gemfile.lock                         | 8 ++++----
 components/gems/Rakefile                             | 2 +-
 omnibus/config/software/rubygems-customization.rb    | 2 +-
 omnibus/config/software/windows-env-customization.rb | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/gems/Gemfile b/components/gems/Gemfile
index 4479952ada..413135fc68 100644
--- a/components/gems/Gemfile
+++ b/components/gems/Gemfile
@@ -21,8 +21,8 @@ group(:omnibus_package, :development, :test) do
   # we pin these gems as they are installed in the ruby source and if we let them
   # float we'll end up with 2 copies shipped in Workstation.
   # When we bump Ruby we need to look at these pins and adjust them
-  gem "rake", "<= 12.3.2"
-  gem "minitest", "<= 5.11.3"
+  gem "rake", "= 13.0.1"
+  gem "minitest", "= 5.13.0"
 
   gem "pry"
   gem "yard"
diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock
index de47b8cce6..a5d1fd9ec5 100644
--- a/components/gems/Gemfile.lock
+++ b/components/gems/Gemfile.lock
@@ -636,7 +636,7 @@ GEM
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitar (0.9)
-    minitest (5.11.3)
+    minitest (5.13.0)
     mixlib-archive (1.0.5)
       mixlib-log
     mixlib-archive (1.0.5-universal-mingw32)
@@ -742,7 +742,7 @@ GEM
       r18n-core (= 4.0.0)
     rack (2.2.2)
     rainbow (3.0.0)
-    rake (12.3.2)
+    rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -1083,7 +1083,7 @@ DEPENDENCIES
   knife-windows (>= 3.0.11)
   listen
   mdl (>= 0.7.0)
-  minitest (<= 5.11.3)
+  minitest (= 5.13.0)
   mixlib-archive (>= 1.0)
   mixlib-install
   mixlib-versioning
@@ -1095,7 +1095,7 @@ DEPENDENCIES
   pry-byebug
   pry-remote
   pry-stack_explorer
-  rake (<= 12.3.2)
+  rake (= 13.0.1)
   rb-readline
   rdp-ruby-wmi
   ruby-prof
diff --git a/components/gems/Rakefile b/components/gems/Rakefile
index fd853271b1..8d9f1012a4 100644
--- a/components/gems/Rakefile
+++ b/components/gems/Rakefile
@@ -22,7 +22,7 @@ end
 desc "Update the One True Gemfile.lock in this directory with the latest dependencies."
 task :update do
   require "bundler"
-  Bundler.with_clean_env do
+  Bundler.with_unbundled_env do
     rm_f "Gemfile.lock"
     sh "bundle _2.1.4_ lock --update --add-platform ruby x64-mingw32 x86-mingw32"
   end
diff --git a/omnibus/config/software/rubygems-customization.rb b/omnibus/config/software/rubygems-customization.rb
index 1f7d4ed286..b7932e760a 100644
--- a/omnibus/config/software/rubygems-customization.rb
+++ b/omnibus/config/software/rubygems-customization.rb
@@ -33,7 +33,7 @@
                                   "#{project_dir}/default/operating_system.rb"
                                 end
 
-    site_ruby = Bundler.with_clean_env do
+    site_ruby = Bundler.with_unbundled_env do
       ruby = windows_safe_path("#{install_dir}/embedded/bin/ruby")
       `#{ruby} -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']"`.strip
     end
diff --git a/omnibus/config/software/windows-env-customization.rb b/omnibus/config/software/windows-env-customization.rb
index a06e99537f..d7e5ee019a 100644
--- a/omnibus/config/software/windows-env-customization.rb
+++ b/omnibus/config/software/windows-env-customization.rb
@@ -31,7 +31,7 @@
   block "Add windows env_customization file" do
     source_customization_file = "#{project_dir}/windows/env_customization.rb"
 
-    site_ruby = Bundler.with_clean_env do
+    site_ruby = Bundler.with_unbundled_env do
       ruby = windows_safe_path("#{install_dir}/embedded/bin/ruby")
       `#{ruby} -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']"`.strip
     end