tb 0.6 → 0.7

data/README

@@ -4,7 +4,7 @@ tb provides a command and a library for manipulating tables:
 Unix filter like operations (grep, sort, cat, cut, ls, etc.),
 SQL like operations (join, group, etc.),
 other table operations (gsub, rename, cross, melt, unmelt, etc.),
-information extractions (git-log, svn-log, tar-tvf),
+information extractions (git, svn, tar),
 and more.
 
 == Example
@@ -156,9 +156,9 @@ There are more subcommands.
     tb mheader [OPTS] [TABLE]
     tb crop [OPTS] [TABLE ...]
     tb ls [OPTS] [FILE ...]
-    tb tar-tvf [OPTS] [TAR-FILE ...]
-    tb svn-log [OPTS] -- [SVN-LOG-ARGS]
-    tb git-log [OPTS] [GIT-DIR ...]
+    tb tar [OPTS] [TAR-FILE ...]
+    tb svn [OPTS] -- [SVN-LOG-ARGS]
+    tb git [OPTS] [GIT-DIR ...]
 
 tb help -s shows one line summary of the subcommands.
 
@@ -189,9 +189,9 @@ tb help -s shows one line summary of the subcommands.
   mheader     : Collapse multi rows header.
   crop        : Extract rectangle in a table.
   ls          : List directory entries as a table.
-  tar-tvf     : Show the file listing of tar file.
-  svn-log     : Show the SVN log as a table.
-  git-log     : Show the GIT log as a table.
+  tar        : Show the file listing of tar file.
+  svn        : Show the SVN log as a table.
+  git        : Show the GIT log as a table.
 
 == Install
 

data/lib/tb/{cmd_git_log.rb → cmd_git.rb}

@@ -26,20 +26,20 @@
 # 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 << 'git-log'
+Tb::Cmd.subcommands << 'git'
 
-Tb::Cmd.default_option[:opt_git_log_git_command] = nil
-Tb::Cmd.default_option[:opt_git_log_debug_input] = nil
-Tb::Cmd.default_option[:opt_git_log_debug_output] = nil
+Tb::Cmd.default_option[:opt_git_command] = nil
+Tb::Cmd.default_option[:opt_git_debug_input] = nil
+Tb::Cmd.default_option[:opt_git_debug_output] = nil
 
-def (Tb::Cmd).op_git_log
+def (Tb::Cmd).op_git
   op = OptionParser.new
-  op.banner = "Usage: tb git-log [OPTS] [GIT-DIR ...]\n" +
+  op.banner = "Usage: tb git [OPTS] [GIT-DIR ...]\n" +
     "Show the GIT log as a table."
   define_common_option(op, "hNod", "--no-pager", '--debug')
-  op.def_option('--git-command COMMAND', 'specify the git command (default: git)') {|command| Tb::Cmd.opt_git_log_git_command = command }
-  op.def_option('--debug-git-log-output FILE', 'store the raw output of git-log (for debug)') {|filename| Tb::Cmd.opt_git_log_debug_output = filename }
-  op.def_option('--debug-git-log-input FILE', 'use the file as output of git-log (for debug)') {|filename| Tb::Cmd.opt_git_log_debug_input = filename }
+  op.def_option('--git-command COMMAND', 'specify the git command (default: git)') {|command| Tb::Cmd.opt_git_command = command }
+  op.def_option('--debug-git-output FILE', 'store the raw output of git (for debug)') {|filename| Tb::Cmd.opt_git_debug_output = filename }
+  op.def_option('--debug-git-input FILE', 'use the file as output of git (for debug)') {|filename| Tb::Cmd.opt_git_debug_input = filename }
   op
 end
 
@@ -69,13 +69,13 @@ Tb::Cmd::GIT_LOG_PRETTY_FORMAT = 'format:%x01commit-separator%x01%n' +
 
 Tb::Cmd::GIT_LOG_HEADER = Tb::Cmd::GIT_LOG_FORMAT_SPEC.map {|k, v| k } + ['files']
 
-def (Tb::Cmd).git_log_with_git_log(dir)
-  if Tb::Cmd.opt_git_log_debug_input
-    File.open(Tb::Cmd.opt_git_log_debug_input) {|f|
+def (Tb::Cmd).git_with_git_log(dir)
+  if Tb::Cmd.opt_git_debug_input
+    File.open(Tb::Cmd.opt_git_debug_input) {|f|
       yield f
     }
   else
-    git = Tb::Cmd.opt_git_log_git_command || 'git'
+    git = Tb::Cmd.opt_git_command || 'git'
     # depends Ruby 1.9.
     command = [
       git,
@@ -89,11 +89,11 @@ def (Tb::Cmd).git_log_with_git_log(dir)
       {:chdir=>dir}
     ]
     $stderr.puts "git command line: #{command.inspect}" if 1 <= Tb::Cmd.opt_debug
-    if Tb::Cmd.opt_git_log_debug_output
+    if Tb::Cmd.opt_git_debug_output
       # File.realdirpath is required before Ruby 2.0.
-      command.last[:out] = File.realdirpath(Tb::Cmd.opt_git_log_debug_output)
+      command.last[:out] = File.realdirpath(Tb::Cmd.opt_git_debug_output)
       system(*command)
-      File.open(Tb::Cmd.opt_git_log_debug_output) {|f|
+      File.open(Tb::Cmd.opt_git_debug_output) {|f|
         yield f
       }
     else
@@ -104,7 +104,7 @@ def (Tb::Cmd).git_log_with_git_log(dir)
   end
 end
 
-def (Tb::Cmd).git_log_unescape_filename(filename)
+def (Tb::Cmd).git_unescape_filename(filename)
   if /\A"/ =~ filename
     $'.chomp('"').gsub(/\\((\d\d\d)|[abtnvfr"\\])/) {
       str = $1
@@ -131,23 +131,23 @@ def (Tb::Cmd).git_log_unescape_filename(filename)
   end
 end
 
-def (Tb::Cmd).git_log_parse_commit(commit_info, files)
+def (Tb::Cmd).git_parse_commit(commit_info, files)
   commit_info = commit_info.split(/\n(?=[a-z])/)
   files_raw = {}
   files_numstat = {}
   files.split(/\n/).each {|file_line|
     if /\A:(\d+) (\d+) ([0-9a-f]+) ([0-9a-f]+) (\S+)\t(.+)\z/ =~ file_line
       mode1, mode2, hash1, hash2, status, filename = $1, $2, $3, $4, $5, $6
-      filename = git_log_unescape_filename(filename)
+      filename = git_unescape_filename(filename)
       files_raw[filename] = [mode1, mode2, hash1, hash2, status]
     elsif /\A(\d+|-)\t(\d+|-)\t(.+)\z/ =~ file_line
       add, del, filename = $1, $2, $3
       add = add == '-' ? nil : add.to_i
       del = del == '-' ? nil : del.to_i
-      filename = git_log_unescape_filename(filename)
+      filename = git_unescape_filename(filename)
       files_numstat[filename] = [add, del]
     else
-      warn "unexpected git-log output (raw/numstat): #{file_line.inspect}"
+      warn "unexpected git output (raw/numstat): #{file_line.inspect}"
     end
   }
   Tb.csv_stream_output(files_csv="") {|gen|
@@ -160,7 +160,7 @@ def (Tb::Cmd).git_log_parse_commit(commit_info, files)
   h = {}
   commit_info.each {|s|
     if /:/ !~ s
-      warn "unexpected git-log output (header:value): #{s.inspect}"
+      warn "unexpected git output (header:value): #{s.inspect}"
       next
     end
     k = $`
@@ -180,32 +180,32 @@ def (Tb::Cmd).git_log_parse_commit(commit_info, files)
   h
 end
 
-def (Tb::Cmd).git_log_each_commit(f)
+def (Tb::Cmd).git_each_commit(f)
   while chunk = f.gets("\x01commit-separator\x01\n")
     chunk.chomp!("\x01commit-separator\x01\n")
     next if chunk.empty? # beginning of the output
     if /\nend-commit\n/ !~ chunk
-      warn "unexpected git-log output (end-commit): #{chunk.inspect}"
+      warn "unexpected git output (end-commit): #{chunk.inspect}"
       next
     end
     commit_info, files = $`, $'
     files.sub!(/\A\n/, '')
-    h = git_log_parse_commit(commit_info, files)
+    h = git_parse_commit(commit_info, files)
     yield h
   end
 
 end
 
-def (Tb::Cmd).main_git_log(argv)
-  op_git_log.parse!(argv)
-  exit_if_help('git-log')
+def (Tb::Cmd).main_git(argv)
+  op_git.parse!(argv)
+  exit_if_help('git')
   argv = ['.'] if argv.empty?
   er = Tb::Enumerator.new {|y|
     y.set_header Tb::Cmd::GIT_LOG_HEADER
     argv.each {|dir|
-      git_log_with_git_log(dir) {|f|
+      git_with_git_log(dir) {|f|
         f.set_encoding("ASCII-8BIT") if f.respond_to? :set_encoding
-        git_log_each_commit(f) {|h|
+        git_each_commit(f) {|h|
           y.yield h
         }
       }

data/lib/tb/{cmd_svn_log.rb → cmd_svn.rb}

@@ -28,27 +28,27 @@
 
 require 'rexml/document'
 
-Tb::Cmd.subcommands << 'svn-log'
+Tb::Cmd.subcommands << 'svn'
 
-Tb::Cmd.default_option[:opt_svn_log_svn_command] = nil
+Tb::Cmd.default_option[:opt_svn_command] = nil
 Tb::Cmd.default_option[:opt_svn_log_xml] = nil
 
-def (Tb::Cmd).op_svn_log
+def (Tb::Cmd).op_svn
   op = OptionParser.new
-  op.banner = "Usage: tb svn-log [OPTS] -- [SVN-LOG-ARGS]\n" +
+  op.banner = "Usage: tb svn [OPTS] -- [SVN-LOG-ARGS]\n" +
     "Show the SVN log as a table."
   define_common_option(op, "hNo", "--no-pager")
-  op.def_option('--svn-command COMMAND', 'specify the svn command (default: svn)') {|command| Tb::Cmd.opt_svn_log_svn_command = command }
+  op.def_option('--svn-command COMMAND', 'specify the svn command (default: svn)') {|command| Tb::Cmd.opt_svn_command = command }
   op.def_option('--svn-log-xml FILE', 'specify the result svn log --xml') {|filename| Tb::Cmd.opt_svn_log_xml = filename }
   op
 end
 
-Tb::Cmd.def_vhelp('svn-log', <<'End')
+Tb::Cmd.def_vhelp('svn', <<'End')
 Example:
 
-  % tb svn-log
-  % tb svn-log -- -v
-  % tb svn-log -- -v http://svn.ruby-lang.org/repos/ruby/trunk
+  % tb svn
+  % tb svn -- -v
+  % tb svn -- -v http://svn.ruby-lang.org/repos/ruby/trunk
 End
 
 class Tb::Cmd::SVNLOGListener
@@ -157,24 +157,24 @@ class Tb::Cmd::SVNLOGListener
   end
 end
 
-def (Tb::Cmd).svn_log_with_svn_log(argv)
+def (Tb::Cmd).svn_with_svn_log(argv)
   if Tb::Cmd.opt_svn_log_xml
     File.open(Tb::Cmd.opt_svn_log_xml) {|f|
       yield f
     }
   else
-    svn = Tb::Cmd.opt_svn_log_svn_command || 'svn'
+    svn = Tb::Cmd.opt_svn_command || 'svn'
     IO.popen([svn, 'log', '--xml', *argv]) {|f|
       yield f
     }
   end
 end
 
-def (Tb::Cmd).main_svn_log(argv)
-  op_svn_log.parse!(argv)
-  exit_if_help('svn-log')
+def (Tb::Cmd).main_svn(argv)
+  op_svn.parse!(argv)
+  exit_if_help('svn')
   er = Tb::Enumerator.new {|y|
-    svn_log_with_svn_log(argv) {|f|
+    svn_with_svn_log(argv) {|f|
       listener = Tb::Cmd::SVNLOGListener.new(y)
       REXML::Parsers::StreamParser.new(f, listener).parse
     }

data/lib/tb/{cmd_tar_tvf.rb → cmd_tar.rb}

@@ -26,20 +26,20 @@
 # 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 << 'tar-tvf'
+Tb::Cmd.subcommands << 'tar'
 
-Tb::Cmd.default_option[:opt_tar_tvf_l] = 0
-Tb::Cmd.default_option[:opt_tar_tvf_ustar] = nil
-Tb::Cmd.default_option[:opt_tar_tvf_hash] = []
+Tb::Cmd.default_option[:opt_tar_l] = 0
+Tb::Cmd.default_option[:opt_tar_ustar] = nil
+Tb::Cmd.default_option[:opt_tar_hash] = []
 
-def (Tb::Cmd).op_tar_tvf
+def (Tb::Cmd).op_tar
   op = OptionParser.new
-  op.banner = "Usage: tb tar-tvf [OPTS] [TAR-FILE ...]\n" +
+  op.banner = "Usage: tb tar [OPTS] [TAR-FILE ...]\n" +
     "Show the file listing of tar file."
   define_common_option(op, "hNo", "--no-pager")
-  op.def_option('-l', 'show more attributes.') {|fs| Tb::Cmd.opt_tar_tvf_l += 1 }
-  op.def_option('--ustar', 'ustar format (POSIX.1-1988).  No GNU and POSIX.1-2001 extension.') {|fs| Tb::Cmd.opt_tar_tvf_ustar = true }
-  op.def_option('--hash=ALGORITHMS', 'hash algorithms such as md5,sha256,sha384,sha512 (default: none)') {|hs| Tb::Cmd.opt_tar_tvf_hash.concat split_field_list_argument(hs) }
+  op.def_option('-l', 'show more attributes.') {|fs| Tb::Cmd.opt_tar_l += 1 }
+  op.def_option('--ustar', 'ustar format (POSIX.1-1988).  No GNU and POSIX.1-2001 extension.') {|fs| Tb::Cmd.opt_tar_ustar = true }
+  op.def_option('--hash=ALGORITHMS', 'hash algorithms such as md5,sha256,sha384,sha512 (default: none)') {|hs| Tb::Cmd.opt_tar_hash.concat split_field_list_argument(hs) }
   op
 end
 
@@ -84,7 +84,7 @@ Tb::Cmd::TAR_HASH_ALGORITHMS = {
   'sha512' => 'SHA512',
 }
 
-def (Tb::Cmd).tar_tvf_parse_seconds_from_epoch(val)
+def (Tb::Cmd).tar_parse_seconds_from_epoch(val)
   if /\./ =~ val
     num = ($` + $').to_i
     den = 10 ** $'.length
@@ -101,9 +101,9 @@ def (Tb::Cmd).tar_tvf_parse_seconds_from_epoch(val)
 end
 
 Tb::Cmd::TAR_PAX_KEYWORD_RECOGNIZERS = {
-  'atime' => [:atime, lambda {|val| Tb::Cmd.tar_tvf_parse_seconds_from_epoch(val) }],
-  'mtime' => [:mtime, lambda {|val| Tb::Cmd.tar_tvf_parse_seconds_from_epoch(val) }],
-  'ctime' => [:ctime, lambda {|val| Tb::Cmd.tar_tvf_parse_seconds_from_epoch(val) }],
+  'atime' => [:atime, lambda {|val| Tb::Cmd.tar_parse_seconds_from_epoch(val) }],
+  'mtime' => [:mtime, lambda {|val| Tb::Cmd.tar_parse_seconds_from_epoch(val) }],
+  'ctime' => [:ctime, lambda {|val| Tb::Cmd.tar_parse_seconds_from_epoch(val) }],
   'gid' => [:gid, lambda {|val| val.to_i }],
   'gname' => [:gname, lambda {|val| val }],
   'uid' => [:uid, lambda {|val| val.to_i }],
@@ -116,7 +116,7 @@ Tb::Cmd::TAR_PAX_KEYWORD_RECOGNIZERS = {
 Tb::Cmd::TAR_CSV_HEADER = %w[mode filemode uid user gid group devmajor devminor size mtime path linkname]
 Tb::Cmd::TAR_CSV_LONG_HEADER = %w[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]
 
-def (Tb::Cmd).tar_tvf_parse_header(header_record)
+def (Tb::Cmd).tar_parse_header(header_record)
   ary = header_record.unpack(Tb::Cmd::TAR_HEADER_TEPMLATE)
   h = {}
   Tb::Cmd::TAR_HEADER_STRUCTURE.each_with_index {|(k, _), i|
@@ -243,7 +243,7 @@ class Tb::Cmd::TarReader
   end
 end
 
-def (Tb::Cmd).tar_tvf_read_end_of_archive_indicator(reader)
+def (Tb::Cmd).tar_read_end_of_archive_indicator(reader)
   # The end of archive indicator is two consecutive records of NULs.
   # The first record is already read.
   second_end_of_archive_indicator_record = reader.get_single_record("second record of the end of archive indicator")
@@ -259,7 +259,7 @@ def (Tb::Cmd).tar_tvf_read_end_of_archive_indicator(reader)
   # archive indicator.  ("ustar Interchange Format" in POSIX)
 end
 
-def (Tb::Cmd).tar_tvf_check_extension_record(reader, h, content_blocklength)
+def (Tb::Cmd).tar_check_extension_record(reader, h, content_blocklength)
   prefix_parameters = {}
   case h[:typeflag]
   when 'L' # GNU
@@ -302,7 +302,7 @@ def (Tb::Cmd).tar_tvf_check_extension_record(reader, h, content_blocklength)
   nil
 end
 
-def (Tb::Cmd).tar_tvf_each(f)
+def (Tb::Cmd).tar_each(f)
   offset = 0
   reader = Tb::Cmd::TarReader.new(f)
   prefix_parameters = {}
@@ -312,14 +312,14 @@ def (Tb::Cmd).tar_tvf_each(f)
       break
     end
     if /\A\0*\z/ =~ header_record
-      tar_tvf_read_end_of_archive_indicator(reader)
+      tar_read_end_of_archive_indicator(reader)
       break
     end
-    h = tar_tvf_parse_header(header_record)
+    h = tar_parse_header(header_record)
     content_numrecords = (h[:size] + Tb::Cmd::TAR_RECORD_LENGTH - 1) / Tb::Cmd::TAR_RECORD_LENGTH
     content_blocklength = content_numrecords * Tb::Cmd::TAR_RECORD_LENGTH
-    if !Tb::Cmd.opt_tar_tvf_ustar
-      extension_params = tar_tvf_check_extension_record(reader, h, content_blocklength)
+    if !Tb::Cmd.opt_tar_ustar
+      extension_params = tar_check_extension_record(reader, h, content_blocklength)
       if extension_params
         prefix_parameters.update extension_params
         next
@@ -336,10 +336,10 @@ def (Tb::Cmd).tar_tvf_each(f)
     when :link, :symlink, :directory, :character_special, :block_special, :fifo
       # xxx: hardlink may have contents for posix archive.
     else
-      if Tb::Cmd.opt_tar_tvf_hash.empty?
+      if Tb::Cmd.opt_tar_hash.empty?
         reader.skip(content_blocklength, 'file content')
       else
-        reader.calculate_hash(content_blocklength, h[:size], Tb::Cmd.opt_tar_tvf_hash).each {|alg, result|
+        reader.calculate_hash(content_blocklength, h[:size], Tb::Cmd.opt_tar_hash).each {|alg, result|
           h[alg] = result
         }
       end
@@ -351,7 +351,7 @@ def (Tb::Cmd).tar_tvf_each(f)
   end
 end
 
-def (Tb::Cmd).tar_tvf_open_with0(arg)
+def (Tb::Cmd).tar_open_with0(arg)
   if arg == '-'
     yield $stdin
   else
@@ -361,8 +361,8 @@ def (Tb::Cmd).tar_tvf_open_with0(arg)
   end
 end
 
-def (Tb::Cmd).tar_tvf_open_with(arg)
-  tar_tvf_open_with0(arg) {|f|
+def (Tb::Cmd).tar_open_with(arg)
+  tar_open_with0(arg) {|f|
     magic = f.read(8)
     case magic
     when /\A\x1f\x8b/, /\A\037\235/ # \x1f\x8b is gzip format.  \037\235 is "compress" format of old Unix.
@@ -423,7 +423,7 @@ def (Tb::Cmd).tar_tvf_open_with(arg)
   }
 end
 
-def (Tb::Cmd).tar_tvf_format_filemode(typeflag, mode)
+def (Tb::Cmd).tar_format_filemode(typeflag, mode)
   entry_type =
     case Tb::Cmd::TAR_TYPEFLAG[typeflag]
     when :regular then '-'
@@ -453,34 +453,34 @@ def (Tb::Cmd).tar_tvf_format_filemode(typeflag, mode)
                      (m & 01000 == 0 ? ?x : ?t)))
 end
 
-def (Tb::Cmd).main_tar_tvf(argv)
-  op_tar_tvf.parse!(argv)
-  exit_if_help('tar-tvf')
-  if Tb::Cmd.opt_tar_tvf_hash.any? {|alg| !Tb::Cmd::TAR_HASH_ALGORITHMS[alg] }
-    STDERR.puts "Unexpected hash algorithm: #{Tb::Cmd.opt_tar_tvf_hash.reject {|alg| Tb::Cmd::TAR_HASH_ALGORITHMS[alg] }.join(",")}"
+def (Tb::Cmd).main_tar(argv)
+  op_tar.parse!(argv)
+  exit_if_help('tar')
+  if Tb::Cmd.opt_tar_hash.any? {|alg| !Tb::Cmd::TAR_HASH_ALGORITHMS[alg] }
+    STDERR.puts "Unexpected hash algorithm: #{Tb::Cmd.opt_tar_hash.reject {|alg| Tb::Cmd::TAR_HASH_ALGORITHMS[alg] }.join(",")}"
     exit false
   end
   argv = ['-'] if argv.empty?
   er = Tb::Enumerator.new {|y|
-    if Tb::Cmd.opt_tar_tvf_l == 0
+    if Tb::Cmd.opt_tar_l == 0
       header = Tb::Cmd::TAR_CSV_HEADER
     else
       header = Tb::Cmd::TAR_CSV_LONG_HEADER
     end
-    header += Tb::Cmd.opt_tar_tvf_hash
+    header += Tb::Cmd.opt_tar_hash
     y.set_header header
     argv.each {|filename|
-      tar_tvf_open_with(filename) {|f|
-        tar_tvf_each(f) {|h|
+      tar_open_with(filename) {|f|
+        tar_each(f) {|h|
           formatted = {}
           formatted["mode"] = sprintf("0%o", h[:mode])
-          formatted["filemode"] = tar_tvf_format_filemode(h[:typeflag], h[:mode])
+          formatted["filemode"] = tar_format_filemode(h[:typeflag], h[:mode])
           formatted["uid"] = h[:uid].to_s
           formatted["gid"] = h[:gid].to_s
           formatted["size"] = h[:size].to_s
-          formatted["mtime"] = h[:mtime].iso8601(0 < Tb::Cmd.opt_tar_tvf_l ? 9 : 0)
-          formatted["atime"] = h[:atime].iso8601(0 < Tb::Cmd.opt_tar_tvf_l ? 9 : 0) if h[:atime]
-          formatted["ctime"] = h[:ctime].iso8601(0 < Tb::Cmd.opt_tar_tvf_l ? 9 : 0) if h[:ctime]
+          formatted["mtime"] = h[:mtime].iso8601(0 < Tb::Cmd.opt_tar_l ? 9 : 0)
+          formatted["atime"] = h[:atime].iso8601(0 < Tb::Cmd.opt_tar_l ? 9 : 0) if h[:atime]
+          formatted["ctime"] = h[:ctime].iso8601(0 < Tb::Cmd.opt_tar_l ? 9 : 0) if h[:ctime]
           formatted["user"] = h[:uname]
           formatted["group"] = h[:gname]
           formatted["devmajor"] = h[:devmajor].to_s
@@ -492,7 +492,7 @@ def (Tb::Cmd).main_tar_tvf(argv)
           formatted["tar_typeflag"] = h[:typeflag]
           formatted["tar_magic"] = h[:magic]
           formatted["tar_version"] = h[:version]
-          Tb::Cmd.opt_tar_tvf_hash.each {|alg| formatted[alg] = h[alg] }
+          Tb::Cmd.opt_tar_hash.each {|alg| formatted[alg] = h[alg] }
           y.yield Hash[header.map {|f2| [f2, formatted[f2]] }]
         }
       }

data/lib/tb/cmdtop.rb

@@ -61,9 +61,9 @@ require 'tb/cmd_shape'
 require 'tb/cmd_mheader'
 require 'tb/cmd_crop'
 require 'tb/cmd_ls'
-require 'tb/cmd_tar_tvf'
-require 'tb/cmd_svn_log'
-require 'tb/cmd_git_log'
+require 'tb/cmd_tar'
+require 'tb/cmd_svn'
+require 'tb/cmd_git'
 require 'tb/cmdmain'
 
 Tb::Cmd.init_option

data/test/test_cmd_git_log.rb

@@ -30,7 +30,7 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     File.open("foo", "w") {|f| f.puts "bar" }
     system("git add foo")
     system("git commit -q -m msg foo")
-    Tb::Cmd.main_git_log(['-o', o="o.csv"])
+    Tb::Cmd.main_git(['-o', o="o.csv"])
     result = File.read(o)
     tb = Tb.parse_csv(result)
     assert_equal(1, tb.size)
@@ -43,7 +43,7 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     File.open(filename, "w") {|f| f.puts "bar" }
     system("git", "add", filename)
     system("git", "commit", "-q", "-m", "msg", filename)
-    Tb::Cmd.main_git_log(['-o', o="o.csv"])
+    Tb::Cmd.main_git(['-o', o="o.csv"])
     result = File.read(o)
     tb = Tb.parse_csv(result)
     assert_equal(1, tb.size)
@@ -53,12 +53,12 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     assert_equal(filename, ftb.get_record(0)["filename"])
   end
 
-  def test_debug_git_log_output_input
+  def test_debug_git_output_input
     system("git init -q")
     File.open("foo", "w") {|f| f.puts "bar" }
     system("git add foo")
     system("git commit -q -m msg foo")
-    Tb::Cmd.main_git_log(['-o', o="o.csv", '--debug-git-log-output', g='gitlog'])
+    Tb::Cmd.main_git(['-o', o="o.csv", '--debug-git-output', g='gitlog'])
     result = File.read(o)
     tb = Tb.parse_csv(result)
     assert_equal(1, tb.size)
@@ -66,7 +66,7 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     gresult = File.read(g)
     assert(!gresult.empty?)
     FileUtils.rmtree('.git')
-    Tb::Cmd.main_git_log(['-o', o="o.csv", '--debug-git-log-input', g])
+    Tb::Cmd.main_git(['-o', o="o.csv", '--debug-git-input', g])
     result = File.read(o)
     tb = Tb.parse_csv(result)
     assert_equal(1, tb.size)
@@ -78,7 +78,7 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     File.open("foo", "w") {|f| f.puts "bar" }
     system("git add foo")
     system("git commit -q -m msg foo")
-    Tb::Cmd.main_git_log(['-o', o="o.csv", '--debug-git-log-output', g='gitlog'])
+    Tb::Cmd.main_git(['-o', o="o.csv", '--debug-git-output', g='gitlog'])
     result = File.read(o)
     tb = Tb.parse_csv(result)
     assert_equal(1, tb.size)
@@ -91,7 +91,7 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     o2 = 'o2.csv'
     File.open('log', 'w') {|log|
       with_stderr(log) {
-        Tb::Cmd.main_git_log(['-o', o2, '--debug-git-log-input', g])
+        Tb::Cmd.main_git(['-o', o2, '--debug-git-input', g])
       }
     }
     result = File.read(o2)
@@ -107,7 +107,7 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     File.open("foo", "w") {|f| f.puts "bar" }
     system("git add foo")
     system("git commit -q -m msg foo")
-    Tb::Cmd.main_git_log(['-o', o="o.csv", '--debug-git-log-output', g='gitlog'])
+    Tb::Cmd.main_git(['-o', o="o.csv", '--debug-git-output', g='gitlog'])
     result = File.read(o)
     tb = Tb.parse_csv(result)
     assert_equal(1, tb.size)
@@ -120,7 +120,7 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     o2 = 'o2.csv'
     File.open('log', 'w') {|log|
       with_stderr(log) {
-        Tb::Cmd.main_git_log(['-o', o2, '--debug-git-log-input', g])
+        Tb::Cmd.main_git(['-o', o2, '--debug-git-input', g])
       }
     }
     result = File.read(o2)
@@ -136,7 +136,7 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     File.open("foo", "w") {|f| f.puts "bar" }
     system("git add foo")
     system("git commit -q -m msg foo")
-    Tb::Cmd.main_git_log(['-o', o="o.csv", '--debug-git-log-output', g='gitlog'])
+    Tb::Cmd.main_git(['-o', o="o.csv", '--debug-git-output', g='gitlog'])
     result = File.read(o)
     tb = Tb.parse_csv(result)
     assert_equal(1, tb.size)
@@ -149,7 +149,7 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     o2 = 'o2.csv'
     File.open('log', 'w') {|log|
       with_stderr(log) {
-        Tb::Cmd.main_git_log(['-o', o2, '--debug-git-log-input', g])
+        Tb::Cmd.main_git(['-o', o2, '--debug-git-input', g])
       }
     }
     result = File.read(o2)
@@ -164,7 +164,7 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     File.open("foo", "w") {|f| f.print "\0\xff" }
     system("git add foo")
     system("git commit -q -m msg foo")
-    Tb::Cmd.main_git_log(['-o', o="o.csv"])
+    Tb::Cmd.main_git(['-o', o="o.csv"])
     result = File.read(o)
     tb = Tb.parse_csv(result)
     assert_equal(1, tb.size)
@@ -180,7 +180,7 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     File.open("bar/baz", "w") {|f| f.print "baz" }
     system("git add bar")
     system("git commit -q -m msg bar")
-    Tb::Cmd.main_git_log(['-o', o="o.csv", "bar"])
+    Tb::Cmd.main_git(['-o', o="o.csv", "bar"])
     result = File.read(o)
     tb = Tb.parse_csv(result)
     assert_equal(1, tb.size)

data/test/test_cmd_svn_log.rb

@@ -33,7 +33,7 @@ class TestTbCmdSvnLog < Test::Unit::TestCase
     system("svn add -q foo hoge")
     system("svn commit -q -m baz foo hoge")
     system("svn update -q") # update the revision of the directory.
-    Tb::Cmd.main_svn_log(['-o', o="o.csv"])
+    Tb::Cmd.main_svn(['-o', o="o.csv"])
     result = File.read(o)
     tb = Tb.parse_csv(result)
     assert_equal(1, tb.size)
@@ -48,7 +48,7 @@ class TestTbCmdSvnLog < Test::Unit::TestCase
     system("svn add -q foo hoge")
     system("svn commit -q -m baz foo hoge")
     system("svn update -q") # update the revision of the directory.
-    Tb::Cmd.main_svn_log(['-o', o="o.csv", '--', '-v'])
+    Tb::Cmd.main_svn(['-o', o="o.csv", '--', '-v'])
     result = File.read(o)
     tb = Tb.parse_csv(result)
     assert_equal(2, tb.size)
@@ -70,7 +70,7 @@ class TestTbCmdSvnLog < Test::Unit::TestCase
     system("svn commit -q -m baz foo hoge")
     system("svn update -q") # update the revision of the directory.
     ###
-    Tb::Cmd.main_svn_log(['-o', o="o.csv"])
+    Tb::Cmd.main_svn(['-o', o="o.csv"])
     result = File.read(o)
     tb = Tb.parse_csv(result)
     assert_equal(1, tb.size)
@@ -78,7 +78,7 @@ class TestTbCmdSvnLog < Test::Unit::TestCase
     ###
     system("svn log --xml > log.xml")
     FileUtils.rmtree('.svn')
-    Tb::Cmd.main_svn_log(['-o', o="o.csv", '--svn-log-xml=log.xml'])
+    Tb::Cmd.main_svn(['-o', o="o.csv", '--svn-log-xml=log.xml'])
     result = File.read(o)
     tb = Tb.parse_csv(result)
     assert_equal(1, tb.size)
@@ -97,7 +97,7 @@ class TestTbCmdSvnLog < Test::Unit::TestCase
     system("svn propdel -q svn:date --revprop -r 1 .")
     system("svn propdel -q svn:log --revprop -r 1 .")
     ###
-    Tb::Cmd.main_svn_log(['-o', o="o.csv"])
+    Tb::Cmd.main_svn(['-o', o="o.csv"])
     result = File.read(o)
     tb = Tb.parse_csv(result)
     assert_equal(1, tb.size)

data/test/test_cmd_tar_tvf.rb

@@ -54,7 +54,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
   def test_basic
     open('foo', 'w') {|f| }
     assert(system('tar cf bar.tar foo'))
-    Tb::Cmd.main_tar_tvf(['-o', o='o.csv', 'bar.tar'])
+    Tb::Cmd.main_tar(['-o', o='o.csv', 'bar.tar'])
     assert_match(/,foo,/, File.read(o))
   end
 
@@ -64,7 +64,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
     o = nil
     open('bar.tar') {|f|
       with_stdin(f) {
-        Tb::Cmd.main_tar_tvf(['-o', o='o.csv'])
+        Tb::Cmd.main_tar(['-o', o='o.csv'])
       }
     }
     assert_match(/,foo,/, File.read(o))
@@ -77,7 +77,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
     o = nil
     IO.popen('cat bar.tar') {|f|
       with_stdin(f) {
-        Tb::Cmd.main_tar_tvf(['-o', o='o.csv'])
+        Tb::Cmd.main_tar(['-o', o='o.csv'])
       }
     }
     assert_match(/,foo,/, File.read(o))
@@ -88,7 +88,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
     open('foo', 'w') {|f| }
     assert(system('tar cf bar.tar foo'))
     assert(system('gzip bar.tar'))
-    Tb::Cmd.main_tar_tvf(['-o', o='o.csv', 'bar.tar.gz'])
+    Tb::Cmd.main_tar(['-o', o='o.csv', 'bar.tar.gz'])
     assert_match(/,foo,/, File.read(o))
   end
 
@@ -100,7 +100,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
     o = nil
     open('bar.tar.gz') {|f|
       with_stdin(f) {
-        Tb::Cmd.main_tar_tvf(['-o', o='o.csv'])
+        Tb::Cmd.main_tar(['-o', o='o.csv'])
       }
     }
     assert_match(/,foo,/, File.read(o))
@@ -114,7 +114,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
     o = nil
     IO.popen('cat bar.tar.gz') {|f|
       with_stdin(f) {
-        Tb::Cmd.main_tar_tvf(['-o', o='o.csv'])
+        Tb::Cmd.main_tar(['-o', o='o.csv'])
       }
     }
     assert_match(/,foo,/, File.read(o))
@@ -124,7 +124,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
     Dir.mkdir("d")
     open('d/foo', 'w') {|f| f << "hahaha" }
     assert(system('tar cf bar.tar d'))
-    Tb::Cmd.main_tar_tvf(['-o', o='o.csv', '-l', 'bar.tar'])
+    Tb::Cmd.main_tar(['-o', o='o.csv', '-l', 'bar.tar'])
     result = File.read(o)
     assert_match(%r{,d/,}, result)
     assert_match(%r{,d/foo,}, result)
@@ -134,7 +134,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
     open('foo', 'w') {|f| f << "hahaha" }
     File.link('foo', 'baz')
     assert(system('tar cf bar.tar foo baz'))
-    Tb::Cmd.main_tar_tvf(['-o', o='o.csv', '-l', 'bar.tar'])
+    Tb::Cmd.main_tar(['-o', o='o.csv', '-l', 'bar.tar'])
     result = File.read(o)
     assert_match(/,foo,/, result)
     assert_match(/,h/, result)
@@ -150,7 +150,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
       next unless tar_and_formats.last.include? format
       tar = tar_and_formats.first
       assert(system("#{tar} cf bar.tar --format=#{format} #{name}"))
-      Tb::Cmd.main_tar_tvf(['-o', o='o.csv', '-l', 'bar.tar'])
+      Tb::Cmd.main_tar(['-o', o='o.csv', '-l', 'bar.tar'])
       result = File.read(o)
       assert_equal(2, result.count("\n"), "tar format: #{format}")
       assert_match(/,#{name},/, result)
@@ -165,7 +165,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
       next unless tar_and_formats.last.include? format
       tar = tar_and_formats.first
       assert(system("#{tar} cf bar.tar --format=#{format} #{name}"))
-      Tb::Cmd.main_tar_tvf(['-o', o='o.csv', '-l', 'bar.tar'])
+      Tb::Cmd.main_tar(['-o', o='o.csv', '-l', 'bar.tar'])
       result = File.read(o)
       assert_equal(2, result.count("\n"), "tar format: #{format}")
       assert_match(/,#{name},/, result)
@@ -180,7 +180,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
       next unless tar_and_formats.last.include? format
       tar = tar_and_formats.first
       assert(system("#{tar} cf bar.tar --format=#{format} foo"))
-      Tb::Cmd.main_tar_tvf(['-o', o='o.csv', '-l', 'bar.tar'])
+      Tb::Cmd.main_tar(['-o', o='o.csv', '-l', 'bar.tar'])
       result = File.read(o)
       assert_equal(2, result.count("\n"), "tar format: #{format}")
       assert_match(/,#{link},/, result)
@@ -196,7 +196,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
       next unless tar_and_formats.last.include? format
       tar = tar_and_formats.first
       assert(system("#{tar} cf bar.tar --format=#{format} #{name}"))
-      Tb::Cmd.main_tar_tvf(['-o', o='o.csv', '-l', 'bar.tar'])
+      Tb::Cmd.main_tar(['-o', o='o.csv', '-l', 'bar.tar'])
       result = File.read(o)
       assert_equal(2, result.count("\n"))
       assert_match(/,#{name},/, result)
@@ -215,7 +215,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
       next unless tar_and_formats.last.include? format
       tar = tar_and_formats.first
       assert(system("#{tar} cf bar.tar --format=#{format} #{name}"))
-      Tb::Cmd.main_tar_tvf(['-o', o='o.csv', '-l', 'bar.tar'])
+      Tb::Cmd.main_tar(['-o', o='o.csv', '-l', 'bar.tar'])
       result = File.read(o)
       assert_equal(2, result.count("\n"), "tar format: #{format}")
       assert_match(/,#{Regexp.escape mtime.iso8601(9)},/, result, "tar format: #{format}")
@@ -233,7 +233,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
       next unless tar_and_formats.last.include? format
       tar = tar_and_formats.first
       assert(system("#{tar} cf bar.tar --format=#{format} #{name}"))
-      Tb::Cmd.main_tar_tvf(['-o', o='o.csv', '-l', 'bar.tar'])
+      Tb::Cmd.main_tar(['-o', o='o.csv', '-l', 'bar.tar'])
       result = File.read(o)
       assert_equal(2, result.count("\n"), "tar format: #{format}")
       assert_match(/,#{Regexp.escape atime.iso8601(9)},/, result, "tar format: #{format}")
@@ -252,7 +252,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
       next unless tar_and_formats.last.include? format
       tar = tar_and_formats.first
       assert(system("#{tar} cf bar.tar --format=#{format} #{name}"))
-      Tb::Cmd.main_tar_tvf(['-o', o='o.csv', '-l', 'bar.tar'])
+      Tb::Cmd.main_tar(['-o', o='o.csv', '-l', 'bar.tar'])
       result = File.read(o)
       assert_equal(2, result.count("\n"), "tar format: #{format}")
       assert_match(/,#{Regexp.escape mtime.iso8601(9)},/, result, "tar format: #{format}")
@@ -271,7 +271,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
       next unless tar_and_formats.last.include? format
       tar = tar_and_formats.first
       assert(system("#{tar} cf bar.tar --format=#{format} #{name}"))
-      Tb::Cmd.main_tar_tvf(['-o', o='o.csv', '-l', 'bar.tar'])
+      Tb::Cmd.main_tar(['-o', o='o.csv', '-l', 'bar.tar'])
       result = File.read(o)
       assert_equal(2, result.count("\n"), "tar format: #{format}")
       assert_match(/,#{Regexp.escape atime.iso8601(9)},/, result, "tar format: #{format}")
@@ -284,7 +284,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
     assert(system('tar cf foo.tar foo'))
     %w[MD5 SHA1 SHA256 SHA384 SHA512].each {|cname|
       alg = cname.downcase
-      Tb::Cmd.main_tar_tvf(['-o', o='o.csv', "--hash=#{alg}", 'foo.tar'])
+      Tb::Cmd.main_tar(['-o', o='o.csv', "--hash=#{alg}", 'foo.tar'])
       result = File.read(o)
       assert_equal(2, result.count("\n"), "hash algorithm: #{alg}")
       assert_match(/,#{Regexp.escape Digest.const_get(cname).hexdigest(str)}$/, result, "hash algorithm: #{alg}")
@@ -297,7 +297,7 @@ class TestTbCmdTarTvf < Test::Unit::TestCase
     assert(system('tar cf foo.tar foo'))
     %w[MD5 SHA1 SHA256 SHA384 SHA512].each {|cname|
       alg = cname.downcase
-      Tb::Cmd.main_tar_tvf(['-o', o='o.csv', "--hash=#{alg}", 'foo.tar'])
+      Tb::Cmd.main_tar(['-o', o='o.csv', "--hash=#{alg}", 'foo.tar'])
       result = File.read(o)
       assert_equal(2, result.count("\n"), "hash algorithm: #{alg}")
       assert_match(/,#{Regexp.escape Digest.const_get(cname).hexdigest(str)}$/, result, "hash algorithm: #{alg}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tb
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies: []
 description: ! 'tb is a manipulation tool for table: CSV, TSV, JSON, etc.
 
@@ -22,7 +22,7 @@ description: ! 'tb is a manipulation tool for table: CSV, TSV, JSON, etc.
 
   other table operations (gsub, rename, cross, melt, unmelt, etc.),
 
-  information extractions (git-log, svn-log, tar-tvf),
+  information extractions (git, svn, tar),
 
   and more.
 
@@ -43,7 +43,7 @@ files:
 - lib/tb/cmd_crop.rb
 - lib/tb/cmd_cross.rb
 - lib/tb/cmd_cut.rb
-- lib/tb/cmd_git_log.rb
+- lib/tb/cmd_git.rb
 - lib/tb/cmd_grep.rb
 - lib/tb/cmd_group.rb
 - lib/tb/cmd_gsub.rb
@@ -57,8 +57,8 @@ files:
 - lib/tb/cmd_rename.rb
 - lib/tb/cmd_shape.rb
 - lib/tb/cmd_sort.rb
-- lib/tb/cmd_svn_log.rb
-- lib/tb/cmd_tar_tvf.rb
+- lib/tb/cmd_svn.rb
+- lib/tb/cmd_tar.rb
 - lib/tb/cmd_to_csv.rb
 - lib/tb/cmd_to_json.rb
 - lib/tb/cmd_to_pnm.rb