mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
[rubygems/rubygems] Delay fileutils
loading to fix some warnings
If the following conditions are met: * You have a default version of fileutils and a higher version of fileutils installed as a regular gem. This case is common on ruby 2.6. * You use a bundler generated binstub on a gem setup with a `Gemfile` using the `gemspec` DSL. Then `fileutils` redefinition warnings happen because of the following: The gist of a bundler generated binstub is: ```ruby require "bundler/setup" load Gem.bin_path("rake", "rake") ``` First configure bundler, then load the requested gem. When `require "bundler/setup"` is called under the previously mentioned setup, `ext_conf_builder.rb` ends up being required because of the new validation that gemspecs with rake extensions depend on `rake`. And that loads the latest version of `fileutils` because of using "rubygems monkeypatched require" that auto-chooses the latest version of default gems. After that, when `Gem.bin_path` gets called, `ext_conf_builder.rb` gets required again, but this time already using "bundler's unmonkeypatched require" which means the default version is chosen and thus the redefinition warning happens. The solution as usual is to lazily load `fileutils`. https://github.com/rubygems/rubygems/commit/08d64e5f06
This commit is contained in:
parent
3660d14de6
commit
8e5fe13c08
Notes:
git
2020-06-05 07:33:47 +09:00
1 changed files with 4 additions and 5 deletions
|
@ -5,15 +5,14 @@
|
|||
# See LICENSE.txt for permissions.
|
||||
#++
|
||||
|
||||
require 'fileutils'
|
||||
require 'tempfile'
|
||||
require 'shellwords'
|
||||
|
||||
class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
|
||||
|
||||
FileEntry = FileUtils::Entry_ # :nodoc:
|
||||
|
||||
def self.build(extension, dest_path, results, args=[], lib_dir=nil)
|
||||
require 'fileutils'
|
||||
require 'tempfile'
|
||||
|
||||
tmp_dest = Dir.mktmpdir(".gem.", ".")
|
||||
|
||||
# Some versions of `mktmpdir` return absolute paths, which will break make
|
||||
|
@ -71,7 +70,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
|
|||
FileUtils.cp_r entries, lib_dir, :remove_destination => true
|
||||
end
|
||||
|
||||
FileEntry.new(tmp_dest).traverse do |ent|
|
||||
FileUtils::Entry_.new(tmp_dest).traverse do |ent|
|
||||
destent = ent.class.new(dest_path, ent.rel)
|
||||
destent.exist? or FileUtils.mv(ent.path, destent.path)
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue