From 4f2b00429e9f98a91ae94f10d2d0435a120ed5e7 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 24 Apr 2012 06:51:44 +0000 Subject: [PATCH] * lib/optparse.rb (OptionParser#to_a): should split by end-of-line [ruby-dev:45568][Bug #6348] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- lib/optparse.rb | 2 +- test/optparse/test_summary.rb | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 731831f75f..f7385395fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Tue Apr 24 14:54:03 2012 Nobuyoshi Nakada +Tue Apr 24 15:51:41 2012 Nobuyoshi Nakada + + * lib/optparse.rb (OptionParser#to_a): should split by end-of-line + [ruby-dev:45568][Bug #6348] * lib/optparse.rb (OptionParser#to_a): String#to_a is no longer defined. [ruby-dev:45568][Bug #6348] diff --git a/lib/optparse.rb b/lib/optparse.rb index 75c6b76bc6..2306606b87 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -1071,7 +1071,7 @@ XXX # # Returns option summary list. # - def to_a; summarize([*banner]) end + def to_a; summarize("#{banner}".split(/$/)) end # # Checks if an argument is given twice, in which case an ArgumentError is diff --git a/test/optparse/test_summary.rb b/test/optparse/test_summary.rb index bda3b49890..2fad5f04dc 100644 --- a/test/optparse/test_summary.rb +++ b/test/optparse/test_summary.rb @@ -31,8 +31,8 @@ class TestOptionParser::SummaryTest < TestOptionParser end def test_summary - o = OptionParser.new("foo bar") - assert_equal("foo bar\n", o.to_s) - assert_equal(["foo bar"], o.to_a) + o = OptionParser.new("foo\nbar") + assert_equal("foo\nbar\n", o.to_s) + assert_equal(["foo", "bar"], o.to_a) end end