Don't require rails/gem_builder during rails initialization, it's only needed for the gems:build task. [rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9240 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 8 insertions, 4 deletions

diff --git a/railties/lib/tasks/gems.rake b/railties/lib/tasks/gems.rake
index 8f3fc51635..c8d5167be6 100644
--- a/railties/lib/tasks/gems.rake
+++ b/railties/lib/tasks/gems.rake
@@ -1,13 +1,18 @@
 desc "List the gems that this rails application depends on"
 task :gems => :environment do
   Rails.configuration.gems.each do |gem|
-    puts "[#{gem.loaded? ? '*' : ' '}] #{gem.name} #{gem.requirement.to_s}"
+    code = gem.loaded? ? (gem.frozen? ? "F" : "I") : " "
+    puts "[#{code}] #{gem.name} #{gem.requirement.to_s}"
   end
+  puts
+  puts "I = Installed"
+  puts "F = Frozen"
 end
 
 namespace :gems do
   desc "Build any native extensions for unpacked gems"
   task :build do
+    require 'rails/gem_builder'
     Dir[File.join(RAILS_ROOT, 'vendor', 'gems', '*')].each do |gem_dir|
       spec_file = File.join(gem_dir, '.specification')
       next unless File.exists?(spec_file)
@@ -26,12 +31,11 @@ namespace :gems do
   end
 
   desc "Unpacks the specified gem into vendor/gems."
-  task :unpack do
-    Rake::Task["environment"].invoke
+  task :unpack => :environment do
     require 'rubygems'
     require 'rubygems/gem_runner'
     Rails.configuration.gems.each do |gem|
-      next unless ENV['GEM'].blank? || ENV['GEM'] == gem.name
+      next unless !gem.frozen? && (ENV['GEM'].blank? || ENV['GEM'] == gem.name)
       gem.unpack_to(File.join(RAILS_ROOT, 'vendor', 'gems')) if gem.loaded?
     end
   end