diff options
author | Matt Jones <al2o3cr@gmail.com> | 2008-10-20 15:02:23 -0400 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2008-10-20 21:45:01 +0100 |
commit | 326030a1e843245ae493fbdfb1b5eb72d1e59f26 (patch) | |
tree | b13530c77cd7155b4eff68b6d0fb602bda567b89 /railties | |
parent | fcb45e5ec3c8ab7b11391c0639609918876ddbb2 (diff) | |
download | rails-326030a1e843245ae493fbdfb1b5eb72d1e59f26.tar.gz rails-326030a1e843245ae493fbdfb1b5eb72d1e59f26.tar.bz2 rails-326030a1e843245ae493fbdfb1b5eb72d1e59f26.zip |
config.gem: Fix typo in unpack, skip dependencies on unloaded gems, and silence spec warnings on refresh. [#1128]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'railties')
-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? |