diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-26 06:50:55 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-26 06:50:55 +0000 |
commit | 0a23fe65728224aa42007d25634b45cd17283c51 (patch) | |
tree | 859ae8648a599fe8e7f381d11754946da317b559 | |
parent | 90cdbb0ed976624df6429ddac48c1542a603b762 (diff) | |
download | ruby-0a23fe65728224aa42007d25634b45cd17283c51.tar.gz |
* 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/trunk@21066 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | lib/optparse.rb | 17 | ||||
-rw-r--r-- | test/optparse/test_summary.rb | 23 |
3 files changed, 42 insertions, 6 deletions
@@ -1,3 +1,11 @@ +Fri Dec 26 15:50:45 2008 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 Dec 26 14:01:38 2008 Tanaka Akira <akr@fsij.org> * io.c (fptr_finalize): close the IO object even if finish_writeconv or diff --git a/lib/optparse.rb b/lib/optparse.rb index e52d5d2759..0397382a6b 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -631,17 +631,21 @@ 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 << "" 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 @@ 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 |