Browse files

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

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
  • Loading branch information...
1 parent 835be0c commit 5b5730cc6e9194fb5f67fe79d2c7849e200ba6ed @yaroslav yaroslav committed with lifo Nov 24, 2008
Showing with 12 additions and 4 deletions.
  1. +2 −0 railties/CHANGELOG
  2. +10 −4 railties/lib/rails_generator/generators/applications/app/app_generator.rb
View
2 railties/CHANGELOG
@@ -1,5 +1,7 @@
*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 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]
View
14 railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -10,7 +10,7 @@ class AppGenerator < Rails::Generator::Base
DEFAULT_DATABASE = 'sqlite3'
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__)}/../../../../.."
def initialize(runtime_args, runtime_options = {})
@@ -83,9 +83,11 @@ def manifest
end
# Dispatches
- m.file "dispatches/dispatch.rb", "public/dispatch.rb", dispatcher_options
- m.file "dispatches/dispatch.rb", "public/dispatch.cgi", dispatcher_options
- m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", dispatcher_options
+ if options[:with_dispatches]
+ m.file "dispatches/dispatch.rb", "public/dispatch.rb", 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
%w(404 422 500 index).each do |file|
@@ -129,6 +131,10 @@ def add_options!(opt)
"Preconfigure for selected database (options: #{DATABASES.join('/')}).",
"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",
"Freeze Rails in vendor/rails from the gems generating the skeleton",
"Default: false") { |v| options[:freeze] = v }

0 comments on commit 5b5730c

Please sign in to comment.