tb 0.9 → 1.0

data/lib/tb/cmd_melt.rb

@@ -61,6 +61,21 @@ def (Tb::Cmd).op_melt
   op
 end
 
+Tb::Cmd.def_vhelp('melt', <<'End')
+Example:
+
+  % cat tst.csv
+  foo,bar,baz
+  A,1,x
+  B,2,y
+  % tb melt foo tst.csv
+  foo,variable,value
+  A,bar,1
+  A,baz,x
+  B,bar,2
+  B,baz,y
+End
+
 def (Tb::Cmd).main_melt(argv)
   op_melt.parse!(argv)
   exit_if_help('melt')

data/lib/tb/cmd_mheader.rb

@@ -39,6 +39,21 @@ def (Tb::Cmd).op_mheader
   op
 end
 
+Tb::Cmd.def_vhelp('mheader', <<'End')
+Example:
+
+  % cat tst.csv
+  foo,foo,bar,bar
+  baz,qux,baz,qux
+  1,2,3,4
+  5,6,7,8
+  % tb mheader tst.csv
+  foo baz,foo qux,bar baz,bar qux
+  1,2,3,4
+  5,6,7,8
+End
+
+
 def (Tb::Cmd).main_mheader(argv)
   op_mheader.parse!(argv)
   exit_if_help('mheader')

data/lib/tb/cmd_nest.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2012 Tanaka Akira  <akr@fsij.org>
+# Copyright (C) 2011-2014 Tanaka Akira  <akr@fsij.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -36,6 +36,28 @@ def (Tb::Cmd).op_nest
   op
 end
 
+Tb::Cmd.def_vhelp('nest', <<'End')
+Example:
+
+  % cat tst.csv
+  name,author,length
+  foo,A,3
+  bar,A,5
+  baz,B,2
+  qux,B,8
+  % tb nest item,name,length tst.csv
+  author,item
+  A,"name,length
+  foo,3
+  bar,5
+  "
+  B,"name,length
+  baz,2
+  qux,8
+  "
+End
+
+
 def (Tb::Cmd).main_nest(argv)
   op_nest.parse!(argv)
   exit_if_help('nest')
@@ -71,11 +93,10 @@ def (Tb::Cmd).main_nest(argv)
       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] }
-        }
+      nested_csv = ""
+      nested_csv << oldfields.to_csv
+      nested.each {|npairs|
+        nested_csv << oldfields.map {|of| npairs[of] }.to_csv
       }
       assoc = last_pairs.reject {|f, v| oldfields_hash[f] }.to_a
       assoc << [newfield, nested_csv]

data/lib/tb/cmd_newfield.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2012 Tanaka Akira  <akr@fsij.org>
+# Copyright (C) 2011-2014 Tanaka Akira  <akr@fsij.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -41,6 +41,23 @@ def (Tb::Cmd).op_newfield
   op
 end
 
+Tb::Cmd.def_vhelp('newfield', <<'End')
+Example:
+
+  % cat tst.csv
+  a,b,c
+  0,1,2
+  4,5,6
+  % tb newfield foo bar tst.csv
+  foo,a,b,c
+  bar,0,1,2
+  bar,4,5,6
+  % tb newfield foo --ruby '_["b"] + _["c"]' tst.csv
+  foo,a,b,c
+  12,0,1,2
+  56,4,5,6
+End
+
 def (Tb::Cmd).main_newfield(argv)
   op_newfield.parse!(argv)
   exit_if_help('newfield')
@@ -50,7 +67,7 @@ def (Tb::Cmd).main_newfield(argv)
     rubyexp = Tb::Cmd.opt_newfield_ruby
     pr = eval("lambda {|_| #{rubyexp} }")
   else
-    err('no ruby expression given.') if argv.empty?
+    err('no value given.') if argv.empty?
     value = argv.shift
     pr = lambda {|_| value }
   end

data/lib/tb/cmd_rename.rb

@@ -36,6 +36,26 @@ def (Tb::Cmd).op_rename
   op
 end
 
+Tb::Cmd.def_vhelp('rename', <<'End')
+Example:
+
+  % cat tst.csv
+  foo,bar,baz
+  1,2,3
+  4,5,6
+  7,8,9
+  % tb rename bar,qux tst.csv
+  foo,qux,baz
+  1,2,3
+  4,5,6
+  7,8,9
+  % tb rename bar,qux,baz,quux tst.csv
+  foo,qux,quux
+  1,2,3
+  4,5,6
+  7,8,9
+End
+
 def (Tb::Cmd).main_rename(argv)
   op_rename.parse!(argv)
   exit_if_help('rename')

data/lib/tb/{cmd_grep.rb → cmd_search.rb}

@@ -26,41 +26,55 @@
 # 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'
+Tb::Cmd.subcommands << 'search'
 
-Tb::Cmd.default_option[:opt_grep_e] = nil
-Tb::Cmd.default_option[:opt_grep_ruby] = nil
-Tb::Cmd.default_option[:opt_grep_f] = nil
-Tb::Cmd.default_option[:opt_grep_v] = nil
+Tb::Cmd.default_option[:opt_search_e] = nil
+Tb::Cmd.default_option[:opt_search_ruby] = nil
+Tb::Cmd.default_option[:opt_search_f] = nil
+Tb::Cmd.default_option[:opt_search_v] = nil
 
-def (Tb::Cmd).op_grep
+def (Tb::Cmd).op_search
   op = OptionParser.new
-  op.banner = "Usage: tb grep [OPTS] REGEXP [TABLE ...]\n" +
+  op.banner = "Usage: tb search [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', 'specify a regexp.') {|pattern| Tb::Cmd.opt_grep_e = pattern }
-  op.def_option('--ruby RUBY-EXP', 'predicate written in ruby.  A hash is given as _.  no usual regexp argument.') {|ruby_exp| Tb::Cmd.opt_grep_ruby = ruby_exp }
-  op.def_option('-v', 'ouput the records which doesn\'t match') { Tb::Cmd.opt_grep_v = true }
+  op.def_option('-f FIELD', 'search field') {|field| Tb::Cmd.opt_search_f = field }
+  op.def_option('-e REGEXP', 'specify a regexp.') {|pattern| Tb::Cmd.opt_search_e = pattern }
+  op.def_option('--ruby RUBY-EXP', 'predicate written in ruby.  A hash is given as _.  no usual regexp argument.') {|ruby_exp| Tb::Cmd.opt_search_ruby = ruby_exp }
+  op.def_option('-v', 'ouput the records which doesn\'t match') { Tb::Cmd.opt_search_v = true }
   op
 end
 
-def (Tb::Cmd).main_grep(argv)
-  op_grep.parse!(argv)
-  exit_if_help('grep')
-  if Tb::Cmd.opt_grep_ruby
-    pred = eval("lambda {|_| #{Tb::Cmd.opt_grep_ruby} }")
-  elsif Tb::Cmd.opt_grep_e
-    re = Regexp.new(Tb::Cmd.opt_grep_e)
-    pred = Tb::Cmd.opt_grep_f ? lambda {|_| re =~ _[Tb::Cmd.opt_grep_f] } :
-                                lambda {|_| _.any? {|k, v| re =~ v.to_s } }
+Tb::Cmd.def_vhelp('search', <<'End')
+Example:
+
+  % cat tst.csv
+  a,b,c
+  0,1,2
+  4,5,6
+  % tb search 0 tst.csv
+  a,b,c
+  0,1,2
+End
+
+def (Tb::Cmd).main_search(argv)
+  op_search.parse!(argv)
+  exit_if_help('search')
+  if Tb::Cmd.opt_search_ruby
+    pred = eval("lambda {|_| #{Tb::Cmd.opt_search_ruby} }")
+  elsif Tb::Cmd.opt_search_e
+    re = Regexp.new(Tb::Cmd.opt_search_e)
+    pred = Tb::Cmd.opt_search_f ?
+      lambda {|_| re =~ _[Tb::Cmd.opt_search_f] } :
+      lambda {|_| _.any? {|k, v| re =~ v.to_s } }
   else
     err("no regexp given.") if argv.empty?
     re = Regexp.new(argv.shift)
-    pred = Tb::Cmd.opt_grep_f ? lambda {|_| re =~ _[Tb::Cmd.opt_grep_f] } :
-                                lambda {|_| _.any? {|k, v| re =~ v.to_s } }
+    pred = Tb::Cmd.opt_search_f ?
+      lambda {|_| re =~ _[Tb::Cmd.opt_search_f] } :
+      lambda {|_| _.any? {|k, v| re =~ v.to_s } }
   end
-  opt_v = Tb::Cmd.opt_grep_v ? true : false
+  opt_v = Tb::Cmd.opt_search_v ? true : false
   argv = ['-'] if argv.empty?
   creader = Tb::CatReader.open(argv, Tb::Cmd.opt_N)
   er = Tb::Enumerator.new {|y|

data/lib/tb/cmd_shape.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2012 Tanaka Akira  <akr@fsij.org>
+# Copyright (C) 2011-2014 Tanaka Akira  <akr@fsij.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -36,38 +36,82 @@ def (Tb::Cmd).op_shape
   op
 end
 
+Tb::Cmd.def_vhelp('shape', <<'End')
+Example:
+
+  % cat tst.csv
+  foo,bar,baz
+  1,2,3
+  4,5
+  6,7,8,9
+  % tb shape tst.csv -o json:-
+  [
+  {
+    "filename": "tst.csv",
+    "records": 3,
+    "min_pairs": 2,
+    "max_pairs": 3,
+    "header_fields": 3,
+    "min_fields": 2,
+    "max_fields": 4
+  }
+  ]
+End
+
 def (Tb::Cmd).main_shape(argv)
   op_shape.parse!(argv)
   exit_if_help('shape')
   filenames = argv.empty? ? ['-'] : argv
-  result = Tb.new(%w[header_fields min_fields max_fields records filename])
-  filenames.each {|filename|
-    tablereader_open(filename) {|tblreader|
-      min_num_fields = nil
-      max_num_fields = nil
-      num_records = 0
-      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?
-          min_num_fields = max_num_fields = n
-        else
-          min_num_fields = n if n < min_num_fields
-          max_num_fields = n if max_num_fields < n
+  ter = Tb::Enumerator.new {|y|
+    filenames.each {|filename|
+      tablereader_open(filename) {|tblreader|
+        tblreader.enable_warning = false if tblreader.respond_to? :enable_warning
+        num_records = 0
+        num_header_fields = nil
+        min_num_fields = nil
+        max_num_fields = nil
+        if tblreader.respond_to? :header_array_hook
+          tblreader.header_array_hook = lambda {|header|
+            num_header_fields = header.length
+          }
+        end
+        if tblreader.respond_to? :row_array_hook
+          tblreader.row_array_hook = lambda {|ary|
+            n = ary.length
+            if min_num_fields.nil?
+              min_num_fields = max_num_fields = n
+            else
+              min_num_fields = n if n < min_num_fields
+              max_num_fields = n if max_num_fields < n
+            end
+          }
         end
+        min_num_pairs = nil
+        max_num_pairs = nil
+        tblreader.each {|pairs|
+          num_records += 1
+          n = pairs.length
+          if min_num_pairs.nil?
+            min_num_pairs = max_num_pairs = n
+          else
+            min_num_pairs = n if n < min_num_pairs
+            max_num_pairs = n if max_num_pairs < n
+          end
+        }
+        h = {
+          'filename'=>filename,
+          'records'=>num_records,
+          'min_pairs'=>min_num_pairs,
+          'max_pairs'=>max_num_pairs,
+        }
+        h['header_fields'] = num_header_fields if num_header_fields
+        h['min_fields'] = min_num_fields if min_num_fields
+        h['max_fields'] = max_num_fields if max_num_fields
+        y.yield(h)
       }
-      result.insert({'header_fields'=>num_header_fields,
-                     'min_fields'=>min_num_fields,
-                     'max_fields'=>max_num_fields,
-                     'records'=>num_records,
-                     'filename'=>filename})
     }
   }
   Tb::Cmd.opt_N = false
-  output_tbenum(result)
+  output_tbenum(ter)
 end
 

data/lib/tb/cmd_sort.rb

@@ -41,6 +41,26 @@ def (Tb::Cmd).op_sort
   op
 end
 
+Tb::Cmd.def_vhelp('sort', <<'End')
+Example:
+
+  % cat tst.csv
+  name,value
+  foo,1
+  bar,8
+  baz,2
+  % tb sort tst.csv
+  name,value
+  bar,8
+  baz,2
+  foo,1
+  % tb sort -f value tst.csv
+  name,value
+  foo,1
+  baz,2
+  bar,8
+End
+
 def (Tb::Cmd).main_sort(argv)
   op_sort.parse!(argv)
   exit_if_help('sort')

data/lib/tb/cmd_tar.rb

@@ -43,6 +43,44 @@ def (Tb::Cmd).op_tar
   op
 end
 
+Tb::Cmd.def_vhelp('tar', <<'End')
+Example:
+
+  % tb tar ruby-1.8.7.tar.bz2|head
+  mode,filemode,uid,user,gid,group,devmajor,devminor,size,mtime,path,linkname
+  0755,drwxr-xr-x,1001,knu,0,wheel,0,0,0,2008-06-01T00:19:03+09:00,ruby-1.8.7/,""
+  0755,drwxr-xr-x,1001,knu,0,wheel,0,0,0,2008-06-01T00:18:24+09:00,ruby-1.8.7/ext/,""
+  0755,drwxr-xr-x,1001,knu,0,wheel,0,0,0,2008-06-01T00:18:25+09:00,ruby-1.8.7/doc/,""
+  0644,-rw-r--r--,1001,knu,0,wheel,0,0,5011,2008-05-31T23:57:11+09:00,ruby-1.8.7/Makefile.in,""
+  0644,-rw-r--r--,1001,knu,0,wheel,0,0,124521,2008-05-31T20:44:49+09:00,ruby-1.8.7/parse.y,""
+  0644,-rw-r--r--,1001,knu,0,wheel,0,0,32308,2008-05-29T20:23:36+09:00,ruby-1.8.7/README.EXT,""
+  0644,-rw-r--r--,1001,knu,0,wheel,0,0,19502,2008-05-31T20:44:49+09:00,ruby-1.8.7/intern.h,""
+  0644,-rw-r--r--,1001,knu,0,wheel,0,0,22581,2008-05-23T14:22:13+09:00,ruby-1.8.7/class.c,""
+  0755,drwxr-xr-x,1001,knu,0,wheel,0,0,0,2008-06-01T00:18:24+09:00,ruby-1.8.7/djgpp/,""
+  % tb tar -l ruby-1.8.7.tar.bz2|head
+  mode,filemode,uid,user,gid,group,devmajor,devminor,size,mtime,atime,ctime,path,linkname,size_in_tar,tar_typeflag,tar_magic,tar_version,tar_chksum
+  0755,drwxr-xr-x,1001,knu,0,wheel,0,0,0,2008-06-01T00:19:03.000000000+09:00,,,ruby-1.8.7/,"",512,5,ustar,00,5406
+  0755,drwxr-xr-x,1001,knu,0,wheel,0,0,0,2008-06-01T00:18:24.000000000+09:00,,,ruby-1.8.7/ext/,"",512,5,ustar,00,5779
+  0755,drwxr-xr-x,1001,knu,0,wheel,0,0,0,2008-06-01T00:18:25.000000000+09:00,,,ruby-1.8.7/doc/,"",512,5,ustar,00,5753
+  0644,-rw-r--r--,1001,knu,0,wheel,0,0,5011,2008-05-31T23:57:11.000000000+09:00,,,ruby-1.8.7/Makefile.in,"",5632,0,ustar,00,6467
+  0644,-rw-r--r--,1001,knu,0,wheel,0,0,124521,2008-05-31T20:44:49.000000000+09:00,,,ruby-1.8.7/parse.y,"",125440,0,ustar,00,6114
+  0644,-rw-r--r--,1001,knu,0,wheel,0,0,32308,2008-05-29T20:23:36.000000000+09:00,,,ruby-1.8.7/README.EXT,"",33280,0,ustar,00,6133
+  0644,-rw-r--r--,1001,knu,0,wheel,0,0,19502,2008-05-31T20:44:49.000000000+09:00,,,ruby-1.8.7/intern.h,"",20480,0,ustar,00,6216
+  0644,-rw-r--r--,1001,knu,0,wheel,0,0,22581,2008-05-23T14:22:13.000000000+09:00,,,ruby-1.8.7/class.c,"",23552,0,ustar,00,6093
+  0755,drwxr-xr-x,1001,knu,0,wheel,0,0,0,2008-06-01T00:18:24.000000000+09:00,,,ruby-1.8.7/djgpp/,"",512,5,ustar,00,5975
+  % tb tar -l --hash=md5 ruby-1.8.7.tar.bz2|head
+  mode,filemode,uid,user,gid,group,devmajor,devminor,size,mtime,atime,ctime,path,linkname,size_in_tar,tar_typeflag,tar_magic,tar_version,tar_chksum,md5
+  0755,drwxr-xr-x,1001,knu,0,wheel,0,0,0,2008-06-01T00:19:03.000000000+09:00,,,ruby-1.8.7/,"",512,5,ustar,00,5406,
+  0755,drwxr-xr-x,1001,knu,0,wheel,0,0,0,2008-06-01T00:18:24.000000000+09:00,,,ruby-1.8.7/ext/,"",512,5,ustar,00,5779,
+  0755,drwxr-xr-x,1001,knu,0,wheel,0,0,0,2008-06-01T00:18:25.000000000+09:00,,,ruby-1.8.7/doc/,"",512,5,ustar,00,5753,
+  0644,-rw-r--r--,1001,knu,0,wheel,0,0,5011,2008-05-31T23:57:11.000000000+09:00,,,ruby-1.8.7/Makefile.in,"",5632,0,ustar,00,6467,1c038d48e3132822f18bf758a81e1794
+  0644,-rw-r--r--,1001,knu,0,wheel,0,0,124521,2008-05-31T20:44:49.000000000+09:00,,,ruby-1.8.7/parse.y,"",125440,0,ustar,00,6114,6f6bd781876136a7a71cf0ffcd6ecabc
+  0644,-rw-r--r--,1001,knu,0,wheel,0,0,32308,2008-05-29T20:23:36.000000000+09:00,,,ruby-1.8.7/README.EXT,"",33280,0,ustar,00,6133,22785b26a8eb77bd426a09f0d493228b
+  0644,-rw-r--r--,1001,knu,0,wheel,0,0,19502,2008-05-31T20:44:49.000000000+09:00,,,ruby-1.8.7/intern.h,"",20480,0,ustar,00,6216,cf8876629465d2e8fcefbe71c21915a7
+  0644,-rw-r--r--,1001,knu,0,wheel,0,0,22581,2008-05-23T14:22:13.000000000+09:00,,,ruby-1.8.7/class.c,"",23552,0,ustar,00,6093,bff1443982b7f0261ce45db9375e5881
+  0755,drwxr-xr-x,1001,knu,0,wheel,0,0,0,2008-06-01T00:18:24.000000000+09:00,,,ruby-1.8.7/djgpp/,"",512,5,ustar,00,5975,
+End
+
 Tb::Cmd::TAR_RECORD_LENGTH = 512
 Tb::Cmd::TAR_HEADER_STRUCTURE = [
   [:name, "Z100"],      # [POSIX] NUL-terminated character strings except when all characters in the array contain non-NUL characters including the last character.

data/lib/tb/cmd_to_json.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2012 Tanaka Akira  <akr@fsij.org>
+# Copyright (C) 2011-2014 Tanaka Akira  <akr@fsij.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -49,7 +49,7 @@ def (Tb::Cmd).main_to_json(argv)
       tablereader_open(filename) {|tblreader|
         tblreader.each {|pairs|
           out.print sep if sep
-          out.print JSON.pretty_generate(Hash[pairs.to_a])
+          out.print JSON.pretty_generate(pairs)
           sep = ",\n"
         }
       }

data/lib/tb/cmd_to_ltsv.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 Tanaka Akira  <akr@fsij.org>
+# Copyright (C) 2013-2014 Tanaka Akira  <akr@fsij.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -40,9 +40,9 @@ def (Tb::Cmd).main_to_ltsv(argv)
   op_to_ltsv.parse!(argv)
   exit_if_help('to-ltsv')
   argv = ['-'] if argv.empty?
-  tbl = Tb::CatReader.open(argv, Tb::Cmd.opt_N).to_tb
+  reader = Tb::CatReader.open(argv, Tb::Cmd.opt_N)
   with_output {|out|
-    tbl_generate_ltsv(tbl, out)
+    reader.write_to_ltsv(out)
   }
 end