merges r21066 from trunk into ruby_1_9_1.

* lib/optparse.rb (OptionParser::List#summarize): gives priority
  to latter switches.  [ruby-dev:36692]

* lib/optparse.rb (OptionParser#summarize): do not append
  unnecessary line terminator.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 23 insertions, 0 deletions

diff --git a/test/optparse/test_summary.rb b/test/optparse/test_summary.rb
new file mode 100644
index 000000000..12744a8a7
--- /dev/null
+++ b/test/optparse/test_summary.rb
@@ -0,0 +1,23 @@
+require 'test/unit'
+require 'optparse'
+
+class TestOptionParser < Test::Unit::TestCase; end
+class TestOptionParser::SummaryTest < Test::Unit::TestCase
+  def test_short_clash
+    r = nil
+    o = OptionParser.new do |opts|
+      opts.on("-f", "--first-option", "description 1", "description 2"){r = "first-option"}
+      opts.on("-t", "--test-option"){r = "test-option"}
+      opts.on("-t", "--another-test-option"){r = "another-test-option"}
+      opts.separator "this is\nseparator"
+      opts.on("-l", "--last-option"){r = "last-option"}
+    end
+    s = o.summarize
+    o.parse("-t")
+    assert_match(/--#{r}/, s.grep(/^\s*-t,/)[0])
+    assert_match(/first-option/, s[0])
+    assert_match(/description 1/, s[0])
+    assert_match(/description 2/, s[1])
+    assert_match(/last-option/, s[-1])
+  end
+end