* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):

  do not remove next argument if empty value is placed.

* test/optparse: added.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4903 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 45 insertions, 0 deletions

diff --git a/test/optparse/test_placearg.rb b/test/optparse/test_placearg.rb
new file mode 100644
index 0000000000..f4fd249b7f
--- /dev/null
+++ b/test/optparse/test_placearg.rb
@@ -0,0 +1,45 @@
+require 'test_optparse'
+
+class TestOptionParser::PlaceArg < TestOptionParser
+  def setup
+    super
+    @opt.def_option("-x [VAL]") {|x| @flag = x}
+    @opt.def_option("--option [VAL]") {|x| @flag = x}
+    @opt.def_option("-n") {}
+  end
+
+  def test_short
+    assert_equal(%w"", no_error {@opt.parse!(%w"-x -n")})
+    assert_equal(nil, @flag)
+    @flag = false
+    assert_equal(%w"", no_error {@opt.parse!(%w"-x foo")})
+    assert_equal("foo", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-xbar")})
+    assert_equal("bar", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-x=")})
+    assert_equal("=", @flag)
+  end
+
+  def test_abbrev
+    assert_equal(%w"", no_error {@opt.parse!(%w"-o -n")})
+    assert_equal(nil, @flag)
+    @flag = false
+    assert_equal(%w"", no_error {@opt.parse!(%w"-o foo")})
+    assert_equal("foo", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-obar")})
+    assert_equal("bar", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"-o=")})
+    assert_equal("=", @flag)
+  end
+
+  def test_long
+    assert_equal(%w"", no_error {@opt.parse!(%w"--opt -n")})
+    assert_equal(nil, @flag)
+    assert_equal(%w"foo", no_error {@opt.parse!(%w"--opt= foo")})
+    assert_equal("", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"--opt=foo")})
+    assert_equal("foo", @flag)
+    assert_equal(%w"", no_error {@opt.parse!(%w"--opt bar")})
+    assert_equal("bar", @flag)
+  end
+end