diff options
| author | Carl Lerche & Yehuda Katz <wycats@gmail.com> | 2009-04-13 15:18:45 -0700 |
|---|---|---|
| committer | Carl Lerche & Yehuda Katz <wycats@gmail.com> | 2009-04-13 15:18:45 -0700 |
| commit | 906aebceedb95d8caa6db6314bc90f605bdfaf2b (patch) | |
| tree | 5abc86bb6709b20df7cb5f4d1750b27c641dca4b /railties/Rakefile | |
| parent | 2036d3ba75da1a0f3061bf5a33c89e2b2eaff420 (diff) | |
| parent | c877857d59554d78dbf45f5f9fcaafb8badec4e2 (diff) | |
| download | rails-906aebceedb95d8caa6db6314bc90f605bdfaf2b.tar.gz rails-906aebceedb95d8caa6db6314bc90f605bdfaf2b.tar.bz2 rails-906aebceedb95d8caa6db6314bc90f605bdfaf2b.zip | |
Bring abstract_controller up to date with rails/master
Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list
of commits that could not be applied cleanly or are obviated with the
abstract_controller refactor. They all need to be revisited to ensure
that fixes made in 2.3 do not reappear in 3.0:
2259ecf368e6a6715966f69216e3ee86bf1a82a7
AR not available
* This will be reimplemented with ActionORM or equivalent
06182ea02e92afad579998aa80144588e8865ac3
implicitly rendering a js response should not use the default layout
[#1844 state:resolved]
* This will be handled generically
893e9eb99504705419ad6edac14d00e71cef5f12
Improve view rendering performance in development mode and reinstate
template recompiling in production [#1909 state:resolved]
* We will need to reimplement rails-dev-boost on top of the refactor;
the changes here are very implementation specific and cannot be
cleanly applied. The following commits are implicated:
199e750d46c04970b5e7684998d09405648ecbd4
3942cb406e1d5db0ac00e03153809cc8dc4cc4db
f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690
e3b166aab37ddc2fbab030b146eb61713b91bf55
ae9f258e03c9fd5088da12c1c6cd216cc89a01f7
44423126c6f6133a1d9cf1d0832b527e8711d40f
0cb020b4d6d838025859bd60fb8151c8e21b8e84
workaround for picking layouts based on wrong view_paths
[#1974 state:resolved]
* The specifics of this commit no longer apply. Since it is a two-line
commit, we will reimplement this change.
8c5cc66a831aadb159f3daaffa4208064c30af0e
make action_controller/layouts pick templates from the current instance's
view_paths instead of the class view_paths [#1974 state:resolved]
* This does not apply at all. It should be trivial to apply the feature
to the reimplemented ActionController::Base.
87e8b162463f13bd50d27398f020769460a770e3
fix HTML fallback for explicit templates [#2052 state:resolved]
* There were a number of patches related to this that simply compounded
each other. Basically none of them apply cleanly, and the underlying
issue needs to be revisited. After discussing the underlying problem
with Koz, we will defer these fixes for further discussion.
Diffstat (limited to 'railties/Rakefile')
| -rw-r--r-- | railties/Rakefile | 92 |
1 files changed, 19 insertions, 73 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index be0f449efc..a9adbda0b5 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -28,7 +28,8 @@ task :default => :test ## we can see the failures task :test do Dir['test/**/*_test.rb'].all? do |file| - system("ruby -Itest #{file}") + ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME')) + system(ruby, '-Itest', file) end or raise "Failures" end @@ -244,6 +245,12 @@ def copy_with_rewritten_ruby_path(src_file, dest_file) end end +desc 'Generate guides (for authors), use ONLY=foo to process just "foo.textile"' +task :guides do + ENV["WARN_BROKEN_LINKS"] = "1" # authors can't disable this + ruby "guides/rails_guides.rb" +end + # Generate documentation ------------------------------------------------------------------ @@ -272,70 +279,6 @@ Rake::RDocTask.new { |rdoc| rdoc.rdoc_files.include('lib/commands/**/*.rb') } -desc "Generate guides for the framework. Use ONLY='migrations i18n.txt' option to build just specific ones." -task :guides do - require 'mizuho/generator' - - source = "doc/guides/source/" - html = "doc/guides/html/" - FileUtils.rm_r(html) if File.directory?(html) - FileUtils.mkdir(html) - - template = File.expand_path("doc/guides/source/templates/guides.html.erb") - asciidoc_conf = 'doc/guides/asciidoc.conf' - - ignore = ['..', 'icons', 'images', 'templates', 'stylesheets'] - ignore << 'active_record_basics.txt' - - indexless = ['index.txt', 'authors.txt'] - - # Traverse all entries in doc/guides/source/ or only those specified in ONLY env variable - entries = Dir.entries(source) - if ENV['ONLY'] - only = ENV['ONLY'].split(' ') - unless only.empty? - entries = entries.select do |e| - only.include?(e) || only.include?(e.sub(/\.txt$/, '')) - end - end - end - - entries.each do |entry| - next if ignore.include?(entry) - - if File.directory?(File.join(source, entry)) - # If the current entry is a directory, then we will want to compile - # the 'index.txt' file inside this directory. - if entry == '.' - input = File.join(source, 'index.txt') - output = File.join(html, "index.html") - else - input = File.join(source, entry, 'index.txt') - output = File.join(html, "#{entry}.html") - end - else - # If the current entry is a file, then we will want to compile this file. - input = File.join(source, entry) - output = File.join(html, entry).sub(/\.txt$/, '.html') - end - - begin - puts "GENERATING => #{output}" - ENV['MANUALSONRAILS_TOC'] = 'no' if indexless.include?(entry) - Mizuho::Generator.new(input, :output => output, :template => template, :conf_file => asciidoc_conf).start - rescue Mizuho::GenerationError - STDERR.puts "*** ERROR" - exit 2 - ensure - ENV.delete('MANUALSONRAILS_TOC') - end - end - - # Copy images and css files to html directory. These dirs are in .gitigore and shouldn't be source controlled. - FileUtils.cp_r File.join(source, 'images'), File.join(html, 'images') - FileUtils.cp_r File.join(source, 'stylesheets'), File.join(html, 'stylesheets') -end - # Generate GEM ---------------------------------------------------------------------------- task :copy_gem_environment do @@ -369,11 +312,11 @@ spec = Gem::Specification.new do |s| EOF s.add_dependency('rake', '>= 0.8.3') - s.add_dependency('activesupport', '= 2.3.0' + PKG_BUILD) - s.add_dependency('activerecord', '= 2.3.0' + PKG_BUILD) - s.add_dependency('actionpack', '= 2.3.0' + PKG_BUILD) - s.add_dependency('actionmailer', '= 2.3.0' + PKG_BUILD) - s.add_dependency('activeresource', '= 2.3.0' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.3.2' + PKG_BUILD) + s.add_dependency('activerecord', '= 2.3.2' + PKG_BUILD) + s.add_dependency('actionpack', '= 2.3.2' + PKG_BUILD) + s.add_dependency('actionmailer', '= 2.3.2' + PKG_BUILD) + s.add_dependency('activeresource', '= 2.3.2' + PKG_BUILD) s.rdoc_options << '--exclude' << '.' s.has_rdoc = false @@ -402,9 +345,12 @@ task :pgem => [:gem] do `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'` end -desc "Publish the API documentation" -task :pdoc => :rdoc do - # railties API isn't separately published +desc "Publish the guides" +task :pguides => :guides do + mkdir_p 'pkg' + `tar -czf pkg/guides.gz guides/output` + Rake::SshFilePublisher.new("web.rubyonrails.org", "/u/sites/guides.rubyonrails.org/public", "pkg", "guides.gz").upload + `ssh web.rubyonrails.org 'cd /u/sites/guides.rubyonrails.org/public/ && tar -xvzf guides.gz && mv guides/output/* . && rm -rf guides*'` end desc "Publish the release files to RubyForge." |