kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Don't generate public/dispatch.cgi/fcgi/rb files by default.

Browse source 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
This commit is contained in:
Yaroslav Markin 2008-11-24 19:22:04 +01:00 committed by Pratik Naik
parent 835be0cbed
commit 5b5730cc6e
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
railties/CHANGELOG
View file

@ -1,5 +1,7 @@
*2.3.0 [Edge]* *2.3.0 [Edge]*
* "rails <app>" will not generate public/dispatch.cgi/fcgi/rb files by default now. Please use "--with-dispatches" option if you need them. [Yaroslav Markin, Pratik Naik]
* Added rake rails:update:application_controller to renamed application.rb to application_controller.rb -- included in rake rails:update so upgrading to 2.3 will automatically trigger it #1439 [kastner] * Added rake rails:update:application_controller to renamed application.rb to application_controller.rb -- included in rake rails:update so upgrading to 2.3 will automatically trigger it #1439 [kastner]
* Added Rails.backtrace_cleaner as an accessor for the Rails::BacktraceCleaner instance used by the framework to cut down on backtrace noise and config/initializers/backtrace_silencers.rb to add your own (or turn them all off) [DHH] * Added Rails.backtrace_cleaner as an accessor for the Rails::BacktraceCleaner instance used by the framework to cut down on backtrace noise and config/initializers/backtrace_silencers.rb to add your own (or turn them all off) [DHH]

14
railties/lib/rails_generator/generators/applications/app/app_generator.rb
View file

@ -10,7 +10,7 @@ class AppGenerator < Rails::Generator::Base
DEFAULT_DATABASE = 'sqlite3' DEFAULT_DATABASE = 'sqlite3'
default_options :db => (ENV["RAILS_DEFAULT_DATABASE"] || DEFAULT_DATABASE), default_options :db => (ENV["RAILS_DEFAULT_DATABASE"] || DEFAULT_DATABASE),
:shebang => DEFAULT_SHEBANG, :freeze => false :shebang => DEFAULT_SHEBANG, :with_dispatches => false, :freeze => false
mandatory_options :source => "#{File.dirname(__FILE__)}/../../../../.." mandatory_options :source => "#{File.dirname(__FILE__)}/../../../../.."
def initialize(runtime_args, runtime_options = {}) def initialize(runtime_args, runtime_options = {})
@ -83,9 +83,11 @@ class AppGenerator < Rails::Generator::Base
end end
# Dispatches # Dispatches
m.file "dispatches/dispatch.rb", "public/dispatch.rb", dispatcher_options if options[:with_dispatches]
m.file "dispatches/dispatch.rb", "public/dispatch.cgi", dispatcher_options m.file "dispatches/dispatch.rb", "public/dispatch.rb", dispatcher_options
m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", dispatcher_options m.file "dispatches/dispatch.rb", "public/dispatch.cgi", dispatcher_options
m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", dispatcher_options
end
# HTML files # HTML files
%w(404 422 500 index).each do |file| %w(404 422 500 index).each do |file|
@ -129,6 +131,10 @@ class AppGenerator < Rails::Generator::Base
"Preconfigure for selected database (options: #{DATABASES.join('/')}).", "Preconfigure for selected database (options: #{DATABASES.join('/')}).",
"Default: #{DEFAULT_DATABASE}") { |v| options[:db] = v } "Default: #{DEFAULT_DATABASE}") { |v| options[:db] = v }
opt.on("-D", "--with-dispatches",
"Add CGI/FastCGI/mod_ruby dispatches code to generated application skeleton",
"Default: false") { |v| options[:with_dispatches] = v }
opt.on("-f", "--freeze", opt.on("-f", "--freeze",
"Freeze Rails in vendor/rails from the gems generating the skeleton", "Freeze Rails in vendor/rails from the gems generating the skeleton",
"Default: false") { |v| options[:freeze] = v } "Default: false") { |v| options[:freeze] = v }