ruby-changes:9529
From: yugui <ko1@a...>
Date: Fri, 26 Dec 2008 20:16:39 +0900 (JST)
Subject: [ruby-changes:9529] Ruby:r21070 (ruby_1_9_1): merges r21066 from trunk into ruby_1_9_1.
yugui 2008-12-26 20:16:16 +0900 (Fri, 26 Dec 2008) New Revision: 21070 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21070 Log: 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. Added files: branches/ruby_1_9_1/test/optparse/test_summary.rb Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/lib/optparse.rb Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 21069) +++ ruby_1_9_1/ChangeLog (revision 21070) @@ -1,3 +1,11 @@ +Fri Dec 26 15:50:45 2008 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 Dec 26 14:01:38 2008 Tanaka Akira <akr@f...> * io.c (fptr_finalize): close the IO object even if finish_writeconv or Index: ruby_1_9_1/lib/optparse.rb =================================================================== --- ruby_1_9_1/lib/optparse.rb (revision 21069) +++ ruby_1_9_1/lib/optparse.rb (revision 21070) @@ -631,17 +631,21 @@ # 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 << "" elsif opt.respond_to?(:each_line) - opt.each_line(&block) + sum.concat([*opt.each_line].reverse) else - opt.each(&block) + sum.concat([*opt.each].reverse) end end + sum.reverse_each(&block) end def add_banner(to) # :nodoc: @@ -964,7 +968,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_9_1/test/optparse/test_summary.rb =================================================================== --- ruby_1_9_1/test/optparse/test_summary.rb (revision 0) +++ ruby_1_9_1/test/optparse/test_summary.rb (revision 21070) @@ -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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/