rio 0.3.6 → 0.3.7

data/test/tc/nolines.rb

@@ -13,8 +13,7 @@ class TC_RIO_skiplines < Test::Unit::TestCase
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end
-  require 'extensions/symbol'
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map { |el| el.to_s } end
   def mkafile(*args)
     file = rio(*args)
     file < (0..1).map { |i| "L#{i}:#{file.to_s}\n" }
@@ -45,10 +44,10 @@ class TC_RIO_skiplines < Test::Unit::TestCase
 
     exp = lines[0..0] + lines[2..5] + lines[7...8]
     ans = file.chomp.skiplines[:empty?]
-    assert_equal(exp.map(&:chomp),ans)
+    assert_equal(exp.map{|el| el.chomp},ans)
 
     ans = file.skiplines(:empty?).chomp.to_a
-    assert_equal(exp.map(&:chomp),ans)
+    assert_equal(exp.map{|el| el.chomp},ans)
 
     file.close
     rio('..').chdir

data/test/tc/noqae.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 class TC_RIO_noqae < Test::Unit::TestCase
   @@tdir = rio(%w/qp noqae/)
@@ -19,7 +16,7 @@ class TC_RIO_noqae < Test::Unit::TestCase
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map{|el| el.to_s} end
   def setup
     s_dir = ''
     #$trace_states = true

data/test/tc/pa.rb

@@ -7,9 +7,8 @@ end
 require 'rio'
 require 'test/unit'
 require 'test/unit/testsuite'
-require 'extensions/symbol'
 
-def smap(a) a.map( &:to_s ) end
+def smap(a) a.map { |el| el.to_s } end
 
 class TC_RIO_pa < Test::Unit::TestCase
   def test_pa

data/test/tc/pathop.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 
 class TC_pathop < Test::RIO::TestCase

data/test/tc/paths.rb

@@ -8,9 +8,7 @@ require 'test/unit'
 require 'test/unit/testsuite'
 
 class TC_RIO_paths < Test::Unit::TestCase
-  require 'extensions/symbol'
-  def pa(a) p a.map( &:to_s ) end
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map { |el| el.to_s } end
   def pmap(a)
     a.sort
   end

data/test/tc/qae.rb

@@ -7,13 +7,12 @@ end
 require 'rio'
 require 'test/unit'
 require 'test/unit/testsuite'
-require 'extensions/symbol'
 
 class TC_RIO_qae < Test::Unit::TestCase
   @@tdir = rio(%w/qp qae/)
   @@once = false
 
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map { |el| el.to_s } end
   def setup
     s_dir = ''
     #$trace_states = true

data/test/tc/qae_riovar.rb

@@ -7,12 +7,11 @@ end
 require 'rio'
 require 'test/unit'
 require 'test/unit/testsuite'
-require 'extensions/symbol'
 
 class TC_RIO_qae_riovar < Test::Unit::TestCase
   @@tdir = rio(%w/qp qae/)
   @@once = false
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map { |el| el.to_s } end
   def self.once()
     @@tdir.rmtree.mkpath.chdir do
       rio('d0').mkpath.chdir {

data/test/tc/records.rb

@@ -9,11 +9,10 @@ require 'test/unit'
 require 'test/unit/testsuite'
 
 class TC_RIO_records < Test::Unit::TestCase
-  require 'extensions/symbol'
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map { |el| el.to_s } end
   def tdir() rio(%w/qp records/) end
   def mkafile(*args)
     file = rio(*args)

data/test/tc/rename.rb

@@ -5,10 +5,8 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
+
 class TC_rename < Test::RIO::TestCase
   @@once = false
   def self.once

data/test/tc/rename_assign.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 class TC_rename_assign < Test::RIO::TestCase
   @@once = false

data/test/tc/riorl.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 require 'tmpdir'
 
@@ -39,21 +36,36 @@ class TC_riorl < Test::RIO::TestCase
     printf(fmt, pi[:scheme].inspect,pi[:opaque].inspect,pi[:path].inspect,
            pi[:fspath].inspect,pi[:to_s].inspect,pi[:to_url].inspect)
   end
-  def mkrios1()
+  def mkrioinfo(astring)
+    rinfo = mksyminfo(astring)
+    rinfo[?-] = rinfo[:stdio]
+    rinfo[?=] = rinfo[:stderr]
+    rinfo[??] = rinfo[:temp]
+    rinfo[?"] = rinfo[:strio]
+    rinfo[?_] = rinfo[:sysio]
+    rinfo[?`] = rinfo[:cmdio]
+    rinfo[?#] = rinfo[:fd]
+    rinfo
+  end
+
+  def mksyminfo(astring)
     rinfo = {
-      ?- => ['stdio',"",nil,nil,"stdio:","stdio:"],
-      ?= => ['stderr',"",nil,nil,"stderr:","stderr:"],
-#      ?" => ['strio',"",nil,nil,"strio:","strio:"],
-      ?? => ['temp',@tmppath,nil,nil,"temp:#{@tmppath}","temp:#{@tmppath}"],
+      :stdio  => ['stdio',"",nil,nil,"stdio:","stdio:"],
+      :stderr => ['stderr',"",nil,nil,"stderr:","stderr:"],
+      :temp => ['temp',@tmppath,nil,nil,"temp:#{@tmppath}","temp:#{@tmppath}"],
     }
-    astring = ""
     strpq = sprintf("0x%08x",astring.object_id)
-    rinfo[?"] = ['strio',strpq,nil,nil,"strio:#{strpq}","strio:#{strpq}"]
+    rinfo[:strio] = ['strio',strpq,nil,nil,"strio:#{strpq}","strio:#{strpq}"]
 
     siopq = sprintf("0x%08x",$stdout.object_id)
-    rinfo[?_] = ['sysio',siopq,nil,nil,"sysio:#{siopq}","sysio:#{siopq}"]
-    rinfo[?`] = ['cmdio','echo%20x',nil,nil,'echo x','cmdio:echo%20x']
-    rinfo[?#] = ['fd','1',nil,nil,'fd:1','fd:1']
+    rinfo[:sysio] = ['sysio',siopq,nil,nil,"sysio:#{siopq}","sysio:#{siopq}"]
+    rinfo[:cmdio] = ['cmdio','echo%20x',nil,nil,'echo x','cmdio:echo%20x']
+    rinfo[:fd] = ['fd','1',nil,nil,'fd:1','fd:1']
+    rinfo
+  end
+
+  def mkrios1()
+    rinfo = mkrioinfo(astring="")
     rios = {
       ?- => rio(?-),
       ?= => rio(?=),
@@ -65,48 +77,50 @@ class TC_riorl < Test::RIO::TestCase
     }
     [rios,rinfo]
   end
+
   def mkrios_sym
-    rinfo = {
-      :stdio  => ['stdio',"",nil,nil,"stdio:","stdio:"],
-      :stderr => ['stderr',"",nil,nil,"stderr:","stderr:"],
-      #:strio => ['strio',"",nil,nil,"strio:","strio:"],
-      :temp => ['temp',@tmppath,nil,nil,"temp:#{@tmppath}","temp:#{@tmppath}"],
-    }
-    astring = ""
-    strpq = sprintf("0x%08x",astring.object_id)
-    rinfo[:strio] = ['strio',strpq,nil,nil,"strio:#{strpq}","strio:#{strpq}"]
+    rinfo = mksyminfo(astring="")
 
-    siopq = sprintf("0x%08x",$stdout.object_id)
-    rinfo[:sysio] = ['sysio',siopq,nil,nil,"sysio:#{siopq}","sysio:#{siopq}"]
-    rinfo[:cmdio] = ['cmdio','echo%20x',nil,nil,'echo x','cmdio:echo%20x']
-    rinfo[:fd] = ['fd','1',nil,nil,'fd:1','fd:1']
     rios = {
       :stdio => rio(:stdio),
       :stderr => rio(:stderr),
       :strio => rio(:strio,astring),
       :temp => rio(:temp),
-      :sysio => rio($stdout),
-      :cmdio => rio(?`,'echo x'),
-      :fd => rio(?#,1),
+      :sysio => rio(:sysio,$stdout),
+      :cmdio => rio(:cmdio,'echo x'),
+      :fd => rio(:fd,1),
     }
+
     [rios,rinfo]
   end
-  def mkrios2()
-    rinfo = {
-      ?- => ['stdout',/^$/,nil,nil,/^stdout:$/,/^stdout:$/],
-      ?? => ['file',%r|//#{@tmppath}\d+\.\d+|,%r|#{@tmppath}\d+\.\d+|,%r|#{@tmppath}\d+\.\d+|,/#{@tmppath}\d+\.\d+/,/#{@tmppath}\d+\.\d+/],
+  def mkrios_modfunc
+    rinfo = mksyminfo(astring="")
+    rios = {
+      :stdio => RIO.stdio,
+      :stderr => RIO.stderr,
+      :strio => RIO.strio(astring),
+      :temp => RIO.temp,
+      :sysio => RIO.sysio($stdout),
+      :cmdio => RIO.cmdio('echo x'),
+      :fd => RIO.fd(1),
     }
-    siopq = sprintf("0x%08x",$stdout.object_id)
+    [rios,rinfo]
+  end
+  def mkrios_classmeth
+    rinfo = mksyminfo(astring="")
     rios = {
-      ?- => rio(?-).print("."),
-      ?? => rio(??).puts("hw"),
+      :stdio => RIO::Rio.stdio,
+      :stderr => RIO::Rio.stderr,
+      :strio => RIO::Rio.strio(astring),
+      :temp => RIO::Rio.temp,
+      :sysio => RIO::Rio.sysio($stdout),
+      :cmdio => RIO::Rio.cmdio('echo x'),
+      :fd => RIO::Rio.fd(1),
     }
     [rios,rinfo]
   end
-  def test_specialpaths
-    fmt = "%-12s %-12s %-8s %-8s %-20s %-20s\n"
+  def check_rios(rios,rinfo,fmt="%-12s %-12s %-8s %-8s %-20s %-20s\n")
     #printf(fmt,'scheme','opaque','path','fspath','to_s','url')
-    rios,rinfo = mkrios1()
     rios.each do |k,r|
       #pinfo(fmt,pathinfo(r))
       assert_equal(rinfo[k][0],r.scheme)
@@ -117,25 +131,41 @@ class TC_riorl < Test::RIO::TestCase
       assert_equal(rinfo[k][5],r.to_url)
     end
   end
+  def test_specialpaths
+    rios,rinfo = mkrios1()
+    check_rios(rios,rinfo)
+  end
+
   def test_specialpaths_sym
-    fmt = "%-12s %-12s %-8s %-8s %-20s %-20s\n"
-    #printf(fmt,'scheme','opaque','path','fspath','to_s','url')
     rios,rinfo = mkrios_sym()
-    rios.each do |k,r|
-      #pinfo(fmt,pathinfo(r))
-      assert_equal(rinfo[k][0],r.scheme)
-      assert_equal(rinfo[k][1],r.opaque)
-      assert_equal(rinfo[k][2],r.path)
-      assert_equal(rinfo[k][3],r.fspath)
-      assert_equal(rinfo[k][4],r.to_s)
-      assert_equal(rinfo[k][5],r.to_url)
-    end
+    check_rios(rios,rinfo)
+  end
+  def test_specialpaths_modfunc
+    rios,rinfo = mkrios_modfunc()
+    check_rios(rios,rinfo)
+  end
+  def test_specialpaths_classmeth
+    rios,rinfo = mkrios_classmeth()
+    check_rios(rios,rinfo)
   end
 
-  def test_specialpaths_op
+  def mkrios_open()
+    rinfo = {
+      ?- => ['stdout',/^$/,nil,nil,/^stdout:$/,/^stdout:$/],
+      ?? => ['file',%r|//#{@tmppath}\d+\.\d+|,%r|#{@tmppath}\d+\.\d+|,%r|#{@tmppath}\d+\.\d+|,
+             /#{@tmppath}\d+\.\d+/,/#{@tmppath}\d+\.\d+/],
+    }
+    siopq = sprintf("0x%08x",$stdout.object_id)
+    rios = {
+      ?- => rio(?-).print("."),
+      ?? => rio(??).puts("hw"),
+    }
+    [rios,rinfo]
+  end
+  def test_specialpaths_open
     fmt = "%-12s %-12s %-8s %-8s %-20s %-20s\n"
     #printf(fmt,'scheme','opaque','path','fspath','to_s','url')
-    rios,rinfo = mkrios2()
+    rios,rinfo = mkrios_open()
     rios.each do |k,r|
       #pinfo(fmt,pathinfo(r))
       assert_equal(rinfo[k][0],r.scheme)

data/test/tc/selnosel.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 require 'tmpdir'
 

data/test/tc/sub.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 class TC_sub < Test::RIO::TestCase
   @@once = false

data/test/tc/symlink.rb

@@ -9,11 +9,10 @@ require 'test/unit'
 require 'test/unit/testsuite'
 
 class TC_RIO_symlink < Test::Unit::TestCase
-  require 'extensions/symbol'
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map { |el| el.to_s } end
   def tdir() rio(%w/qp symlink/) end
   def mkafile(*args)
     file = rio(*args)

data/test/tc/symlink0.rb

@@ -9,11 +9,10 @@ require 'test/unit'
 require 'test/unit/testsuite'
 
 class TC_RIO_symlink0 < Test::Unit::TestCase
-  require 'extensions/symbol'
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map { |el| el.to_s } end
   def tdir() rio(%w/qp symlink0/) end
   def mkafile(*args)
     file = rio(*args)

data/test/tc/symlink1.rb

@@ -9,11 +9,10 @@ require 'test/unit'
 require 'test/unit/testsuite'
 
 class TC_RIO_symlink1 < Test::Unit::TestCase
-  require 'extensions/symbol'
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map { |el| el.to_s } end
   def tdir() rio(%w/qp symlink1/) end
   def mkafile(*args)
     file = rio(*args)

data/test/tc/temp.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 require 'tmpdir'
 

data/test/tc/tempdir.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 require 'tmpdir'
 

data/test/tc/tempfile.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 require 'tmpdir'
 

data/test/tc/testcase.rb

@@ -1,7 +1,7 @@
 require 'rio'
 require 'test/unit'
 require 'test/unit/testsuite'
-require 'extensions/symbol'
+
 
 
 module RIOSupport
@@ -48,7 +48,7 @@ module RIO_TestCase
   def assert_array_equal(a,b,msg="array same regardless of order")
     assert_equal(smap(a).sort,smap(b).sort,msg)
   end
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map { |el| el.to_s } end
   def mkafile(*args)
     file = rio(*args)
     file < (0..1).map { |i| "L#{i}:#{file.to_s}\n" }
@@ -103,7 +103,13 @@ module Test
         assert((!(a)),msg)
       end
       def assert_array_equal(a,b,msg="array same regardless of order")
-        assert_equal(smap(a).sort,smap(b).sort,msg)
+        if a.nil?
+          assert_nil(b)
+        elsif b.nil?
+          assert_nil(a)
+        else
+          assert_equal(smap(a).sort,smap(b).sort,msg)
+        end
       end
       def assert_dirs_equal(exp,d,msg="")
         exp.each do |ent|
@@ -130,7 +136,6 @@ module Test
         end
       end
 
-      def smap(a) a.map( &:to_s ) end
       def self.make_lines_file(n_lines=8,*args)
         file = rio(*args)
         lines = (0...n_lines).map { |i| "L#{i}:#{file}" + $/ }