nobu	2012-04-24 14:55:54 +0900 (Tue, 24 Apr 2012)

  New Revision: 35454

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

  Log:
    merge revision(s) 35453:
    
    * lib/optparse.rb (OptionParser#to_a): String#to_a is no longer
      defined.  [ruby-dev:45568][Bug #6348]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    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/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35453)
+++ ruby_1_9_3/ChangeLog	(revision 35454)
@@ -1,3 +1,8 @@
+Tue Apr 24 14:55:41 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/optparse.rb (OptionParser#to_a): String#to_a is no longer
+	  defined.  [ruby-dev:45568][Bug #6348]
+
 Sat Apr 21 07:16:16 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* strftime.c (rb_strftime_with_timespec): fix padding of time zone
Index: ruby_1_9_3/lib/optparse.rb
===================================================================
--- ruby_1_9_3/lib/optparse.rb	(revision 35453)
+++ ruby_1_9_3/lib/optparse.rb	(revision 35454)
@@ -1065,13 +1065,13 @@
   #
   # Returns option summary string.
   #
-  def help; summarize(banner.to_s.sub(/\n?\z/, "\n")) end
+  def help; summarize("#{banner}".sub(/\n?\z/, "\n")) end
   alias to_s help
 
   #
   # Returns option summary list.
   #
-  def to_a; summarize(banner.to_a.dup) end
+  def to_a; summarize([*banner]) 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 35453)
+++ ruby_1_9_3/version.h	(revision 35454)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 196
+#define RUBY_PATCHLEVEL 197
 
-#define RUBY_RELEASE_DATE "2012-04-21"
+#define RUBY_RELEASE_DATE "2012-04-24"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 21
+#define RUBY_RELEASE_DAY 24
 
 #include "ruby/version.h"
 
Index: ruby_1_9_3/test/optparse/test_summary.rb
===================================================================
--- ruby_1_9_3/test/optparse/test_summary.rb	(revision 35453)
+++ ruby_1_9_3/test/optparse/test_summary.rb	(revision 35454)
@@ -18,4 +18,21 @@
     assert_match(/description 2/, s[1])
     assert_match(/last-option/, s[-1])
   end
+
+  def test_banner
+    o = OptionParser.new("foo bar")
+    assert_equal("foo bar", o.banner)
+  end
+
+  def test_banner_from_progname
+    o = OptionParser.new
+    o.program_name = "foobar"
+    assert_equal("Usage: foobar [options]\n", o.help)
+  end
+
+  def test_summary
+    o = OptionParser.new("foo bar")
+    assert_equal("foo bar\n", o.to_s)
+    assert_equal(["foo bar"], o.to_a)
+  end
 end

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