From 2aae7a296299167cb9b6b6cbfbdc255208d060bd Mon Sep 17 00:00:00 2001 From: Matt Jones Date: Thu, 23 Oct 2008 00:59:31 -0400 Subject: [PATCH] Make refresh_specs more defensive, and show gems loaded by outside sources. --- railties/lib/rails/gem_dependency.rb | 1 + railties/lib/tasks/gems.rake | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb index 46d5fd3..dea17b7 100644 --- a/railties/lib/rails/gem_dependency.rb +++ b/railties/lib/rails/gem_dependency.rb @@ -166,6 +166,7 @@ module Rails end def refresh_spec(directory) + return if framework_gem? real_gems = Gem.source_index.installed_source_index exact_dep = Gem::Dependency.new(name, "= #{specification.version}") matches = real_gems.search(exact_dep) diff --git a/railties/lib/tasks/gems.rake b/railties/lib/tasks/gems.rake index e2cb4b9..12c30ce 100644 --- a/railties/lib/tasks/gems.rake +++ b/railties/lib/tasks/gems.rake @@ -6,10 +6,11 @@ task :gems => 'gems:base' do puts puts "I = Installed" puts "F = Frozen" + puts "R = Framework (loaded before add_gem_load_paths)" end def print_gem_status(gem, indent=1) - code = gem.loaded? ? (gem.frozen? ? "F" : "I") : " " + code = gem.loaded? ? (gem.frozen? ? (gem.framework_gem? ? "R" : "F") : "I") : " " puts " "*(indent-1)+" - [#{code}] #{gem.name} #{gem.requirement.to_s}" gem.dependencies.each { |g| print_gem_status(g, indent+1)} if gem.loaded? end -- 1.5.3.1