Merge pull request #273 from musicglue/master

strip out environment switches from rails runner ARGV [#272]

Author: jonleighton

lib/spring/commands/rails.rb

@@ -34,6 +34,11 @@ def command_name
     end
 
     class RailsRunner < Rails
+      def call
+        remove_environment_switches ARGV
+        super
+      end
+
       def env(tail)
         previous_option = nil
         tail.reverse.each do |option|
@@ -49,6 +54,18 @@ def env(tail)
       def command_name
         "runner"
       end
+
+      def remove_environment_switches switches
+        if i = switches.index('-e')
+          if switches.length >= i + 1
+            switches.slice! i..(i+1)
+          end
+        end
+
+        if i = switches.find_index { |arg| arg =~ /--environment=/ }
+          switches.slice! i
+        end
+      end
     end
 
     Spring.register_command "rails_console",  RailsConsole.new

test/unit/commands_test.rb

@@ -27,6 +27,20 @@ class CommandsTest < ActiveSupport::TestCase
     assert_nil command.env(['puts 1+1'])
   end
 
+  test 'RailsRunner#remove_environment_switches removes -e <env>' do
+    command = Spring::Commands::RailsRunner.new
+    switches = ['-b', '-a', '-e', 'test', '-r']
+    command.remove_environment_switches switches
+    assert_equal ['-b', '-a', '-r'], switches
+  end
+
+  test 'RailsRunner#remove_environment_switches removes --environment=<env>' do
+    command = Spring::Commands::RailsRunner.new
+    switches = ['-b', '--environment=test', '-a', '-r']
+    command.remove_environment_switches switches
+    assert_equal ['-b', '-a', '-r'], switches
+  end
+
   test "rake command has configurable environments" do
     command = Spring::Commands::Rake.new
     assert_nil command.env(["foo"])