1 files changed, 11 insertions, 10 deletions
diff --git a/railties/lib/commands/console.rb b/railties/lib/commands/console.rb
index 45acd18c2f..63df834639 100644
--- a/railties/lib/commands/console.rb
+++ b/railties/lib/commands/console.rb
@@ -1,23 +1,26 @@
+irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+
 require 'optparse'
 
-options = { :sandbox => false }
+options = { :sandbox => false, :irb => irb }
 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("--irb=[#{irb}]", 'Invoke a different irb.') { |v| options[:irb] = v }
   opt.on("--debugger", 'Enable ruby-debugging for the console.') { |v| options[:debugger] = v }
   opt.parse!(ARGV)
 end
 
-require 'irb'
-require "irb/completion"
-require "#{RAILS_ROOT}/config/environment"
-require "console_app"
-require "console_sandbox" if options[:sandbox]
-require "console_with_helpers"
+libs =  " -r irb/completion"
+libs << %( -r "#{RAILS_ROOT}/config/environment")
+libs << " -r console_app"
+libs << " -r console_sandbox" if options[:sandbox]
+libs << " -r console_with_helpers"
 
 if options[:debugger]
   begin
     require 'ruby-debug'
+    libs << " -r ruby-debug"
     puts "=> Debugger enabled"
   rescue Exception
     puts "You need to install ruby-debug to run the console in debugging mode. With gems, use 'gem install ruby-debug'"
@@ -39,6 +42,4 @@ if options[:sandbox]
 else
   puts "Loading #{ENV['RAILS_ENV']} environment (Rails #{Rails.version})"
 end
-
-ARGV.replace(["--simple-prompt"])
-IRB.start
+exec "#{options[:irb]} #{libs} --simple-prompt"