tb 0.2 → 0.3

data/test-all-cov.rb

@@ -17,10 +17,10 @@ at_exit {
     %r{lib/tb[/.]} !~ f
   }
   if !fs.empty?
-    if STDOUT.tty?
+    if $stdout.tty?
       out = IO.popen(['less', '-S', '-j20', '+/ 0:'], 'w')
     else
-      out = STDOUT
+      out = $stdout
     end
     pat = nil
     fs[0].chars.to_a.reverse_each {|ch|
@@ -55,7 +55,7 @@ at_exit {
         end
       }
     }
-    if out != STDOUT
+    if out != $stdout
       out.close
     end
   end

data/test-all.rb

@@ -4,7 +4,7 @@ $:.unshift "lib"
 
 r, w = IO.pipe
 w.close
-STDIN.reopen(r)
+$stdin.reopen(r)
 r.close
 
 Dir.glob('test/test_*.rb') {|filename|

data/test/test_basic.rb

@@ -208,10 +208,10 @@ class TestTbBasic < Test::Unit::TestCase
     t1 = Tb.new %w[a b], %w[1 2], %w[3 4], %w[0 4]
     t2 = Tb.new %w[b c], %w[2 3], %w[4 5], %w[5 8]
     t3 = t1.natjoin2(t2)
-    assert_equal([{"_recordid"=>0, "a"=>"1", "b"=>"2", "c"=>"3"},
-                  {"_recordid"=>1, "a"=>"3", "b"=>"4", "c"=>"5"},
-                  {"_recordid"=>2, "a"=>"0", "b"=>"4", "c"=>"5"}],
-                 t3.to_a.map {|r| r.to_h_with_reserved })
+    assert_equal([{"a"=>"1", "b"=>"2", "c"=>"3"},
+                  {"a"=>"3", "b"=>"4", "c"=>"5"},
+                  {"a"=>"0", "b"=>"4", "c"=>"5"}],
+                 t3.to_a.map {|r| r.to_h })
   end
 
   def test_natjoin2_nocommon
@@ -229,12 +229,12 @@ class TestTbBasic < Test::Unit::TestCase
     t1 = Tb.new %w[a b], %w[1 2], %w[3 4], %w[0 4], %w[0 1]
     t2 = Tb.new %w[b c], %w[2 3], %w[4 5], %w[5 8]
     t3 = t1.natjoin2_outer(t2)
-    assert_equal([{"_recordid"=>0, "a"=>"1", "b"=>"2", "c"=>"3"},
-                  {"_recordid"=>1, "a"=>"3", "b"=>"4", "c"=>"5"},
-                  {"_recordid"=>2, "a"=>"0", "b"=>"4", "c"=>"5"},
-                  {"_recordid"=>3, "a"=>"0", "b"=>"1"},
-                  {"_recordid"=>4, "b"=>"5", "c"=>"8"}],
-                 t3.to_a.map {|r| r.to_h_with_reserved })
+    assert_equal([{"a"=>"0", "b"=>"1"},
+                  {"a"=>"1", "b"=>"2", "c"=>"3"},
+                  {"a"=>"3", "b"=>"4", "c"=>"5"},
+                  {"a"=>"0", "b"=>"4", "c"=>"5"},
+                  {"b"=>"5", "c"=>"8"}],
+                 t3.to_a.map {|r| r.to_h })
   end
 
   def test_fmap!
@@ -384,4 +384,20 @@ class TestTbBasic < Test::Unit::TestCase
     assert_equal([['banana', 'yellow'], ['orange', 'orange']], rs)
   end
 
+  def test_with_header
+    t = Tb.new %w[a b], [1, 2], [3, 4]
+    result = []
+    t.with_header {|x|
+      result << x
+    }.each {|x|
+      result << x
+    }
+    assert_equal(3, result.length)
+    assert_equal(%w[a b], result[0])
+    assert_kind_of(Tb::Record, result[1])
+    assert_kind_of(Tb::Record, result[2])
+    assert_equal([["a", 1], ["b", 2]], result[1].to_a)
+    assert_equal([["a", 3], ["b", 4]], result[2].to_a)
+  end
+
 end

data/test/test_catreader.rb

@@ -14,12 +14,13 @@ class TestTbCatReader < Test::Unit::TestCase
         3,4
       End
       Tb::CatReader.open([i1, i2]) {|r|
-        assert_equal(%w[a b], r.header)
-        assert_equal([%w[1 2], %w[4 3]], r.read_all)
-        assert_equal(0, r.index_from_field("a"))
-        assert_equal("b", r.field_from_index(1))
-        assert_equal(2, r.index_from_field_ex("1"))
-        assert_equal("2", r.field_from_index_ex(3))
+        result = []
+        r.with_header {|header|
+          result << header
+        }.each {|pairs|
+          result << pairs.to_a
+        }
+        assert_equal([%w[a b], [['a','1'], ['b','2']], [['b','3'],['a','4']]], result)
       }
     }
   end

data/test/test_cmd_cat.rb

@@ -115,4 +115,36 @@ class TestTbCmdCat < Test::Unit::TestCase
     End
   end
 
+  def test_with_filename
+    File.open(i1="i1.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
+      a,b,c
+      1,2,3
+    End
+    File.open(i2="i2.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
+      a,b,c
+      4,5,6
+    End
+    Tb::Cmd.main_cat(['-o', o="o.csv", '--with-filename', i1, i2])
+    assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
+      filename,a,b,c
+      i1.csv,1,2,3
+      i2.csv,4,5,6
+    End
+  end
+
+  def test_empty
+    File.open(i1="i1.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
+      a,b,c
+      1,2,3
+    End
+    File.open(i2="i2.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
+      a,b,c
+    End
+    Tb::Cmd.main_cat(['-o', o="o.csv", '--with-filename', i1, i2])
+    assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
+      filename,a,b,c
+      i1.csv,1,2,3
+    End
+  end
+
 end

data/test/test_cmd_consecutive.rb

@@ -87,4 +87,14 @@ class TestTbCmdConsecutive < Test::Unit::TestCase
     End
   end
 
+  def test_header_only
+    File.open(i="i.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
+      a,b,c
+    End
+    Tb::Cmd.main_consecutive(['-o', o="o.csv", i])
+    assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
+      a_1,a_2,b_1,b_2,c_1,c_2
+    End
+  end
+
 end

data/test/test_cmd_crop.rb

@@ -19,16 +19,16 @@ class TestTbCmdCrop < Test::Unit::TestCase
     File.open(i="i.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
       ,,
       ,a,b,,
-      ,0,1,,,
-      ,4,,,
+      ,0,1,,2,
+      ,,4,,,
       ,,,
 
     End
     Tb::Cmd.main_crop(['-o', o="o.csv", i])
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       a,b
-      0,1
-      4
+      0,1,,2
+      ,4
     End
   end
 

data/test/test_cmd_cross.rb

@@ -23,7 +23,7 @@ class TestTbCmdCross < Test::Unit::TestCase
       bbbb,2000,4
       cccc,2002,5
     End
-    Tb::Cmd.main_cross(['-o', o="o.csv", 'name', 'year', i])
+    Tb::Cmd.main_cross(['-o', o="o.csv", 'year', 'name', i])
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       name,aaaa,bbbb,cccc
       year,count,count,count
@@ -43,6 +43,18 @@ class TestTbCmdCross < Test::Unit::TestCase
     assert(!exc.success?)
   end
 
+  def test_field_not_found
+    File.open(i="i.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
+      name,year,observ
+      aaaa,2000,1
+      bbbb,2001,3
+    End
+    exc = assert_raise(SystemExit) { Tb::Cmd.main_cross(['-o', "o.csv", 'foo', 'year', i]) }
+    assert(!exc.success?)
+    exc = assert_raise(SystemExit) { Tb::Cmd.main_cross(['-o', "o.csv", 'name', 'bar', i]) }
+    assert(!exc.success?)
+  end
+
   def test_compact
     File.open(i="i.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
       name,year,observ
@@ -51,7 +63,7 @@ class TestTbCmdCross < Test::Unit::TestCase
       bbbb,2000,4
       cccc,2002,5
     End
-    Tb::Cmd.main_cross(['-o', o="o.csv", 'name', 'year', '-c', i])
+    Tb::Cmd.main_cross(['-o', o="o.csv", 'year', 'name', '-c', i])
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       year,aaaa,bbbb,cccc
       2000,1,1,
@@ -69,7 +81,7 @@ class TestTbCmdCross < Test::Unit::TestCase
       cccc,2002,5
       aaaa,2000,2
     End
-    Tb::Cmd.main_cross(['-o', o="o.csv", 'name', 'year', '-a', 'sum(observ)', i])
+    Tb::Cmd.main_cross(['-o', o="o.csv", 'year', 'name', '-a', 'sum(observ)', i])
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       name,aaaa,bbbb,cccc
       year,sum(observ),sum(observ),sum(observ)
@@ -90,7 +102,7 @@ class TestTbCmdCross < Test::Unit::TestCase
       5,6
       7,8
     End
-    Tb::Cmd.main_cross(['-o', o="o.csv", 'a', 'b', i1, i2])
+    Tb::Cmd.main_cross(['-o', o="o.csv", 'b', 'a', i1, i2])
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       a,1,3,6,8
       b,count,count,count,count

data/test/test_cmd_git_log.rb

@@ -0,0 +1,46 @@
+require 'test/unit'
+require 'tb/cmdtop'
+require 'tmpdir'
+
+class TestTbCmdGitLog < Test::Unit::TestCase
+  def setup
+    Tb::Cmd.reset_option
+    @curdir = Dir.pwd
+    @tmpdir = Dir.mktmpdir
+    Dir.chdir @tmpdir
+  end
+  def teardown
+    Tb::Cmd.reset_option
+    Dir.chdir @curdir
+    FileUtils.rmtree @tmpdir
+  end
+
+  def test_basic
+    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"])
+    result = File.read(o)
+    tb = Tb.parse_csv(result)
+    assert_equal(1, tb.size)
+    assert_match(/,A,foo\n/, tb.get_record(0)["files"])
+  end
+
+  def test_escaped_filename
+    filename = (1..32).to_a.pack("C*") + "\"\\"
+    system("git init -q")
+    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"])
+    result = File.read(o)
+    tb = Tb.parse_csv(result)
+    assert_equal(1, tb.size)
+    assert_match(/,A,/, tb.get_record(0)["files"])
+    ftb = Tb.parse_csv(tb.get_record(0)["files"])
+    assert_equal(1, ftb.size)
+    assert_equal(filename, ftb.get_record(0)["filename"])
+  end
+
+end

data/test/test_cmd_help.rb

@@ -16,24 +16,22 @@ class TestTbCmdHelp < Test::Unit::TestCase
   end
 
   def with_stdout(io)
-    save = STDOUT.dup
-    STDOUT.reopen(io)
+    save = $stdout
+    $stdout = io
     begin
       yield
     ensure
-      STDOUT.reopen(save)
-      save.close
+      $stdout = save
     end
   end
 
   def with_stderr(io)
-    save = STDERR.dup
-    STDERR.reopen(io)
+    save = $stderr
+    $stderr = io
     begin
       yield
     ensure
-      STDERR.reopen(save)
-      save.close
+      $stderr = save
     end
   end
 
@@ -81,7 +79,7 @@ class TestTbCmdHelp < Test::Unit::TestCase
       msg = th.value
       r.close
       assert_match(/Usage:/, msg)
-      assert_match(/ tb csv /, msg)
+      assert_match(/ tb to-csv /, msg)
       assert_match(/ tb cut /, msg)
     }
   end
@@ -90,7 +88,7 @@ class TestTbCmdHelp < Test::Unit::TestCase
     assert_equal(true, Tb::Cmd.main(['-h', '-o', o="msg"]))
     msg = File.read(o)
     assert_match(/Usage:/, msg)
-    assert_match(/ tb csv /, msg)
+    assert_match(/ tb to-csv /, msg)
     assert_match(/ tb cut /, msg)
   end
 
@@ -98,7 +96,7 @@ class TestTbCmdHelp < Test::Unit::TestCase
     assert_equal(true, Tb::Cmd.main(['--help', '-o', o="msg"]))
     msg = File.read(o)
     assert_match(/Usage:/, msg)
-    assert_match(/ tb csv /, msg)
+    assert_match(/ tb to-csv /, msg)
     assert_match(/ tb cut /, msg)
   end
 
@@ -106,7 +104,7 @@ class TestTbCmdHelp < Test::Unit::TestCase
     assert_equal(true, Tb::Cmd.main(['help', '-o', o="msg"]))
     msg = File.read(o)
     assert_match(/Usage:/, msg)
-    assert_match(/ tb csv /, msg)
+    assert_match(/ tb to-csv /, msg)
     assert_match(/ tb cut /, msg)
   end
 
@@ -187,4 +185,11 @@ class TestTbCmdHelp < Test::Unit::TestCase
     assert_match(/unexpected subcommand/, exc.message)
   end
 
+  def test_help_s
+    assert_exit_success(['help', '-o', o="msg", '-s'])
+    msg = File.read(o)
+    assert_match(/Show help message of tb command/, msg)
+    assert_no_match(/Usage:/, msg)
+  end
+
 end

data/test/test_cmd_join.rb

@@ -64,6 +64,26 @@ class TestTbCmdJoin < Test::Unit::TestCase
     End
   end
 
+  def test_outer2
+    File.open(i1="i1.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
+      b,c
+      4,5
+      6,7
+    End
+    File.open(i2="i2.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
+      a,b
+      1,2
+      3,4
+    End
+    Tb::Cmd.main_join(['-o', o="o.csv", '--outer', i1, i2])
+    assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
+      b,c,a
+      2,,1
+      4,5,3
+      6,7,
+    End
+  end
+
   def test_outer_missing
     File.open(i1="i1.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
       a,b
@@ -189,8 +209,8 @@ class TestTbCmdJoin < Test::Unit::TestCase
     Tb::Cmd.main_join(['-o', o="o.csv", '--right', i1, i2, i3])
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       a,b,c,d
-      3,,D,F
       2,,,E
+      3,,D,F
     End
   end
 

data/test/test_cmd_ls.rb

@@ -16,13 +16,12 @@ class TestTbCmdLs < Test::Unit::TestCase
   end
 
   def with_stderr(io)
-    save = STDERR.dup
-    STDERR.reopen(io)
+    save = $stderr
+    $stderr = io
     begin
       yield
     ensure
-      STDERR.reopen(save)
-      save.close
+      $stderr = save
     end
   end
 

data/test/test_cmd_mheader.rb

@@ -15,6 +15,16 @@ class TestTbCmdMheader < Test::Unit::TestCase
     FileUtils.rmtree @tmpdir
   end
 
+  def with_stderr(io)
+    save = $stderr
+    $stderr = io
+    begin
+      yield
+    ensure
+      $stderr = save
+    end
+  end
+
   def test_basic
     File.open(i="i.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
           ,2000,2000,2001,2001
@@ -48,18 +58,14 @@ class TestTbCmdMheader < Test::Unit::TestCase
       a,a
       1,1
     End
-    save = STDERR.dup
-    logf = File.open(log="log", "w")
-    STDERR.reopen(logf)
-    logf.close
-    Tb::Cmd.main_mheader(['-o', o="o.csv", i])
-    STDERR.reopen(save)
-    save.close
+    o = nil
+    File.open(log="log", "w") {|logf|
+      with_stderr(logf) {
+        Tb::Cmd.main_mheader(['-o', o="o.csv", i])
+      }
+    }
     assert_equal('', File.read(o))
-    assert_match(/no header found/, File.read(log))
-  ensure
-    save.close if save && !save.closed?
-    logf.close if logf && !logf.closed?
+    assert_match(/unique header fields not recognized/, File.read(log))
   end
 
   def test_twofile