Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes Rake::RDocTask deprecation warnings from Rake 0.9.0 #1278

Merged
merged 1 commit into from
May 24, 2011
Merged

Fixes Rake::RDocTask deprecation warnings from Rake 0.9.0 #1278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions railties/lib/rails/generators/rails/plugin/templates/Rakefile.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env rake
require 'rake/testtask'
require 'rake/rdoctask'
require 'rdoc/task'

desc 'Default: run unit tests.'
task :default => :test
Expand All @@ -14,10 +14,10 @@ Rake::TestTask.new(:test) do |t|
end

desc 'Generate documentation for the <%= file_name %> plugin.'
Rake::RDocTask.new(:rdoc) do |rdoc|
RDoc::Task.new(:rdoc) do |rdoc|
rdoc.rdoc_dir = 'rdoc'
rdoc.title = '<%= class_name %>'
rdoc.options << '--line-numbers' << '--inline-source'
rdoc.rdoc_files.include('README')
rdoc.rdoc_files.include('lib/**/*.rb')
end
end
4 changes: 2 additions & 2 deletions railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ rescue LoadError
puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
end

require 'rake/rdoctask'
require 'rdoc/task'

Rake::RDocTask.new(:rdoc) do |rdoc|
RDoc::Task.new(:rdoc) do |rdoc|
rdoc.rdoc_dir = 'rdoc'
rdoc.title = '<%= camelized %>'
rdoc.options << '--line-numbers' << '--inline-source'
Expand Down
4 changes: 2 additions & 2 deletions railties/lib/rails/tasks/documentation.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'rake/rdoctask'
require 'rdoc/task'

# Monkey-patch to remove redoc'ing and clobber descriptions to cut down on rake -T noise
class RDocTaskWithoutDescriptions < Rake::RDocTask
class RDocTaskWithoutDescriptions < RDoc::Task
def define
task rdoc_task_name

Expand Down
4 changes: 2 additions & 2 deletions railties/test/railties/railtie_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class MyTie < Rails::Railtie
assert !$ran_block
require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
require 'rdoc/task'

AppTemplate::Application.load_tasks
assert $ran_block
Expand All @@ -121,7 +121,7 @@ class MyTie < Rails::Railtie
assert_equal [], $ran_block
require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
require 'rdoc/task'

AppTemplate::Application.load_tasks
assert $ran_block.include?("my_tie")
Expand Down
2 changes: 1 addition & 1 deletion railties/test/railties/shared_tests.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ def test_rake_tasks_lib_tasks_are_loaded

boot_rails
require 'rake'
require 'rake/rdoctask'
require 'rdoc/task'
require 'rake/testtask'
Rails.application.load_tasks
Rake::Task[:foo].invoke
Expand Down