Refactoring

Author: jonleighton

lib/spring/commands/rails.rb

@@ -35,36 +35,39 @@ def command_name
 
     class RailsRunner < Rails
       def call
-        remove_environment_switches ARGV
+        ARGV.replace extract_environment(ARGV).first
         super
       end
 
-      def env(tail)
-        previous_option = nil
-        tail.reverse.each do |option|
-          case option
-          when /--environment=(\w+)/ then return $1
-          when '-e' then return previous_option
-          end
-          previous_option = option
-        end
-        nil
+      def env(args)
+        extract_environment(args).last
       end
 
       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)
+      def extract_environment(args)
+        environment = nil
+
+        args = args.select.with_index { |arg, i|
+          case arg
+          when "-e"
+            false
+          when /--environment=(\w+)/
+            environment = $1
+            false
+          else
+            if i > 0 && args[i - 1] == "-e"
+              environment = arg
+              false
+            else
+              true
+            end
           end
-        end
+        }
 
-        if i = switches.find_index { |arg| arg =~ /--environment=/ }
-          switches.slice! i
-        end
+        [args, environment]
       end
     end
 

test/unit/commands_test.rb

@@ -27,18 +27,16 @@ class CommandsTest < ActiveSupport::TestCase
     assert_nil command.env(['puts 1+1'])
   end
 
-  test 'RailsRunner#remove_environment_switches removes -e <env>' do
+  test 'RailsRunner#extract_environment 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
+    args = ['-b', '-a', '-e', 'test', '-r']
+    assert_equal [['-b', '-a', '-r'], 'test'], command.extract_environment(args)
   end
 
-  test 'RailsRunner#remove_environment_switches removes --environment=<env>' do
+  test 'RailsRunner#extract_environment 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
+    args = ['-b', '--environment=test', '-a', '-r']
+    assert_equal [['-b', '-a', '-r'], 'test'], command.extract_environment(args)
   end
 
   test "rake command has configurable environments" do