From 12d32ddea2ad6420456ca3f9128023519ef08799 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sun, 18 Nov 2012 23:58:17 -0200 Subject: Refactor config abort message a bit for dbconsole Remove not used variable. Remove config attr_reader causing warning. Fix indent in runner file. --- railties/lib/rails/commands/dbconsole.rb | 10 +++------- railties/lib/rails/commands/runner.rb | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'railties/lib/rails') 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." -- cgit v1.2.3