nobu	2012-04-24 15:52:23 +0900 (Tue, 24 Apr 2012)

  New Revision: 35456

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35456

  Log:
    merge revision(s) 35455:
    
    * lib/optparse.rb (OptionParser#to_a): should split by end-of-line
      [ruby-dev:45568][Bug #6348]

  Modified files:
    branches/ruby_1_9_3/lib/optparse.rb
    branches/ruby_1_9_3/test/optparse/test_summary.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/lib/optparse.rb
===================================================================
--- ruby_1_9_3/lib/optparse.rb	(revision 35455)
+++ ruby_1_9_3/lib/optparse.rb	(revision 35456)
@@ -1071,7 +1071,7 @@
   #
   # 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
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35455)
+++ ruby_1_9_3/version.h	(revision 35456)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 197
+#define RUBY_PATCHLEVEL 198
 
 #define RUBY_RELEASE_DATE "2012-04-24"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/optparse/test_summary.rb
===================================================================
--- ruby_1_9_3/test/optparse/test_summary.rb	(revision 35455)
+++ ruby_1_9_3/test/optparse/test_summary.rb	(revision 35456)
@@ -31,8 +31,8 @@
   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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/