rio 0.3.3 → 0.3.4

data/test/tc/overload.rb

@@ -14,52 +14,52 @@ class TC_RIO_overload < Test::Unit::TestCase
       src = rio('src').print!(line0)
 
       rio('src') > rio('dst1')
-      assert_equal(line0,rio('dst1').slurp)
+      assert_equal(line0,rio('dst1').contents)
 #      $trace_states = true
       rio('dst2') < rio('src') 
       $trace_states = false
-      assert_equal(line0,rio('dst2').slurp)
+      assert_equal(line0,rio('dst2').contents)
       rio('dst2') << rio('src') 
-      assert_equal(line0+line0,rio('dst2').slurp)
+      assert_equal(line0+line0,rio('dst2').contents)
 
       rio('dst3') << rio('src') 
-      assert_equal(line0,rio('dst3').slurp)
+      assert_equal(line0,rio('dst3').contents)
       rio('dst3') << rio('src') 
-      assert_equal(line0+line0,rio('dst3').slurp)
+      assert_equal(line0+line0,rio('dst3').contents)
 
       rio('dst4') < rio('src') 
-      assert_equal(line0,rio('dst4').slurp)
+      assert_equal(line0,rio('dst4').contents)
 
       rio('dst5') < line0
-      assert_equal(line0,rio('dst5').slurp)
+      assert_equal(line0,rio('dst5').contents)
       rio('dst5') << line0
-      assert_equal(line0+line0,rio('dst5').slurp)
+      assert_equal(line0+line0,rio('dst5').contents)
       
       rio('dst6') < ::File.new('src','r')
-      assert_equal(line0,rio('dst6').slurp)
+      assert_equal(line0,rio('dst6').contents)
       rio('dst6') << ::File.new('src','r')
-      assert_equal(line0+line0,rio('dst6').slurp)
+      assert_equal(line0+line0,rio('dst6').contents)
       
       rio('dst7') < "Line 0\n"
-      assert_equal(line0,rio('dst7').slurp)
+      assert_equal(line0,rio('dst7').contents)
       rio('dst7') << "Line 0\n"
-      assert_equal(line0+line0,rio('dst7').slurp)
+      assert_equal(line0+line0,rio('dst7').contents)
       
       rio('dst8').puts!("Zippy DO\n")
       rio('dst8') < rio('src') 
-      assert_equal(line0,rio('dst8').slurp)
+      assert_equal(line0,rio('dst8').contents)
       
       rio('src') > rio('dst10')
-      assert_equal(line0,rio('dst10').slurp)
+      assert_equal(line0,rio('dst10').contents)
       rio('src') >> rio('dst10')
-      assert_equal(line0+line0,rio('dst10').slurp)
+      assert_equal(line0+line0,rio('dst10').contents)
       
       rio('src') > rio('dst1')
-      assert_equal(line0,rio('dst1').slurp)
+      assert_equal(line0,rio('dst1').contents)
       
       rio('src') >> rio('dst1a')
       rio('src') >> rio('dst1a')
-      assert_equal(line0+line0,rio('dst1a').slurp)
+      assert_equal(line0+line0,rio('dst1a').contents)
       
       str = 'Hello World'
       rio('src') > str
@@ -70,11 +70,11 @@ class TC_RIO_overload < Test::Unit::TestCase
       fh = ::File.new('dst2','w')
       rio('src') > fh
       fh.close
-      assert_equal(line0,rio('dst2').slurp)
+      assert_equal(line0,rio('dst2').contents)
       
       rio('src.gz').gzip < rio('src')
       rio('dst3') < rio('src.gz').gzip
-      assert_equal(line0,rio('dst3').slurp)
+      assert_equal(line0,rio('dst3').contents)
 
       str = 'Hello World'
      rio('src.gz').gzip > str
@@ -91,8 +91,8 @@ class TC_RIO_overload < Test::Unit::TestCase
 
 #     dst2 = rio(datadir,'dst2').mkdir
 #     src > dst2
-#     sline = rio(datadir,'src').slurp
-#     l2 = rio(datadir,'dst2/src').slurp
+#     sline = rio(datadir,'src').contents
+#     l2 = rio(datadir,'dst2/src').contents
 #     assert_equal(line0,sline,'a message in a assertion')
 #     assert_equal(line0,l2)
 
@@ -100,31 +100,31 @@ class TC_RIO_overload < Test::Unit::TestCase
 #     sd1 = rio(datadir,'dir1/sd1').rmtree.mkpath
 #     txt = "Hello f1.txt"
 #     sd1.catpath('f1.txt').puts(txt).close
-#     oline = rio(datadir,'dir1/sd1/f1.txt').slurp
+#     oline = rio(datadir,'dir1/sd1/f1.txt').contents
 
 #     dir2 = rio(datadir,'dir2').rmtree.mkpath
-#     sd1.copy(dir2)
-#     nline = rio(datadir,'dir2/sd1/f1.txt').slurp
+#     sd1.copy_to(dir2)
+#     nline = rio(datadir,'dir2/sd1/f1.txt').contents
 #     assert_equal(oline,nline)
     
 #     dir2 = rio(datadir,'dir2').rmtree.mkpath
 #     sd1 > dir2
-#     nline = rio(datadir,'dir2/sd1/f1.txt').slurp
+#     nline = rio(datadir,'dir2/sd1/f1.txt').contents
 #     assert_equal(oline,nline)
     
 #     dir2 = rio(datadir,'dir2').rmtree.mkpath
 #     dir2 < rio(datadir,'dir1/sd1')
-#     nline = rio(datadir,'dir2/sd1/f1.txt').slurp
+#     nline = rio(datadir,'dir2/sd1/f1.txt').contents
 #     assert_equal(oline,nline)
     
 #     dir2 = rio(datadir,'dir2').rmtree.mkpath
 #     sd1 > dir2.to_s
-#     nline = rio(datadir,'dir2/sd1/f1.txt').slurp
+#     nline = rio(datadir,'dir2/sd1/f1.txt').contents
 #     assert_equal(oline,nline)
     
 #     dir2 = rio(datadir,'dir2').rmtree.mkpath
 #     dir2 < rio(datadir,'dir1/sd1').to_s
-#     nline = rio(datadir,'dir2/sd1/f1.txt').slurp
+#     nline = rio(datadir,'dir2/sd1/f1.txt').contents
 #     assert_equal(oline,nline)
     
   end

data/test/tc/riorl.rb

@@ -60,6 +60,28 @@ 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}"],
+    }
+    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),
+      :temp => rio(:temp),
+      :sysio => rio($stdout),
+      :cmdio => rio(?`,'echo x'),
+      :fd => rio(?#,1),
+    }
+    [rios,rinfo]
+  end
   def mkrios2()
     rinfo = {
       ?- => ['stdout',/^$/,nil,nil,/^stdout:$/,/^stdout:$/],
@@ -86,6 +108,20 @@ class TC_riorl < Test::RIO::TestCase
       assert_equal(r.to_url,rinfo[k][5])
     end
   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(r.scheme,rinfo[k][0])
+      assert_equal(r.opaque,rinfo[k][1])
+      assert_equal(r.path,rinfo[k][2])
+      assert_equal(r.fspath,rinfo[k][3])
+      assert_equal(r.to_s,rinfo[k][4])
+      assert_equal(r.to_url,rinfo[k][5])
+    end
+  end
 
   def test_specialpaths_op
     fmt = "%-12s %-12s %-8s %-8s %-20s %-20s\n"

data/test/tc/selnosel.rb

@@ -0,0 +1,36 @@
+#!/usr/local/bin/ruby
+if $0 == __FILE__
+  Dir.chdir File.dirname(__FILE__)+'/../'
+  $:.unshift File.expand_path('../lib/')
+end
+
+require 'rio'
+require 'test/unit'
+require 'test/unit/testsuite'
+require 'extensions/symbol'
+require 'tc/testcase'
+require 'tmpdir'
+
+class TC_selnosel < Test::RIO::TestCase
+  @@once = false
+  def self.once
+    @@once = true
+    rio('dir').delete!.mkpath.chdir {
+      rio('f1').touch
+      rio('f2').touch
+      rio('g1').touch
+      rio('g2').touch
+    }
+  end
+  def setup
+    super
+    self.class.once unless @@once
+    @dir = rio('dir')
+  end
+
+  def test_selnosel
+    ario = @dir.files('f*').skipfiles(/1/,:symlink?)
+    ans = ario.to_a
+    assert_equal(%w[dir/f2],smap(ans))
+  end
+end

data/test/tc/skip.rb

@@ -0,0 +1,58 @@
+#!/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_skip < Test::RIO::TestCase
+  @@once = false
+  def self.once
+    @@once = true
+    rio('d0').rmtree.mkpath.chdir {
+      rio('f1') < (0..1).map { |i| "L#{i}:d0/f1\n" }
+      rio('f2') < (0..1).map { |i| "L#{i}:d0/f2\n" }
+      rio('g1') < (0..1).map { |i| "L#{i}:d0/g1\n" }
+      rio('g2') < (0..1).map { |i| "L#{i}:d0/g2\n" }
+      rio('x1').symlink('n1')
+      rio('x2').symlink('n2')
+      rio('f1').symlink('l1')
+      rio('f2').symlink('l2')
+      rio('d1').symlink('c1')
+      rio('d2').symlink('c2')
+    }
+  end
+  def setup
+    super
+    self.class.once unless @@once
+    @d0 = rio('d0')
+  end
+
+  def test_prefix_files
+    exprio = rio(@d0).skipfiles(/1/)
+    ansrio = rio(@d0).skip.files(/1/)
+    assert_equal(smap(exprio[]),smap(ansrio[]))
+  end
+  def test_prefix_dirs
+    exprio = rio(@d0).skipdirs(/1/)
+    ansrio = rio(@d0).skip.dirs(/1/)
+    assert_equal(exprio[],ansrio[])
+  end
+  def test_prefix_entries
+    exprio = rio(@d0).skipentries(/1/)
+    ansrio = rio(@d0).skip.entries(/1/)
+    assert_equal(exprio[],ansrio[])
+  end
+  def test_prefix_alone
+    exprio = rio(@d0).skipentries(/1/)
+    ansrio = rio(@d0).skip(/1/)
+    assert_equal(exprio[],ansrio[])
+  end
+  def test_prefix_atend
+#    exprio = rio(@d0).skipentries(/1/)
+    ansrio = rio(@d0).skip[]
+#    assert_equal(exprio[],ansrio[])
+  end
+end

data/test/tc/skiplines.rb

@@ -0,0 +1,42 @@
+#!/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_skiplines < Test::RIO::TestCase
+  @@once = false
+  N_LINES = 4
+  def self.once
+    @@once = true
+    rio('f1') < (0...N_LINES).map { |i| "L#{i}:f1\n" }
+    rio('f2') < (0...N_LINES).map { |i| "L#{i}:f2\n" }
+    rio('g1') < (0...N_LINES).map { |i| "L#{i}:g1\n" }
+    rio('g2') < (0...N_LINES).map { |i| "L#{i}:g2\n" }
+  end
+  def setup
+    super
+    self.class.once unless @@once
+    
+  end
+
+  def test_prefix_lines
+#    exprio = rio(@d0).skipfiles(/1/)
+#    ansrio = rio(@d0).skip.files(/1/)
+    r = rio('f1').skip.lines(1)
+#    p r.cx
+#    p r.to_a
+#    assert_equal(smap(exprio[]),smap(ansrio[]))
+  end
+  def test_skip_param
+#    exprio = rio(@d0).skipfiles(/1/)
+#    ansrio = rio(@d0).skip.files(/1/)
+    r = rio('f1').lines(/^L/).skip(1..2)
+#    p r.to_a
+#    assert_equal(smap(exprio[]),smap(ansrio[]))
+  end
+
+end

data/test/tc/symlink.rb

@@ -33,7 +33,7 @@ class TC_RIO_symlink < Test::Unit::TestCase
     assert_equal('link',lnk.ftype)
     assert_equal(dst.exist?,lnk.exist?)
     if dst.exist?
-      assert_equal(dst.slurp,lnk.slurp)
+      assert_equal(dst.contents,lnk.contents)
     end
   end
   def compare_links(exp,ans)

data/test/tc/symlink0.rb

@@ -33,7 +33,7 @@ class TC_RIO_symlink0 < Test::Unit::TestCase
     assert_equal('link',lnk.ftype)
     assert_equal(dst.exist?,lnk.exist?)
     if dst.exist?
-      assert_equal(dst.slurp,lnk.slurp)
+      assert_equal(dst.contents,lnk.contents)
     end
   end
   def compare_links(exp,ans)

data/test/tc/temp.rb

@@ -11,7 +11,7 @@ require 'extensions/symbol'
 require 'tc/testcase'
 require 'tmpdir'
 
-class TC_tempfile < Test::RIO::TestCase
+class TC_temp < Test::RIO::TestCase
   @@once = false
   def self.once
     @@once = true

data/test/tc/tempdir.rb

@@ -11,7 +11,7 @@ require 'extensions/symbol'
 require 'tc/testcase'
 require 'tmpdir'
 
-class TC_tempfile < Test::RIO::TestCase
+class TC_tempdir < Test::RIO::TestCase
   @@once = false
   def self.once
     @@once = true

data/test/tc/testcase.rb

@@ -107,13 +107,19 @@ module Test
       def assert_dirs_equal(exp,d,msg="")
         exp.each do |ent|
           ds = rio(d,ent.filename)
-          assert(ds.exist?,"entry '#{ds}' exists")
+          assert_equal(ent.symlink?,ds.symlink?,"both symlinks, or not")
+          unless ent.symlink?
+            assert(ds.exist?,"entry '#{ds}' exists")
+          end
           assert_equal(ent.ftype,ds.ftype,"same ftype")
           assert_rios_equal(ent,ds,"sub rios are the same")
         end
       end
       def assert_rios_equal(exp,ans,msg="")
         case
+        when exp.symlink?
+          assert(ans.symlink?,"entry is a symlink")
+          assert_equal(exp.readlink,ans.readlink,"symlinks read the same")
         when exp.file?
           assert(ans.file?,"entry is a file")
           assert_equal(exp.readlines,ans.readlines,"file has same contents")

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rio
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
-date: 2005-08-19 00:00:00 -07:00
+  version: 0.3.4
+date: 2005-09-06 00:00:00 -07:00
 summary: "Rio - Ruby I/O Comfort Class"
 require_paths: 
   - lib
@@ -56,6 +56,7 @@ files:
   - test/tc/copydirlines.rb
   - test/tc/copylines.rb
   - test/tc/copynonex.rb
+  - test/tc/copysymlink.rb
   - test/tc/create.rb
   - test/tc/csv.rb
   - test/tc/csv2.rb
@@ -91,6 +92,9 @@ files:
   - test/tc/rename.rb
   - test/tc/rename_assign.rb
   - test/tc/riorl.rb
+  - test/tc/selnosel.rb
+  - test/tc/skip.rb
+  - test/tc/skiplines.rb
   - test/tc/sub.rb
   - test/tc/symlink.rb
   - test/tc/symlink0.rb
@@ -115,10 +119,10 @@ files:
   - lib/rio/arycopy.rb
   - lib/rio/assert.rb
   - lib/rio/base.rb
+  - lib/rio/construct.rb
   - lib/rio/constructor.rb
   - lib/rio/context.rb
   - lib/rio/cp.rb
-  - lib/rio/cxdir.rb
   - lib/rio/dir.rb
   - lib/rio/doc.rb
   - lib/rio/entrysel.rb
@@ -126,6 +130,7 @@ files:
   - lib/rio/ext.rb
   - lib/rio/factory.rb
   - lib/rio/file.rb
+  - lib/rio/filter.rb
   - lib/rio/ftp.rb
   - lib/rio/grande.rb
   - lib/rio/handle.rb
@@ -135,11 +140,10 @@ files:
   - lib/rio/kernel.rb
   - lib/rio/local.rb
   - lib/rio/match.rb
-  - lib/rio/matchcolumns.rb
   - lib/rio/matchrecord.rb
   - lib/rio/open3.rb
   - lib/rio/path.rb
-  - lib/rio/rangemath.rb
+  - lib/rio/prompt.rb
   - lib/rio/record.rb
   - lib/rio/rectype.rb
   - lib/rio/state.rb
@@ -148,12 +152,12 @@ files:
   - lib/rio/tempdir.rb
   - lib/rio/to_rio.rb
   - lib/rio/version.rb
-  - lib/rio/context/chomp.rb
   - lib/rio/context/closeoneof.rb
   - lib/rio/context/cxx.rb
   - lib/rio/context/dir.rb
   - lib/rio/context/gzip.rb
   - lib/rio/context/methods.rb
+  - lib/rio/context/skip.rb
   - lib/rio/context/stream.rb
   - lib/rio/doc/HOWTO.rb
   - lib/rio/doc/INTRO.rb
@@ -163,7 +167,6 @@ files:
   - lib/rio/exception/open.rb
   - lib/rio/exception/state.rb
   - lib/rio/ext/csv.rb
-  - lib/rio/filter/chomp.rb
   - lib/rio/filter/closeoneof.rb
   - lib/rio/filter/gzip.rb
   - lib/rio/ftp/conn.rb
@@ -174,14 +177,16 @@ files:
   - lib/rio/if/file.rb
   - lib/rio/if/fileordir.rb
   - lib/rio/if/grande.rb
+  - lib/rio/if/grande_entry.rb
+  - lib/rio/if/grande_stream.rb
   - lib/rio/if/internal.rb
-  - lib/rio/if/methods.rb
   - lib/rio/if/path.rb
   - lib/rio/if/stream.rb
   - lib/rio/if/string.rb
   - lib/rio/if/temp.rb
   - lib/rio/if/test.rb
   - lib/rio/impl/path.rb
+  - lib/rio/ops/construct.rb
   - lib/rio/ops/create.rb
   - lib/rio/ops/dir.rb
   - lib/rio/ops/either.rb
@@ -226,6 +231,7 @@ files:
   - ex/riocat
   - ex/riogunzip
   - ex/riogzip
+  - ex/rioprompt.rb
   - ex/tolf
 test_files: []
 rdoc_options: