tb 0.2 → 0.3

data/lib/tb/cmd_mheader.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 << 'mheader'
 
@@ -28,7 +32,8 @@ Tb::Cmd.default_option[:opt_mheader_count] = nil
 
 def (Tb::Cmd).op_mheader
   op = OptionParser.new
-  op.banner = 'Usage: tb mheader [OPTS] [TABLE]'
+  op.banner = "Usage: tb mheader [OPTS] [TABLE]\n" +
+    "Collapse multi rows header."
   define_common_option(op, "ho", "--no-pager")
   op.def_option('-c N', 'number of header records') {|arg| Tb::Cmd.opt_mheader_count = arg.to_i }
   op
@@ -51,27 +56,32 @@ def (Tb::Cmd).main_mheader(argv)
       header.length == h2.length ? h2 : nil
     }
   end
-  with_table_stream_output {|gen|
-    Tb::CatReader.open(argv, true) {|tblreader|
-      tblreader.each {|ary|
-        if header
-          ary.each_with_index {|v,i|
-            header[i] ||= []
-            header[i] << v if header[i].empty? || header[i].last != v
-          }
-          h2 = header_end_p.call
-          if h2
-            gen << h2
-            header = nil
-          end
-        else
-          gen << ary
+  creader = Tb::CatReader.open(argv, true)
+  er = Tb::Enumerator.new {|y|
+    creader.each {|pairs|
+      if header
+        ary = []
+        pairs.each {|f, v| ary[f.to_i-1] = v }
+        ary.each_with_index {|v,i|
+          header[i] ||= []
+          header[i] << v if header[i].empty? || header[i].last != v
+        }
+        h2 = header_end_p.call
+        if h2
+          pairs2 = Tb::Pairs.new(h2.map.with_index {|v, i| ["#{i+1}", v] })
+          y.yield pairs2
+          header = nil
         end
-      }
+      else
+        y.yield pairs
+      end
     }
   }
+  with_output {|out|
+    er.write_to_csv(out, false)
+  }
   if header
-    warn "no header found."
+    warn "unique header fields not recognized."
   end
 end
 

data/lib/tb/cmd_nest.rb

@@ -0,0 +1,94 @@
+# 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:
+# 
+#  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.
+
+Tb::Cmd.subcommands << 'nest'
+
+def (Tb::Cmd).op_nest
+  op = OptionParser.new
+  op.banner = "Usage: tb nest [OPTS] NEWFIELD,OLDFIELD1,OLDFIELD2,... [TABLE ...]\n" +
+    "Nest fields."
+  define_common_option(op, "hNo", "--no-pager")
+  op
+end
+
+def (Tb::Cmd).main_nest(argv)
+  op_nest.parse!(argv)
+  exit_if_help('nest')
+  err('no fields given.') if argv.empty?
+  fields = split_field_list_argument(argv.shift)
+  newfield, *oldfields = fields
+  oldfields_hash = {}
+  oldfields.each {|f| oldfields_hash[f] = true }
+  argv = ['-'] if argv.empty?
+  creader = Tb::CatReader.open(argv, Tb::Cmd.opt_N)
+  er = Tb::Enumerator.new {|y|
+    sorted = creader.with_header {|header0|
+      oldfields.each {|f|
+        if !header0.include?(f)
+          err("field not found: #{f.inspect}")
+        end
+      }
+      y.set_header(header0.reject {|f| oldfields_hash[f] } + [newfield])
+    }.map {|pairs|
+      cv = pairs.reject {|f, v|
+        oldfields_hash[f]
+      }.map {|f, v|
+        [smart_cmp_value(f), smart_cmp_value(v)]
+      }.sort
+      [cv, pairs]
+    }
+
+    nested = nil
+    boundary_p = lambda {|(cv1, _), (cv2, _)|
+      cv1 != cv2
+    }
+    before_group = lambda {|(_, _)|
+      nested = []
+    }
+    body = lambda {|(_, pairs)|
+      nested << pairs.reject {|f, v| !oldfields_hash[f] }
+    }
+    after_group = lambda {|(_, last_pairs)|
+      Tb.csv_stream_output(nested_csv="") {|ngen|
+        ngen << oldfields
+        nested.each {|npairs|
+          ngen << oldfields.map {|of| npairs[of] }
+        }
+      }
+      assoc = last_pairs.reject {|f, v| oldfields_hash[f] }.to_a
+      assoc << [newfield, nested_csv]
+      pairs = Tb::Pairs.new(assoc)
+      y.yield pairs
+    }
+    sorted.each_group_element(boundary_p, before_group, body, after_group)
+  }
+  with_output {|out|
+    er.write_to_csv(out, !Tb::Cmd.opt_N)
+  }
+end
+

data/lib/tb/cmd_newfield.rb

@@ -1,32 +1,37 @@
-# 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 << 'newfield'
 
 def (Tb::Cmd).op_newfield
   op = OptionParser.new
-  op.banner = 'Usage: tb newfield [OPTS] FIELD RUBY-EXP [TABLE]'
+  op.banner = "Usage: tb newfield [OPTS] FIELD RUBY-EXP [TABLE]\n" +
+    "Add a field."
   define_common_option(op, "ho", "--no-pager")
   op
 end
@@ -40,19 +45,10 @@ def (Tb::Cmd).main_newfield(argv)
   rubyexp = argv.shift
   pr = eval("lambda {|_| #{rubyexp} }")
   argv = ['-'] if argv.empty?
-  Tb::CatReader.open(argv, Tb::Cmd.opt_N) {|tblreader|
-    renamed_header = [field] + tblreader.header
-    with_table_stream_output {|gen|
-      gen.output_header(renamed_header)
-      tblreader.each {|ary|
-        h = {}
-        ary.each_with_index {|str, i|
-          f = tblreader.field_from_index_ex(i)
-          h[f] = str
-        }
-        gen << [pr.call(h), *ary]
-      }
-    }
+  creader = Tb::CatReader.open(argv, Tb::Cmd.opt_N)
+  er = creader.newfield(field) {|pairs| pr.call(pairs) }
+  with_output {|out|
+    er.write_to_csv(out, !Tb::Cmd.opt_N)
   }
 end
 

data/lib/tb/cmd_rename.rb

@@ -1,32 +1,37 @@
-# 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 << 'rename'
 
 def (Tb::Cmd).op_rename
   op = OptionParser.new
-  op.banner = 'Usage: tb rename [OPTS] SRC,DST,... [TABLE]'
+  op.banner = "Usage: tb rename [OPTS] SRC,DST,... [TABLE]\n" +
+    "Rename field names."
   define_common_option(op, "ho", "--no-pager")
   op
 end
@@ -39,20 +44,23 @@ def (Tb::Cmd).main_rename(argv)
   argv = ['-'] if argv.empty?
   h = {}
   fs.each_slice(2) {|sf, df| h[sf] = df }
-  Tb::CatReader.open(argv, Tb::Cmd.opt_N) {|tblreader|
-    header = tblreader.header
-    h.each {|sf, df|
-      unless header.include? sf
-        err "field not found: #{sf.inspect}"
-      end
-    }
-    renamed_header = tblreader.header.map {|f| h.fetch(f, f) }
-    with_table_stream_output {|gen|
-      gen.output_header(renamed_header)
-      tblreader.each {|ary|
-        gen << ary
+  creader = Tb::CatReader.open(argv, Tb::Cmd.opt_N)
+  er = Tb::Enumerator.new {|y|
+    header = nil
+    creader.with_header {|header0|
+      header = header0
+      h.each {|sf, df|
+        unless header.include? sf
+          err "field not found: #{sf.inspect}"
+        end
       }
+      y.set_header header.map {|f| h.fetch(f, f) }
+    }.each {|pairs|
+      y.yield Tb::Pairs.new(pairs.map {|f, v| [h.fetch(f, f), v] })
     }
   }
+  with_output {|out|
+    er.write_to_csv(out, !Tb::Cmd.opt_N)
+  }
 end
 

data/lib/tb/cmd_shape.rb

@@ -1,32 +1,37 @@
-# 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 << 'shape'
 
 def (Tb::Cmd).op_shape
   op = OptionParser.new
-  op.banner = 'Usage: tb shape [OPTS] [TABLE ...]'
+  op.banner = "Usage: tb shape [OPTS] [TABLE ...]\n" +
+    "Show table size."
   define_common_option(op, "hNo", "--no-pager")
   op
 end
@@ -38,11 +43,14 @@ def (Tb::Cmd).main_shape(argv)
   result = Tb.new(%w[header_fields min_fields max_fields records filename])
   filenames.each {|filename|
     tablereader_open(filename) {|tblreader|
-      num_header_fields = tblreader.header.length
       min_num_fields = nil
       max_num_fields = nil
       num_records = 0
-      tblreader.each {|ary|
+      num_header_fields = nil
+      tblreader.with_header {|header|
+        num_header_fields = header.length
+      }.each {|pairs|
+        ary = pairs.values
         num_records += 1
         n = ary.length
         if min_num_fields.nil?
@@ -60,8 +68,7 @@ def (Tb::Cmd).main_shape(argv)
     }
   }
   with_output {|out|
-    # don't use tbl_generate_csv() because the header should always outputted.
-    result.generate_csv(out)
+    result.write_to_csv(out, true)
   }
 end