* lib/rubygems.rb (Gem.find_files): reverted to use globbing.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-08-08 07:42:51 +00:00
Родитель b26000068e
Коммит 1c8c901e3c
3 изменённых файлов: 8 добавлений и 9 удалений

Просмотреть файл

@ -1,11 +1,10 @@
Sun Aug 8 16:22:04 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
Sun Aug 8 16:42:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rubygems.rb (Gem.find_files): reverted to use globbing.
* lib/rubygems.rb (Gem.find_files): fixed search order same as
default behavior.
* lib/rubygems/gem_path_searcher.rb (matching_files): check if
exist, not globbing.
* gem_prelude.rb, lib/rubygems.rb (Gem.suffixes): return truely
require-able suffixes only.

Просмотреть файл

@ -476,9 +476,9 @@ module Gem
load_path_files = suffixes.map do |sfx|
base = path + sfx
$LOAD_PATH.map {|load_path|
File.expand_path(base, load_path)
}.select {|f| File.file?(f.untaint)}
end.flatten
Dir[File.expand_path(base, load_path)]
}
end.flatten.select {|f| File.file?(f.untaint)}
specs = searcher.find_all path

Просмотреть файл

@ -69,8 +69,8 @@ class Gem::GemPathSearcher
def matching_files(spec, path)
return [] unless @lib_dirs[spec.object_id] # case no paths
load_path = File.join(@lib_dirs[spec.object_id], path)
Gem.suffixes.map {|sfx| load_path + sfx}.select {|f| File.file?(f.untaint)}
glob = File.join @lib_dirs[spec.object_id], "#{path}#{Gem.suffix_pattern}"
Dir[glob].select { |f| File.file? f.untaint }
end
##