diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/optparse.rb | 8 |
2 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sun Feb 1 16:10:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/optparse.rb (Switch#summarize): strips an equal sign from + short option, and fills right sides in shorter lines. + [ruby-talk:326414] + Sun Feb 1 05:19:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * variable.c (rb_const_get_0), vm_insnhelper.c (vm_get_ev_const): diff --git a/lib/optparse.rb b/lib/optparse.rb index 9c6b3924f0..19793f8d4d 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -384,10 +384,16 @@ class OptionParser left[-1] << if left[-1].empty? then ' ' * 4 else ', ' end << s end - left[0] << arg if arg + if arg + left[0] << (left[1] ? arg.sub(/\A(\[?)=/, '\1') + ',' : arg) + end mlen = left.collect {|ss| ss.length}.max.to_i while mlen > width and l = left.shift mlen = left.collect {|ss| ss.length}.max.to_i if l.length == mlen + if l.length < width and (r = right[0]) and !r.empty? + l = l.to_s.ljust(width) + ' ' + r + right.shift + end yield(indent + l) end |