Ensure RDoc::Task exists even if 'rdoc/task' was not required

vijaydev · May 25, 2011 · 05adf52 · 05adf52
1 parent ee46bb7
commit 05adf52
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 17 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,11 +1,6 @@
 #!/usr/bin/env rake
 
-
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rake/rdoctask'
-end
+require 'rdoc/task'
 require 'net/http'
 
 $:.unshift File.expand_path('..', __FILE__)

diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
@@ -7,7 +7,9 @@ end
 begin
   require 'rdoc/task'
 rescue LoadError
+  require 'rdoc/rdoc'
   require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
 end
 
 RDoc::Task.new(:rdoc) do |rdoc|

diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
@@ -1,7 +1,9 @@
 begin
   require 'rdoc/task'
 rescue LoadError
+  require 'rdoc/rdoc'
   require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
 end
 
 # Monkey-patch to remove redoc'ing and clobber descriptions to cut down on rake -T noise

diff --git a/railties/test/railties/railtie_test.rb b/railties/test/railties/railtie_test.rb
@@ -97,12 +97,7 @@ class MyTie < Rails::Railtie
       assert !$ran_block
       require 'rake'
       require 'rake/testtask'
-      begin
-        require 'rdoc/task'
-      rescue LoadError
-        require 'rake/rdoctask'
-      end
-
+      require 'rdoc/task'
 
       AppTemplate::Application.load_tasks
       assert $ran_block

diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb
@@ -237,11 +237,7 @@ def test_rake_tasks_lib_tasks_are_loaded
 
       boot_rails
       require 'rake'
-      begin
-        require 'rdoc/task'
-      rescue LoadError
-        require 'rake/rdoctask'
-      end
+      require 'rdoc/task'
       require 'rake/testtask'
       Rails.application.load_tasks
       Rake::Task[:foo].invoke