aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-02-25 18:52:52 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-02-25 18:52:52 +0000
commitef338e4de4e5a9fa8d1c3b3c93cc59d24c42ec37 (patch)
tree98842e436e909508b4c0dc23c31737f845f15cc4
parent290983be3114cd48f63265466abb57b15cbfb8f5 (diff)
downloadrails-ef338e4de4e5a9fa8d1c3b3c93cc59d24c42ec37.tar.gz
rails-ef338e4de4e5a9fa8d1c3b3c93cc59d24c42ec37.tar.bz2
rails-ef338e4de4e5a9fa8d1c3b3c93cc59d24c42ec37.zip
Prepare order for uncommenting, use consistent opt options [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3643 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--railties/environments/environment.rb14
-rw-r--r--railties/lib/rails_generator/generators/applications/app/app_generator.rb5
2 files changed, 10 insertions, 9 deletions
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index fe987e244f..0d5e79d1f9 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -20,13 +20,17 @@ Rails::Initializer.run do |config|
# (by default production uses :info, the others :debug)
# config.log_level = :debug
+ # Enable page/fragment caching by setting a file-based store
+ # (remember to create the caching directory and make it readable to the application)
+ # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
+
# Use the database for sessions instead of the file system
# (create the session table with 'rake create_sessions_table')
# config.action_controller.session_store = :active_record_store
- # Enable page/fragment caching by setting a file-based store
- # (remember to create the caching directory and make it readable to the application)
- # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
+ # Use Active Record's schema dumper instead of SQL when creating the test database
+ # (enables use of different database adapters for development and test environments)
+ # config.active_record.schema_format = :ruby
# Activate observers that should always be running
# config.active_record.observers = :cacher, :garbage_collector
@@ -34,10 +38,6 @@ Rails::Initializer.run do |config|
# Make Active Record use UTC-base instead of local time
# config.active_record.default_timezone = :utc
- # Use Active Record's schema dumper instead of SQL when creating the test database
- # (enables use of different database adapters for development and test environments)
- # config.active_record.schema_format = :ruby
-
# See Rails::Configuration for more options
end
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 2456f02451..a192c14e0d 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -89,8 +89,9 @@ class AppGenerator < Rails::Generator::Base
def add_options!(opt)
opt.separator ''
opt.separator 'Options:'
- opt.on("--ruby [#{DEFAULT_SHEBANG}]",
- "Path to the Ruby binary of your choice.") { |options[:shebang]| }
+ opt.on("-r", "--ruby",
+ "Path to the Ruby binary of your choice.",
+ "Default: #{DEFAULT_SHEBANG}") { |options[:shebang]| }
opt.on("-d", "--database=name", String,
"Preconfigure for selected database (options: mysql/postgresql/sqlite2/sqlite3).",