From 0a555dd421f3b7966df1a1f70ae462a143734d21 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Tue, 20 Mar 2012 19:28:30 -0400
Subject: fix rails server support of RAILS_ENV variable

When launching rails server from the command line with a rails environment specified such as `rails server RAILS_ENV=production` an error would occur since rails will try to use `RAILS_ENV=production` as it's server.

When launching rails with a specified server such as thin `rails server thin RAILS_ENV=production` no error will be thrown, but rails will not start up in the specified environment.

This fixes both of those cases
---
 railties/lib/rails/commands/server.rb |  5 +++++
 railties/test/commands/server_test.rb | 26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 railties/test/commands/server_test.rb

diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index a608693ca4..721a47a974 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -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
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
new file mode 100644
index 0000000000..8039aec873
--- /dev/null
+++ b/railties/test/commands/server_test.rb
@@ -0,0 +1,26 @@
+require 'abstract_unit'
+require 'rails/commands/server'
+
+class Rails::ServerTest < ActiveSupport::TestCase
+
+  def test_environment_with_server_option
+    args    = ["thin", "RAILS_ENV=production"]
+    options = Rails::Server::Options.new.parse!(args)
+    assert_equal 'production', options[:environment]
+    assert_equal 'thin', options[:server]
+  end
+
+  def test_environment_without_server_option
+    args    = ["RAILS_ENV=production"]
+    options = Rails::Server::Options.new.parse!(args)
+    assert_equal 'production', options[:environment]
+    assert_nil options[:server]
+  end
+
+  def test_server_option_without_environment
+    args    = ["thin"]
+    options = Rails::Server::Options.new.parse!(args)
+    assert_nil options[:environment]
+    assert_equal 'thin', options[:server]
+  end
+end
-- 
cgit v1.2.3


From 7529283732bb56ba1b0125aabab774d01b4057c7 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Thu, 22 Mar 2012 13:13:12 -0400
Subject: match rails console environment support, to server

rails server takes `-e` as an argument to specify RAILS_ENV, rails console currently does not have the same interface. This commit fixes this disparity so developers can manually specify `RAILS_ENV` or can pass in an environment with a `-e`.
---
 railties/lib/rails/commands/console.rb | 13 +++++++++++++
 railties/test/commands/console_test.rb | 19 +++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 86376ac7e6..d7c9e820dc 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -24,6 +24,9 @@ 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("-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
@@ -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"
diff --git a/railties/test/commands/console_test.rb b/railties/test/commands/console_test.rb
index 01847ae58c..9aa1d68675 100644
--- a/railties/test/commands/console_test.rb
+++ b/railties/test/commands/console_test.rb
@@ -55,6 +55,25 @@ class Rails::ConsoleTest < ActiveSupport::TestCase
     assert_match /Loading \w+ environment in sandbox \(Rails/, output
   end
 
+  def test_console_with_environment
+    app.expects(:sandbox=).with(nil)
+    FakeConsole.expects(:start)
+
+    start ["-e production"]
+
+    assert_match /production/, output
+  end
+
+  def test_console_with_rails_environment
+    app.expects(:sandbox=).with(nil)
+    FakeConsole.expects(:start)
+
+    start ["RAILS_ENV=production"]
+
+    assert_match /production/, output
+  end
+
+
   def test_console_defaults_to_IRB
     config = mock("config", :console => nil)
     app = mock("app", :config => config)
-- 
cgit v1.2.3