tb 0.9 → 1.0

data/test/test_cmd_cat.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'tb/cmdtop'
 require 'tmpdir'
+require_relative 'util_tbtest'
 
 class TestTbCmdCat < Test::Unit::TestCase
   def setup
@@ -69,14 +70,18 @@ class TestTbCmdCat < Test::Unit::TestCase
       5,6
       7,8,y
     End
-    Tb::Cmd.main_cat(['-o', o="o.csv", i1, i2])
+    o = "o.csv"
+    stderr = capture_stderr {
+      Tb::Cmd.main_cat(['-o', o, i1, i2])
+    }
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       a,b,c
       1,2
-      3,4,,x
+      3,4
       ,5,6
-      ,7,8,y
+      ,7,8
     End
+    assert_match(/Header too short/, stderr)
   end
 
   def test_extend_both
@@ -88,12 +93,16 @@ class TestTbCmdCat < Test::Unit::TestCase
       b
       2,y
     End
-    Tb::Cmd.main_cat(['-o', o="o.csv", i1, i2])
+    o = "o.csv"
+    stderr = capture_stderr {
+      Tb::Cmd.main_cat(['-o', o, i1, i2])
+    }
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       a,b
-      1,,x
-      ,2,y
+      1
+      ,2
     End
+    assert_match(/Header too short/, stderr)
   end
 
   def test_field_order
@@ -177,6 +186,19 @@ class TestTbCmdCat < Test::Unit::TestCase
     End
   end
 
+  def test_ltsv_output
+    File.open(i1="i1.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
+      a,b,c
+      1,2,3
+      4,5,6
+    End
+    Tb::Cmd.main_cat(['-o', o="o.ltsv", i1])
+    assert_equal(<<-"End".gsub(/^ */, '').gsub(/ /, "\t"), File.read(o))
+       a:1 b:2 c:3
+       a:4 b:5 c:6
+    End
+  end
+
   def test_invalid_output_format
     File.open(i1="i1.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
       a,b,c

data/test/test_cmd_consecutive.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'tb/cmdtop'
 require 'tmpdir'
+require_relative 'util_tbtest'
 
 class TestTbCmdConsecutive < Test::Unit::TestCase
   def setup
@@ -52,12 +53,16 @@ class TestTbCmdConsecutive < Test::Unit::TestCase
       4,5,6
       7,8,9
     End
-    Tb::Cmd.main_consecutive(['-o', o="o.csv", i])
+    o = "o.csv"
+    stderr = capture_stderr {
+      Tb::Cmd.main_consecutive(['-o', o, i])
+    }
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       a_1,a_2,b_1,b_2
-      1,4,2,5,3,6
-      4,7,5,8,6,9
+      1,4,2,5
+      4,7,5,8
     End
+    assert_match(/Header too short/, stderr)
   end
 
   def test_n3

data/test/test_cmd_cut.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'tb/cmdtop'
 require 'tmpdir'
+require_relative 'util_tbtest'
 
 class TestTbCmdCut < Test::Unit::TestCase
   def setup
@@ -61,19 +62,28 @@ class TestTbCmdCut < Test::Unit::TestCase
       a,b
       0,1,2,3
     End
-    Tb::Cmd.main_cut(['-o', o="o.csv", 'a,2,1', i])
+    o = "o.csv"
+    stderr = capture_stderr {
+      Tb::Cmd.main_cut(['-o', o, 'a,2,1', i])
+    }
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       a,2,1
-      0,3,2
+      0
     End
+    assert_match(/Header too short/, stderr)
   end
 
-  def test_unextendable
+  def test_zero
     File.open(i="i.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
       a,b
       0,1,2,3
     End
-    assert_raise(ArgumentError) { Tb::Cmd.main_cut(['-o', "o.csv", '0', i]) }
+    o = "o.csv"
+    stderr = capture_stderr {
+      Tb::Cmd.main_cut(['-o', o, '0', i])
+    }
+    assert_equal("0\n\n", File.read(o))
+    assert_match(/Header too short/, stderr)
   end
 
   def test_twofile

data/test/test_cmd_git_log.rb

@@ -31,10 +31,10 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     system("git add foo")
     system("git commit -q -m msg foo")
     Tb::Cmd.main_git(['-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"])
+    aa = CSV.read(o)
+    assert_equal(2, aa.length)
+    header, row = aa
+    assert_match(/,A,foo\n/, row[header.index "files"])
   end
 
   def test_escaped_filename
@@ -44,13 +44,14 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     system("git", "add", filename)
     system("git", "commit", "-q", "-m", "msg", filename)
     Tb::Cmd.main_git(['-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"])
+    aa = CSV.read(o)
+    assert_equal(2, aa.length)
+    header, row = aa
+    assert_match(/,A,/, row[header.index "files"])
+    faa = CSV.parse(row[header.index "files"])
+    assert_equal(2, faa.length)
+    fheader, frow = faa
+    assert_equal(filename, frow[fheader.index "filename"])
   end
 
   def test_debug_git_output_input
@@ -59,18 +60,18 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     system("git add foo")
     system("git commit -q -m msg foo")
     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)
-    assert_match(/,A,foo\n/, tb.get_record(0)["files"])
+    aa = CSV.read(o)
+    assert_equal(2, aa.length)
+    header, row = aa
+    assert_match(/,A,foo\n/, row[header.index "files"])
     gresult = File.read(g)
     assert(!gresult.empty?)
     FileUtils.rmtree('.git')
     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)
-    assert_match(/,A,foo\n/, tb.get_record(0)["files"])
+    aa = CSV.read(o)
+    assert_equal(2, aa.length)
+    header, row = aa
+    assert_match(/,A,foo\n/, row[header.index "files"])
   end
 
   def test_warn1
@@ -79,10 +80,10 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     system("git add foo")
     system("git commit -q -m msg foo")
     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)
-    assert_match(/,A,foo\n/, tb.get_record(0)["files"])
+    aa = CSV.read(o)
+    assert_equal(2, aa.length)
+    header, row = aa
+    assert_match(/,A,foo\n/, row[header.index "files"])
     gresult = File.binread(g)
     FileUtils.rmtree('.git')
     ###
@@ -94,10 +95,10 @@ class TestTbCmdGitLog < Test::Unit::TestCase
         Tb::Cmd.main_git(['-o', o2, '--debug-git-input', g])
       }
     }
-    result = File.read(o2)
-    tb = Tb.parse_csv(result)
-    assert_equal(1, tb.size)
-    assert_not_match(/,A,foo\n/, tb.get_record(0)["files"])
+    aa = CSV.read(o2)
+    assert_equal(2, aa.length)
+    header, row = aa
+    assert_not_match(/,A,foo\n/, row[header.index "files"])
     log = File.read('log')
     assert(!log.empty?)
   end
@@ -108,10 +109,10 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     system("git add foo")
     system("git commit -q -m msg foo")
     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)
-    assert_match(/,A,foo\n/, tb.get_record(0)["files"])
+    aa = CSV.read(o)
+    assert_equal(2, aa.length)
+    header, row = aa
+    assert_match(/,A,foo\n/, row[header.index "files"])
     gresult = File.binread(g)
     FileUtils.rmtree('.git')
     ###
@@ -123,10 +124,10 @@ class TestTbCmdGitLog < Test::Unit::TestCase
         Tb::Cmd.main_git(['-o', o2, '--debug-git-input', g])
       }
     }
-    result = File.read(o2)
-    tb = Tb.parse_csv(result)
-    assert_equal(1, tb.size)
-    assert_match(/,A,foo\n/, tb.get_record(0)["files"])
+    aa = CSV.read(o2)
+    assert_equal(2, aa.length)
+    header, row = aa
+    assert_match(/,A,foo\n/, row[header.index "files"])
     log = File.read('log')
     assert(!log.empty?)
   end
@@ -137,10 +138,10 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     system("git add foo")
     system("git commit -q -m msg foo")
     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)
-    assert_match(/,A,foo\n/, tb.get_record(0)["files"])
+    aa = CSV.read(o)
+    assert_equal(2, aa.length)
+    header, row = aa
+    assert_match(/,A,foo\n/, row[header.index "files"])
     gresult = File.binread(g)
     FileUtils.rmtree('.git')
     ###
@@ -152,9 +153,8 @@ class TestTbCmdGitLog < Test::Unit::TestCase
         Tb::Cmd.main_git(['-o', o2, '--debug-git-input', g])
       }
     }
-    result = File.read(o2)
-    tb = Tb.parse_csv(result)
-    assert_equal(0, tb.size)
+    aa = CSV.read(o2)
+    assert_equal(1, aa.length)
     log = File.read('log')
     assert(!log.empty?)
   end
@@ -165,10 +165,10 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     system("git add foo")
     system("git commit -q -m msg foo")
     Tb::Cmd.main_git(['-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"])
+    aa = CSV.read(o)
+    assert_equal(2, aa.length)
+    header, row = aa
+    assert_match(/,,,A,foo\n/, row[header.index "files"])
   end
 
   def test_subdir
@@ -181,10 +181,10 @@ class TestTbCmdGitLog < Test::Unit::TestCase
     system("git add bar")
     system("git commit -q -m msg bar")
     Tb::Cmd.main_git(['-o', o="o.csv", "bar"])
-    result = File.read(o)
-    tb = Tb.parse_csv(result)
-    assert_equal(1, tb.size)
-    assert_not_match(/foo\n/, tb.get_record(0)["files"])
+    aa = CSV.read(o)
+    assert_equal(2, aa.length)
+    header, row = aa
+    assert_not_match(/foo\n/, row[header.index "files"])
   end
 
 end

data/test/test_cmd_grep.rb

@@ -2,7 +2,7 @@ require 'test/unit'
 require 'tb/cmdtop'
 require 'tmpdir'
 
-class TestTbCmdGrep < Test::Unit::TestCase
+class TestTbCmdSearch < Test::Unit::TestCase
   def setup
     Tb::Cmd.reset_option
     @curdir = Dir.pwd
@@ -23,7 +23,7 @@ class TestTbCmdGrep < Test::Unit::TestCase
       8,9,a,b
       c,d,e,f
     End
-    Tb::Cmd.main_grep(['-o', o="o.csv", '[6f]', i])
+    Tb::Cmd.main_search(['-o', o="o.csv", '[6f]', i])
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       a,b,c,d
       4,5,6,7
@@ -32,7 +32,7 @@ class TestTbCmdGrep < Test::Unit::TestCase
   end
 
   def test_no_regexp
-    exc = assert_raise(SystemExit) { Tb::Cmd.main_grep([]) }
+    exc = assert_raise(SystemExit) { Tb::Cmd.main_search([]) }
     assert(!exc.success?)
   end
 
@@ -44,7 +44,7 @@ class TestTbCmdGrep < Test::Unit::TestCase
       8,9,a,b
       c,d,e,f
     End
-    Tb::Cmd.main_grep(['-o', o="o.csv", '-e', '[6f]', i])
+    Tb::Cmd.main_search(['-o', o="o.csv", '-e', '[6f]', i])
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       a,b,c,d
       4,5,6,7
@@ -60,7 +60,7 @@ class TestTbCmdGrep < Test::Unit::TestCase
       8,9,a,b
       c,d,e,f
     End
-    Tb::Cmd.main_grep(['-o', o="o.csv", '--ruby', '_["b"] == "5"', i])
+    Tb::Cmd.main_search(['-o', o="o.csv", '--ruby', '_["b"] == "5"', i])
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       a,b,c,d
       4,5,6,7
@@ -78,7 +78,7 @@ class TestTbCmdGrep < Test::Unit::TestCase
       5,6
       7,8
     End
-    Tb::Cmd.main_grep(['-o', o="o.csv", '[46]', i1, i2])
+    Tb::Cmd.main_search(['-o', o="o.csv", '[46]', i1, i2])
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       a,b
       3,4

data/test/test_cmd_gsub.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'tb/cmdtop'
 require 'tmpdir'
+require_relative 'util_tbtest'
 
 class TestTbCmdGsub < Test::Unit::TestCase
   def setup
@@ -72,11 +73,15 @@ class TestTbCmdGsub < Test::Unit::TestCase
       a,b
       foo,bar,baz
     End
-    Tb::Cmd.main_gsub(['-o', o="o.csv", '-f', '1', 'baz', 'Y', i])
+    o = "o.csv"
+    stderr = capture_stderr {
+      Tb::Cmd.main_gsub(['-o', o, '-f', '1', 'baz', 'Y', i])
+    }
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       a,b
-      foo,bar,Y
+      foo,bar
     End
+    assert_match(/Header too short/, stderr)
   end
 
   def test_twofile

data/test/test_cmd_ls.rb

@@ -72,16 +72,17 @@ class TestTbCmdLs < Test::Unit::TestCase
     File.open("a", "w") {}
     File.chmod(0754, "a")
     Tb::Cmd.main_ls(['-o', o="o.csv", '-l', 'a'])
-    tb = Tb.load_csv(o)
-    assert_equal(1, tb.size)
-    assert_equal(%w[filemode nlink user group size mtime filename symlink], tb.list_fields)
-    rec = tb.get_record(0)
-    assert_equal("-rwxr-xr--", rec["filemode"])
-    assert_equal("1", rec["nlink"])
-    assert_match(/\A\d+\z/, rec["size"])
-    assert_match(/\A\d+-\d\d-\d\dT\d\d:\d\d:\d\d/, rec["mtime"])
-    assert_equal("a", rec["filename"])
-    assert_equal(nil, rec["symlink"])
+    aa = CSV.read(o)
+    assert_equal(2, aa.length)
+    header, row = aa
+    assert_equal(%w[filemode nlink user group size mtime filename symlink], header)
+    assert_equal(8, row.length)
+    assert_equal("-rwxr-xr--", row[header.index "filemode"])
+    assert_equal("1", row[header.index "nlink"])
+    assert_match(/\A\d+\z/, row[header.index "size"])
+    assert_match(/\A\d+-\d\d-\d\dT\d\d:\d\d:\d\d/, row[header.index "mtime"])
+    assert_equal("a", row[header.index "filename"])
+    assert_equal(nil, row[header.index "symlink"])
   end
 
   def test_opt_l
@@ -89,56 +90,60 @@ class TestTbCmdLs < Test::Unit::TestCase
     File.open("d/a", "w") {}
     Dir.mkdir("d/d2")
     Tb::Cmd.main_ls(['-o', o="o.csv", '-l', 'd'])
-    tb = Tb.load_csv(o)
-    assert_equal(2, tb.size)
-    assert_equal("d/a", tb.get_record(0)["filename"])
-    assert_equal("d/d2", tb.get_record(1)["filename"])
+    aa = CSV.read(o)
+    assert_equal(3, aa.length)
+    header, row1, row2 = aa
+    i = header.index("filename")
+    assert_equal("d/a", row1[i])
+    assert_equal("d/d2", row2[i])
   end
 
   def test_opt_ll_single
     File.open("a", "w") {}
     File.chmod(0754, "a")
     Tb::Cmd.main_ls(['-o', o="o.csv", '-ll', 'a'])
-    tb = Tb.load_csv(o)
-    assert_equal(1, tb.size)
-    assert_equal(%w[dev ino mode filemode nlink uid user gid group rdev size blksize blocks atime mtime ctime filename symlink], tb.list_fields)
-    rec = tb.get_record(0)
-    assert_match(/\A0x[0-9a-f]+\z/, rec["dev"])
-    assert_match(/\A\d+\z/, rec["ino"])
-    assert_match(/\A0[0-7]+\z/, rec["mode"])
-    assert_equal("-rwxr-xr--", rec["filemode"])
-    assert_equal("1", rec["nlink"])
-    assert_match(/\A\d+\z/, rec["uid"])
-    assert_match(/\A\d+\z/, rec["gid"])
-    assert_match(/\A0x[0-9a-f]+\z/, rec["rdev"])
-    assert_match(/\A\d+\z/, rec["size"])
-    assert_match(/\A\d+\z/, rec["blksize"])
-    assert_match(/\A\d+\z/, rec["blocks"])
-    assert_match(/\A\d+-\d\d-\d\dT\d\d:\d\d:\d\d/, rec["atime"])
-    assert_match(/\A\d+-\d\d-\d\dT\d\d:\d\d:\d\d/, rec["mtime"])
-    assert_match(/\A\d+-\d\d-\d\dT\d\d:\d\d:\d\d/, rec["ctime"])
-    assert_equal("a", rec["filename"])
-    assert_equal(nil, rec["symlink"])
+    aa = CSV.read(o)
+    assert_equal(2, aa.length)
+    header, row = aa
+    assert_equal(%w[dev ino mode filemode nlink uid user gid group rdev size blksize blocks atime mtime ctime filename symlink], header)
+    assert_match(/\A0x[0-9a-f]+\z/, row[header.index "dev"])
+    assert_match(/\A\d+\z/, row[header.index "ino"])
+    assert_match(/\A0[0-7]+\z/, row[header.index "mode"])
+    assert_equal("-rwxr-xr--", row[header.index "filemode"])
+    assert_equal("1", row[header.index "nlink"])
+    assert_match(/\A\d+\z/, row[header.index "uid"])
+    assert_match(/\A\d+\z/, row[header.index "gid"])
+    assert_match(/\A0x[0-9a-f]+\z/, row[header.index "rdev"])
+    assert_match(/\A\d+\z/, row[header.index "size"])
+    assert_match(/\A\d+\z/, row[header.index "blksize"])
+    assert_match(/\A\d+\z/, row[header.index "blocks"])
+    assert_match(/\A\d+-\d\d-\d\dT\d\d:\d\d:\d\d/, row[header.index "atime"])
+    assert_match(/\A\d+-\d\d-\d\dT\d\d:\d\d:\d\d/, row[header.index "mtime"])
+    assert_match(/\A\d+-\d\d-\d\dT\d\d:\d\d:\d\d/, row[header.index "ctime"])
+    assert_equal("a", row[header.index "filename"])
+    assert_equal(nil, row[header.index "symlink"])
   end
 
   def test_opt_a
     Dir.mkdir("d")
     File.open("d/.foo", "w") {}
     Tb::Cmd.main_ls(['-o', o="o.csv", '-a', 'd'])
-    tb = Tb.load_csv(o)
-    assert_equal(3, tb.size)
-    assert_equal("d", tb.get_record(0)["filename"]) # d/.
-    assert_equal(".", tb.get_record(1)["filename"]) # d/..
-    assert_equal("d/.foo", tb.get_record(2)["filename"])
+    aa = CSV.read(o)
+    assert_equal(4, aa.length)
+    header, row1, row2, row3 = aa
+    assert_equal("d", row1[header.index "filename"]) # d/.
+    assert_equal(".", row2[header.index "filename"]) # d/..
+    assert_equal("d/.foo", row3[header.index "filename"])
   end
 
   def test_opt_A
     Dir.mkdir("d")
     File.open("d/.foo", "w") {}
     Tb::Cmd.main_ls(['-o', o="o.csv", '-A', 'd'])
-    tb = Tb.load_csv(o)
-    assert_equal(1, tb.size)
-    assert_equal("d/.foo", tb.get_record(0)["filename"])
+    aa = CSV.read(o)
+    assert_equal(2, aa.length)
+    header, row = aa
+    assert_equal("d/.foo", row[header.index "filename"])
   end
 
   def test_opt_R
@@ -148,12 +153,13 @@ class TestTbCmdLs < Test::Unit::TestCase
     File.open("d/d2/b", "w") {}
     File.open("d/d2/c", "w") {}
     Tb::Cmd.main_ls(['-o', o="o.csv", '-R', 'd'])
-    tb = Tb.load_csv(o)
-    assert_equal(4, tb.size)
-    assert_equal("d/a", tb.get_record(0)["filename"])
-    assert_equal("d/d2", tb.get_record(1)["filename"])
-    assert_equal("d/d2/b", tb.get_record(2)["filename"])
-    assert_equal("d/d2/c", tb.get_record(3)["filename"])
+    aa = CSV.read(o)
+    assert_equal(5, aa.length)
+    header, row1, row2, row3, row4 = aa
+    assert_equal("d/a", row1[header.index "filename"])
+    assert_equal("d/d2", row2[header.index "filename"])
+    assert_equal("d/d2/b", row3[header.index "filename"])
+    assert_equal("d/d2/c", row4[header.index "filename"])
   end
 
   def test_opt_Ra
@@ -163,25 +169,27 @@ class TestTbCmdLs < Test::Unit::TestCase
     File.open("d/d2/b", "w") {}
     File.open("d/d2/c", "w") {}
     Tb::Cmd.main_ls(['-o', o="o.csv", '-Ra', 'd'])
-    tb = Tb.load_csv(o)
-    assert_equal(8, tb.size)
-    assert_equal("d/.", tb.get_record(0)["filename"])
-    assert_equal("d/..", tb.get_record(1)["filename"])
-    assert_equal("d/a", tb.get_record(2)["filename"])
-    assert_equal("d/d2", tb.get_record(3)["filename"])
-    assert_equal("d/d2/.", tb.get_record(4)["filename"])
-    assert_equal("d/d2/..", tb.get_record(5)["filename"])
-    assert_equal("d/d2/b", tb.get_record(6)["filename"])
-    assert_equal("d/d2/c", tb.get_record(7)["filename"])
+    aa = CSV.read(o)
+    assert_equal(9, aa.length)
+    header, *rows = aa
+    assert_equal("d/.", rows[0][header.index "filename"])
+    assert_equal("d/..", rows[1][header.index "filename"])
+    assert_equal("d/a", rows[2][header.index "filename"])
+    assert_equal("d/d2", rows[3][header.index "filename"])
+    assert_equal("d/d2/.", rows[4][header.index "filename"])
+    assert_equal("d/d2/..", rows[5][header.index "filename"])
+    assert_equal("d/d2/b", rows[6][header.index "filename"])
+    assert_equal("d/d2/c", rows[7][header.index "filename"])
   end
 
   def test_symlink
     File.symlink("a", "b")
     Tb::Cmd.main_ls(['-o', o="o.csv", '-l', 'b'])
-    tb = Tb.load_csv(o)
-    assert_equal(1, tb.size)
-    assert_equal("b", tb.get_record(0)["filename"])
-    assert_equal("a", tb.get_record(0)["symlink"])
+    aa = CSV.read(o)
+    assert_equal(2, aa.length)
+    header, row = aa
+    assert_equal("b", row[header.index "filename"])
+    assert_equal("a", row[header.index "symlink"])
   end
 
   def test_not_found