diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-18 23:58:17 -0200 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-18 23:59:20 -0200 |
commit | 12d32ddea2ad6420456ca3f9128023519ef08799 (patch) | |
tree | 0b1f22eb02a3a73eb1b28385ec4e17205a297e90 /railties/lib/rails/commands | |
parent | 53aefdec91e4e26b2fbd1a8dc39817ecabfe6125 (diff) | |
download | rails-12d32ddea2ad6420456ca3f9128023519ef08799.tar.gz rails-12d32ddea2ad6420456ca3f9128023519ef08799.tar.bz2 rails-12d32ddea2ad6420456ca3f9128023519ef08799.zip |
Refactor config abort message a bit for dbconsole
Remove not used variable.
Remove config attr_reader causing warning.
Fix indent in runner file.
Diffstat (limited to 'railties/lib/rails/commands')
-rw-r--r-- | railties/lib/rails/commands/dbconsole.rb | 10 | ||||
-rw-r--r-- | railties/lib/rails/commands/runner.rb | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb index d614328e52..4a5674236d 100644 --- a/railties/lib/rails/commands/dbconsole.rb +++ b/railties/lib/rails/commands/dbconsole.rb @@ -5,7 +5,7 @@ require 'rbconfig' module Rails class DBConsole - attr_reader :config, :arguments + attr_reader :arguments def self.start new.start @@ -82,17 +82,13 @@ module Rails def config @config ||= begin cfg = begin - cfg = YAML.load(ERB.new(IO.read("config/database.yml")).result) + YAML.load(ERB.new(IO.read("config/database.yml")).result) rescue SyntaxError, StandardError require APP_PATH Rails.application.config.database_configuration end - unless cfg[environment] - abort "No database is configured for the environment '#{environment}'" - end - - cfg[environment] + cfg[environment] || abort("No database is configured for the environment '#{environment}'") end end diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb index 0cc672e01c..62d82cc005 100644 --- a/railties/lib/rails/commands/runner.rb +++ b/railties/lib/rails/commands/runner.rb @@ -41,7 +41,7 @@ ENV["RAILS_ENV"] = options[:environment] require APP_PATH Rails.application.require_environment! - Rails.application.load_runner +Rails.application.load_runner if code_or_file.nil? $stderr.puts "Run '#{$0} -h' for help." |