diff options
Diffstat (limited to 'railties/lib/generators/rails/app/templates')
18 files changed, 29 insertions, 47 deletions
diff --git a/railties/lib/generators/rails/app/templates/Gemfile b/railties/lib/generators/rails/app/templates/Gemfile index ce495177eb..f51edc4d2f 100644 --- a/railties/lib/generators/rails/app/templates/Gemfile +++ b/railties/lib/generators/rails/app/templates/Gemfile @@ -1,5 +1,5 @@ # Edit this Gemfile to bundle your application's dependencies. -source :gemcutter +source 'http://gemcutter.org' <% if !dev_or_edge? %> gem "rails", "<%= Rails::VERSION::STRING %>" @@ -18,17 +18,17 @@ gem "rails", "<%= Rails::VERSION::STRING %>" # ActiveRecord requires a database adapter. By default, # Rails has selected sqlite3. <% end -%> -gem "<%= gem_for_database %>" +gem "<%= gem_for_database %>"<% if require_for_database %>, :require => "<%= require_for_database %>"<% end %> <% end -%> ## Bundle the gems you use: # gem "bj" # gem "hpricot", "0.6" -# gem "sqlite3-ruby", :require_as => "sqlite3" -# gem "aws-s3", :require_as => "aws/s3" +# gem "sqlite3-ruby", :require => "sqlite3" +# gem "aws-s3", :require => "aws/s3" ## Bundle gems used only in certain environments: -# gem "rspec", :only => :test -# only :test do +# gem "rspec", :group => :test +# group :test do # gem "webrat" # end diff --git a/railties/lib/generators/rails/app/templates/config/boot.rb b/railties/lib/generators/rails/app/templates/config/boot.rb index 70bd40bc4c..03396113e8 100644 --- a/railties/lib/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/generators/rails/app/templates/config/boot.rb @@ -1,6 +1,6 @@ # Use Bundler (preferred) begin - require File.expand_path('../../vendor/environment', __FILE__) + require File.expand_path('../../.bundle/environment', __FILE__) rescue LoadError require 'rubygems' require 'bundler' @@ -16,6 +16,9 @@ rescue LoadError # require 'rubygems' end +# Auto-require all bundled libraries. +Bundler.require + <% unless options[:skip_activerecord] -%> require 'rails/all' @@ -40,4 +43,4 @@ require "action_view/railtie" require "action_mailer/railtie" require "active_resource/railtie" require "rails/test_unit/railtie" -<% end -%>
\ No newline at end of file +<% end -%> diff --git a/railties/lib/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/generators/rails/app/templates/config/environments/development.rb.tt index 177ce44d41..f0e917dd96 100644 --- a/railties/lib/generators/rails/app/templates/config/environments/development.rb.tt +++ b/railties/lib/generators/rails/app/templates/config/environments/development.rb.tt @@ -10,9 +10,9 @@ config.whiny_nils = true # Show full error reports and disable caching - config.action_controller.consider_all_requests_local = true - config.action_view.debug_rjs = true - config.action_controller.perform_caching = false + config.consider_all_requests_local = true + config.action_view.debug_rjs = true + config.action_controller.perform_caching = false # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = false diff --git a/railties/lib/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/generators/rails/app/templates/config/environments/production.rb.tt index ee071df63b..917052c3df 100644 --- a/railties/lib/generators/rails/app/templates/config/environments/production.rb.tt +++ b/railties/lib/generators/rails/app/templates/config/environments/production.rb.tt @@ -6,8 +6,8 @@ config.cache_classes = true # Full error reports are disabled and caching is turned on - config.action_controller.consider_all_requests_local = false - config.action_controller.perform_caching = true + config.consider_all_requests_local = false + config.action_controller.perform_caching = true # See everything in the log (default is :info) # config.log_level = :debug diff --git a/railties/lib/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/generators/rails/app/templates/config/environments/test.rb.tt index f6c38f3c0d..0b87b241ec 100644 --- a/railties/lib/generators/rails/app/templates/config/environments/test.rb.tt +++ b/railties/lib/generators/rails/app/templates/config/environments/test.rb.tt @@ -11,8 +11,8 @@ config.whiny_nils = true # Show full error reports and disable caching - config.action_controller.consider_all_requests_local = true - config.action_controller.perform_caching = false + config.consider_all_requests_local = true + config.action_controller.perform_caching = false # Disable request forgery protection in test environment config.action_controller.allow_forgery_protection = false diff --git a/railties/lib/generators/rails/app/templates/gitignore b/railties/lib/generators/rails/app/templates/gitignore index a4f05d101d..af64fae5e7 100644 --- a/railties/lib/generators/rails/app/templates/gitignore +++ b/railties/lib/generators/rails/app/templates/gitignore @@ -1,3 +1,4 @@ +.bundle db/*.sqlite3 log/*.log tmp/**/* diff --git a/railties/lib/generators/rails/app/templates/public/index.html b/railties/lib/generators/rails/app/templates/public/index.html index b153ae392f..ef916f9c5a 100644 --- a/railties/lib/generators/rails/app/templates/public/index.html +++ b/railties/lib/generators/rails/app/templates/public/index.html @@ -255,7 +255,7 @@ <ol> <li> - <h2>Use <code>script/generate</code> to create your models and controllers</h2> + <h2>Use <code>rails generate</code> to create your models and controllers</h2> <p>To see all available options, run it without parameters.</p> </li> diff --git a/railties/lib/generators/rails/app/templates/script/about b/railties/lib/generators/rails/app/templates/script/about deleted file mode 100755 index 93fd007649..0000000000 --- a/railties/lib/generators/rails/app/templates/script/about +++ /dev/null @@ -1,3 +0,0 @@ -require File.expand_path('../../config/environment', __FILE__) -$LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info" -require 'rails/commands/about' diff --git a/railties/lib/generators/rails/app/templates/script/console.tt b/railties/lib/generators/rails/app/templates/script/console.tt deleted file mode 100755 index 47aa254f9f..0000000000 --- a/railties/lib/generators/rails/app/templates/script/console.tt +++ /dev/null @@ -1,5 +0,0 @@ -require File.expand_path('../../config/boot', __FILE__) -require 'rails/commands/console' -require File.expand_path('../../config/application', __FILE__) - -Rails::Console.start(Rails::Application) diff --git a/railties/lib/generators/rails/app/templates/script/dbconsole.tt b/railties/lib/generators/rails/app/templates/script/dbconsole.tt deleted file mode 100755 index 1e53c1d761..0000000000 --- a/railties/lib/generators/rails/app/templates/script/dbconsole.tt +++ /dev/null @@ -1,5 +0,0 @@ -require File.expand_path('../../config/boot', __FILE__) -require 'rails/commands/dbconsole' -require File.expand_path('../../config/application', __FILE__) - -Rails::DBConsole.start(Rails::Application) diff --git a/railties/lib/generators/rails/app/templates/script/destroy b/railties/lib/generators/rails/app/templates/script/destroy deleted file mode 100755 index adfa8e8426..0000000000 --- a/railties/lib/generators/rails/app/templates/script/destroy +++ /dev/null @@ -1,2 +0,0 @@ -require File.expand_path('../../config/environment', __FILE__) -require 'rails/commands/destroy' diff --git a/railties/lib/generators/rails/app/templates/script/generate b/railties/lib/generators/rails/app/templates/script/generate deleted file mode 100755 index 6fb8ad0395..0000000000 --- a/railties/lib/generators/rails/app/templates/script/generate +++ /dev/null @@ -1,2 +0,0 @@ -require File.expand_path('../../config/environment', __FILE__) -require 'rails/commands/generate' diff --git a/railties/lib/generators/rails/app/templates/script/performance/benchmarker b/railties/lib/generators/rails/app/templates/script/performance/benchmarker deleted file mode 100755 index 9647d8f10a..0000000000 --- a/railties/lib/generators/rails/app/templates/script/performance/benchmarker +++ /dev/null @@ -1,2 +0,0 @@ -require File.expand_path('../../../config/environment', __FILE__) -require 'rails/commands/performance/benchmarker' diff --git a/railties/lib/generators/rails/app/templates/script/performance/profiler b/railties/lib/generators/rails/app/templates/script/performance/profiler deleted file mode 100755 index a5822042d2..0000000000 --- a/railties/lib/generators/rails/app/templates/script/performance/profiler +++ /dev/null @@ -1,2 +0,0 @@ -require File.expand_path('../../../config/environment', __FILE__) -require 'rails/commands/performance/profiler' diff --git a/railties/lib/generators/rails/app/templates/script/plugin b/railties/lib/generators/rails/app/templates/script/plugin deleted file mode 100755 index 1f1af6c880..0000000000 --- a/railties/lib/generators/rails/app/templates/script/plugin +++ /dev/null @@ -1,2 +0,0 @@ -require File.expand_path('../../config/application', __FILE__) -require 'rails/commands/plugin' diff --git a/railties/lib/generators/rails/app/templates/script/rails b/railties/lib/generators/rails/app/templates/script/rails new file mode 100644 index 0000000000..2fcf6d09b5 --- /dev/null +++ b/railties/lib/generators/rails/app/templates/script/rails @@ -0,0 +1,9 @@ +# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application. + +ENV_PATH = File.expand_path('../../config/environment', __FILE__) +BOOT_PATH = File.expand_path('../../config/boot', __FILE__) +APP_PATH = File.expand_path('../../config/application', __FILE__) +ROOT_PATH = File.expand_path('../..', __FILE__) + +require BOOT_PATH +require 'rails/commands' diff --git a/railties/lib/generators/rails/app/templates/script/runner b/railties/lib/generators/rails/app/templates/script/runner deleted file mode 100755 index 3354ed4a28..0000000000 --- a/railties/lib/generators/rails/app/templates/script/runner +++ /dev/null @@ -1,3 +0,0 @@ -require File.expand_path('../../config/boot', __FILE__) -require 'rails/commands/runner' -require File.expand_path('../../config/environment', __FILE__) diff --git a/railties/lib/generators/rails/app/templates/script/server.tt b/railties/lib/generators/rails/app/templates/script/server.tt deleted file mode 100755 index 4fd0cc7832..0000000000 --- a/railties/lib/generators/rails/app/templates/script/server.tt +++ /dev/null @@ -1,5 +0,0 @@ -require File.expand_path('../../config/boot', __FILE__) -require 'rails/commands/server' - -Dir.chdir(File.expand_path('../..', __FILE__)) -Rails::Server.start |