rio 0.3.7 → 0.3.8

data/test/runftptests.rb

@@ -0,0 +1,14 @@
+#!/usr/local/bin/ruby
+Dir.chdir File.dirname(__FILE__)
+$devlib=File.expand_path('../lib/')
+$:.unshift $devlib unless $:[0] == $devlib
+
+$mswin32 = (RUBY_PLATFORM =~ /mswin32/)
+
+require 'rio'
+require 'test/unit'
+
+require 'ftp/all'
+$trace_states = false
+require 'test/unit/ui/console/testrunner'
+#require 'test/unit/ui/tk/testrunner'

data/test/{1.rb → runhttptests.rb}

@@ -1,14 +1,14 @@
-#!/usr/bin/ruby
-Dir.chdir File.dirname(__FILE__)
-$:.unshift '../lib'
-
-require 'rio'
-require 'test/unit'
-
-ARGV.each do |el|
-  puts "Running test '#{el}'"
-  load 'tc/'+el+'.rb'
-end
-$trace_states = false
-require 'test/unit/ui/console/testrunner'
-#require 'test/unit/ui/tk/testrunner'
+#!/usr/bin/ruby
+Dir.chdir File.dirname(__FILE__)
+$devlib=File.expand_path('../lib/')
+$:.unshift $devlib unless $:[0] == $devlib
+
+$mswin32 = (RUBY_PLATFORM =~ /mswin32/)
+
+require 'rio'
+require 'test/unit'
+
+require 'tc/copy-from-http'
+$trace_states = false
+require 'test/unit/ui/console/testrunner'
+#require 'test/unit/ui/tk/testrunner'

data/test/runtests.rb

@@ -1,14 +1,14 @@
-#!/usr/bin/ruby
-Dir.chdir File.dirname(__FILE__)
-$devlib=File.expand_path('../lib/')
-$:.unshift $devlib unless $:[0] == $devlib
-
-$mswin32 = (RUBY_PLATFORM =~ /mswin32/)
-
-require 'rio'
-require 'test/unit'
-
-require 'tc/all'
-$trace_states = false
-require 'test/unit/ui/console/testrunner'
-#require 'test/unit/ui/tk/testrunner'
+#!/usr/local/bin/ruby
+Dir.chdir File.dirname(__FILE__)
+$devlib=File.expand_path('../lib/')
+$:.unshift $devlib unless $:[0] == $devlib
+
+$mswin32 = (RUBY_PLATFORM =~ /mswin32/)
+
+require 'rio'
+require 'test/unit'
+
+require 'tc/all'
+$trace_states = false
+require 'test/unit/ui/console/testrunner'
+#require 'test/unit/ui/tk/testrunner'

data/test/tc/all.rb

@@ -2,59 +2,74 @@ require 'test/unit'
 require 'tc/testcase'
 
 #require 'tc/yaml'
-require 'tc/dir_iter'
-require 'tc/piper' unless $mswin32
-require 'tc/cmdpipe'
-require 'tc/base'
-require 'tc/split'
-require 'tc/route'
-require 'tc/skip'
-require 'tc/skiplines'
-require 'tc/selnosel'
-require 'tc/csv'
-require 'tc/csv2'
-require 'tc/csv_columns'
-require 'tc/temp'
-require 'tc/tempfile'
-require 'tc/tempdir'
-require 'tc/riorl'
+
 require 'tc/abs'
-require 'tc/closeoneof'
+require 'tc/tonl'
+require 'tc/files_select'
+require 'tc/emptyriodir'
+require 'tc/entsel'
+require 'tc/base'
 require 'tc/clearsel'
 require 'tc/closeoncopy'
-require 'tc/copy-to'
-require 'tc/copy-from'
+require 'tc/closeoneof'
+require 'tc/cmdpipe'
 require 'tc/copy'
+require 'tc/copy-from'
+require 'tc/copy-to'
 require 'tc/copyarray'
+require 'tc/copydest'
 require 'tc/copydir'
 require 'tc/copydirlines'
-require 'tc/copydest'
 require 'tc/copylines'
 require 'tc/create'
+require 'tc/csv'
+require 'tc/csv2'
+require 'tc/csv_columns'
 require 'tc/dir'
+require 'tc/dir_iter'
 require 'tc/dirent'
 require 'tc/each'
 require 'tc/each_break'
+require 'tc/empty'
 require 'tc/entary'
 require 'tc/eq'
 require 'tc/expand_path'
 require 'tc/ext'
-require 'tc/getrec'
 require 'tc/get'
+require 'tc/gzip'
+require 'tc/getrec'
+require 'tc/io_each_byte'
+require 'tc/io_read'
+require 'tc/iometh'
+require 'tc/likeio'
 require 'tc/lines'
 require 'tc/methods'
 require 'tc/misc'
 require 'tc/nolines'
 require 'tc/noqae'
+require 'tc/null' unless $mswin32
 require 'tc/overload'
 require 'tc/pa'
 require 'tc/paths'
+require 'tc/pid'
+require 'tc/pid'
+require 'tc/piper' unless $mswin32
 require 'tc/qae'
 require 'tc/qae_riovar'
+require 'tc/readline'
 require 'tc/records'
 require 'tc/rename'
+require 'tc/riorl'
+require 'tc/route'
+require 'tc/selnosel'
+require 'tc/skip'
+require 'tc/skiplines'
+require 'tc/split'
 require 'tc/symlink' unless $mswin32
 require 'tc/symlink0' unless $mswin32
 require 'tc/symlink1' unless $mswin32
+require 'tc/temp'
+require 'tc/tempdir'
+require 'tc/tempfile'
 
 

data/test/tc/cmdpipe.rb

@@ -12,6 +12,9 @@ class TC_cmdpipe < Test::RIO::TestCase
   @@dname = 'd'
   @@fnames = ['f0','f1','f2','g0','g1']
 
+  require 'tc/programs_util'
+  include Test::RIO::Programs
+
   def self.once
     @@once = true
     rio(@@dname).rmtree.mkpath.chdir {
@@ -26,7 +29,7 @@ class TC_cmdpipe < Test::RIO::TestCase
   end
 
   def test_cmd_out
-    ls = rio(?-,'ls d')
+    ls = rio(?-,PROG['list_dir']+' d')
     out = rio(?").chomp
     exp = @@fnames
     rtn = ls | out
@@ -35,8 +38,8 @@ class TC_cmdpipe < Test::RIO::TestCase
   end
 
   def test_cmd_cmd_out
-    ls = rio(?-,'ls d')
-    grep = rio(?-,'grep f')
+    ls = rio(?-,PROG['list_dir']+' d')
+    grep = rio(?-,PROG['find_lines']+' f')
     out = rio(?").chomp
     exp = @@fnames.select { |fn| fn =~ /f/ }
     rtn = ls | grep | out
@@ -45,9 +48,9 @@ class TC_cmdpipe < Test::RIO::TestCase
   end
 
   def test_cmd_cmd_cmd_out
-    ls = rio(?-,'ls d')
-    cmd = rio(?-,'grep f')
-    cmd2 = rio(?-,'grep 1')
+    ls = rio(?-,PROG['list_dir']+' d')
+    cmd = rio(?-,PROG['find_lines']+' f')
+    cmd2 = rio(?-,PROG['find_lines']+' 1')
     out = rio(?").chomp
     exp = @@fnames.select { |fn| fn =~ /f1/ }
     rtn = ls | cmd | cmd2 | out
@@ -66,7 +69,7 @@ class TC_cmdpipe < Test::RIO::TestCase
 
   def test_file_cmd_out
     inp = rio('d/f2')
-    cmd = rio(?-,'grep 1')
+    cmd = rio(?-,PROG['find_lines']+' 1')
     out = rio(?")
     rtn = inp | cmd | out
     exp = inp[/1/]
@@ -76,8 +79,8 @@ class TC_cmdpipe < Test::RIO::TestCase
 
   def test_file_cmd_cmd_out
     inp = rio('d/f2')
-    cmd = rio(?-,'grep 1')
-    cmd2 = rio(?-,'grep 0')
+    cmd = rio(?-,PROG['find_lines']+' 1')
+    cmd2 = rio(?-,PROG['find_lines']+' 0')
     out = rio(?")
     rtn = inp | cmd | cmd2 | out
     exp = inp[/10/]
@@ -87,8 +90,8 @@ class TC_cmdpipe < Test::RIO::TestCase
 
   def test_file_cmdpipe_out2
     inp = rio('d/f2')
-    cmd = rio(?-,'grep 1')
-    cmd2 = rio(?-,'grep 0')
+    cmd = rio(?-,PROG['find_lines']+' 1')
+    cmd2 = rio(?-,PROG['find_lines']+' 0')
 
     cmdpipe = inp | cmd | cmd2
     assert_equal('cmdpipe',cmdpipe.scheme)
@@ -108,8 +111,8 @@ class TC_cmdpipe < Test::RIO::TestCase
 
   def test_file_cmdpipe_out
     inp = rio('d/f2')
-    cmd = rio(?-,'grep 1')
-    cmd2 = rio(?-,'grep 0')
+    cmd = rio(?-,PROG['find_lines']+' 1')
+    cmd2 = rio(?-,PROG['find_lines']+' 0')
     out = rio(?")
 
     cmdpipe = cmd | cmd2
@@ -122,8 +125,8 @@ class TC_cmdpipe < Test::RIO::TestCase
   end
 
   def test_cmdpipe_without
-    cmd = rio(?-,'grep 1')
-    cmd2 = rio(?-,'grep 0')
+    cmd = rio(?-,PROG['find_lines']+' 1')
+    cmd2 = rio(?-,PROG['find_lines']+' 0')
     out = rio(?")
 
     cmdpipe = rio(?|,cmd,cmd2,out)

data/test/tc/copy-from-http.rb

@@ -0,0 +1,89 @@
+#!/usr/local/bin/ruby
+if $0 == __FILE__
+  Dir.chdir File.dirname(__FILE__)+'/../'
+  $:.unshift File.expand_path('../lib/')
+end
+
+require 'rio'
+require 'tc/testcase'
+
+class TC_copy_from_http < Test::RIO::TestCase
+  @@once = false
+  def self.once
+    @@once = true
+
+    rio('d0').rmtree.mkpath
+    rio('d1').rmtree.mkpath
+    rio('d0/d2').rmtree.mkpath
+    make_lines_file(1,'d0/f0')
+    make_lines_file(2,'d0/f1')
+    make_lines_file(3,'d1/f2')
+    make_lines_file(4,'d1/f3')
+    make_lines_file(5,'d0/d2/f4')
+    make_lines_file(6,'d0/d2/f5')
+  end
+  def setup
+    super
+    self.class.once unless @@once
+
+    @d0 = rio('d0')
+    @d2 = rio('d0/d2')
+  end
+  def cptest(src)
+    dst = rio('dst').delete!.mkpath
+    dst < src.clone
+    assert_rios_equal(src.clone,rio(dst,src.filename),"rio copy")
+  end
+
+  def test_uri_rio_to_file
+    ario = rio('out').delete!.touch
+    url = 'http://localhost/riotest/hw.html'
+    urio = rio(url)
+    ario < urio
+    exp = urio.contents
+    assert_equal(exp,ario.contents)
+  end
+  def test_uri_rio_to_dir
+    ario = rio('ud').delete!.mkdir
+    url = 'http://localhost/riotest/hw.html'
+    urio = rio(url)
+    #$trace_states = true
+    ario < urio
+    $trace_states = false
+    drio = rio(ario,urio.filename)
+    assert(drio.file?)
+    assert(urio.contents,drio.contents)
+  end
+  def test_uri_string_to_dir
+    ario = rio('uds').delete!.mkdir
+    url = 'http://localhost/riotest/hw.html'
+    urio = rio(url)
+    #$trace_states = true
+    ario < url
+    $trace_states = false
+    drio = rio(ario,urio.filename)
+    assert(drio.file?)
+    assert(urio.contents,drio.contents)
+  end
+  def test_url_string_to_file
+    ario = rio('out').delete!.touch
+    url = 'http://localhost/riotest/hw.html'
+    ario < url
+    exp = url
+    assert_equal(exp,ario.contents)
+  end
+  def test_url_array_to_file
+    ario = rio('out').delete!.touch
+    url = 'http://localhost/riotest/hw.html'
+    ario < [url]
+    exp = url
+    assert_equal(exp,ario.contents)
+  end
+  def test_url_string_to_nonex
+    ario = rio('outz').delete!
+    url = 'http://localhost/riotest/hw.html'
+    ario < url
+    exp = url
+    assert_equal(exp,ario.contents)
+  end
+end

data/test/tc/copy-from.rb

@@ -7,7 +7,7 @@ end
 require 'rio'
 require 'tc/testcase'
 
-class TC_copyfrom < Test::RIO::TestCase
+class TC_copy_from < Test::RIO::TestCase
   @@once = false
   def self.once
     @@once = true
@@ -121,57 +121,6 @@ class TC_copyfrom < Test::RIO::TestCase
     ans = ario.readlines
     assert_equal(exp,ans)
   end
-  def test_uri_rio_to_file
-    ario = rio('out').delete!.touch
-    url = 'http://localhost/rio/hw.html'
-    urio = rio(url)
-    ario < urio
-    exp = urio.contents
-    assert_equal(exp,ario.contents)
-  end
-  def test_uri_rio_to_dir
-    ario = rio('ud').delete!.mkdir
-    url = 'http://localhost/rio/hw.html'
-    urio = rio(url)
-    #$trace_states = true
-    ario < urio
-    $trace_states = false
-    drio = rio(ario,urio.filename)
-    assert(drio.file?)
-    assert(urio.contents,drio.contents)
-  end
-  def test_uri_string_to_dir
-    ario = rio('uds').delete!.mkdir
-    url = 'http://localhost/rio/hw.html'
-    urio = rio(url)
-    #$trace_states = true
-    ario < url
-    $trace_states = false
-    drio = rio(ario,urio.filename)
-    assert(drio.file?)
-    assert(urio.contents,drio.contents)
-  end
-  def test_url_string_to_file
-    ario = rio('out').delete!.touch
-    url = 'http://localhost/rio/hw.html'
-    ario < url
-    exp = url
-    assert_equal(exp,ario.contents)
-  end
-  def test_url_array_to_file
-    ario = rio('out').delete!.touch
-    url = 'http://localhost/rio/hw.html'
-    ario < [url]
-    exp = url
-    assert_equal(exp,ario.contents)
-  end
-  def test_url_string_to_nonex
-    ario = rio('outz').delete!
-    url = 'http://localhost/rio/hw.html'
-    ario < url
-    exp = url
-    assert_equal(exp,ario.contents)
-  end
   def test_simple_ary
     dst = rio('dst').delete!.mkpath
     dst < @d0[]

data/test/tc/copy.rb

@@ -27,7 +27,7 @@ class TC_RIO_copy < Test::Unit::TestCase
     sline = rio(datadir,'src').readline
     l1 = rio(datadir,'dst1').readline
     l2 = rio(datadir,'dst2/src').readline
-    assert_equal(inline,sline,'a message in a assertion')
+    assert_equal(inline,sline,'a message in an assertion')
     assert_equal(inline,l1)
     assert_equal(inline,l2)
 
@@ -37,25 +37,27 @@ class TC_RIO_copy < Test::Unit::TestCase
     sd1.join('f1.txt').puts(txt).close
     oline = rio(datadir,'dir1/sd1/f1.txt').readline
 
-    dir2 = rio(datadir,'dir2').rmtree.mkpath
-    sd1.copy_to(dir2)
-    nline = rio(datadir,'dir2/sd1/f1.txt').readline
-    assert_equal(oline,nline)
+#     dir2 = rio(datadir,'dir2').rmtree.mkpath
+#     sd1.copy_to(dir2)
+#     $trace_states = true
+#     nline = rio(datadir,'dir2/sd1/f1.txt').readline
+#     assert_equal(oline,nline)
     
-    dir2 = rio(datadir,'dir2').rmtree.mkpath
-    sd1 > dir2
-    nline = rio(datadir,'dir2/sd1/f1.txt').readline
-    assert_equal(oline,nline)
+#     dir2 = rio(datadir,'dir2').rmtree.mkpath
+#     sd1 > dir2
+#     $trace_states = false
+#     nline = rio(datadir,'dir2/sd1/f1.txt').readline
+#     assert_equal(oline,nline)
     
-    dir2 = rio(datadir,'dir2').rmtree.mkpath
-    dir2 < rio(datadir,'dir1/sd1')
-    nline = rio(datadir,'dir2/sd1/f1.txt').readline
-    assert_equal(oline,nline)
+#     dir2 = rio(datadir,'dir2').rmtree.mkpath
+#     dir2 < rio(datadir,'dir1/sd1')
+#     nline = rio(datadir,'dir2/sd1/f1.txt').readline
+#     assert_equal(oline,nline)
     
-    dir2 = rio(datadir,'dir2').rmtree.mkpath
-    sd1 > dir2.to_s
-    nline = rio(datadir,'dir2/sd1/f1.txt').readline
-    assert_equal(oline,nline)
+#     dir2 = rio(datadir,'dir2').rmtree.mkpath
+#     sd1 > dir2.to_s
+#     nline = rio(datadir,'dir2/sd1/f1.txt').readline
+#     assert_equal(oline,nline)
     
     dir2 = rio(datadir,'dir2').rmtree.mkpath
     dir2 < rio(datadir,'dir1/sd1').to_s

data/test/tc/csv2.rb

@@ -115,7 +115,8 @@ class TC_csv2 < Test::RIO::TestCase
     rec_ary = @records[0]
     rec_rio = rio('src1.csv').csv.getrec
     assert_kind_of(::Array,rec_rio)
-    assert_equal(@strings[0],rec_rio.to_s)
+    exp = $EXTEND_CSV_RESULTS ? @strings[0] : @records[0].to_s
+    assert_equal(exp,rec_rio.to_s)
 
     rec_rio = rio('src1.csv').csv.lines.getrec
     assert_kind_of(::Array,rec_rio)
@@ -123,11 +124,13 @@ class TC_csv2 < Test::RIO::TestCase
 
     ary = rio('src1.csv').csv[]
     assert_kind_of(::Array,ary[0])
-    assert_equal(@strings[0],ary[0].to_s)
+    exp = $EXTEND_CSV_RESULTS ? @strings[0] : @records[0].to_s
+    assert_equal(exp,ary[0].to_s)
 
     recs = rio('src1.csv').csv.lines[]
     assert_kind_of(::String,recs[0])
-    assert_equal(@records[0],recs[0].to_a)
+    exp = $EXTEND_CSV_RESULTS ? @records[0] : [@strings[0]+$/]
+    assert_equal(exp,recs[0].to_a)
     return
   end
 

data/test/tc/empty.rb

@@ -0,0 +1,47 @@
+#!/usr/local/bin/ruby
+if $0 == __FILE__
+  Dir.chdir File.dirname(__FILE__)+'/../'
+  $:.unshift File.expand_path('../lib/')
+end
+
+require 'rio'
+require 'tc/testcase'
+
+class TC_empty < Test::RIO::TestCase
+  @@once = false
+  def self.once
+    @@once = true
+
+    rio('d0').rmtree.mkpath
+    rio('d1').rmtree.mkpath.chdir {
+      rio('file').touch
+    }
+    rio('f0').delete!.touch
+    rio('f1').puts!("a nonempty file\n")
+  end
+  def setup
+    super
+    self.class.once unless @@once
+  end
+  def test_file_empty
+    assert(rio('d0').empty?)
+  end
+  def test_file_not_empty
+    assert!(rio('d1').empty?)
+  end
+  def test_dir_empty
+    assert(rio('f0').empty?)
+  end
+  def test_dir_not_empty
+    assert!(rio('f1').empty?)
+  end
+  def test_ps_empty
+    assert(rio(?-,'ls d0').empty?)
+  end
+  def test_ps_not_empty
+    assert!(rio(?-,'ls d1').empty?)
+  end
+  def test_dev_null_empty
+    assert(rio(nil).empty?)
+  end
+end

data/test/tc/emptyriodir.rb

@@ -0,0 +1,129 @@
+#!/usr/local/bin/ruby
+if $0 == __FILE__
+  Dir.chdir File.dirname(__FILE__)+'/../'
+  $:.unshift File.expand_path('../lib/')
+end
+
+require 'rio'
+require 'tc/testcase'
+
+class TC_emptyriodir < Test::RIO::TestCase
+  include RIO_TestCase
+  @@once = false
+  def self.once
+    @@once = true
+    rio('adir').mkdir.chdir {
+      rio('a.rb').touch  
+      rio('b.rb').touch
+      rio('c.txt').touch
+    }
+    rio('d.rb').touch
+    rio('e.txt').touch
+    rio('f.d').mkdir
+  end
+
+  def setup
+    super
+    self.class.once unless @@once
+  end
+
+  def test_ss
+    
+    dotans = rio('.')[]
+    empans = rio[]
+    assert_array_equal(dotans,empans)
+
+    dotans = rio('.')['*.rb']
+    empans = rio['*.rb']
+    assert_array_equal(dotans,empans)
+
+  end
+
+  def test_each
+
+    dotans = []
+    empans = []
+    rio('.').each{ |el| dotans << el }
+    rio.each{ |el| empans << el }
+    assert_array_equal(dotans,empans)
+
+    dotans = []
+    empans = []
+    rio('.').entries('*.rb') { |el| dotans << el }
+    rio.entries('*.rb') { |el| empans << el }
+    assert_array_equal(dotans,empans)
+  end
+
+  def test_read
+    dotans = []
+    empans = []
+    dotrio = rio('.')
+    emprio = rio
+    while s = dotrio.read do dotans << s end
+    while s = emprio.read do empans << s end
+    assert_array_equal(dotans,empans)
+  end
+
+  def test_get
+    dotans = []
+    empans = []
+    dotrio = rio('.')
+    emprio = rio
+    while s = dotrio.get do dotans << s end
+    while s = emprio.get do empans << s end
+    assert_array_equal(dotans,empans)
+
+    dotans = []
+    empans = []
+    dotrio = rio('.').entries('*.d')
+    emprio = rio.entries('*.d')
+    while s = dotrio.get do dotans << s end
+    while s = emprio.get do empans << s end
+    assert_array_equal(dotans,empans)
+
+  end
+
+  def test_skip
+    
+    dotans = rio('.').skip[]
+    empans = rio.skip[]
+    assert_array_equal(dotans,empans)
+
+    dotans = rio('.').skip['*.rb']
+    empans = rio.skip['*.rb']
+    assert_array_equal(dotans,empans)
+
+  end
+
+  def test_dirs
+    
+    dotans = rio('.').dirs[]
+    empans = rio.dirs[]
+    assert_array_equal(dotans,empans)
+
+    dotans = rio('.').dirs['*.d']
+    empans = rio.dirs['*.d']
+    assert_array_equal(dotans,empans)
+
+  end
+
+
+  def test_getwd
+    dotans = rio('.').getwd
+    empans = rio.getwd
+    assert_array_equal(dotans,empans)
+  end
+
+  def test_rmdir
+    rio('empty.d').delete!.mkdir.chdir {
+      assert_raise(RIO::Exception::CantHandle) { rio.rmdir }
+    }
+  end
+
+  def test_rmtree
+    rio('empty.d').delete!.mkdir.chdir {
+      assert_raise(RIO::Exception::CantHandle) { rio.rmtree }
+    }
+  end
+
+end