tb 0.2 → 0.3

data/lib/tb/cmd_grep.rb

@@ -1,26 +1,30 @@
-# Copyright (C) 2011 Tanaka Akira  <akr@fsij.org>
+# Copyright (C) 2011-2012 Tanaka Akira  <akr@fsij.org>
 # 
 # Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# modification, are permitted provided that the following conditions
+# are met:
 # 
-#  1. Redistributions of source code must retain the above copyright notice, this
-#     list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the above copyright notice,
-#     this list of conditions and the following disclaimer in the documentation
-#     and/or other materials provided with the distribution.
-#  3. The name of the author may not be used to endorse or promote products
-#     derived from this software without specific prior written permission.
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above
+#     copyright notice, this list of conditions and the following
+#     disclaimer in the documentation and/or other materials provided
+#     with the distribution.
+#  3. The name of the author may not be used to endorse or promote
+#     products derived from this software without specific prior
+#     written permission.
 # 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Tb::Cmd.subcommands << 'grep'
 
@@ -31,7 +35,8 @@ Tb::Cmd.default_option[:opt_grep_v] = nil
 
 def (Tb::Cmd).op_grep
   op = OptionParser.new
-  op.banner = 'Usage: tb grep [OPTS] REGEXP [TABLE ...]'
+  op.banner = "Usage: tb grep [OPTS] REGEXP [TABLE ...]\n" +
+    "Search rows using regexp or ruby expression."
   define_common_option(op, "hNo", "--no-pager")
   op.def_option('-f FIELD', 'search field') {|field| Tb::Cmd.opt_grep_f = field }
   op.def_option('-e REGEXP', 'predicate written in ruby.  A hash is given as _.  no usual regexp argument.') {|pattern| Tb::Cmd.opt_grep_e = pattern }
@@ -57,20 +62,26 @@ def (Tb::Cmd).main_grep(argv)
   end
   opt_v = Tb::Cmd.opt_grep_v ? true : false
   argv = ['-'] if argv.empty?
-  Tb::CatReader.open(argv, Tb::Cmd.opt_N) {|tblreader|
-    with_table_stream_output {|gen|
-      gen.output_header tblreader.header
-      tblreader.each {|ary|
-        h = {}
-        ary.each_with_index {|str, i|
-          f = tblreader.field_from_index_ex(i)
-          h[f] = str
-        }
-        found = pred.call(h)
-        found = opt_v ^ !!(found)
-        gen << ary if found
+  creader = Tb::CatReader.open(argv, Tb::Cmd.opt_N)
+  er = Tb::Enumerator.new {|y|
+    header = nil
+    creader.with_header {|header0|
+      header = header0
+      y.set_header header
+    }.each {|pairs|
+      h = {}
+      pairs.each {|f, v|
+        h[f] = v
       }
+      found = pred.call(h)
+      found = opt_v ^ !!(found)
+      if found
+        y.yield pairs
+      end
     }
   }
+  with_output {|out|
+    er.write_to_csv(out, !Tb::Cmd.opt_N)
+  }
 end
 

data/lib/tb/cmd_group.rb

@@ -1,26 +1,30 @@
-# Copyright (C) 2011 Tanaka Akira  <akr@fsij.org>
+# Copyright (C) 2011-2012 Tanaka Akira  <akr@fsij.org>
 # 
 # Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# modification, are permitted provided that the following conditions
+# are met:
 # 
-#  1. Redistributions of source code must retain the above copyright notice, this
-#     list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the above copyright notice,
-#     this list of conditions and the following disclaimer in the documentation
-#     and/or other materials provided with the distribution.
-#  3. The name of the author may not be used to endorse or promote products
-#     derived from this software without specific prior written permission.
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above
+#     copyright notice, this list of conditions and the following
+#     disclaimer in the documentation and/or other materials provided
+#     with the distribution.
+#  3. The name of the author may not be used to endorse or promote
+#     products derived from this software without specific prior
+#     written permission.
 # 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Tb::Cmd.subcommands << 'group'
 
@@ -28,7 +32,8 @@ Tb::Cmd.default_option[:opt_group_fields] = []
 
 def (Tb::Cmd).op_group
   op = OptionParser.new
-  op.banner = 'Usage: tb group [OPTS] KEY-FIELD1,... [TABLE ...]'
+  op.banner = "Usage: tb group [OPTS] KEY-FIELD1,... [TABLE ...]\n" +
+    "Group and aggregate rows."
   define_common_option(op, "hNo", "--no-pager")
   op.def_option('-a AGGREGATION-SPEC[,NEW-FIELD]',
                 '--aggregate AGGREGATION-SPEC[,NEW-FIELD]') {|arg| Tb::Cmd.opt_group_fields << arg }
@@ -55,28 +60,47 @@ def (Tb::Cmd).main_group(argv)
     ]
   }
   argv = ['-'] if argv.empty?
-  h = {}
-  Tb::CatReader.open(argv, Tb::Cmd.opt_N) {|tblreader|
-    kis = kfs.map {|f| tblreader.index_from_field(f) }
-    result_fields = kfs + opt_group_fields.map {|nf, maker| nf }
-    tblreader.each {|ary|
-      kvs = ary.values_at(*kis)
-      if !h.include?(kvs)
-        h[kvs] = opt_group_fields.map {|nf, maker| ag = maker.call(tblreader.header); ag.update(ary); ag }
-      else
-        h[kvs].each {|ag|
-          ag.update(ary)
-        }
-      end
+  creader = Tb::CatReader.open(argv, Tb::Cmd.opt_N)
+  result = Tb::Enumerator.new {|y|
+    er = creader.extsort_by {|pairs|
+      kfs.map {|f| smart_cmp_value(pairs[f]) }
     }
-    result = Tb.new(result_fields)
-    h.keys.sort_by {|k| k.map {|v| smart_cmp_value(v) } }.each {|k|
-      a = h[k]
-      result.insert_values result_fields, k + a.map {|ag| ag.finish }
+    header = nil
+    row = nil
+    agg = nil
+    er2 = er.with_header {|header0|
+      header = header0
+      y.set_header(kfs + opt_group_fields.map {|f, maker| f })
     }
-    with_output {|out|
-      tbl_generate_csv(result, out)
+    boudary_p = lambda {|pairs1, pairs2|
+      kfs.any? {|f| pairs1[f] != pairs2[f] }
     }
+    before = lambda {|first_pairs|
+      row = {}
+      kfs.each {|f|
+        row[f] = first_pairs[f]
+      }
+      agg = {}
+      opt_group_fields.each {|f, maker|
+        agg[f] = maker.call(header)
+      }
+    }
+    body = lambda {|pairs|
+      ary = header.map {|f| pairs[f] }
+      opt_group_fields.each {|f, maker|
+        agg[f].update(ary)
+      }
+    }
+    after = lambda {|last_pairs|
+      opt_group_fields.each {|f, maker|
+        row[f] = agg[f].finish
+      }
+      y.yield row
+    }
+    er2.each_group_element(boudary_p, before, body, after)
+  }
+  with_output {|out|
+    result.write_to_csv(out, !Tb::Cmd.opt_N)
   }
 end
 

data/lib/tb/cmd_gsub.rb

@@ -1,26 +1,30 @@
-# Copyright (C) 2011 Tanaka Akira  <akr@fsij.org>
+# Copyright (C) 2011-2012 Tanaka Akira  <akr@fsij.org>
 # 
 # Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# modification, are permitted provided that the following conditions
+# are met:
 # 
-#  1. Redistributions of source code must retain the above copyright notice, this
-#     list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the above copyright notice,
-#     this list of conditions and the following disclaimer in the documentation
-#     and/or other materials provided with the distribution.
-#  3. The name of the author may not be used to endorse or promote products
-#     derived from this software without specific prior written permission.
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above
+#     copyright notice, this list of conditions and the following
+#     disclaimer in the documentation and/or other materials provided
+#     with the distribution.
+#  3. The name of the author may not be used to endorse or promote
+#     products derived from this software without specific prior
+#     written permission.
 # 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Tb::Cmd.subcommands << 'gsub'
 
@@ -29,7 +33,8 @@ Tb::Cmd.default_option[:opt_gsub_f] = nil
 
 def (Tb::Cmd).op_gsub
   op = OptionParser.new
-  op.banner = 'Usage: tb gsub [OPTS] REGEXP STRING [TABLE ...]'
+  op.banner = "Usage: tb gsub [OPTS] REGEXP STRING [TABLE ...]\n" +
+    "Substitute cells."
   define_common_option(op, "hNo", "--no-pager")
   op.def_option('-f FIELD', 'target field') {|field| Tb::Cmd.opt_gsub_f = field }
   op.def_option('-e REGEXP', 'specify regexp, possibly begins with a hyphen') {|pattern| Tb::Cmd.opt_gsub_e = pattern }
@@ -48,30 +53,35 @@ def (Tb::Cmd).main_gsub(argv)
   err('no substitution given.') if argv.empty?
   repl = argv.shift
   argv = ['-'] if argv.empty?
-  Tb::CatReader.open(argv, Tb::Cmd.opt_N) {|tblreader|
-    with_table_stream_output {|gen|
-      gen.output_header tblreader.header
-      tblreader.each {|ary|
-        if Tb::Cmd.opt_gsub_f
-          ary2 = []
-          ary.each_with_index {|str, i|
-            f = tblreader.field_from_index_ex(i)
-            if f == Tb::Cmd.opt_gsub_f
-              str ||= ''
-              ary2 << str.gsub(re, repl)
-            else
-              ary2 << str
-            end
-          }
-        else
-          ary2 = ary.map {|s|
-            s ||= ''
-            s.gsub(re, repl)
-          }
-        end
-        gen << ary2
-      }
+  creader = Tb::CatReader.open(argv, Tb::Cmd.opt_N)
+  er = Tb::Enumerator.new {|y|
+    creader.with_cumulative_header {|header0|
+      if header0
+        y.set_header header0
+      end
+    }.each {|pairs, header|
+      fs = header.dup
+      fs.pop while !fs.empty? && !pairs.has_key?(fs.last)
+      if Tb::Cmd.opt_gsub_f
+        pairs2 = pairs.map {|f, v|
+          if f == Tb::Cmd.opt_gsub_f
+            v ||= ''
+            [f, v.gsub(re, repl)]
+          else
+            [f, v]
+          end
+        }
+      else
+        pairs2 = pairs.map {|f, v|
+          v ||= ''
+          [f, v.gsub(re, repl)]
+        }
+      end
+      y.yield Tb::Pairs.new(pairs2)
     }
   }
+  with_output {|out|
+    er.write_to_csv(out, !Tb::Cmd.opt_N)
+  }
 end
 

data/lib/tb/cmd_help.rb

@@ -1,44 +1,68 @@
-# Copyright (C) 2011 Tanaka Akira  <akr@fsij.org>
+# Copyright (C) 2011-2012 Tanaka Akira  <akr@fsij.org>
 # 
 # Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# modification, are permitted provided that the following conditions
+# are met:
 # 
-#  1. Redistributions of source code must retain the above copyright notice, this
-#     list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the above copyright notice,
-#     this list of conditions and the following disclaimer in the documentation
-#     and/or other materials provided with the distribution.
-#  3. The name of the author may not be used to endorse or promote products
-#     derived from this software without specific prior written permission.
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above
+#     copyright notice, this list of conditions and the following
+#     disclaimer in the documentation and/or other materials provided
+#     with the distribution.
+#  3. The name of the author may not be used to endorse or promote
+#     products derived from this software without specific prior
+#     written permission.
 # 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Tb::Cmd.subcommands << 'help'
 
+Tb::Cmd.default_option[:opt_help_s] = nil
+
 def (Tb::Cmd).usage_list_subcommands
   with_output {|f|
     f.print <<'End'
 Usage:
 End
     Tb::Cmd.subcommands.each {|subcommand|
-      f.puts "  " + self.subcommand_send("op", subcommand).banner.sub(/\AUsage: /, '')
+      banner = self.subcommand_send("op", subcommand).banner
+      usage = banner[/^Usage: (.*)/, 1]
+      f.puts "  " + usage
+    }
+  }
+end
+
+def (Tb::Cmd).list_summary_of_subcommands
+  with_output {|f|
+    f.print <<'End'
+End
+    subcommand_maxlen = Tb::Cmd.subcommands.map {|subcommand| subcommand.length }.max
+    fmt = "%-#{subcommand_maxlen}s : %s"
+    Tb::Cmd.subcommands.each {|subcommand|
+      banner = self.subcommand_send("op", subcommand).banner
+      summary = banner[/^Usage: (.*)\n(.*)/, 2]
+      f.puts(fmt % [subcommand, summary])
     }
   }
 end
 
 def (Tb::Cmd).op_help
   op = OptionParser.new
-  op.banner = 'Usage: tb help [OPTS] [SUBCOMMAND]'
+  op.banner = "Usage: tb help [OPTS] [SUBCOMMAND]\n" +
+    "Show help message of tb command."
   define_common_option(op, "hvo", "--no-pager")
+  op.def_option('-s', 'show summary of subcommands') { Tb::Cmd.opt_help_s = true }
   op
 end
 
@@ -49,13 +73,13 @@ Example:
   tb help               : list subcommands
 
   tb cat -h             : succinct help of "cat" subcommand
-  tb cat -hh            : verbose help of "cat" subcommand
   tb help cat           : succinct help of "cat" subcommand
+  tb cat -hh            : verbose help of "cat" subcommand
   tb help -h cat        : verbose help of "cat" subcommand
 
   tb help -h            : succinct help of "help" subcommand
-  tb help -hh           : verbose help of "help" subcommand
   tb help help          : succinct help of "help" subcommand
+  tb help -hh           : verbose help of "help" subcommand
   tb help -h help       : verbose help of "help" subcommand
 End
 
@@ -83,7 +107,10 @@ end
 
 def (Tb::Cmd).main_help(argv)
   op_help.parse!(argv)
-  if argv.empty?
+  if Tb::Cmd.opt_help_s
+    list_summary_of_subcommands
+    exit
+  elsif argv.empty?
     if Tb::Cmd.opt_help == 0
       usage_list_subcommands
       return true