diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-27 10:05:04 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-27 10:05:04 +0000 |
commit | 85d461456c154d7b4a72b20369e0d65d7880ce02 (patch) | |
tree | 21e1be2c786c8040a426841768e046fb4dc365b1 /lib/rubygems.rb | |
parent | 3a83ba90c35833bab757998def36cfe872dec461 (diff) | |
download | ruby-85d461456c154d7b4a72b20369e0d65d7880ce02.tar.gz |
Merge master branch from rubygems upstream.
* It's preparation to release RubyGems 3.0.0.beta2 and Ruby 2.6.0
preview 3.
* https://github.com/rubygems/rubygems/compare/v3.0.0.beta1...fad2eb15a282b19dfcb4b48bc95b8b39ebb4511f
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems.rb')
-rw-r--r-- | lib/rubygems.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index d263f29dd2..858d910610 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -7,7 +7,6 @@ #++ require 'rbconfig' -require 'thread' module Gem VERSION = "3.0.0.beta1" @@ -526,8 +525,9 @@ An Array (#{env.inspect}) was passed in from #{caller[3]} end def self.find_files_from_load_path glob # :nodoc: + glob_with_suffixes = "#{glob}#{Gem.suffix_pattern}" $LOAD_PATH.map { |load_path| - Dir["#{File.expand_path glob, load_path}#{Gem.suffix_pattern}"] + Gem::Util.glob_files_in_dir(glob_with_suffixes, load_path) }.flatten.select { |file| File.file? file.untaint } end @@ -1119,8 +1119,9 @@ An Array (#{env.inspect}) was passed in from #{caller[3]} path = "rubygems_plugin" files = [] + glob = "#{path}#{Gem.suffix_pattern}" $LOAD_PATH.each do |load_path| - globbed = Dir["#{File.expand_path path, load_path}#{Gem.suffix_pattern}"] + globbed = Gem::Util.glob_files_in_dir(glob, load_path) globbed.each do |load_path_file| files << load_path_file if File.file?(load_path_file.untaint) |