diff --git a/ChangeLog b/ChangeLog index a78e438e78..85e2dce82c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Apr 25 05:56:56 2012 Nobuyoshi Nakada + + * lib/optparse.rb (OptionParser#to_a): split for each lines. + [ruby-dev:45568][Bug #6348] + Tue Apr 24 21:20:39 2012 NARUSE, Yui * lib/optparse.rb (OptionParser#to_a): should split by end-of-line, 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 diff --git a/version.h b/version.h index 6abc5a71c7..4de8cb09d6 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 199 +#define RUBY_PATCHLEVEL 200 -#define RUBY_RELEASE_DATE "2012-04-24" +#define RUBY_RELEASE_DATE "2012-04-25" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_DAY 25 #include "ruby/version.h"