diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2008-10-21 02:30:57 +0200 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-10-21 02:30:57 +0200 |
commit | 68d84e259346c1bc3d8fd546162e5a93caf0bbdc (patch) | |
tree | 60f6e71fcb669eb0f9b6b0bc70fa5c2a81a103f6 /railties/lib | |
parent | 9acb88e666269204821b78bec7b72d3d16597096 (diff) | |
parent | 326030a1e843245ae493fbdfb1b5eb72d1e59f26 (diff) | |
download | rails-68d84e259346c1bc3d8fd546162e5a93caf0bbdc.tar.gz rails-68d84e259346c1bc3d8fd546162e5a93caf0bbdc.tar.bz2 rails-68d84e259346c1bc3d8fd546162e5a93caf0bbdc.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/gem_dependency.rb | 2 | ||||
-rw-r--r-- | railties/lib/tasks/gems.rake | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb index 80481859e1..46d5fd3a47 100644 --- a/railties/lib/rails/gem_dependency.rb +++ b/railties/lib/rails/gem_dependency.rb @@ -151,7 +151,7 @@ module Rails end # Gem.activate changes the spec - get the original - real_spec = Gem::Specification.load(spec.loaded_from) + real_spec = Gem::Specification.load(specification.loaded_from) write_spec(directory, real_spec) end diff --git a/railties/lib/tasks/gems.rake b/railties/lib/tasks/gems.rake index c65dfc7dd4..e2cb4b9577 100644 --- a/railties/lib/tasks/gems.rake +++ b/railties/lib/tasks/gems.rake @@ -11,7 +11,7 @@ end def print_gem_status(gem, indent=1) code = gem.loaded? ? (gem.frozen? ? "F" : "I") : " " puts " "*(indent-1)+" - [#{code}] #{gem.name} #{gem.requirement.to_s}" - gem.dependencies.each { |g| print_gem_status(g, indent+1)} + gem.dependencies.each { |g| print_gem_status(g, indent+1)} if gem.loaded? end namespace :gems do @@ -70,6 +70,7 @@ namespace :gems do task :refresh_specs => :base do require 'rubygems' require 'rubygems/gem_runner' + Rails::VendorGemSourceIndex.silence_spec_warnings = true Rails.configuration.gems.each do |gem| next unless gem.frozen? && (ENV['GEM'].blank? || ENV['GEM'] == gem.name) gem.refresh_spec(Rails::GemDependency.unpacked_path) if gem.loaded? |