tb 0.2 → 0.3

data/test/{test_cmd_json.rb → test_cmd_to_json.rb}

@@ -6,7 +6,7 @@ begin
 rescue LoadError
 end
 
-class TestTbCmdJSON < Test::Unit::TestCase
+class TestTbCmdToJSON < Test::Unit::TestCase
   def setup
     Tb::Cmd.reset_option
     @curdir = Dir.pwd
@@ -25,7 +25,35 @@ class TestTbCmdJSON < Test::Unit::TestCase
       0,1,2
       4,5,6
     End
-    Tb::Cmd.main_json(['-o', o="o.json", i])
+    Tb::Cmd.main_to_json(['-o', o="o.json", i])
+    assert_equal(<<-"End".gsub(/\s/, ''), File.read(o).gsub(/\s/, ''))
+      [{
+        "a": "0",
+        "b": "1",
+        "c": "2"
+      },
+      {
+        "a": "4",
+        "b": "5",
+        "c": "6"
+      }]
+    End
+  end
+
+  def test_json_to_json
+    File.open(i="i.json", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
+      [{
+        "a": "0",
+        "b": "1",
+        "c": "2"
+      },
+      {
+        "a": "4",
+        "b": "5",
+        "c": "6"
+      }]
+    End
+    Tb::Cmd.main_to_json(['-o', o="o.json", i])
     assert_equal(<<-"End".gsub(/\s/, ''), File.read(o).gsub(/\s/, ''))
       [{
         "a": "0",
@@ -51,7 +79,7 @@ class TestTbCmdJSON < Test::Unit::TestCase
       5,6
       7,8
     End
-    Tb::Cmd.main_json(['-o', o="o.csv", i1, i2])
+    Tb::Cmd.main_to_json(['-o', o="o.csv", i1, i2])
     assert_equal(<<-"End".gsub(/\s/, ''), File.read(o).gsub(/\s/, ''))
       [{
         "a": "1",

data/test/{test_cmd_pnm.rb → test_cmd_to_pnm.rb}

@@ -2,7 +2,7 @@ require 'test/unit'
 require 'tb/cmdtop'
 require 'tmpdir'
 
-class TestTbCmdPNM < Test::Unit::TestCase
+class TestTbCmdToPNM < Test::Unit::TestCase
   def setup
     Tb::Cmd.reset_option
     @curdir = Dir.pwd
@@ -23,7 +23,7 @@ class TestTbCmdPNM < Test::Unit::TestCase
       11
       01
     End
-    Tb::Cmd.main_pnm(['-o', o="o.ppm", i])
+    Tb::Cmd.main_to_pnm(['-o', o="o.ppm", i])
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       P1
       2 3

data/test/{test_cmd_pp.rb → test_cmd_to_pp.rb}

@@ -2,7 +2,7 @@ require 'test/unit'
 require 'tb/cmdtop'
 require 'tmpdir'
 
-class TestTbCmdPP < Test::Unit::TestCase
+class TestTbCmdToPP < Test::Unit::TestCase
   def setup
     Tb::Cmd.reset_option
     @curdir = Dir.pwd
@@ -21,7 +21,7 @@ class TestTbCmdPP < Test::Unit::TestCase
       0,1,2
       4,5,6
     End
-    Tb::Cmd.main_pp(['-o', o="o.pp", i])
+    Tb::Cmd.main_to_pp(['-o', o="o.pp", i])
     assert_equal(<<-"End".gsub(/\s/, ''), File.read(o).gsub(/\s/, ''))
       { "a" => "0", "b" => "1", "c" => "2" }
       { "a" => "4", "b" => "5", "c" => "6" }
@@ -33,7 +33,7 @@ class TestTbCmdPP < Test::Unit::TestCase
       a,b
       0,1,2,3
     End
-    Tb::Cmd.main_pp(['-o', o="o.pp", i])
+    Tb::Cmd.main_to_pp(['-o', o="o.pp", i])
     assert_equal(<<-"End".gsub(/\s/, ''), File.read(o).gsub(/\s/, ''))
       { "a" => "0", "b" => "1", "1" => "2", "2" => "3" }
     End
@@ -50,7 +50,7 @@ class TestTbCmdPP < Test::Unit::TestCase
       5,6
       7,8
     End
-    Tb::Cmd.main_pp(['-o', o="o.csv", i1, i2])
+    Tb::Cmd.main_to_pp(['-o', o="o.csv", i1, i2])
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       {"a"=>"1", "b"=>"2"}
       {"a"=>"3", "b"=>"4"}

data/test/{test_cmd_tsv.rb → test_cmd_to_tsv.rb}

@@ -2,7 +2,7 @@ require 'test/unit'
 require 'tb/cmdtop'
 require 'tmpdir'
 
-class TestTbCmdTSV < Test::Unit::TestCase
+class TestTbCmdToTSV < Test::Unit::TestCase
   def setup
     Tb::Cmd.reset_option
     @curdir = Dir.pwd
@@ -21,7 +21,7 @@ class TestTbCmdTSV < Test::Unit::TestCase
       0,1,2
       4,5,6
     End
-    Tb::Cmd.main_tsv(['-o', o="o.tsv", i])
+    Tb::Cmd.main_to_tsv(['-o', o="o.tsv", i])
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       a\tb\tc
       0\t1\t2
@@ -35,7 +35,7 @@ class TestTbCmdTSV < Test::Unit::TestCase
       0,1,2
       4,5,6
     End
-    Tb::Cmd.main_tsv(['-o', o="o.tsv", '-N', i])
+    Tb::Cmd.main_to_tsv(['-o', o="o.tsv", '-N', i])
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       a\tb\tc
       0\t1\t2
@@ -54,7 +54,7 @@ class TestTbCmdTSV < Test::Unit::TestCase
       5,6
       7,8
     End
-    Tb::Cmd.main_tsv(['-o', o="o.csv", i1, i2])
+    Tb::Cmd.main_to_tsv(['-o', o="o.csv", i1, i2])
     assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
       a\tb
       1\t2

data/test/{test_cmd_yaml.rb → test_cmd_to_yaml.rb}

@@ -2,7 +2,7 @@ require 'test/unit'
 require 'tb/cmdtop'
 require 'tmpdir'
 
-class TestTbCmdYAML < Test::Unit::TestCase
+class TestTbCmdToYAML < Test::Unit::TestCase
   def setup
     Tb::Cmd.reset_option
     @curdir = Dir.pwd
@@ -21,7 +21,7 @@ class TestTbCmdYAML < Test::Unit::TestCase
       0,1,2
       4,5,6
     End
-    Tb::Cmd.main_yaml(['-o', o="o.yaml", i])
+    Tb::Cmd.main_to_yaml(['-o', o="o.yaml", i])
     assert_equal(
       [
         {'a' => '0', 'b' => '1', 'c' => '2'},
@@ -41,7 +41,7 @@ class TestTbCmdYAML < Test::Unit::TestCase
       5,6
       7,8
     End
-    Tb::Cmd.main_yaml(['-o', o="o.csv", i1, i2])
+    Tb::Cmd.main_to_yaml(['-o', o="o.csv", i1, i2])
     assert_equal(
       [
         {'a' => '1', 'b' => '2'},

data/test/test_cmd_unnest.rb

@@ -0,0 +1,89 @@
+require 'test/unit'
+require 'tb/cmdtop'
+require 'tmpdir'
+
+class TestTbCmdUnnest < 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
+    File.open(i="i.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
+      a,b,c
+      foo,"b1,b2
+      1,2
+      3,4
+      ",baz
+      qux,"b1,b2
+      5,6
+      ",quuux
+    End
+    Tb::Cmd.main_unnest(['-o', o="o.csv", 'b', i])
+    assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
+      a,b1,b2,c
+      foo,1,2,baz
+      foo,3,4,baz
+      qux,5,6,quuux
+    End
+  end
+
+  def test_opt_outer1
+    File.open(i="i.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
+      a,b,c
+      foo,"b1,b2
+      1,2
+      ",baz
+      f,"b1,b2
+      ",g
+      qux,,quuux
+    End
+    Tb::Cmd.main_unnest(['-o', o="o.csv", '--outer', 'b', i])
+    assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
+      a,b1,b2,c
+      foo,1,2,baz
+      f,,,g
+      qux,,,quuux
+    End
+  end
+
+  def test_opt_no_outer
+    File.open(i="i.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
+      a,b,c
+      foo,"b1,b2
+      1,2
+      ",baz
+      f,"b1,b2
+      ",g
+      qux,,quuux
+    End
+    Tb::Cmd.main_unnest(['-o', o="o.csv", 'b', i])
+    assert_equal(<<-"End".gsub(/^[ \t]+/, ''), File.read(o))
+      a,b1,b2,c
+      foo,1,2,baz
+    End
+  end
+
+  def test_no_target_field
+    File.open(i="i.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
+      a,b,c
+      foo,"b1,b2
+      1,2
+      3,4
+      ",baz
+      qux,"b1,b2
+      5,6
+      ",quuux
+    End
+    exc = assert_raise(SystemExit) { Tb::Cmd.main_unnest(['-o', "o.csv", 'bb', i]) }
+    assert(!exc.success?)
+  end
+
+end

data/test/test_cmdtty.rb

@@ -30,19 +30,19 @@ class TestTbCmdTTY < Test::Unit::TestCase
     end
   end
 
-  def with_stdout(io)
-    save = STDOUT.dup
-    STDOUT.reopen(io)
+  def with_real_stdout(io)
+    save = $stdout.dup
+    $stdout.reopen(io)
     begin
       yield
     ensure
-      STDOUT.reopen(save)
+      $stdout.reopen(save)
       save.close
     end
   end
 
   def reader_thread(io)
-    Thread.new {
+    th = Thread.new {
       r = ''
       loop {
         begin
@@ -53,9 +53,12 @@ class TestTbCmdTTY < Test::Unit::TestCase
       }
       r
     }
+    sleep 0.1 if /freebsd/ =~ RUBY_PLATFORM # FreeBSD 8.2-RELEASE-p3 (amd64) hang ???
+    th
   end
 
   def test_ttyout_multiscreen
+    return unless IO.instance_methods.include?(:raw!)
     File.open(i="i.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
       a,b,c
       0,1,2
@@ -66,8 +69,8 @@ class TestTbCmdTTY < Test::Unit::TestCase
         s.raw!
         s.winsize = [2, 80]
         th = reader_thread(m)
-        with_stdout(s) {
-          Tb::Cmd.main_csv([i])
+        with_real_stdout(s) {
+          Tb::Cmd.main_to_csv([i])
         }
         s.close
         result = th.value
@@ -81,6 +84,7 @@ class TestTbCmdTTY < Test::Unit::TestCase
   end
 
   def test_ttyout_singlescreen
+    return unless IO.instance_methods.include?(:raw!)
     File.open(i="i.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
       a,b,c
       0,1,2
@@ -91,8 +95,8 @@ class TestTbCmdTTY < Test::Unit::TestCase
         s.raw!
         s.winsize = [24, 80]
         th = reader_thread(m)
-        with_stdout(s) {
-          Tb::Cmd.main_csv([i])
+        with_real_stdout(s) {
+          Tb::Cmd.main_to_csv([i])
         }
         s.close
         result = th.value
@@ -106,6 +110,7 @@ class TestTbCmdTTY < Test::Unit::TestCase
   end
 
   def test_ttyout_tab
+    return unless IO.instance_methods.include?(:raw!)
     File.open(i="i.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
       a,b,c
       0,\t,2
@@ -115,8 +120,8 @@ class TestTbCmdTTY < Test::Unit::TestCase
         s.raw!
         s.winsize = [3, 10]
         th = reader_thread(m)
-        with_stdout(s) {
-          Tb::Cmd.main_csv([i])
+        with_real_stdout(s) {
+          Tb::Cmd.main_to_csv([i])
         }
         s.close
         result = th.value
@@ -129,6 +134,7 @@ class TestTbCmdTTY < Test::Unit::TestCase
   end
 
   def test_ttyout_nottysize
+    return unless IO.instance_methods.include?(:raw!)
     File.open(i="i.csv", "w") {|f| f << <<-"End".gsub(/^[ \t]+/, '') }
       a,b,c
       0,1,2
@@ -138,8 +144,8 @@ class TestTbCmdTTY < Test::Unit::TestCase
         s.raw!
         s.winsize = [0, 0]
         th = reader_thread(m)
-        with_stdout(s) {
-          Tb::Cmd.main_csv([i])
+        with_real_stdout(s) {
+          Tb::Cmd.main_to_csv([i])
         }
         s.close
         result = th.value

data/test/test_enumerable.rb

@@ -1,4 +1,4 @@
-require 'tb/enumerable'
+require 'tb'
 require 'test/unit'
 
 class TestTbEnumerable < Test::Unit::TestCase
@@ -119,4 +119,86 @@ class TestTbEnumerable < Test::Unit::TestCase
     assert_equal({"sweet"=>{"yellow"=>1, "green"=>1}, "tart"=>{"yellow"=>1}},
                  a.tb_category_count(:taste, :color))
   end
+
+  def test_extsort_by_empty
+    assert_equal([], [].extsort_by {|x| x }.to_a)
+  end
+
+  def test_extsort_by_exhaustive
+    maxlen = 3
+    #maxlen = 7
+    midsize = Marshal.dump([0,0]).size + 1
+    [0, midsize, nil].each {|memsize|
+      (maxlen+1).times {|len|
+        (len**len).times {|i|
+          ary = []
+          len.times {|j|
+            ary << (i % len)
+            i /= len
+          }
+          uary = ary.sort.uniq
+          next if uary[0] != 0 || uary[-1] != uary.length - 1
+          ary1 = ary.map.with_index.to_a
+          #p [memsize, ary1]
+          ary2 = ary1.extsort_by(:memsize => memsize) {|v, k| v }.to_a
+          assert_equal(ary1.sort, ary2,
+                       "#{ary.inspect}.extsort_by(:memsize=>#{memsize}) {|v, k| v }.to_a")
+        }
+      }
+    }
+  end
+
+  def test_extsort_by_random
+    midsize = Marshal.dump([0,0]).size + 1
+    [0, midsize, nil].each {|memsize|
+      10.times {|i|
+        len = rand(100)
+        ary = []
+        len.times { ary << rand(1000) }
+        ary1 = ary.sort
+        ary2 = ary.extsort_by(:memsize => memsize) {|x| x }.to_a
+        assert_equal(ary1, ary2)
+      }
+    }
+  end
+
+  def test_extsort_by_block_random
+    3.times {|i|
+      len = rand(100)
+      ary = []
+      len.times { ary << rand(1000) }
+      ary1 = ary.sort.reverse
+      ary2 = ary.extsort_by {|x| -x }.to_a
+      assert_equal(ary1, ary2)
+    }
+  end
+
+  def test_each_group_element
+    result = []
+    (0..9).to_a.each_group_element(
+      lambda {|a, b| a / 3 != b / 3 },
+      lambda {|v| result << [:before, v] },
+      lambda {|v| result << [:body, v] },
+      lambda {|v| result << [:after, v] })
+    assert_equal(
+      [[:before, 0],
+       [:body, 0],
+       [:body, 1],
+       [:body, 2],
+       [:after, 2],
+       [:before, 3],
+       [:body, 3],
+       [:body, 4],
+       [:body, 5],
+       [:after, 5],
+       [:before, 6],
+       [:body, 6],
+       [:body, 7],
+       [:body, 8],
+       [:after, 8],
+       [:before, 9],
+       [:body, 9],
+       [:after, 9]],
+      result)
+  end
 end