Seperate e opts again

jkutner · Sep 7, 2015 · b1185db · b1185db
1 parent 06359f3
commit b1185db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/mrblib/jruby_opts_parser.rb b/mrblib/jruby_opts_parser.rb
@@ -84,9 +84,10 @@ def parse(opts)
           @ruby_opts << opt
         end
       elsif ['-C', '-e', '-I', '-S'].include?(opt[0..1])
-        # Match switches that take an argument
-        opt += opts.shift if opt.size == 2
         @ruby_opts << opt
+        if opt.size == 2
+          @ruby_opts << opts.shift
+        end
       elsif opt == "--manage"
         @java_opts << "-Dcom.sun.management.jmxremote"
         @java_opts << "-Djruby.management.enabled=true"

diff --git a/test/test_jruby_opts_parser.rb b/test/test_jruby_opts_parser.rb
@@ -44,28 +44,28 @@ def test_parse_ruby_opts_with_args
     assert_equal ["-Ctmp"], parser.ruby_opts
     assert parser.valid?
     parser = JRubyOptsParser.parse!(["-C", "tmp"])
-    assert_equal ["-Ctmp"], parser.ruby_opts
+    assert_equal ["-C", "tmp"], parser.ruby_opts
     assert parser.valid?
 
     parser = JRubyOptsParser.parse!(['-e"puts 1"'])
     assert_equal ['-e"puts 1"'], parser.ruby_opts
     assert parser.valid?
     parser = JRubyOptsParser.parse!(['-e', 'puts 1'])
-    assert_equal ['-eputs 1'], parser.ruby_opts
+    assert_equal ['-e', 'puts 1'], parser.ruby_opts
     assert parser.valid?
 
     parser = JRubyOptsParser.parse!(['-Ilib'])
     assert_equal ['-Ilib'], parser.ruby_opts
     assert parser.valid?
     parser = JRubyOptsParser.parse!(['-I', 'lib'])
-    assert_equal ['-Ilib'], parser.ruby_opts
+    assert_equal ['-I', 'lib'], parser.ruby_opts
     assert parser.valid?
 
     parser = JRubyOptsParser.parse!(['-Srake'])
     assert_equal ['-Srake'], parser.ruby_opts
     assert parser.valid?
     parser = JRubyOptsParser.parse!(['-S', 'rake'])
-    assert_equal ['-Srake'], parser.ruby_opts
+    assert_equal ['-S', 'rake'], parser.ruby_opts
     assert parser.valid?
   end