mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
906aebceed
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:2259ecf368
AR not available * This will be reimplemented with ActionORM or equivalent06182ea02e
implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically893e9eb995
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:199e750d46
3942cb406e
f8ea9f85d4
e3b166aab3
ae9f258e03
44423126c6
0cb020b4d6
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.8c5cc66a83
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.87e8b16246
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.
158 lines
4.8 KiB
Ruby
158 lines
4.8 KiB
Ruby
require 'rubygems'
|
|
require 'rake'
|
|
require 'rake/testtask'
|
|
require 'rake/rdoctask'
|
|
require 'rake/packagetask'
|
|
require 'rake/gempackagetask'
|
|
require 'rake/contrib/sshpublisher'
|
|
require File.join(File.dirname(__FILE__), 'lib', 'action_pack', 'version')
|
|
|
|
PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
|
|
PKG_NAME = 'actionpack'
|
|
PKG_VERSION = ActionPack::VERSION::STRING + PKG_BUILD
|
|
PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
|
|
|
|
RELEASE_NAME = "REL #{PKG_VERSION}"
|
|
|
|
RUBY_FORGE_PROJECT = "actionpack"
|
|
RUBY_FORGE_USER = "webster132"
|
|
|
|
desc "Default Task"
|
|
task :default => [ :test ]
|
|
|
|
# Run the unit tests
|
|
|
|
desc "Run all unit tests"
|
|
task :test => [:test_action_pack, :test_active_record_integration]
|
|
|
|
Rake::TestTask.new(:test_action_pack) do |t|
|
|
t.libs << "test"
|
|
|
|
# make sure we include the tests in alphabetical order as on some systems
|
|
# this will not happen automatically and the tests (as a whole) will error
|
|
t.test_files = Dir.glob( "test/[cdft]*/**/*_test.rb" ).sort
|
|
|
|
t.verbose = true
|
|
#t.warning = true
|
|
end
|
|
|
|
desc 'ActiveRecord Integration Tests'
|
|
Rake::TestTask.new(:test_active_record_integration) do |t|
|
|
t.libs << "test"
|
|
t.test_files = Dir.glob("test/activerecord/*_test.rb")
|
|
t.verbose = true
|
|
end
|
|
|
|
|
|
# Genereate the RDoc documentation
|
|
|
|
Rake::RDocTask.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'
|
|
if ENV['DOC_FILES']
|
|
rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
|
|
else
|
|
rdoc.rdoc_files.include('README', 'RUNNING_UNIT_TESTS', 'CHANGELOG')
|
|
rdoc.rdoc_files.include(Dir['lib/**/*.rb'] -
|
|
Dir['lib/*/vendor/**/*.rb'])
|
|
rdoc.rdoc_files.exclude('lib/actionpack.rb')
|
|
end
|
|
}
|
|
|
|
# Create compressed packages
|
|
dist_dirs = [ "lib", "test" ]
|
|
|
|
spec = Gem::Specification.new do |s|
|
|
s.platform = Gem::Platform::RUBY
|
|
s.name = PKG_NAME
|
|
s.version = PKG_VERSION
|
|
s.summary = "Web-flow and rendering framework putting the VC in MVC."
|
|
s.description = %q{Eases web-request routing, handling, and response as a half-way front, half-way page controller. Implemented with specific emphasis on enabling easy unit/integration testing that doesn't require a browser.} #'
|
|
|
|
s.author = "David Heinemeier Hansson"
|
|
s.email = "david@loudthinking.com"
|
|
s.rubyforge_project = "actionpack"
|
|
s.homepage = "http://www.rubyonrails.org"
|
|
|
|
s.has_rdoc = true
|
|
s.requirements << 'none'
|
|
|
|
s.add_dependency('activesupport', '= 2.3.2' + PKG_BUILD)
|
|
|
|
s.require_path = 'lib'
|
|
s.autorequire = 'action_controller'
|
|
|
|
s.files = [ "Rakefile", "install.rb", "README", "RUNNING_UNIT_TESTS", "CHANGELOG", "MIT-LICENSE" ]
|
|
dist_dirs.each do |dir|
|
|
s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
|
|
end
|
|
end
|
|
|
|
Rake::GemPackageTask.new(spec) do |p|
|
|
p.gem_spec = spec
|
|
p.need_tar = true
|
|
p.need_zip = true
|
|
end
|
|
|
|
task :lines do
|
|
lines, codelines, total_lines, total_codelines = 0, 0, 0, 0
|
|
|
|
for file_name in FileList["lib/**/*.rb"]
|
|
next if file_name =~ /vendor/
|
|
f = File.open(file_name)
|
|
|
|
while line = f.gets
|
|
lines += 1
|
|
next if line =~ /^\s*$/
|
|
next if line =~ /^\s*#/
|
|
codelines += 1
|
|
end
|
|
puts "L: #{sprintf("%4d", lines)}, LOC #{sprintf("%4d", codelines)} | #{file_name}"
|
|
|
|
total_lines += lines
|
|
total_codelines += codelines
|
|
|
|
lines, codelines = 0, 0
|
|
end
|
|
|
|
puts "Total: Lines #{total_lines}, LOC #{total_codelines}"
|
|
end
|
|
|
|
# Publishing ------------------------------------------------------
|
|
|
|
task :update_scriptaculous do
|
|
for js in %w( controls dragdrop effects )
|
|
system("svn export --force http://dev.rubyonrails.org/svn/rails/spinoffs/scriptaculous/src/#{js}.js #{File.dirname(__FILE__)}/lib/action_view/helpers/javascripts/#{js}.js")
|
|
end
|
|
end
|
|
|
|
desc "Updates actionpack to the latest version of the javascript spinoffs"
|
|
task :update_js => [ :update_scriptaculous ]
|
|
|
|
# Publishing ------------------------------------------------------
|
|
|
|
desc "Publish the API documentation"
|
|
task :pgem => [:package] do
|
|
Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
|
|
`ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'`
|
|
end
|
|
|
|
desc "Publish the API documentation"
|
|
task :pdoc => [:rdoc] do
|
|
Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/ap", "doc").upload
|
|
end
|
|
|
|
desc "Publish the release files to RubyForge."
|
|
task :release => [ :package ] do
|
|
require 'rubyforge'
|
|
require 'rake/contrib/rubyforgepublisher'
|
|
|
|
packages = %w( gem tgz zip ).collect{ |ext| "pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}" }
|
|
|
|
rubyforge = RubyForge.new
|
|
rubyforge.login
|
|
rubyforge.add_release(PKG_NAME, PKG_NAME, "REL #{PKG_VERSION}", *packages)
|
|
end
|