merge revision(s) 21066:

	* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 42 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index ee4e5b27d1..e5b9ff6515 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Feb 20 20:36:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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.
+
 Fri Feb 20 19:34:36 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
 
 	* lib/cgi/session.rb: ignore session_id options fixed.[Bug #605]
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 80b16fa18d..d4500266d5 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -630,15 +630,19 @@ class OptionParser
     # method which is called on every option.
     #
     def summarize(*args, &block)
-      list.each do |opt|
+      sum = []
+      list.reverse_each do |opt|
         if opt.respond_to?(:summarize) # perhaps OptionParser::Switch
-          opt.summarize(*args, &block)
+          s = []
+          opt.summarize(*args) {|l| s << l}
+          sum.concat(s.reverse)
         elsif !opt or opt.empty?
-          yield("")
+          sum << ""
         else
-          opt.each(&block)
+          sum.concat(opt.to_a.reverse)
         end
       end
+      sum.reverse_each(&block)
     end
 
     def add_banner(to)  # :nodoc:
@@ -960,7 +964,8 @@ class OptionParser
   # +indent+:: Indentation, defaults to @summary_indent.
   #
   def summarize(to = [], width = @summary_width, max = width - 1, indent = @summary_indent, &blk)
-    visit(:summarize, {}, {}, width, max, indent, &(blk || proc {|l| to << l + $/}))
+    blk ||= proc {|l| to << (l.index($/, -1) ? l : l + $/)}
+    visit(:summarize, {}, {}, width, max, indent, &blk)
     to
   end
 
diff --git a/test/optparse/test_summary.rb b/test/optparse/test_summary.rb
new file mode 100644
index 0000000000..12744a8a7b
--- /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
diff --git a/version.h b/version.h
index 9ad32cff15..1d99123840 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-02-20"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20090220
-#define RUBY_PATCHLEVEL 346
+#define RUBY_PATCHLEVEL 347
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8