diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-10-16 18:58:35 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-10-16 18:58:35 -0500 |
| commit | d8594026962704b6b51e188a29406fbd22bb31ce (patch) | |
| tree | 60e24269b4cabaebfcf21a6c9c7b5da0f05f1f29 /railties/lib/rails/commands | |
| parent | 92bfc693f2293fe5d459a6edb4216594cd5a7eb2 (diff) | |
| download | rails-d8594026962704b6b51e188a29406fbd22bb31ce.tar.gz rails-d8594026962704b6b51e188a29406fbd22bb31ce.tar.bz2 rails-d8594026962704b6b51e188a29406fbd22bb31ce.zip | |
Use Rails.initialize! where we just want to run the initializers and aren't concerned about the config
Diffstat (limited to 'railties/lib/rails/commands')
| -rw-r--r-- | railties/lib/rails/commands/about.rb | 2 | ||||
| -rwxr-xr-x | railties/lib/rails/commands/generate.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/commands/performance/benchmarker.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/commands/performance/profiler.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/commands/runner.rb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/railties/lib/rails/commands/about.rb b/railties/lib/rails/commands/about.rb index 54c12a266f..6fdbc08027 100644 --- a/railties/lib/rails/commands/about.rb +++ b/railties/lib/rails/commands/about.rb @@ -1,3 +1,3 @@ -Rails.application.new +Rails.initialize! require 'rails/info' puts Rails::Info diff --git a/railties/lib/rails/commands/generate.rb b/railties/lib/rails/commands/generate.rb index cfa6a51d94..22aefa803a 100755 --- a/railties/lib/rails/commands/generate.rb +++ b/railties/lib/rails/commands/generate.rb @@ -1,5 +1,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'generators')) -Rails.application.new +Rails.initialize! if ARGV.size == 0 Rails::Generators.help diff --git a/railties/lib/rails/commands/performance/benchmarker.rb b/railties/lib/rails/commands/performance/benchmarker.rb index 5039c5408c..5420b57311 100644 --- a/railties/lib/rails/commands/performance/benchmarker.rb +++ b/railties/lib/rails/commands/performance/benchmarker.rb @@ -12,7 +12,7 @@ end require 'benchmark' include Benchmark -Rails.application.new +Rails.initialize! # Don't include compilation in the benchmark ARGV.each { |expression| eval(expression) } diff --git a/railties/lib/rails/commands/performance/profiler.rb b/railties/lib/rails/commands/performance/profiler.rb index 7274e2dfb7..30346dc0e7 100644 --- a/railties/lib/rails/commands/performance/profiler.rb +++ b/railties/lib/rails/commands/performance/profiler.rb @@ -5,7 +5,7 @@ end # Keep the expensive require out of the profile. $stderr.puts 'Loading Rails...' -Rails.application.new # Initialize the application +Rails.initialize! # Initialize the application # Define a method to profile. if ARGV[1] and ARGV[1].to_i > 1 diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb index d24f36dd63..84d72f9fa9 100644 --- a/railties/lib/rails/commands/runner.rb +++ b/railties/lib/rails/commands/runner.rb @@ -36,7 +36,7 @@ ARGV.delete(code_or_file) ENV["RAILS_ENV"] = options[:environment] RAILS_ENV.replace(options[:environment]) if defined?(RAILS_ENV) -Rails.application.new +Rails.initialize! begin if code_or_file.nil? |