diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-11-18 16:28:12 -0800 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-11-18 16:28:37 -0800 |
| commit | 520b8b59110dd130c89b317b6bd65d8644c7836f (patch) | |
| tree | 95d93326f18d529b6f9f40cd0932dc549232e2ed /railties/lib/rails/generators | |
| parent | 4403dfac6ce876c7ffb7a450b2249864c7a17cb7 (diff) | |
| download | rails-520b8b59110dd130c89b317b6bd65d8644c7836f.tar.gz rails-520b8b59110dd130c89b317b6bd65d8644c7836f.tar.bz2 rails-520b8b59110dd130c89b317b6bd65d8644c7836f.zip | |
Final steps toward clean rails "foo"; cd foo; gem bundle; script/server working
Diffstat (limited to 'railties/lib/rails/generators')
5 files changed, 7 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 2bcea4bc8f..d970bd8db8 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -50,7 +50,7 @@ module Rails::Generators def create_root_files copy_file "Rakefile" copy_file "README" - copy_file "config.ru" + template "config.ru" template "Gemfile" end diff --git a/railties/lib/rails/generators/rails/app/templates/config.ru b/railties/lib/rails/generators/rails/app/templates/config.ru index 509a0da5b7..fea9ba7fe5 100644 --- a/railties/lib/rails/generators/rails/app/templates/config.ru +++ b/railties/lib/rails/generators/rails/app/templates/config.ru @@ -2,4 +2,4 @@ require ::File.expand_path('../config/environment', __FILE__) # Dispatch the request -run Rails.application +run <%= app_name.classify %> diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index 8008c6ba07..43067b2530 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -1,6 +1,6 @@ require File.expand_path('../boot', __FILE__) -Rails::Initializer.run do |config| +class <%= app_name.classify %> < Rails::Application # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. diff --git a/railties/lib/rails/generators/rails/app/templates/config/environment.rb b/railties/lib/rails/generators/rails/app/templates/config/environment.rb index 0bb191f205..1c35ae44d2 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environment.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/environment.rb @@ -2,4 +2,4 @@ require File.expand_path('../application', __FILE__) # Initialize the rails application -Rails.initialize! +<%= app_name.classify %>.initialize! diff --git a/railties/lib/rails/generators/rails/app/templates/script/server b/railties/lib/rails/generators/rails/app/templates/script/server index a7aaee2953..b4864eb745 100755 --- a/railties/lib/rails/generators/rails/app/templates/script/server +++ b/railties/lib/rails/generators/rails/app/templates/script/server @@ -1,2 +1,5 @@ require File.expand_path('../../config/application', __FILE__) +# Temporary patch until Rack::Server +# Will be Rails::Server.start(File.expand_path("../../config.ru", __FILE__)) +$config_ru = File.expand_path("../../config.ru", __FILE__) require 'rails/commands/server' |