diff options
| author | Xavier Noria <fxn@hashref.com> | 2013-04-30 07:29:28 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2013-04-30 07:29:28 -0700 |
| commit | 24444441b695d0b0d899f486e04dcdfdf9c64085 (patch) | |
| tree | 98b37a120597a85c90c5ac34224fa581de82c7ee | |
| parent | 5e8015f5615c47c5233d199cf58bc52de440cb1e (diff) | |
| parent | 5aec73daf5ea144ac9f2a4e15c6807cc2dcb87b6 (diff) | |
| download | rails-24444441b695d0b0d899f486e04dcdfdf9c64085.tar.gz rails-24444441b695d0b0d899f486e04dcdfdf9c64085.tar.bz2 rails-24444441b695d0b0d899f486e04dcdfdf9c64085.zip | |
Merge pull request #10385 from siong1987/fix_rake_doc_guides
Make `rake doc:guides` works again. Fix #10384.
| -rw-r--r-- | guides/rails_guides.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/tasks/documentation.rake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/guides/rails_guides.rb b/guides/rails_guides.rb index ab890f202c..ce409868ca 100644 --- a/guides/rails_guides.rb +++ b/guides/rails_guides.rb @@ -22,7 +22,7 @@ end 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? diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake index 1c3426028d..f89d6b12e1 100644 --- a/railties/lib/rails/tasks/documentation.rake +++ b/railties/lib/rails/tasks/documentation.rake @@ -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 |