tb 0.2 → 0.3

data/lib/tb/cmd_join.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 << 'join'
 
@@ -30,7 +34,8 @@ Tb::Cmd.default_option[:opt_join_retain_right] = nil
 
 def (Tb::Cmd).op_join
   op = OptionParser.new
-  op.banner = 'Usage: tb join [OPTS] [TABLE1 TABLE2 ...]'
+  op.banner = "Usage: tb join [OPTS] [TABLE1 TABLE2 ...]\n" +
+    "Concatenate tables horizontally as left/right/full natural join."
   define_common_option(op, 'hNod', '--no-pager', '--debug')
   op.def_option('--outer', 'outer join') {
     Tb::Cmd.opt_join_retain_left = true
@@ -60,22 +65,14 @@ def (Tb::Cmd).main_join(argv)
   retain_left = Tb::Cmd.opt_join_retain_left
   retain_right = Tb::Cmd.opt_join_retain_right
   err('two tables required at least.') if argv.length < 2
-  result = load_table(argv.shift)
-  if retain_left || retain_right
-    argv.each {|filename|
-      tbl = load_table(filename)
-      STDERR.puts "shared keys: #{(result.list_fields & tbl.list_fields).inspect}" if 1 <= Tb::Cmd.opt_debug
-      result = result.natjoin2_outer(tbl, Tb::Cmd.opt_join_outer_missing, retain_left, retain_right)
-    }
-  else
-    argv.each {|filename|
-      tbl = load_table(filename)
-      STDERR.puts "shared keys: #{(result.list_fields & tbl.list_fields).inspect}" if 1 <= Tb::Cmd.opt_debug
-      result = result.natjoin2(tbl)
-    }
-  end
+  result = tablereader_open(argv.shift)
+  argv.each {|filename|
+    tbl = tablereader_open(filename)
+    $stderr.puts "shared keys: #{(result.list_fields & tbl.list_fields).inspect}" if 1 <= Tb::Cmd.opt_debug
+    result = result.natjoin2_outer(tbl, Tb::Cmd.opt_join_outer_missing, retain_left, retain_right)
+  }
   with_output {|out|
-    tbl_generate_csv(result, out)
+    result.write_to_csv(out, !Tb::Cmd.opt_N)
   }
 end
 

data/lib/tb/cmd_ls.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 << 'ls'
 
@@ -31,7 +35,8 @@ Tb::Cmd.default_option[:opt_ls_R] = nil
 
 def (Tb::Cmd).op_ls
   op = OptionParser.new
-  op.banner = 'Usage: tb ls [OPTS] [FILE ...]'
+  op.banner = "Usage: tb ls [OPTS] [FILE ...]\n" +
+    "List directory entries as a table."
   define_common_option(op, "hNo", "--no-pager")
   op.def_option('-a', 'don\'t ignore filenames beginning with a period.') {|fs| Tb::Cmd.opt_ls_a = true }
   op.def_option('-A', 'don\'t ignore filenames beginning with a period, except "." and "..".') {|fs| Tb::Cmd.opt_ls_A = true }
@@ -44,230 +49,253 @@ def (Tb::Cmd).main_ls(argv)
   op_ls.parse!(argv)
   exit_if_help('ls')
   argv = ['.'] if argv.empty?
-  @fail = false
-  with_table_stream_output {|gen|
-    if Tb::Cmd.opt_ls_l == 0
-      gen.output_header ['filename'] # don't generate the header when -N.
-    else
-      gen.output_header(ls_long_header()) # don't generate the header when -N.
-    end
+  opts = {
+    :a => Tb::Cmd.opt_ls_a,
+    :A => Tb::Cmd.opt_ls_A,
+    :l => Tb::Cmd.opt_ls_l,
+    :R => Tb::Cmd.opt_ls_R,
+  }
+  ls = nil
+  er = Tb::Enumerator.new {|y|
+    ls = Tb::Cmd::Ls.new(y, opts)
+    ls.set_header
     argv.each {|arg|
-      ls_run(gen, Pathname(real_pathname_string(arg)))
+      ls.ls_run(Pathname(ls.real_pathname_string(arg)))
     }
   }
-  if @fail
+  with_output {|out|
+    er.write_to_csv(out, !Tb::Cmd.opt_N)
+  }
+  if ls.fail
     exit false
   end
 end
 
-def (Tb::Cmd).ls_run(gen, path)
-  st = ls_get_stat(path)
-  return if !st
-  if st.directory?
-    ls_dir(gen, path, st)
-  else
-    ls_file(gen, path, st)
+class Tb::Cmd::Ls
+  def initialize(y, opts)
+    @y = y
+    @opts = opts
+    @fail = false
   end
-end
+  attr_reader :fail
 
-def (Tb::Cmd).ls_dir(gen, dir, st)
-  begin
-    entries = Dir.entries(dir)
-  rescue SystemCallError
-    @fail = true
-    warn "tb: #{$!}: #{dir}"
-    return
+  def set_header
+    if @opts[:l] == 0
+      @y.set_header ['filename']
+    else
+      @y.set_header(ls_long_header())
+    end
   end
-  entries.map! {|filename| real_pathname_string(filename) }
-  entries = entries.sort_by {|filename| smart_cmp_value(filename) }
-  if Tb::Cmd.opt_ls_a || Tb::Cmd.opt_ls_A
-    entries1, entries2 = entries.partition {|filename| /\A\./ =~ filename }
-    entries0, entries1 = entries1.partition {|filename| filename == '.' || filename == '..' }
-    entries0.sort!
-    if Tb::Cmd.opt_ls_A
-      entries = entries1 + entries2
+
+  def ls_run(path)
+    st = ls_get_stat(path)
+    return if !st
+    if st.directory?
+      ls_dir(path, st)
     else
-      entries = entries0 + entries1 + entries2
+      ls_file(path, st)
     end
-  else
-    entries.reject! {|filename| /\A\./ =~ filename }
   end
-  if !Tb::Cmd.opt_ls_R
-    entries.each {|filename|
-      ls_file(gen, dir + filename, nil)
-    }
-  else
-    dirs = []
-    entries.each {|filename|
-      path = dir + filename
-      st2 = ls_get_stat(path)
-      next if !st2
-      if filename == '.' || filename == '..'
-        if dir.to_s != '.'
-          path = Pathname(dir.to_s + "/" + filename)
-        end
-        ls_file(gen, path, st2)
-      elsif st2.directory?
-        dirs << [path, st2]
+
+  def ls_dir(dir, st)
+    begin
+      entries = Dir.entries(dir)
+    rescue SystemCallError
+      @fail = true
+      warn "tb: #{$!}: #{dir}"
+      return
+    end
+    entries.map! {|filename| real_pathname_string(filename) }
+    entries = entries.sort_by {|filename| smart_cmp_value(filename) }
+    if @opts[:a] || @opts[:A]
+      entries1, entries2 = entries.partition {|filename| /\A\./ =~ filename }
+      entries0, entries1 = entries1.partition {|filename| filename == '.' || filename == '..' }
+      entries0.sort!
+      if @opts[:A]
+        entries = entries1 + entries2
       else
-        ls_file(gen, path, st2)
+        entries = entries0 + entries1 + entries2
       end
-    }
-    dirs.each {|path, st2|
-      ls_file(gen, path, st2)
-      ls_dir(gen, path, st2)
-    }
+    else
+      entries.reject! {|filename| /\A\./ =~ filename }
+    end
+    if !@opts[:R]
+      entries.each {|filename|
+        ls_file(dir + filename, nil)
+      }
+    else
+      dirs = []
+      entries.each {|filename|
+        path = dir + filename
+        st2 = ls_get_stat(path)
+        next if !st2
+        if filename == '.' || filename == '..'
+          if dir.to_s != '.'
+            path = Pathname(dir.to_s + "/" + filename)
+          end
+          ls_file(path, st2)
+        elsif st2.directory?
+          dirs << [path, st2]
+        else
+          ls_file(path, st2)
+        end
+      }
+      dirs.each {|path, st2|
+        ls_file(path, st2)
+        ls_dir(path, st2)
+      }
+    end
   end
-end
 
-def (Tb::Cmd).ls_file(gen, path, st)
-  if 0 < Tb::Cmd.opt_ls_l
-    if !st
-      st = ls_get_stat(path)
-      return if !st
+  def ls_file(path, st)
+    if 0 < @opts[:l]
+      if !st
+        st = ls_get_stat(path)
+        return if !st
+      end
+      @y.yield ls_long_info(path, st)
+    else
+      @y.yield Tb::Pairs.new([['filename', path.to_s]])
     end
-    gen << ls_long_info(path, st)
-  else
-    gen << [path.to_s]
   end
-end
 
-def (Tb::Cmd).ls_get_stat(path)
-  begin
-    st = path.lstat
-  rescue SystemCallError
-    @fail = true
-    warn "tb: #{$!}: #{path}"
-    return nil
+  def ls_get_stat(path)
+    begin
+      st = path.lstat
+    rescue SystemCallError
+      @fail = true
+      warn "tb: #{$!}: #{path}"
+      return nil
+    end
+    st
   end
-  st
-end
 
-def (Tb::Cmd).ls_long_header
-  if 1 < Tb::Cmd.opt_ls_l
-    %w[dev ino mode filemode nlink uid user gid group rdev size blksize blocks atime mtime ctime filename symlink]
-  else
-    %w[filemode nlink user group size mtime filename symlink]
+  def ls_long_header
+    if 1 < @opts[:l]
+      %w[dev ino mode filemode nlink uid user gid group rdev size blksize blocks atime mtime ctime filename symlink]
+    else
+      %w[filemode nlink user group size mtime filename symlink]
+    end
   end
-end
-
-def (Tb::Cmd).ls_long_info(path, st)
-  ls_long_header.map {|info_type|
-    self.send("ls_info_#{info_type}", path, st)
-  }
-end
 
-def (Tb::Cmd).ls_info_dev(path, st) sprintf("0x%x", st.dev) end
-def (Tb::Cmd).ls_info_ino(path, st) st.ino end
-def (Tb::Cmd).ls_info_mode(path, st) sprintf("0%o", st.mode) end
-def (Tb::Cmd).ls_info_nlink(path, st) st.nlink end
-def (Tb::Cmd).ls_info_uid(path, st) st.uid end
-def (Tb::Cmd).ls_info_gid(path, st) st.gid end
-def (Tb::Cmd).ls_info_rdev(path, st) sprintf("0x%x", st.rdev) end
-def (Tb::Cmd).ls_info_size(path, st) st.size end
-def (Tb::Cmd).ls_info_blksize(path, st) st.blksize end
-def (Tb::Cmd).ls_info_blocks(path, st) st.blocks end
+  def ls_long_info(path, st)
+    Tb::Pairs.new(ls_long_header.map {|info_type|
+      [info_type, self.send("ls_info_#{info_type}", path, st)]
+    })
+  end
 
-def (Tb::Cmd).ls_info_filemode(path, st)
-  entry_type =
-    case st.ftype
-    when "file" then '-'
-    when "directory" then 'd'
-    when "characterSpecial" then 'c'
-    when "blockSpecial" then 'b'
-    when "fifo" then 'p'
-    when "link" then 'l'
-    when "socket" then 's'
-    when "unknown" then '?'
-    else '?'
-    end
-  m = st.mode
-  sprintf("%s%c%c%c%c%c%c%c%c%c",
-    entry_type,
-    (m & 0400 == 0 ? ?- : ?r),
-    (m & 0200 == 0 ? ?- : ?w),
-    (m & 0100 == 0 ? (m & 04000 == 0 ? ?- : ?S) :
-                     (m & 04000 == 0 ? ?x : ?s)),
-    (m & 0040 == 0 ? ?- : ?r),
-    (m & 0020 == 0 ? ?- : ?w),
-    (m & 0010 == 0 ? (m & 02000 == 0 ? ?- : ?S) :
-                     (m & 02000 == 0 ? ?x : ?s)),
-    (m & 0004 == 0 ? ?- : ?r),
-    (m & 0002 == 0 ? ?- : ?w),
-    (m & 0001 == 0 ? (m & 01000 == 0 ? ?- : ?T) :
-                     (m & 01000 == 0 ? ?x : ?t)))
-end
+  def ls_info_dev(path, st) sprintf("0x%x", st.dev) end
+  def ls_info_ino(path, st) st.ino end
+  def ls_info_mode(path, st) sprintf("0%o", st.mode) end
+  def ls_info_nlink(path, st) st.nlink end
+  def ls_info_uid(path, st) st.uid end
+  def ls_info_gid(path, st) st.gid end
+  def ls_info_rdev(path, st) sprintf("0x%x", st.rdev) end
+  def ls_info_size(path, st) st.size end
+  def ls_info_blksize(path, st) st.blksize end
+  def ls_info_blocks(path, st) st.blocks end
 
-def (Tb::Cmd).ls_info_user(path, st)
-  uid = st.uid
-  begin
-    pw = Etc.getpwuid(uid)
-  rescue ArgumentError
-  end
-  if pw
-    pw.name
-  else
-    uid
+  def ls_info_filemode(path, st)
+    entry_type =
+      case st.ftype
+      when "file" then '-'
+      when "directory" then 'd'
+      when "characterSpecial" then 'c'
+      when "blockSpecial" then 'b'
+      when "fifo" then 'p'
+      when "link" then 'l'
+      when "socket" then 's'
+      when "unknown" then '?'
+      else '?'
+      end
+    m = st.mode
+    sprintf("%s%c%c%c%c%c%c%c%c%c",
+      entry_type,
+      (m & 0400 == 0 ? ?- : ?r),
+      (m & 0200 == 0 ? ?- : ?w),
+      (m & 0100 == 0 ? (m & 04000 == 0 ? ?- : ?S) :
+                       (m & 04000 == 0 ? ?x : ?s)),
+      (m & 0040 == 0 ? ?- : ?r),
+      (m & 0020 == 0 ? ?- : ?w),
+      (m & 0010 == 0 ? (m & 02000 == 0 ? ?- : ?S) :
+                       (m & 02000 == 0 ? ?x : ?s)),
+      (m & 0004 == 0 ? ?- : ?r),
+      (m & 0002 == 0 ? ?- : ?w),
+      (m & 0001 == 0 ? (m & 01000 == 0 ? ?- : ?T) :
+                       (m & 01000 == 0 ? ?x : ?t)))
   end
-end
 
-def (Tb::Cmd).ls_info_group(path, st)
-  gid = st.gid
-  begin
-    gr = Etc.getgrgid(gid)
-  rescue ArgumentError
+  def ls_info_user(path, st)
+    uid = st.uid
+    begin
+      pw = Etc.getpwuid(uid)
+    rescue ArgumentError
+    end
+    if pw
+      pw.name
+    else
+      uid
+    end
   end
-  if gr
-    gr.name
-  else
-    gid
+
+  def ls_info_group(path, st)
+    gid = st.gid
+    begin
+      gr = Etc.getgrgid(gid)
+    rescue ArgumentError
+    end
+    if gr
+      gr.name
+    else
+      gid
+    end
   end
-end
 
-def (Tb::Cmd).ls_info_atime(path, st)
-  if 1 < Tb::Cmd.opt_ls_l
-    st.atime.iso8601(9)
-  else
-    st.atime.iso8601
+  def ls_info_atime(path, st)
+    if 1 < @opts[:l]
+      st.atime.iso8601(9)
+    else
+      st.atime.iso8601
+    end
   end
-end
 
-def (Tb::Cmd).ls_info_mtime(path, st)
-  if 1 < Tb::Cmd.opt_ls_l
-    st.mtime.iso8601(9)
-  else
-    st.mtime.iso8601
+  def ls_info_mtime(path, st)
+    if 1 < @opts[:l]
+      st.mtime.iso8601(9)
+    else
+      st.mtime.iso8601
+    end
   end
-end
 
-def (Tb::Cmd).ls_info_ctime(path, st)
-  if 1 < Tb::Cmd.opt_ls_l
-    st.ctime.iso8601(9)
-  else
-    st.ctime.iso8601
+  def ls_info_ctime(path, st)
+    if 1 < @opts[:l]
+      st.ctime.iso8601(9)
+    else
+      st.ctime.iso8601
+    end
   end
-end
 
-def (Tb::Cmd).ls_info_filename(path, st)
-  path
-end
+  def ls_info_filename(path, st)
+    path
+  end
 
-def (Tb::Cmd).ls_info_symlink(path, st)
-  return nil if !st.symlink?
-  begin
-    File.readlink(path)
-  rescue SystemCallError
-    @fail = true
-    warn "tb: #{$!}: #{path}"
-    return nil
+  def ls_info_symlink(path, st)
+    return nil if !st.symlink?
+    begin
+      File.readlink(path)
+    rescue SystemCallError
+      @fail = true
+      warn "tb: #{$!}: #{path}"
+      return nil
+    end
   end
-end
 
-def (Tb::Cmd).real_pathname_string(str)
-  if str.respond_to? :force_encoding
-    # pathname is a sequence of bytes on Unix.
-    str.dup.force_encoding("ASCII-8BIT")
-  else
-    str
+  def real_pathname_string(str)
+    if str.respond_to? :force_encoding
+      # pathname is a sequence of bytes on Unix.
+      str.dup.force_encoding("ASCII-8BIT")
+    else
+      str
+    end
   end
 end