Merge #7036

7036: Bump travis rubies r=hsbt a=deivid-rodriguez

### What was the end-user problem that led to this PR?

The problem was that hacks create confusion, even if they include TODO notes.

### What was your diagnosis of the problem?

My diagnosis was that we can should upgrade to the latest ruby releases to reduce the number of hacks we need to maintain.

### What is your fix for the problem, implemented in this PR?

My fix is to upgrade rubies and remove hacks.

### Why did you choose this fix out of the possible options?

I chose this fix because it's a good change.

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>

2 files changed, 2 insertions, 6 deletions

diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index 13a6030277..c1d785a6e1 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "monitor"
-require "rubygems/config_file"
 
 module Bundler
   class RubygemsIntegration
diff --git a/lib/bundler/vendor/fileutils/lib/fileutils.rb b/lib/bundler/vendor/fileutils/lib/fileutils.rb
index 77b3bade52..3a48e80293 100644
--- a/lib/bundler/vendor/fileutils/lib/fileutils.rb
+++ b/lib/bundler/vendor/fileutils/lib/fileutils.rb
@@ -1082,11 +1082,6 @@ module Bundler::FileUtils
   end
   module_function :chown_R
 
-  begin
-    require 'etc'
-  rescue LoadError # rescue LoadError for miniruby
-  end
-
   def fu_get_uid(user)   #:nodoc:
     return nil unless user
     case user
@@ -1095,6 +1090,7 @@ module Bundler::FileUtils
     when /\A\d+\z/
       user.to_i
     else
+      require 'etc'
       Etc.getpwnam(user) ? Etc.getpwnam(user).uid : nil
     end
   end
@@ -1108,6 +1104,7 @@ module Bundler::FileUtils
     when /\A\d+\z/
       group.to_i
     else
+      require 'etc'
       Etc.getgrnam(group) ? Etc.getgrnam(group).gid : nil
     end
   end