* 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

test/optparse/test_noarg.rb

@@ -0,0 +1,57 @@
+require 'test_optparse'
+
+module TestOptionParser::NoArg
+  class Def1 < TestOptionParser
+    include NoArg
+    def setup
+      super
+      @opt.def_option("-x") {|x| @flag = x}
+      @opt.def_option("--option") {|x| @flag = x}
+    end
+  end
+  class Def2 < TestOptionParser
+    include NoArg
+    def setup
+      super
+      @opt.def_option("-x", "--option") {|x| @flag = x}
+    end
+  end
+
+  def test_short
+    assert_raises(OptionParser::InvalidOption) {@opt.parse!(%w"-xq")}
+    assert_equal(%w"", no_error {@opt.parse!(%w"-x")})
+    assert_equal(true, @flag)
+    @flag = nil
+    assert_equal(%w"foo", no_error {@opt.parse!(%w"-x foo")})
+    assert_equal(true, @flag)
+  end
+
+  def test_abbrev
+    assert_raises(OptionParser::InvalidOption) {@opt.parse!(%w"-oq")}
+    assert_equal(%w"", no_error {@opt.parse!(%w"-o")})
+    assert_equal(true, @flag)
+    @flag = nil
+    no_error {@opt.parse!(%w"-O")}
+    assert_equal(true, @flag)
+    @flag = nil
+    assert_equal(%w"foo", no_error {@opt.parse!(%w"-o foo")})
+    assert_equal(true, @flag)
+  end
+
+  def test_long
+    assert_raises(OptionParser::NeedlessArgument) {@opt.parse!(%w"--option=x")}
+    assert_equal(%w"", no_error {@opt.parse!(%w"--opt")})
+    assert_equal(true, @flag)
+    @flag = nil
+    assert_equal(%w"foo", no_error {@opt.parse!(%w"--opt foo")})
+    assert_equal(true, @flag)
+  end
+
+  def test_ambiguous
+    @opt.def_option("--open") {|x|}
+    assert_raises(OptionParser::AmbiguousOption) {@opt.parse!(%w"--op")}
+    assert_raises(OptionParser::AmbiguousOption) {@opt.parse!(%w"-o")}
+    assert_equal(%w"", no_error {@opt.parse!(%w"--opt")})
+    assert_equal(true, @flag)
+  end
+end