ruby-changes:10893
From: shyouhei <ko1@a...>
Date: Fri, 20 Feb 2009 20:42:52 +0900 (JST)
Subject: [ruby-changes:10893] Ruby:r22467 (ruby_1_8_6): merge revision(s) 21066:
shyouhei 2009-02-20 20:42:39 +0900 (Fri, 20 Feb 2009) New Revision: 22467 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22467 Log: 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. Added files: branches/ruby_1_8_6/test/optparse/test_summary.rb Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/lib/optparse.rb branches/ruby_1_8_6/version.h Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 22466) +++ ruby_1_8_6/ChangeLog (revision 22467) @@ -1,3 +1,11 @@ +Fri Feb 20 20:36:18 2009 Nobuyoshi Nakada <nobu@r...> + + * 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@r...> * lib/cgi/session.rb: ignore session_id options fixed.[Bug #605] Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 22466) +++ ruby_1_8_6/version.h (revision 22467) @@ -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 Index: ruby_1_8_6/lib/optparse.rb =================================================================== --- ruby_1_8_6/lib/optparse.rb (revision 22466) +++ ruby_1_8_6/lib/optparse.rb (revision 22467) @@ -630,15 +630,19 @@ # 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 @@ # +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 Index: ruby_1_8_6/test/optparse/test_summary.rb =================================================================== --- ruby_1_8_6/test/optparse/test_summary.rb (revision 0) +++ ruby_1_8_6/test/optparse/test_summary.rb (revision 22467) @@ -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 Property changes on: ruby_1_8_6/test/optparse/test_summary.rb ___________________________________________________________________ Name: svn:eol-style + LF Name: svn:keywords + Author Id Revision -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/