1 files changed, 38 insertions, 16 deletions

diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index aef7600fbd..96ced3c2f9 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -18,17 +18,34 @@ module Rails
           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 the debugger.') { |v| options[:debugger] = v }
+          opt.on("--debugger", 'Enables the debugger.') do |v|
+            if RUBY_VERSION < '2.0.0'
+              options[:debugger] = v
+            else
+              puts "=> Notice: debugger option is ignored since Ruby 2.0 and " \
+                   "it will be removed in future versions."
+            end
+          end
           opt.parse!(arguments)
         end
 
         if arguments.first && arguments.first[0] != '-'
           env = arguments.first
-          options[:environment] = %w(production development test).detect {|e| e =~ /^#{env}/} || env
+          if available_environments.include? env
+            options[:environment] = env
+          else
+            options[:environment] = %w(production development test).detect {|e| e =~ /^#{env}/} || env
+          end
         end
 
         options
       end
+
+      private
+
+        def available_environments
+          Dir['config/environments/*.rb'].map { |fname| File.basename(fname, '.*') }
+        end
     end
 
     attr_reader :options, :app, :console
@@ -36,7 +53,10 @@ module Rails
     def initialize(app, options={})
       @app     = app
       @options = options
+
+      app.sandbox = sandbox?
       app.load_console
+
       @console = app.config.console || IRB
     end
 
@@ -56,13 +76,25 @@ module Rails
       Rails.env = environment
     end
 
-    def debugger?
-      options[:debugger]
+    if RUBY_VERSION < '2.0.0'
+      def debugger?
+        options[:debugger]
+      end
+
+      def require_debugger
+        require 'debugger'
+        puts "=> Debugger enabled"
+      rescue LoadError
+        puts "You're missing the 'debugger' gem. Add it to your Gemfile, bundle it and try again."
+        exit(1)
+      end
     end
 
     def start
-      app.sandbox = sandbox?
-      require_debugger if debugger?
+      if RUBY_VERSION < '2.0.0'
+        require_debugger if debugger?
+      end
+
       set_environment! if environment?
 
       if sandbox?
@@ -77,15 +109,5 @@ module Rails
       end
       console.start
     end
-
-    def require_debugger
-      begin
-        require 'debugger'
-        puts "=> Debugger enabled"
-      rescue Exception
-        puts "You're missing the 'debugger' gem. Add it to your Gemfile, bundle, and try again."
-        exit
-      end
-    end
   end
 end