nobu	2007-11-05 05:17:06 +0900 (Mon, 05 Nov 2007)

  New Revision: 13823

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/optparse.rb
    trunk/ChangeLog
    trunk/lib/optparse.rb

  Log:
    * lib/optparse.rb (OptionParser::Switch::summarize): fix for long form
      option with very long argument.  a patch from Kobayashi Noritada
      <nori1 AT dolphin.c.u-tokyo.ac.jp> in [ruby-list:44179].


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=13823&r2=13822
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13823&r2=13822
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/optparse.rb?r1=13823&r2=13822
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/optparse.rb?r1=13823&r2=13822

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13822)
+++ ChangeLog	(revision 13823)
@@ -1,3 +1,9 @@
+Mon Nov  5 05:17:04 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/optparse.rb (OptionParser::Switch::summarize): fix for long form
+	  option with very long argument.  a patch from Kobayashi Noritada
+	  <nori1 AT dolphin.c.u-tokyo.ac.jp> in [ruby-list:44179].
+
 Mon Nov  5 01:20:33 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* parse.y (call_args): remove "parenthesize argument(s) for future
Index: lib/optparse.rb
===================================================================
--- lib/optparse.rb	(revision 13822)
+++ lib/optparse.rb	(revision 13823)
@@ -379,7 +379,7 @@
       while s = lopts.shift
         l = left[-1].length + s.length
         l += arg.length if left.size == 1 && arg
-        l < max or left << ''
+        l < max or sopts.empty? or left << ''
         left[-1] << if left[-1].empty? then ' ' * 4 else ', ' end << s
       end
 
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 13822)
+++ ruby_1_8/ChangeLog	(revision 13823)
@@ -1,3 +1,9 @@
+Mon Nov  5 05:17:04 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/optparse.rb (OptionParser::Switch::summarize): fix for long form
+	  option with very long argument.  a patch from Kobayashi Noritada
+	  <nori1 AT dolphin.c.u-tokyo.ac.jp> in [ruby-list:44179].
+
 Mon Nov  5 01:20:33 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* parse.y (call_args): remove "parenthesize argument(s) for future
Index: ruby_1_8/lib/optparse.rb
===================================================================
--- ruby_1_8/lib/optparse.rb	(revision 13822)
+++ ruby_1_8/lib/optparse.rb	(revision 13823)
@@ -379,7 +379,7 @@
       while s = lopts.shift
         l = left[-1].length + s.length
         l += arg.length if left.size == 1 && arg
-        l < max or left << ''
+        l < max or sopts.empty? or left << ''
         left[-1] << if left[-1].empty? then ' ' * 4 else ', ' end << s
       end
 

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