summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-08 07:42:51 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-08 07:42:51 +0000
commit1c8c901e3c553bdd15d2a1e5e9d8ce4c5c6c7aa2 (patch)
treecdeeadaad3e880822329898b38781c6915f4f945 /lib
parentb26000068e8d87ea69501cadc93bd2bdc9f2a692 (diff)
* 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
Diffstat (limited to 'lib')
-rw-r--r--lib/rubygems.rb6
-rw-r--r--lib/rubygems/gem_path_searcher.rb4
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index eca80cc985..e4360c616e 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -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
diff --git a/lib/rubygems/gem_path_searcher.rb b/lib/rubygems/gem_path_searcher.rb
index a745b0291c..6ee3c078d5 100644
--- a/lib/rubygems/gem_path_searcher.rb
+++ b/lib/rubygems/gem_path_searcher.rb
@@ -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
##