1 files changed, 61 insertions, 27 deletions

diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 3acac2a6f0..d7c9e820dc 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -4,47 +4,81 @@ require 'irb/completion'
 
 module Rails
   class Console
-    def self.start(app)
-      new(app).start
-    end
+    attr_reader :options, :app, :console, :arguments
 
-    def initialize(app)
-      @app = app
+    def self.start(*args)
+      new(*args).start
     end
 
-    def start
-      options = {}
-
-      OptionParser.new do |opt|
-        opt.banner = "Usage: console [environment] [options]"
-        opt.on('-s', '--sandbox', 'Rollback database modifications on exit.') { |v| options[:sandbox] = v }
-        opt.on("--debugger", 'Enable ruby-debugging for the console.') { |v| options[:debugger] = v }
-        opt.on('--irb', "DEPRECATED: Invoke `/your/choice/of/ruby script/rails console` instead") { |v| abort '--irb option is no longer supported. Invoke `/your/choice/of/ruby script/rails console` instead' }
-        opt.parse!(ARGV)
-      end
+    def initialize(app, arguments = ARGV)
+      @app       = app
+      @arguments = arguments
+      app.load_console
+      @console   = app.config.console || IRB
+    end
 
-      @app.sandbox = options[:sandbox]
-      @app.load_console
+    def options
+      @options ||= begin
+        options = {}
 
-      if options[:debugger]
-        begin
-          require 'ruby-debug'
-          puts "=> Debugger enabled"
-        rescue Exception
-          puts "You need to install ruby-debug19 to run the console in debugging mode. With gems, use 'gem install ruby-debug19'"
-          exit
+        OptionParser.new do |opt|
+          opt.banner = "Usage: console [environment] [options]"
+          opt.on('-s', '--sandbox', 'Rollback database modifications on exit.') { |v| options[:sandbox] = v }
+          opt.on("-e", "--environment=name", String,
+                  "Specifies the environment to run this console under (test/development/production).",
+                  "Default: development") { |v| options[:environment] = v.strip }
+          opt.on("--debugger", 'Enable ruby-debugging for the console.') { |v| options[:debugger] = v }
+          opt.parse!(arguments)
         end
+
+        options
       end
+    end
+
+    def sandbox?
+      options[:sandbox]
+    end
+
+    def environment?
+      options[:environment]
+    end
+
+    def set_environment!
+      Rails.env = options[:environment]
+    end
+
+    def debugger?
+      options[:debugger]
+    end
+
+    def start
+      app.sandbox = sandbox?
+
+      require_debugger if debugger?
 
-      if options[:sandbox]
+      set_environment! if environment?
+
+      if sandbox?
         puts "Loading #{Rails.env} environment in sandbox (Rails #{Rails.version})"
         puts "Any modifications you make will be rolled back on exit"
       else
         puts "Loading #{Rails.env} environment (Rails #{Rails.version})"
       end
 
-      IRB::ExtendCommandBundle.send :include, Rails::ConsoleMethods
-      IRB.start
+      if defined?(console::ExtendCommandBundle)
+        console::ExtendCommandBundle.send :include, Rails::ConsoleMethods
+      end
+      console.start
+    end
+
+    def require_debugger
+      begin
+        require 'ruby-debug'
+        puts "=> Debugger enabled"
+      rescue Exception
+        puts "You need to install ruby-debug19 to run the console in debugging mode. With gems, use 'gem install ruby-debug19'"
+        exit
+      end
     end
   end
 end