summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-24 20:46:14 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-24 20:46:14 +0000
commit3c2f707f1688a23602b9fdbc42db1970658b9945 (patch)
tree3bead907f725ae619e8682fcc790ae67c0652cb9
parenta06cddb466eafb046fcfdf0fd60684acb0b3d0a3 (diff)
* lib/optparse.rb (OptionParser#to_a): split for each lines.
[ruby-dev:45568][Bug #6348] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/optparse.rb2
-rw-r--r--test/optparse/test_summary.rb2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ef1c6add20..bcb655b8e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 25 05:46:12 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb (OptionParser#to_a): split for each lines.
+ [ruby-dev:45568][Bug #6348]
+
Tue Apr 24 21:57:53 2012 Tanaka Akira <akr@fsij.org>
* ext/socket/raddrinfo.c (init_unix_addrinfo): show actual path length
diff --git a/lib/optparse.rb b/lib/optparse.rb
index da022c9450..dcb67604e2 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1071,7 +1071,7 @@ XXX
#
# Returns option summary list.
#
- def to_a; summarize("#{banner}".split) 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 2fad5f04dc..d7771733a3 100644
--- a/test/optparse/test_summary.rb
+++ b/test/optparse/test_summary.rb
@@ -33,6 +33,6 @@ class TestOptionParser::SummaryTest < TestOptionParser
def test_summary
o = OptionParser.new("foo\nbar")
assert_equal("foo\nbar\n", o.to_s)
- assert_equal(["foo", "bar"], o.to_a)
+ assert_equal(["foo\n", "bar"], o.to_a)
end
end