rio 0.3.8 → 0.3.9

data/test/bin/list_dir.rb

@@ -9,6 +9,6 @@ require 'rio'
 
 dir = ARGV.shift || '.'
 rio(dir).chdir {
-  puts rio.to_a
+  puts rio[]
 }
 

data/test/ftp/anon_misc.rb

@@ -13,13 +13,21 @@ class TC_ftp_anon_misc < Test::RIO::TestCase
   @@once = false
   include Test::RIO::FTP::Const
 
+  ALLENTS = [FTP_RWROOT/'f0',d0=FTP_RWROOT/'d0',d0/'f1',d1=d0/'d1',d1/'f2']
   def self.once
     @@once = true
   end
   def setup
     super
     self.class.once unless @@once
-    FS_RWROOT.entries { |ent| ent.delete! }
+    ALLENTS.reverse.each do |ent|
+      if ent.filename =~ /f/
+        ent.rm
+      else
+        ent.rmdir
+      end
+    end
+    #FS_RWROOT.entries { |ent| ent.delete! }
   end
 
   def test_dir
@@ -33,6 +41,8 @@ class TC_ftp_anon_misc < Test::RIO::TestCase
   end
   def test_mkdir
     rwdir = rio(FTP_RWROOT)
+    rio(rwdir,'dir1').rmdir
+    rio(rwdir,'dir0').rmdir
     rwdir.chdir
     assert_equal(FTP_RWROOT.to_s,rwdir.cwd.to_s)
     rio(rwdir,'dir0').mkdir
@@ -40,6 +50,8 @@ class TC_ftp_anon_misc < Test::RIO::TestCase
   end
   def test_rmdir
     rwdir = rio(FTP_RWROOT)
+    rio(rwdir,'dir1').rmdir
+    rio(rwdir,'dir0').rmdir
     rio(rwdir,'dir1').mkdir
     assert_equal(smap([FTP_RWROOT/'dir1']),smap(FTP_RWROOT.entries[/^dir/]))
     rio(rwdir,'dir1').rmdir

data/test/ftp/anon_special.rb

@@ -22,7 +22,7 @@ class TC_ftp_anon_special < Test::RIO::TestCase
     FS_RWROOT.entries { |ent| ent.delete! }
   end
 
-  def test_mkpath
+  def atest_mkpath
     rwdir = rio(FTP_RWROOT)
     tpath = rwdir/'d0'/'d1'/'d2'
     tpath.mkpath
@@ -37,12 +37,12 @@ class TC_ftp_anon_special < Test::RIO::TestCase
     rwdir/'d0'/'d1'/'f1' < "a file"
     d0 = rio(rwdir,'d0').rmtree
     assert!(d0.exist?)
-    tpath.mkpath
-    assert(tpath.dir?)
-    d0 = rio(rwdir,'d0').rmtree
-    assert!(d0.exist?)
+#    tpath.mkpath
+#    assert(tpath.dir?)
+#    d0 = rio(rwdir,'d0').rmtree
+#    assert!(d0.exist?)
   end
-  def test_sel
+  def atest_sel
     rwdir = rio(FTP_RWROOT)
     d0 = rwdir/'d0'
     d1 = d0/'d1'

data/test/ftp/anon_write.rb

@@ -27,7 +27,14 @@ class TC_ftp_anon_write < Test::RIO::TestCase
   def setup
     super
     self.class.once unless @@once
-    FS_RWROOT.entries { |ent| ent.delete! }
+    ALLENTS.reverse.each do |ent|
+      if ent.filename =~ /f/
+        ent.rm
+      else
+        ent.rmdir
+      end
+    end
+    #FS_RWROOT.entries { |ent| ent.delete! }
   end
   def test_cp_file_to_dir
     fname = 'f0'
@@ -35,14 +42,14 @@ class TC_ftp_anon_write < Test::RIO::TestCase
     rem = FTP_RWROOT.dup
     rem < loc
     frem = rem/fname
-    assert_equal(loc.contents,frem.contents)
+    assert_equal(loc.chomp[],frem.chomp[])
   end
   def test_cp_file_to_file
     fname = 'f0'
     loc = SRCDIR/fname
     rem = FTP_RWROOT.dup/fname
     rem < loc
-    assert_equal(loc.contents,rem.contents)
+    assert_equal(loc.chomp[],rem.chomp[])
   end
   def test_cp_dir_left
     dname = 'd0'

data/test/ftp/ftp2ftp.rb

@@ -26,7 +26,7 @@ class TC_ftp2ftp < Test::RIO::TestCase
     src = FTP_ROROOT/fname
     dst = FTP_RWROOT/fname
     dst < src
-    assert_equal(src.contents,dst.contents)
+    assert_equal(src.chomp[],dst.chomp[])
   end
   def test_cp_ro2rw_file2
     fname = 'f0'
@@ -34,7 +34,7 @@ class TC_ftp2ftp < Test::RIO::TestCase
     dst = FTP_RWROOT
     dst < src
     fdst = dst/fname
-    assert_equal(src.contents,fdst.contents)
+    assert_equal(src.chomp[],fdst.chomp[])
   end
   def test_cp_ro2rw_dir
     fname = 'd0'

data/test/ftp/testdef.rb

@@ -6,9 +6,11 @@ module Test
       module Const
         FTPUSER = 'ftp'
         
-        FSROOT = rio('/home/ftp')
-        #FTPHOST = '192.168.1.101'
-        FTPHOST = 'localhost'
+        #DRV = $mswin32 ? 'x:' : ''
+        #FSROOT = rio("#{DRV}/srv/ftp")
+        FSROOT = rio("../../srv/ftp")
+        FTPHOST = '192.168.1.101'
+        #FTPHOST = 'localhost'
         FTPROOT = rio("ftp://#{FTPHOST}/")
 
         TESTDIR = rio('riotest')
@@ -19,9 +21,10 @@ module Test
         FTP_ROROOT = FTPROOT/TESTDIR/RODIR
         FS_RWROOT = FSROOT/TESTDIR/RWDIR
         FS_ROROOT = FSROOT/TESTDIR/RODIR
-        
-        PASSWDFILE = FSROOT/'etc/passwd'
-        UID,GID = rio(PASSWDFILE).lines[/^#{FTPUSER}/][0].split(':')[2..3].map{|strid| strid.to_i}
+        unless $mswin32
+          PASSWDFILE = '/etc/passwd'
+          UID,GID = rio(PASSWDFILE).lines[/^#{FTPUSER}/][0].split(':')[2..3].map{|strid| strid.to_i}
+        end
       end
       include Const
       def init_test_files

data/test/http/all.rb

@@ -0,0 +1,3 @@
+require 'tc/testcase'
+
+require 'http/copy-from-http'

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

@@ -0,0 +1,140 @@
+#!/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
+
+  end
+  def setup
+    super
+    self.class.once unless @@once
+  end
+  RTHOST = ENV['RIO_TEST_HOST'] ||= 'localhost'
+  RTPORT = ENV['RIO_TEST_PORT'] || 80
+  RTHOSTPORT = "#{RTHOST}:#{RTPORT}"
+  RTDIR = 'riotest'
+  HWFILENAME = 'hw.html'
+  GZFILENAME = 'lines.txt.gz'
+  HWURL = "http://#{RTHOSTPORT}/#{RTDIR}/#{HWFILENAME}"
+  GZURL = "http://#{RTHOSTPORT}/#{RTDIR}/#{GZFILENAME}"
+  LOCALRTDIR = rio('../../srv/www/htdocs',RTDIR)
+  HWFILE = LOCALRTDIR/HWFILENAME
+  GZFILE = LOCALRTDIR/GZFILENAME
+
+
+  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_gunzip_uri_rio
+    ans = rio(GZURL).gzip.contents
+    exp = rio(GZFILE).gzip.contents
+    
+    assert_equal(exp,ans)
+  end
+  def test_gunzip_copy_uri_rio
+    ario = rio('out.txt').delete! < rio(GZURL).gzip
+    ans = rio(ario).contents
+    exp = rio(GZFILE).gzip.contents
+    
+    assert_equal(exp,ans)
+  end
+  def test_uri_rio_to_file
+    ario = rio('outf').delete!.touch
+    url = HWURL
+    urio = rio(url)
+    ario < urio
+    exp = urio.contents
+    assert_equal(exp,ario.contents)
+    assert_equal(rio(HWFILE).contents,rio('outf').contents)
+  end
+  def test_uri_rio_to_file2
+    ario = rio('outf2').delete!.touch
+    url = HWURL
+    urio = rio(url)
+    urio > ario
+    exp = urio.contents
+    assert_equal(exp,ario.contents)
+    assert_equal(rio(HWFILE).contents,rio('outf2').contents)
+  end
+  def test_uri_rio_to_filex
+    ario = rio('outx').delete!
+    url = HWURL
+    urio = rio(url)
+    ario < urio
+    exp = urio.contents
+    assert_equal(exp,ario.contents)
+    assert_equal(rio(HWFILE).contents,rio('outx').contents)
+  end
+  def test_uri_rio_to_filex2
+    ario = rio('outx2').delete!
+    url = HWURL
+    urio = rio(url)
+    urio > ario
+    exp = urio.contents
+    assert_equal(exp,ario.contents)
+    assert_equal(rio(HWFILE).contents,rio('outx2').contents)
+  end
+  def test_uri_rio_to_dir
+    ario = rio('ud').delete!.mkdir
+    url = HWURL
+    urio = rio(url)
+    ario < urio
+    drio = rio(ario,urio.filename)
+    assert(drio.file?)
+    assert_equal(urio.contents,drio.contents)
+    assert_equal(rio(HWFILE).contents,drio.contents)
+  end
+  def test_uri_rio_to_dir2
+    ario = rio('ud2').delete!.mkdir
+    url = HWURL
+    urio = rio(url)
+    urio > ario
+    drio = rio(ario,urio.filename)
+    assert(drio.file?)
+    assert_equal(urio.contents,drio.contents)
+    assert_equal(rio(HWFILE).contents,drio.contents)
+  end
+  def test_uri_string_to_dir
+    ario = rio('uds').delete!.mkdir
+    url = HWURL
+    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 = HWURL
+    ario < url
+    exp = url
+    assert_equal(exp,ario.contents)
+  end
+  def test_url_array_to_file
+    ario = rio('out').delete!.touch
+    url = HWURL
+    ario < [url]
+    exp = url
+    assert_equal(exp,ario.contents)
+  end
+  def test_url_string_to_nonex
+    ario = rio('outz').delete!
+    url = HWURL
+    ario < url
+    exp = url
+    assert_equal(exp,ario.contents)
+  end
+end

data/test/lib/temp_server.rb

@@ -0,0 +1,44 @@
+require 'webrick'
+require 'rio'
+
+
+class TempServer
+  def initialize(server_config = {})
+    @logdir = rio('log').delete!.mkdir
+    @config = { :DocumentRoot => rio('srv/www/htdocs').abs, 
+      :Logger => WEBrick::Log.new(@logdir/'server.log'), 
+      :AccessLog => [[ @logdir/'access.log', WEBrick::AccessLog::COMBINED_LOG_FORMAT ]],
+      :Port => ENV['RIO_TEST_PORT'] || '8088',
+    }
+    @config.merge!(server_config)
+    ENV['RIO_TEST_PORT'] = @config[:Port]
+    @server = create_server(@config)
+  end
+
+  def create_server(config = {})
+    server = WEBrick::HTTPServer.new(config)
+    yield server if block_given?
+    ['INT', 'TERM'].each {|signal| 
+      trap(signal) {server.shutdown}
+    }
+    server
+  end
+  def run_progs(progs)
+    progs.each do |prog|
+      system("ruby #{prog}")
+    end
+  end
+  def run(*programs)
+    Thread.new(@server) { |srv|
+      srv.start
+    }
+    Thread.new(programs) { |progs|
+      #Thread.pass
+      run_progs(progs)
+    }.join()
+    
+    Thread.new(@server) { |srv|
+      srv.shutdown
+    }
+  end
+end

data/test/runalltests.rb

@@ -9,7 +9,9 @@ require 'rio'
 require 'test/unit'
 
 require 'tc/all'
-require 'ftp/all'
+#require 'ftp/all'
 $trace_states = false
 require 'test/unit/ui/console/testrunner'
+require 'lib/temp_server.rb'
+TempServer.new.run('runhttptests.rb')
 #require 'test/unit/ui/tk/testrunner'

data/test/runhttp.rb

@@ -0,0 +1,12 @@
+#!/usr/local/bin/ruby
+Dir.chdir File.dirname(__FILE__)
+$:.unshift File.expand_path('../lib/')
+
+require 'webrick'
+require 'rio'
+require 'lib/temp_server'
+
+
+TempServer.new.run('runhttptests.rb')
+
+#threads.each { |aThread|  aThread.join }

data/test/runhttptests.rb

@@ -8,7 +8,7 @@ $mswin32 = (RUBY_PLATFORM =~ /mswin32/)
 require 'rio'
 require 'test/unit'
 
-require 'tc/copy-from-http'
+require 'http/all'
 $trace_states = false
 require 'test/unit/ui/console/testrunner'
 #require 'test/unit/ui/tk/testrunner'

data/test/runtests.rb

@@ -6,9 +6,47 @@ $:.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 'optparse'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{$0} [options]"
+  
+  opts.on("-f", "--ftp", "Run FTP Tests") do |v|
+    options[:ftp] = v
+  end
+  opts.on("-h", "--http", "Run HTTP Tests") do |v|
+    options[:http] = v
+  end
+  opts.on("-s", "--std", "Run Standard Tests") do |v|
+    options[:std] = v
+  end
+  opts.on("-a", "--all", "Run All Tests") do |v|
+    options[:std] = v
+    options[:ftp] = v
+    options[:http] = v
+  end
+end.parse!
+
+options[:std] = true if options.empty?
+
+options.keys.each do |opt|
+  case opt
+  when :std
+    require 'tc/all'
+    require 'test/unit/ui/console/testrunner'
+  when :http
+    require 'lib/temp_server.rb'
+    TempServer.new.run('runhttptests.rb')
+  when :ftp
+    require 'test/unit'
+    require 'ftp/all'
+    require 'test/unit/ui/console/testrunner'
+  end
+end
+
 #require 'test/unit/ui/tk/testrunner'
+#require 'test/unit/ui/fox/testrunner'
+#Test::Unit::UI::Tk::TestRunner.run(TC_MyTest)

data/test/tc/abs.rb

@@ -18,7 +18,7 @@ class TC_RIO_abs < Test::Unit::TestCase
       hduri = ::URI.parse(hdurl)
       hd = rio(hduri)
       assert_equal('/',hd.path)
-      assert_nil(hd.fspath)
+      assert_equal('/',hd.fspath)
       assert_equal('http',hd.scheme)    
       assert_equal('localhost',hd.host)
       assert_equal(true,hd.abs?)
@@ -28,7 +28,7 @@ class TC_RIO_abs < Test::Unit::TestCase
       hdurl = 'http://localhost/'
       hd = rio(hdurl)
       assert_equal('/',hd.path)
-      assert_nil(hd.fspath)
+      assert_equal('/',hd.fspath)
       assert_equal('http',hd.scheme)    
       assert_equal('localhost',hd.host)
       assert_equal(true,hd.abs?)
@@ -39,7 +39,7 @@ class TC_RIO_abs < Test::Unit::TestCase
       hduri = ::URI.parse(hdurl)
       hd = rio(hduri)
       assert_equal('/',hd.path)
-      assert_nil(hd.fspath)
+      assert_equal('/',hd.fspath)
       assert_equal('http',hd.scheme)    
       assert_equal('localhost',hd.host)
       assert_equal(true,hd.abs?)
@@ -49,7 +49,7 @@ class TC_RIO_abs < Test::Unit::TestCase
       hdurl = 'http://localhost'
       hd = rio(hdurl)
       assert_equal('/',hd.path)
-      assert_nil(hd.fspath)
+      assert_equal('/',hd.fspath)
       assert_equal('http',hd.scheme)    
       assert_equal('localhost',hd.host)
       assert_equal(true,hd.abs?)
@@ -59,7 +59,7 @@ class TC_RIO_abs < Test::Unit::TestCase
       hdurl = 'http://localhost/rio/hw.html'
       hd = rio(hdurl)
       assert_equal('/rio/hw.html',hd.path)
-      assert_nil(hd.fspath)
+      assert_equal('/rio/hw.html',hd.fspath)
       assert_equal('http',hd.scheme)    
       assert_equal('localhost',hd.host)
       assert_equal(true,hd.abs?)
@@ -276,6 +276,10 @@ class TC_RIO_abs < Test::Unit::TestCase
       assert_kind_of(RIO::Rio,tmp)
       assert_equal('/tmp',tmp.to_s)
       
+      z = tmp.join('zippy')
+      assert_kind_of(RIO::Rio,z)
+      assert_equal('/tmp/zippy',z.to_s)
+
       z = tmp/'zippy'
       assert_kind_of(RIO::Rio,z)
       assert_equal('/tmp/zippy',z.to_s)