From 079e567d0260fb7e011d11f699bb790e07820b90 Mon Sep 17 00:00:00 2001 From: Matt Jones Date: Tue, 7 Oct 2008 23:10:45 -0400 Subject: [PATCH] Mark gem as not loaded when spec not found --- railties/lib/rails/gem_dependency.rb | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb index 3b2f484..ffdc403 100644 --- a/railties/lib/rails/gem_dependency.rb +++ b/railties/lib/rails/gem_dependency.rb @@ -108,6 +108,8 @@ module Rails @loaded ||= begin if vendor_rails? true + elsif specification.nil? + false else # check if the gem is loaded by inspecting $" # specification.files lists all the files contained in the gem -- 1.5.3.1 From 18cefe651bb28bf2023973d17291065cdf9a2c18 Mon Sep 17 00:00:00 2001 From: Matt Jones Date: Wed, 8 Oct 2008 10:29:48 -0400 Subject: [PATCH] Fix definition of find_name --- railties/lib/rails/vendor_gem_source_index.rb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/railties/lib/rails/vendor_gem_source_index.rb b/railties/lib/rails/vendor_gem_source_index.rb index c870110..e188f07 100644 --- a/railties/lib/rails/vendor_gem_source_index.rb +++ b/railties/lib/rails/vendor_gem_source_index.rb @@ -63,8 +63,8 @@ module Rails YAML.load_file(spec_file) if File.exist?(spec_file) end - def find_name(gem_name, version_requirement = Gem::Requirement.default) - search(/^#{gem_name}$/, version_requirement) + def find_name(*args) + @installed_source_index.find_name(*args) + @vendor_source_index.find_name(*args) end def search(*args) -- 1.5.3.1