mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge branch 'master' of github.com:rails/rails
This commit is contained in:
José Valim
commit
7a7cbab1f4
8 changed files with 42 additions and 45 deletions
24
Rakefile
24
Rakefile
|
|
@ -1,9 +1,8 @@
|
|||
gem 'rdoc', '>= 2.5.9'
|
||||
require 'rdoc'
|
||||
require 'horo'
|
||||
|
||||
require 'rake'
|
||||
require 'rake/rdoctask'
|
||||
require 'rdoc/task'
|
||||
require 'rake/gempackagetask'
|
||||
|
||||
PROJECTS = %w(activesupport activemodel actionpack actionmailer activeresource activerecord railties)
|
||||
|
|
@ -11,7 +10,7 @@ PROJECTS = %w(activesupport activemodel actionpack actionmailer activeresource a
|
|||
desc 'Run all tests by default'
|
||||
task :default => %w(test test:isolated)
|
||||
|
||||
%w(test test:isolated rdoc package gem).each do |task_name|
|
||||
%w(test test:isolated package gem).each do |task_name|
|
||||
desc "Run #{task_name} task for all projects"
|
||||
task task_name do
|
||||
errors = []
|
||||
|
|
@ -63,24 +62,15 @@ task :install => :gem do
|
|||
end
|
||||
|
||||
desc "Generate documentation for the Rails framework"
|
||||
Rake::RDocTask.new do |rdoc|
|
||||
RDoc::Task.new do |rdoc|
|
||||
rdoc.rdoc_dir = 'doc/rdoc'
|
||||
rdoc.title = "Ruby on Rails Documentation"
|
||||
|
||||
rdoc.options << '--line-numbers' << '--inline-source'
|
||||
rdoc.options << '-A cattr_accessor=object'
|
||||
rdoc.options << '--charset' << 'utf-8'
|
||||
rdoc.options << '--main' << 'README.rdoc'
|
||||
rdoc.options << '-f' << 'horo'
|
||||
rdoc.options << '-c' << 'utf-8'
|
||||
rdoc.options << '-m' << 'README.rdoc'
|
||||
|
||||
# Workaround: RDoc assumes that rdoc.template can be required, and that
|
||||
# rdoc.template.upcase is a constant living in RDoc::Generator::HTML
|
||||
# which holds the actual template class.
|
||||
#
|
||||
# We put 'doc/template' in the load path to be able to set the template
|
||||
# to the string 'horo' and thus meet those RDoc's assumptions.
|
||||
$:.unshift('doc/template')
|
||||
|
||||
rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : 'horo'
|
||||
rdoc.rdoc_files.include('README.rdoc')
|
||||
|
||||
rdoc.rdoc_files.include('railties/CHANGELOG')
|
||||
rdoc.rdoc_files.include('railties/MIT-LICENSE')
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ gem 'rdoc', '>= 2.5.9'
|
|||
require 'rdoc'
|
||||
require 'rake'
|
||||
require 'rake/testtask'
|
||||
require 'rake/rdoctask'
|
||||
require 'rdoc/task'
|
||||
require 'rake/packagetask'
|
||||
require 'rake/gempackagetask'
|
||||
|
||||
|
|
@ -26,12 +26,12 @@ namespace :test do
|
|||
end
|
||||
|
||||
# Generate the RDoc documentation
|
||||
Rake::RDocTask.new { |rdoc|
|
||||
RDoc::Task.new { |rdoc|
|
||||
rdoc.rdoc_dir = 'doc'
|
||||
rdoc.title = "Action Mailer -- Easy email delivery and testing"
|
||||
rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
|
||||
rdoc.options << '--charset' << 'utf-8'
|
||||
rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
|
||||
rdoc.options << '-f' << 'horo'
|
||||
rdoc.options << '--main' << 'README.rdoc'
|
||||
rdoc.rdoc_files.include('README.rdoc', 'CHANGELOG')
|
||||
rdoc.rdoc_files.include('lib/action_mailer.rb')
|
||||
rdoc.rdoc_files.include('lib/action_mailer/*.rb')
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ gem 'rdoc', '>= 2.5.9'
|
|||
require 'rdoc'
|
||||
require 'rake'
|
||||
require 'rake/testtask'
|
||||
require 'rake/rdoctask'
|
||||
require 'rdoc/task'
|
||||
require 'rake/packagetask'
|
||||
require 'rake/gempackagetask'
|
||||
|
||||
|
|
@ -38,12 +38,12 @@ end
|
|||
|
||||
# Genereate the RDoc documentation
|
||||
|
||||
Rake::RDocTask.new { |rdoc|
|
||||
RDoc::Task.new { |rdoc|
|
||||
rdoc.rdoc_dir = 'doc'
|
||||
rdoc.title = "Action Pack -- On rails from request to response"
|
||||
rdoc.options << '--line-numbers' << '--inline-source'
|
||||
rdoc.options << '--charset' << 'utf-8'
|
||||
rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
|
||||
rdoc.options << '-f' << 'horo'
|
||||
rdoc.options << '--main' << 'README.rdoc'
|
||||
if ENV['DOC_FILES']
|
||||
rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
|
||||
else
|
||||
|
|
|
|||
|
|
@ -23,15 +23,15 @@ namespace :test do
|
|||
end
|
||||
|
||||
|
||||
require 'rake/rdoctask'
|
||||
require 'rdoc/task'
|
||||
|
||||
# Generate the RDoc documentation
|
||||
Rake::RDocTask.new do |rdoc|
|
||||
RDoc::Task.new do |rdoc|
|
||||
rdoc.rdoc_dir = "doc"
|
||||
rdoc.title = "Active Model"
|
||||
rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
|
||||
rdoc.options << '-f' << 'horo'
|
||||
rdoc.options << '--charset' << 'utf-8'
|
||||
rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
|
||||
rdoc.options << '--main' << 'README.rdoc'
|
||||
rdoc.rdoc_files.include("README.rdoc", "CHANGELOG")
|
||||
rdoc.rdoc_files.include("lib/**/*.rb")
|
||||
end
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ gem 'rdoc', '>= 2.5.9'
|
|||
require 'rdoc'
|
||||
require 'rake'
|
||||
require 'rake/testtask'
|
||||
require 'rake/rdoctask'
|
||||
require 'rdoc/task'
|
||||
require 'rake/packagetask'
|
||||
require 'rake/gempackagetask'
|
||||
|
||||
|
|
@ -166,12 +166,12 @@ task :rebuild_frontbase_databases => 'frontbase:rebuild_databases'
|
|||
|
||||
# Generate the RDoc documentation
|
||||
|
||||
Rake::RDocTask.new { |rdoc|
|
||||
RDoc::Task.new { |rdoc|
|
||||
rdoc.rdoc_dir = 'doc'
|
||||
rdoc.title = "Active Record -- Object-relation mapping put on rails"
|
||||
rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
|
||||
rdoc.options << '-f' << 'horo'
|
||||
rdoc.options << '--main' << 'README.rdoc'
|
||||
rdoc.options << '--charset' << 'utf-8'
|
||||
rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
|
||||
rdoc.rdoc_files.include('README.rdoc', 'RUNNING_UNIT_TESTS', 'CHANGELOG')
|
||||
rdoc.rdoc_files.include('lib/**/*.rb')
|
||||
rdoc.rdoc_files.exclude('lib/active_record/vendor/*')
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ gem 'rdoc', '>= 2.5.9'
|
|||
require 'rdoc'
|
||||
require 'rake'
|
||||
require 'rake/testtask'
|
||||
require 'rake/rdoctask'
|
||||
require 'rdoc/task'
|
||||
require 'rake/packagetask'
|
||||
require 'rake/gempackagetask'
|
||||
|
||||
|
|
@ -29,12 +29,12 @@ end
|
|||
|
||||
# Generate the RDoc documentation
|
||||
|
||||
Rake::RDocTask.new { |rdoc|
|
||||
RDoc::Task.new { |rdoc|
|
||||
rdoc.rdoc_dir = 'doc'
|
||||
rdoc.title = "Active Resource -- Object-oriented REST services"
|
||||
rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
|
||||
rdoc.options << '-f' << 'horo'
|
||||
rdoc.options << '--main' << 'README.rdoc'
|
||||
rdoc.options << '--charset' << 'utf-8'
|
||||
rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
|
||||
rdoc.rdoc_files.include('README.rdoc', 'CHANGELOG')
|
||||
rdoc.rdoc_files.include('lib/**/*.rb')
|
||||
rdoc.rdoc_files.exclude('lib/activeresource.rb')
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
gem 'rdoc', '>= 2.5.9'
|
||||
require 'rdoc'
|
||||
require 'rake/testtask'
|
||||
require 'rake/rdoctask'
|
||||
require 'rdoc/task'
|
||||
require 'rake/gempackagetask'
|
||||
|
||||
task :default => :test
|
||||
|
|
@ -22,12 +22,12 @@ dist_dirs = [ "lib", "test"]
|
|||
|
||||
# Genereate the RDoc documentation
|
||||
|
||||
Rake::RDocTask.new { |rdoc|
|
||||
RDoc::Task.new { |rdoc|
|
||||
rdoc.rdoc_dir = 'doc'
|
||||
rdoc.title = "Active Support -- Utility classes and standard library extensions from Rails"
|
||||
rdoc.options << '--line-numbers' << '--inline-source'
|
||||
rdoc.options << '-f' << 'horo'
|
||||
rdoc.options << '--main' << 'README.rdoc'
|
||||
rdoc.options << '--charset' << 'utf-8'
|
||||
rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
|
||||
rdoc.rdoc_files.include('README.rdoc', 'CHANGELOG')
|
||||
rdoc.rdoc_files.include('lib/active_support.rb')
|
||||
rdoc.rdoc_files.include('lib/active_support/**/*.rb')
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ gem 'rdoc', '>= 2.5.9'
|
|||
require 'rdoc'
|
||||
require 'rake'
|
||||
require 'rake/testtask'
|
||||
require 'rake/rdoctask'
|
||||
require 'rdoc/task'
|
||||
require 'rake/gempackagetask'
|
||||
|
||||
require 'date'
|
||||
|
|
@ -35,6 +35,13 @@ end
|
|||
|
||||
# Update spinoffs -------------------------------------------------------------------
|
||||
|
||||
desc "Updates application README to the latest version Railties README"
|
||||
task :update_readme do
|
||||
readme = "lib/rails/generators/rails/app/templates/README"
|
||||
rm readme
|
||||
cp "./README.rdoc", readme
|
||||
end
|
||||
|
||||
desc 'Generate guides (for authors), use ONLY=foo to process just "foo.textile"'
|
||||
task :generate_guides do
|
||||
ENV["WARN_BROKEN_LINKS"] = "1" # authors can't disable this
|
||||
|
|
@ -53,12 +60,12 @@ end
|
|||
|
||||
# Generate documentation ------------------------------------------------------------------
|
||||
|
||||
Rake::RDocTask.new { |rdoc|
|
||||
RDoc::Task.new { |rdoc|
|
||||
rdoc.rdoc_dir = 'doc'
|
||||
rdoc.title = "Railties -- Gluing the Engine to the Rails"
|
||||
rdoc.options << '--line-numbers' << '--inline-source' << '--accessor' << 'cattr_accessor=object'
|
||||
rdoc.options << '-f' << 'horo'
|
||||
rdoc.options << '--main' << 'README.rdoc'
|
||||
rdoc.options << '--charset' << 'utf-8'
|
||||
rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
|
||||
rdoc.rdoc_files.include('README.rdoc', 'CHANGELOG')
|
||||
rdoc.rdoc_files.include('lib/**/*.rb')
|
||||
rdoc.rdoc_files.exclude('lib/rails/generators/**/templates/*')
|
||||
|
|
|
|||
Loading…
Reference in a new issue