Permalink
Browse files

Merge pull request #10385 from siong1987/fix_rake_doc_guides

Make `rake doc:guides` works again.  Fix #10384.
  • Loading branch information...
2 parents 5e8015f + 5aec73d commit 24444441b695d0b0d899f486e04dcdfdf9c64085 @fxn fxn committed Apr 30, 2013
Showing with 3 additions and 3 deletions.
  1. +1 −1 guides/rails_guides.rb
  2. +2 −2 railties/lib/rails/tasks/documentation.rake
View
@@ -22,7 +22,7 @@ def bundler?
begin
require 'redcarpet'
-rescue Gem::LoadError
+rescue LoadError
# This can happen if doc:guides is executed in an application.
$stderr.puts('Generating guides requires Redcarpet 2.1.1+.')
$stderr.puts(<<ERROR) if bundler?
@@ -57,8 +57,8 @@ namespace :doc do
# desc "Generate Rails Guides"
task :guides do
- # FIXME: Reaching outside lib directory is a bad idea
- require File.expand_path('../../../../../guides/rails_guides', __FILE__)
+ rails_gem_dir = Gem::Specification.find_by_name("rails").gem_dir
+ require File.expand_path(File.join(rails_gem_dir, "/guides/rails_guides"))
RailsGuides::Generator.new(Rails.root.join("doc/guides")).generate
end
end

0 comments on commit 2444444

Please sign in to comment.