Refactor script/dbconsole into an object

railties/lib/rails/commands/dbconsole.rb

@@ -2,9 +2,15 @@ require 'erb'
 require 'yaml'
 require 'optparse'
 
+module Rails
+  class DBConsole
+    def self.start
+      new.start
+    end
+
+    def start
       include_password = false
       options = {}
-
       OptionParser.new do |opt|
         opt.banner = "Usage: dbconsole [options] [environment]"
         opt.on("-p", "--include-password", "Automatically provide the password from database.yml") do |v|
@@ -25,7 +31,7 @@ OptionParser.new do |opt|
       end
 
       env = ARGV.first || ENV['RAILS_ENV'] || 'development'
-unless config = YAML::load(ERB.new(IO.read(Rails.root + "/config/database.yml")).result)[env]
+      unless config = YAML::load(ERB.new(IO.read("#{Rails.root}/config/database.yml")).result)[env]
         abort "No database is configured for the environment '#{env}'"
       end
 
@@ -85,3 +91,6 @@ when "sqlite3"
       else
         abort "Unknown command-line client for #{config['database']}. Submit a Rails patch to add support!"
       end
+    end
+  end
+end

railties/lib/rails/generators/rails/app/templates/script/dbconsole

@@ -1,2 +1,3 @@
 require File.expand_path('../../config/application',  __FILE__)
 require 'rails/commands/dbconsole'
+Rails::DBConsole.start