rio 0.4.2 → 0.5.1

data/test/tc/nolines.rb

@@ -5,11 +5,13 @@ if $0 == __FILE__
 end
 
 require 'rio'
+# $trace_states = true
 require 'test/unit'
-require 'test/unit/testsuite'
+require 'qpdir'
+#require 'test/unit/testsuite'
 
 class TC_RIO_skiplines < Test::Unit::TestCase
-  def tdir() rio(%w/qp skiplines/) end
+  def tdir() rio($QPDIR,%w/skiplines/) end
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end

data/test/tc/noqae.rb

@@ -6,8 +6,10 @@ end
 
 require 'rio'
 require 'tc/testcase'
+require 'qpdir'
+
 class TC_RIO_noqae < Test::Unit::TestCase
-  @@tdir = rio(%w/qp noqae/)
+  @@tdir = rio($QPDIR,%w/noqae/)
   @@once = false
   def initialize(*args)
     super
@@ -82,7 +84,7 @@ class TC_RIO_noqae < Test::Unit::TestCase
     all
   end
   def test_noqae_fs
-    rio('qp/noqae').chdir do
+    rio($QPDIR,'noqae').chdir do
       begin
 
         begin
@@ -193,7 +195,7 @@ class TC_RIO_noqae < Test::Unit::TestCase
   end
 
   def test_noqae_fs_de
-    @@tdir.abs.chdir do
+    @@tdir.chdir do
       begin
         begin
           ans = []
@@ -281,7 +283,7 @@ class TC_RIO_noqae < Test::Unit::TestCase
   end
   def test_noqae_fs_re
     
-    @@tdir.abs.chdir do
+    @@tdir.chdir do
       begin
 
         begin
@@ -442,7 +444,7 @@ class TC_RIO_noqae < Test::Unit::TestCase
 
   def ztest_noqae_fs_re
     all = ['d0/d1','d0/d2','d0/c1','d0/c2','d0/f1','d0/f2','d0/n1','d0/n2','d0/l1','d0/l2']
-    rio('qp/noqae').chdir do
+    rio($QPDIR,'noqae').chdir do
       begin
         begin
           ans = []
@@ -536,7 +538,7 @@ class TC_RIO_noqae < Test::Unit::TestCase
     end
   end
   def ztest_noqae_fs_lines 
-    rio('qp/noqae').chdir do
+    rio($QPDIR,'noqae').chdir do
       begin
         begin
           ans = []
@@ -596,7 +598,7 @@ class TC_RIO_noqae < Test::Unit::TestCase
   end
 
   def ztest_noqae_fs_lines_ss
-    rio('qp/noqae').chdir do
+    rio($QODIR,'noqae').chdir do
       begin
         begin
           ans = []
@@ -650,7 +652,7 @@ class TC_RIO_noqae < Test::Unit::TestCase
   end
 
   def ztest_noqae_chomp 
-    rio('qp/noqae').chdir do
+    rio($QPDIR,'noqae').chdir do
       begin
         begin
           ans = []
@@ -677,7 +679,7 @@ class TC_RIO_noqae < Test::Unit::TestCase
   def ztest_noqae_fs_nest
     ds = ['d1/d1','d1/d2','d1/d1/f1','d1/d1/f2','d1/d2/d1','d1/d2/d1/f1','d1/d2/d1/f2','d1/d2/d2',
           'd1/d3','d1/d3/d1','d1/d3/f1','d1/d3/d1/f1','d1/d3/d1/d1']
-    rio('qp/noqae').chdir do
+    rio($QPDIR,'noqae').chdir do
       begin
         begin
           ans = []
@@ -785,7 +787,7 @@ class TC_RIO_noqae < Test::Unit::TestCase
 
   def ztest_noqae_fs_all
     ds = ['d0/d1','d0/d2','d0/f1','d0/f2','d0/d1/d2','d0/d1/d2/d1','d0/d1/d2/f1','d0/d1/d2/d1/f1','d0/d1/d2/d1/f2']
-    rio('qp/noqae').chdir do
+    rio($QPDIR,'noqae').chdir do
       begin
         begin
           ans = []

data/test/tc/overload.rb

@@ -9,8 +9,7 @@ require 'tc/testcase'
 
 class TC_RIO_overload < Test::Unit::TestCase
   def test_overload
-    qp = RIO.rio('qp')
-    rio(qp,'test_overload').rmtree.mkpath.chdir {
+    rio($QPDIR,'test_overload').rmtree.mkpath.chdir {
       line0 = "Line 0\n"
       src = rio('src').print!(line0)
 

data/test/tc/pa.rb

@@ -6,7 +6,8 @@ end
 
 require 'rio'
 require 'test/unit'
-require 'test/unit/testsuite'
+require 'qpdir'
+#require 'test/unit/testsuite'
 
 def smap(a) a.map { |el| el.to_s } end
 
@@ -14,7 +15,7 @@ class TC_RIO_pa < Test::Unit::TestCase
   def test_pa
     s_dir = ''
     #$trace_states = true
-    tdir = rio(%w/qp pa/)
+    tdir = rio($QPDIR,%w/pa/)
     tdir.rmtree.mkpath.chdir {
       rio(%w/d0 d00 d000/).mkpath
       rio(%w/d1 d10 d000/).mkpath
@@ -41,14 +42,14 @@ class TC_RIO_pa < Test::Unit::TestCase
         ent.files { |el| ans << el }
       end
       exp = ["d1/d10/f0.txt","d1/d10/f1.txt","d1/d10/f2.emp","d1/f0.txt"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
       ario = rio('d1')
       ans = []
       ario.each do |ent|
         ent.files(/x/) { |el| ans << el }
       end
       exp = ["d1/d10/f0.txt", "d1/d10/f1.txt", "d1/f0.txt"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ario = rio('d1')
       ans = ario[/x/]
@@ -63,79 +64,79 @@ class TC_RIO_pa < Test::Unit::TestCase
       ans = []
       rio('d1').all.files('*.?x?').lines(/L2/) { |el| ans << el }
       exp = ["L2:d1/d10/d000/f100.txt\n", "L2:d1/d10/f0.txt\n", "L2:d1/d10/f1.txt\n", "L2:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = []
       rio('d1').all.files('*.?x?').lines(2) { |el| ans << el }
       exp = ["L2:d1/d10/d000/f100.txt\n", "L2:d1/d10/f0.txt\n", "L2:d1/d10/f1.txt\n", "L2:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = []
 
       rio('d1').all.files('*.?x?').lines(2...3) { |el| ans << el }
       exp = ["L2:d1/d10/d000/f100.txt\n", "L2:d1/d10/f0.txt\n", "L2:d1/d10/f1.txt\n", "L2:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
       
       ans = rio('d1').all.files('*.?x?').lines(/L1/).to_a
       exp = ["L1:d1/d10/d000/f100.txt\n", "L1:d1/d10/f0.txt\n", "L1:d1/d10/f1.txt\n", "L1:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = rio('d1').all.files('*.?x?').lines[/L1/]
       exp = ["L1:d1/d10/d000/f100.txt\n", "L1:d1/d10/f0.txt\n", "L1:d1/d10/f1.txt\n", "L1:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = rio('d1').all.lines(/L1/).files['*.?x?']
       exp = ["L1:d1/d10/d000/f100.txt\n", "L1:d1/d10/f0.txt\n", "L1:d1/d10/f1.txt\n", "L1:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = rio('d1').all.files('*.?x?').lines[1]
       exp = ["L1:d1/d10/d000/f100.txt\n", "L1:d1/d10/f0.txt\n", "L1:d1/d10/f1.txt\n", "L1:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = rio('d1').all.files('*.?x?').lines[1...2]
       exp = ["L1:d1/d10/d000/f100.txt\n", "L1:d1/d10/f0.txt\n", "L1:d1/d10/f1.txt\n", "L1:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = rio('d1').all.lines(/L0/).files[/f0/]
       exp = ["L0:d1/d10/f0.txt\n", "L0:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = rio('d1').all.lines(/L0/).files[]
       exp = ["L0:d1/d10/d000/f100.txt\n", "L0:d1/d10/f0.txt\n", "L0:d1/d10/f1.txt\n", "L0:d1/d10/f2.emp\n", "L0:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = rio('d1').all.files(/f0/).lines[/L0/]
       exp = ["L0:d1/d10/f0.txt\n", "L0:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = rio('d1').all.files(/f0/).lines[]
       exp = ["L0:d1/d10/f0.txt\n", "L1:d1/d10/f0.txt\n", "L2:d1/d10/f0.txt\n", "L0:d1/f0.txt\n", "L1:d1/f0.txt\n", "L2:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = rio('d1').all.bytes(8).records(0..1).files[/f0/]
       exp = ["L0:d1/d10/f0.txt\nL1:d1/d10/f0.txt\nL2:d1/d10/f0.txt\n", "L0:d1/f0.txt\nL1:d1/f0.txt\nL2:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = rio('d1').all.bytes(8).files(/f0/).records[0..1]
       exp = ["L0:d1/d10/f0.txt\nL1:d1/d10/f0.txt\nL2:d1/d10/f0.txt\n", "L0:d1/f0.txt\nL1:d1/f0.txt\nL2:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
 
       ans = rio('d1').all.bytes(32).files(/f0/).records[]
       exp = ["L0:d1/d10/f0.txt\nL1:d1/d10/f0.txt\nL2:d1/d10/f0.txt\n", "L0:d1/f0.txt\nL1:d1/f0.txt\nL2:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = rio('d1').all.bytes(32).files[/f0/]
       exp = ["L0:d1/d10/f0.txt\nL1:d1/d10/f0.txt\nL2:d1/d10/f0.txt\n", "L0:d1/f0.txt\nL1:d1/f0.txt\nL2:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = rio('d1').all.bytes.files['*.emp']
       exp = ["L0:d1/d10/f2.emp\nL1:d1/d10/f2.emp\nL2:d1/d10/f2.emp\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = rio('d1').all.files('*.emp').bytes[]
       exp = ["L0:d1/d10/f2.emp\nL1:d1/d10/f2.emp\nL2:d1/d10/f2.emp\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = rio('d1').all.lines[]
       exp = ["L0:d1/d10/d000/f100.txt\n", "L1:d1/d10/d000/f100.txt\n", "L2:d1/d10/d000/f100.txt\n", 
@@ -143,12 +144,12 @@ class TC_RIO_pa < Test::Unit::TestCase
              "L0:d1/d10/f1.txt\n", "L1:d1/d10/f1.txt\n", "L2:d1/d10/f1.txt\n", 
              "L0:d1/d10/f2.emp\n", "L1:d1/d10/f2.emp\n", "L2:d1/d10/f2.emp\n", 
              "L0:d1/f0.txt\n", "L1:d1/f0.txt\n", "L2:d1/f0.txt\n"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = rio('d1').all[]
       exp = ["d1/d10", "d1/d10/d000", "d1/d10/d000/f100.txt", "d1/d10/d100", 
              "d1/d10/f0.txt", "d1/d10/f1.txt", "d1/d10/f2.emp", "d1/d11", "d1/f0.txt"]
-      assert_equal(exp,smap(ans))
+      assert_equal(exp.sort,smap(ans).sort)
 
       ans = rio('d1').all.files('*.emp').lines[]
       exp = ["L0:d1/d10/f2.emp\n", "L1:d1/d10/f2.emp\n", "L2:d1/d10/f2.emp\n"]

data/test/tc/path_parts.rb

@@ -88,7 +88,8 @@ class TC_path_parts < Test::RIO::TestCase
 
   def self.once
     @@once = true
-    expfile = RIO.cwd('../../tc/rlparts.ans.yml')
+    fpath = ::File.dirname(__FILE__) + '/rlparts.ans.yml'
+    expfile = rio(::File.expand_path(fpath))
     @@exp = expfile.yaml.get
   end
 
@@ -99,9 +100,14 @@ class TC_path_parts < Test::RIO::TestCase
 
   def run_path_tests_exp(paths,sym)
     paths.each do |pstr|
-      #p pstr
+      #p pstr,sym
       r = rio(pstr)
-      assert_equal(@@exp[r.to_s][sym],r.__send__(sym).to_s,"rio('#{pstr}').#{sym} failed")
+      exp = @@exp[r.to_s][sym]
+      ans = r.__send__(sym).to_s
+      display_rslt(exp,ans,pstr,sym)
+      #ok = exp == ans ? "PASS" : "FAIL"
+      #puts "#{ok} #{sym}[#{r}]: #{exp} <=> #{ans}"
+      #assert_equal(exp,ans,"rio('#{pstr}').#{sym} failed")
     end
   end
   def run_path_tests_native(paths,sym,*args)
@@ -109,17 +115,44 @@ class TC_path_parts < Test::RIO::TestCase
       r = rio(pstr)
       exp = File.__send__(sym,pstr,*args)
       ans = r.__send__(sym,*args).to_s
-      #puts "#{sym}[#{r}]: #{exp} <=> #{ans}"
-      assert_equal(exp,ans,"rio('#{pstr}').#{sym} failed")
+      display_rslt(exp,ans,pstr,sym,*args)
+      #ok = exp == ans ? "PASS" : "FAIL"
+      #puts "#{ok} #{sym}[#{r}]: #{exp} <=> #{ans}"
+      #assert_equal(exp,ans,"rio('#{pstr}').#{sym} failed")
+    end
+  end
+  def run_path_tests_native_path(paths,sym,*args)
+    paths.each do |pstr|
+      r = rio(pstr)
+      fpth = r.path
+      exp = File.__send__(sym,fpth,*args)
+      ans = r.__send__(sym,*args).to_s
+      display_rslt(exp,ans,pstr,sym,*args)
+      #ok = exp == ans ? "PASS" : "FAIL"
+      #puts "#{ok} rio('#{pstr}').#{sym} = #{ans} (#{exp})"
+      #assert_equal(File.__send__(sym,fpth,*args),r.__send__(sym,*args).to_s,"rio('#{pstr}').#{sym} failed")
     end
   end
   def run_path_tests_native_fspath(paths,sym,*args)
     paths.each do |pstr|
       r = rio(pstr)
       fpth = r.fspath
-      assert_equal(File.__send__(sym,fpth,*args),r.__send__(sym,*args).to_s,"rio('#{pstr}').#{sym} failed")
+      exp = File.__send__(sym,fpth,*args)
+      ans = r.__send__(sym,*args).to_s
+      display_rslt(exp,ans,pstr,sym,*args)
+      #ok = exp == ans ? "PASS" : "FAIL"
+      #puts "#{ok} rio('#{pstr}').#{sym} = #{ans} (#{exp})"
+      #assert_equal(File.__send__(sym,fpth,*args),r.__send__(sym,*args).to_s,"rio('#{pstr}').#{sym} failed")
     end
   end
+  def display_rslt(exp,ans,pstr,sym,*args)
+    ok = exp == ans ? "" : "FAIL"
+    arg_str = args.empty? ? '' : '('+args.map{|el| "'"+el.to_s+"'" }.join(",")+')'
+    call_str = sprintf("rio('%s').%s%s",pstr,sym,arg_str)
+    #printf("\n%-4s %-55s = %-20s <=> %-20s",ok,call_str,ans,exp) if ok == "FAIL"
+    assert_equal(exp,ans,"#{call_str} failed")
+    
+  end
   def test_filename()
     @@gen.all_paths.each do |pstr|
       assert_equal(rio(pstr).basename(''),rio(pstr).filename)
@@ -129,10 +162,6 @@ class TC_path_parts < Test::RIO::TestCase
   def test_uri_dirname
     run_path_tests_exp(@@gen.uri_paths,:dirname)
   end
-  def test_uri_basename
-    run_path_tests_exp(@@gen.uri_paths,:basename)
-  end
-
   def test_fs_dirname
     run_path_tests_native(@@gen.fs_basic_paths,:dirname)
     run_path_tests_native(@@gen.fs_drive_paths,:dirname)
@@ -141,17 +170,22 @@ class TC_path_parts < Test::RIO::TestCase
   def test_fs_url_dirname
     run_path_tests_exp(@@gen.fs_url_paths,:dirname)
   end
+
+  def test_uri_basename
+    run_path_tests_exp(@@gen.uri_paths,:basename)
+  end
+
   def test_fs_url_basename
-    run_path_tests_native_fspath(@@gen.fs_url_paths,:basename,'')
-    run_path_tests_native_fspath(@@gen.fs_url_paths,:basename,'.txt')
+    run_path_tests_native_path(@@gen.fs_url_paths,:basename,'')
+    run_path_tests_native_path(@@gen.fs_url_paths,:basename,'.txt')
   end
   def test_fs_basename
     run_path_tests_native(@@gen.fs_basic_paths,:basename,'')
     run_path_tests_native(@@gen.fs_drive_paths,:basename,'')
-    run_path_tests_native(@@gen.fs_unc_paths,:basename,'')
+    run_path_tests_native_path(@@gen.fs_unc_paths,:basename,'')
     run_path_tests_native(@@gen.fs_basic_paths,:basename,'.txt')
     run_path_tests_native(@@gen.fs_drive_paths,:basename,'.txt')
-    run_path_tests_native(@@gen.fs_unc_paths,:basename,'.txt')
+    run_path_tests_native_path(@@gen.fs_unc_paths,:basename,'.txt')
   end
 
   def test_fs_path
@@ -166,11 +200,11 @@ class TC_path_parts < Test::RIO::TestCase
   def test_uri_fspath
     run_path_tests_exp(@@gen.uri_paths,:fspath)
   end
-  def test_fs_urlpath
-    run_path_tests_exp(@@gen.fs_paths,:urlpath)
-  end
-  def test_uri_urlpath
-    run_path_tests_exp(@@gen.uri_paths,:urlpath)
-  end
+  #def test_fs_urlpath
+  #  run_path_tests_exp(@@gen.fs_paths,:urlpath)
+  #end
+  #def test_uri_urlpath
+  #  run_path_tests_exp(@@gen.uri_paths,:urlpath)
+  #end
 
 end

data/test/tc/paths.rb

@@ -5,7 +5,8 @@ if $0 == __FILE__
 end
 require 'rio'
 require 'test/unit'
-require 'test/unit/testsuite'
+require 'qpdir'
+#require 'test/unit/testsuite'
 
 class TC_RIO_paths < Test::Unit::TestCase
   def smap(a) a.map { |el| el.to_s } end
@@ -18,7 +19,7 @@ class TC_RIO_paths < Test::Unit::TestCase
 
   def test_paths
     s_dir = ''
-    tdir = rio(%w/qp test_paths/)
+    tdir = rio($QPDIR,%w/test_paths/)
     tdir.rmtree.mkpath.chdir {
       rio(%w/dir0 dir00 dir000/).mkpath
       rio(%w/dir1 dir10 dir000/).mkpath

data/test/tc/piper.rb

@@ -42,64 +42,65 @@ class TC_piper < Test::RIO::TestCase
   end
 
   def test_cmd_out
-    ls = rio(?-,PROG['list_dir'])
+    ls = rio(?-,PROG[:list_dir])
     checkit([@@dname],ls)
   end
 
   def test_cmd_out2
-    ls = rio(?-,PROG['list_dir']+' d')
+    p PROG
+    ls = rio(?-,PROG[:list_dir]+' d')
     checkit(@@fnames,ls)
   end
 
   def test_cmd_cmd_out
-    ls = rio(?-,PROG['list_dir']+' d')
-    grep = rio(?-,PROG['find_lines']+' 1').w!
+    ls = rio(?-,PROG[:list_dir]+' d')
+    grep = rio(?-,PROG[:find_lines]+' 1').w!
     checkit(@@fnames.select { |s| s =~ /1/ },ls,grep)
   end
 
   def test_cmd_cmd_cmd_out
-    ls = rio(?-,PROG['list_dir']+' d')
-    grep = rio(?-,PROG['find_lines']+' 1').w!
-    grep2 = rio(?-,PROG['find_lines']+' g').w!
+    ls = rio(?-,PROG[:list_dir]+' d')
+    grep = rio(?-,PROG[:find_lines]+' 1').w!
+    grep2 = rio(?-,PROG[:find_lines]+' g').w!
     checkit(@@fnames.select { |s| s =~ /g1/ },ls,grep,grep2)
   end
 
   def test_cmd_cmd_cmd_cmd_out
-    ls = rio(?-,PROG['list_dir']+' d')
-    grep = rio(?-,PROG['find_lines']+' 1').w!
-    grep2 = rio(?-,PROG['find_lines']+' g').w!
-    wc = rio(?-,PROG['count_lines']).w!
+    ls = rio(?-,PROG[:list_dir]+' d')
+    grep = rio(?-,PROG[:find_lines]+' 1').w!
+    grep2 = rio(?-,PROG[:find_lines]+' g').w!
+    wc = rio(?-,PROG[:count_lines]).w!
 
     checkit(["1"],ls,grep,grep2,wc)
   end
   def test_piper_out
-    ls = rio(?-,PROG['list_dir']+' d')
-    grep = rio(?-,PROG['find_lines']+' 1').w!
+    ls = rio(?-,PROG[:list_dir]+' d')
+    grep = rio(?-,PROG[:find_lines]+' 1').w!
     rp1 = RIO::Piper::Base.new(ls,grep)
     checkit(@@fnames.select { |s| s =~ /1/ },rp1)
   end
 
   def test_piper_cmd_out
-    ls = rio(?-,PROG['list_dir']+' d')
-    grep = rio(?-,PROG['find_lines']+' 1').w!
+    ls = rio(?-,PROG[:list_dir]+' d')
+    grep = rio(?-,PROG[:find_lines]+' 1').w!
     rp1 = RIO::Piper::Base.new(ls,grep)
-    grep2 = rio(?-,PROG['find_lines']+' g').w!
+    grep2 = rio(?-,PROG[:find_lines]+' g').w!
     checkit(@@fnames.select { |s| s =~ /g1/ },rp1,grep2)
   end
 
   def test_cmd_piper_out
-    ls = rio(?-,PROG['list_dir']+' d')
-    grep = rio(?-,PROG['find_lines']+' 1').w!
-    grep2 = rio(?-,PROG['find_lines']+' g').w!
+    ls = rio(?-,PROG[:list_dir]+' d')
+    grep = rio(?-,PROG[:find_lines]+' 1').w!
+    grep2 = rio(?-,PROG[:find_lines]+' g').w!
     rp1 = RIO::Piper::Base.new(grep,grep2)
     checkit(@@fnames.select { |s| s =~ /g1/ },ls,rp1)
   end
 
   def test_piper_piper_out
-    ls = rio(?-,PROG['list_dir']+' d')
-    grep = rio(?-,PROG['find_lines']+' 1').w!
-    grep2 = rio(?-,PROG['find_lines']+' g').w!
-    wc = rio(?-,PROG['count_lines']).w!
+    ls = rio(?-,PROG[:list_dir]+' d')
+    grep = rio(?-,PROG[:find_lines]+' 1').w!
+    grep2 = rio(?-,PROG[:find_lines]+' g').w!
+    wc = rio(?-,PROG[:count_lines]).w!
     rp1 = RIO::Piper::Base.new(ls,grep)
     rp2 = RIO::Piper::Base.new(grep2,wc)
     checkit(["1"],rp1,rp2)
@@ -112,30 +113,30 @@ class TC_piper < Test::RIO::TestCase
 
   def test_file_cmd_out
     f = rio('d/f2')
-    grep = rio(?-,PROG['find_lines']+' 2').w!
+    grep = rio(?-,PROG[:find_lines]+' 2').w!
     checkit(rio('d/f2').chomp[/2/],f,grep)
   end
 
   def test_file_cmd_cmd_out
     f = rio('d/f2')
-    grep = rio(?-,PROG['find_lines']+' 2').w!
-    grep2 = rio(?-,PROG['find_lines']+' 0').w!
+    grep = rio(?-,PROG[:find_lines]+' 2').w!
+    grep2 = rio(?-,PROG[:find_lines]+' 0').w!
     checkit(rio('d/f2').chomp[/0/],f,grep,grep2)
   end
 
   def test_file_cmd_cmd_cmd_out
     f = rio('d/f2')
-    grep = rio(?-,PROG['find_lines']+' 2').w!
-    grep2 = rio(?-,PROG['find_lines']+' 0').w!
-    wc = rio(?-,PROG['count_lines']).w!
+    grep = rio(?-,PROG[:find_lines]+' 2').w!
+    grep2 = rio(?-,PROG[:find_lines]+' 0').w!
+    wc = rio(?-,PROG[:count_lines]).w!
     checkit(["1"],f,grep,grep2,wc)
   end
 
 
   def test_file_piper_out
     f = rio('d/f2')
-    grep = rio(?-,PROG['find_lines']+' 2').w!
-    grep2 = rio(?-,PROG['find_lines']+' 0').w!
+    grep = rio(?-,PROG[:find_lines]+' 2').w!
+    grep2 = rio(?-,PROG[:find_lines]+' 0').w!
     rp1 = RIO::Piper::Base.new(grep,grep2)
     checkit(rio('d/f2').chomp[/0/],f,rp1)
   end