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>

4 files changed, 7 insertions, 18 deletions

diff --git a/.travis.yml b/.travis.yml
index 2e90164fe8..c87c1305c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,8 +28,8 @@ addons:
       secure: "TrzIv116JLGUxm6PAUskCYrv8KTDguncKROVwbnjVPKTGDAgoDderd8JUdDEXrKoZ9qGLD2TPYKExt9/QDl71E+qHdWnVqWv4HKCUk2P9z/VLKzHuggOUBkCXiJUhjywUieCJhI3N92bfq2EjSBbu2/OFHqWOjLQ+QCooTEBjv8="
 
 rvm:
-  - 2.6.1
-  - 2.5.3
+  - 2.6.2
+  - 2.5.5
   - 2.4.5
   - 2.3.8
 
@@ -47,11 +47,11 @@ env:
 
 jobs:
   include:
-    - rvm: 2.6.1
+    - rvm: 2.6.2
       script: rake rubocop
       stage: linting
     # Ruby 2.5, Rubygems 2.7
-    - rvm: 2.5.3
+    - rvm: 2.5.5
       env: RGV=v2.7.9
       stage: test
     # Ruby 2.4, Rubygems 2.6
@@ -67,7 +67,7 @@ jobs:
       env: RGV=master
       stage: test
     # 1.x mode (we want to keep stuff passing in 1.x mode for now)
-    - rvm: 2.6.1
+    - rvm: 2.6.2
       env: RGV=v3.0.3 BUNDLER_SPEC_SUB_VERSION=1.98
       stage: test
 
diff --git a/Rakefile b/Rakefile
index d64e9cc789..0a4d9c8900 100644
--- a/Rakefile
+++ b/Rakefile
@@ -77,13 +77,6 @@ namespace :spec do
       # Install the gems with a consistent version of RubyGems
       sh "gem update --system 3.0.3"
 
-      # Fix incorrect default gem specifications on ruby 2.6.1. Can be removed
-      # when 2.6.2 is released and we start testing against it
-      if RUBY_VERSION == "2.6.1"
-        sh "gem install etc:1.0.1 --default"
-        sh "gem install bundler:1.17.2 --default"
-      end
-
       $LOAD_PATH.unshift("./spec")
       require "support/rubygems_ext"
       Spec::Rubygems::DEPS["codeclimate-test-reporter"] = "~> 0.6.0" if RUBY_VERSION >= "2.2.0"
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