3 files changed, 24 insertions, 5 deletions
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 86376ac7e6..cd6a03fe51 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -24,7 +24,10 @@ module Rails
         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("-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.parse!(arguments)
         end
 
@@ -36,6 +39,14 @@ module Rails
       options[:sandbox]
     end
 
+    def environment?
+      options[:environment]
+    end
+
+    def set_environment!
+      Rails.env = options[:environment]
+    end
+
     def debugger?
       options[:debugger]
     end
@@ -45,6 +56,8 @@ module Rails
 
       require_debugger if debugger?
 
+      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"
@@ -60,10 +73,10 @@ module Rails
 
     def require_debugger
       begin
-        require 'ruby-debug'
+        require 'debugger'
         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'"
+        puts "You're missing the 'debugger' gem. Add it to your Gemfile, bundle, and try again."
         exit
       end
     end
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb
index e8cc5d9e3b..2802981e7a 100644
--- a/railties/lib/rails/commands/runner.rb
+++ b/railties/lib/rails/commands/runner.rb
@@ -9,7 +9,6 @@ if ARGV.first.nil?
 end
 
 ARGV.clone.options do |opts|
-  script_name = File.basename($0)
   opts.banner = "Usage: runner [options] ('Some.ruby(code)' or a filename)"
 
   opts.separator ""
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 0b757cbe28..4c4caad69f 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -17,7 +17,7 @@ module Rails
           opts.on("-c", "--config=file", String,
                   "Use custom rackup configuration file") { |v| options[:config] = v }
           opts.on("-d", "--daemon", "Make server run as a Daemon.") { options[:daemonize] = true }
-          opts.on("-u", "--debugger", "Enable ruby-debugging for the server.") { options[:debugger] = true }
+          opts.on("-u", "--debugger", "Enable the debugger") { options[:debugger] = true }
           opts.on("-e", "--environment=name", String,
                   "Specifies the environment to run this server under (test/development/production).",
                   "Default: development") { |v| options[:environment] = v }
@@ -32,6 +32,11 @@ module Rails
 
         opt_parser.parse! args
 
+        # Handle's environment like RAILS_ENV=production passed in directly
+        if index = args.index {|arg| arg.include?("RAILS_ENV")}
+          options[:environment] ||= args.delete_at(index).split('=').last
+        end
+
         options[:server] = args.shift
         options
       end
@@ -71,6 +76,8 @@ module Rails
         wrapped_app # touch the app so the logger is set up
 
         console = ActiveSupport::Logger.new($stdout)
+        console.formatter = Rails.logger.formatter
+
         Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
       end