Merge branch 'master' of git@github.com:lifo/docrails

2 files changed, 15 insertions, 1 deletions

diff --git a/railties/lib/tasks/documentation.rake b/railties/lib/tasks/documentation.rake
index b20b58ba24..77b6532fbf 100644
--- a/railties/lib/tasks/documentation.rake
+++ b/railties/lib/tasks/documentation.rake
@@ -52,6 +52,19 @@ namespace :doc do
     rm_rf 'doc/plugins' rescue nil
   end
 
+  desc "Generate Rails guides"
+  task :guides do
+    source = File.join(RAILTIES_PATH, "doc/guides")
+    destination = File.join(RAILS_ROOT, "doc/guides")
+    FileUtils.rm_r(destination) if File.directory?(destination)
+    FileUtils.mkdir(destination)
+
+    FileUtils.cp_r File.join(source, 'html/.'), File.join(destination)
+    # Copy images and css files to html directory. These dirs are in .gitigore and shouldn't be source controlled.
+    FileUtils.cp_r File.join(source, 'source/images'), File.join(destination, 'images')
+    FileUtils.cp_r File.join(source, 'source/stylesheets'), File.join(destination, 'stylesheets')
+  end
+
   namespace :plugins do
     # Define doc tasks for each plugin
     plugins.each do |plugin|
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?