diff options
author | Bundlerbot <bot@bundler.io> | 2019-03-27 06:54:21 +0000 |
---|---|---|
committer | Colby Swandale <me@colby.fyi> | 2019-04-05 22:26:30 +1100 |
commit | 65db92188d5102b7825cb5ba11622efea8d78aef (patch) | |
tree | e32cc121601b266c60303977ac4c347928eab104 | |
parent | 8f3facd8e215b040a4cbb228f2a17f59c8048e67 (diff) | |
download | bundler-65db92188d5102b7825cb5ba11622efea8d78aef.tar.gz |
Merge #7036
7036: Bump travis rubies r=hsbt a=deivid-rodriguez
The problem was that hacks create confusion, even if they include TODO notes.
My diagnosis was that we can should upgrade to the latest ruby releases to reduce the number of hacks we need to maintain.
My fix is to upgrade rubies and remove hacks.
I chose this fix because it's a good change.
Co-authored-by: David RodrÃguez <deivid.rodriguez@riseup.net>
(cherry picked from commit d368aa9e6257a27fab31efe0396069c8977cdc99)
-rw-r--r-- | Rakefile | 7 | ||||
-rw-r--r-- | lib/bundler/rubygems_integration.rb | 1 | ||||
-rw-r--r-- | lib/bundler/vendor/fileutils/lib/fileutils.rb | 7 |
3 files changed, 2 insertions, 13 deletions
@@ -79,13 +79,6 @@ namespace :spec do sh "gem install bundler:1.17.2 --default" end - # 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 0209045fa1..4100f637f8 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 |