rio 0.3.4 → 0.3.6

data/lib/rio/state.rb

@@ -41,7 +41,7 @@ require 'rio/context/methods'
 require 'rio/ext'
 require 'rio/symantics'
 require 'rio/filter'
-$trace_states = false
+
 module RIO
 
                    
@@ -55,7 +55,7 @@ module RIO
     # * and some basic error handling stubs
     class Base
       KIOSYMS = [:gets,:open,:readline,:readlines,:chop,:to_a,:putc,:puts,:print,:printf,:split,
-                 :=~,:===,:==,:eql?,:sub,:sub!,:gsub,:gsub!]
+                 :=~,:===,:==,:eql?,:sub,:sub!,:gsub,:gsub!,:load]
       @@kernel_cleaned ||= KIOSYMS.each { |sym| undef_method(sym) } 
     end 
     
@@ -79,7 +79,7 @@ module RIO
       end
 
       def initialize_copy(*args)
-        #p callstr('enter state initialize_copy',*args)
+        #p callstr('initialize_copy',args[0].inspect)
         super
         @rl = @rl.clone unless @rl.nil?
         @cx = @cx.clone unless @cx.nil?
@@ -89,7 +89,12 @@ module RIO
       def self.new_r(riorl)
         new.init(riorl,Cx::Vars.new( { 'closeoneof' => true, 'closeoncopy' => true } ))
       end
-
+      def clone_rio()
+        cp = Rio.new(self.rl)
+        cp.cx = self.cx
+        cp.ioh = self.ioh.clone unless self.ioh.nil?
+        cp
+      end
       def init(riorl,cntx,iohandle=nil)
         @rl = riorl
         @cx = cntx
@@ -106,6 +111,11 @@ module RIO
         init(other.rl,other.cx,other.ioh)
       end
 
+      alias :ior :ioh
+      alias :iow :ioh
+
+
+
       # Section: State Switching
 
       # the method for changing states
@@ -170,7 +180,7 @@ module RIO
 
 
       extend Forwardable
-      def_instance_delegators(:rl,:path,:to_s,:fspath,:length)
+      def_instance_delegators(:rl,:path,:to_s,:fspath,:urlpath,:length)
 
       def ==(other) @rl == other end
       def ===(other) self == other end
@@ -200,6 +210,14 @@ module RIO
         return arg0 if arg0.kind_of?(::RIO::Rio)
         new_rio(arg0)
       end
+      def ensure_cmd_rio(arg)
+        case arg
+        when ::String then new_rio(:cmdio,arg)
+        when ::Fixnum then new_rio(arg)
+        when Rio then arg.clone
+        else ensure_rio(arg)
+        end
+      end
 
       include Symantics
 

data/lib/rio/stream.rb

@@ -43,6 +43,7 @@ require 'rio/ops/stream/output'
 require 'rio/ext'
 
 require 'rio/filter/gzip'
+#require 'rio/filter/yaml'
 #require 'rio/filter/chomp'
 #require 'rio/filter/strip'
 require 'rio/filter/closeoneof'
@@ -116,10 +117,12 @@ module RIO
       end
 
       def add_extensions()
+        #p callstr('add_extensions')
         Ext::Input.add_extensions(self)
       end
       def add_filters
         add_filter(Filter::GZipRead) if gzip?
+        #add_filter(Filter::YAML) if yaml?
         add_line_filters()
         if closeoneof?
           add_filter(Filter::CloseOnEOF)
@@ -143,6 +146,7 @@ module RIO
       end
       def add_filters
         add_filter(Filter::GZipWrite) if gzip?
+        #add_filter(Filter::YAML) if yaml?
         self
       end
 

data/lib/rio/stream/duplex.rb

@@ -50,6 +50,7 @@ module RIO
       module Ops
         module Output
           def wclose()
+            #p "wclose #{self}"
             ioh.close_write
             return self.close.softreset if ioh.closed?
             self

data/lib/rio/stream/open.rb

@@ -40,6 +40,7 @@ require 'rio/stream/base'
 require 'rio/ops/stream'
 require 'rio/ops/path'
 require 'rio/cp'
+require 'rio/piper/cp'
 
 module RIO
   module Stream
@@ -50,6 +51,7 @@ module RIO
       #include Ops::Path::Query
       include Cp::Open::Output
       include Cp::Open::Input
+      include Piper::Cp::Input
 
       def check?() true end
 
@@ -73,6 +75,7 @@ module RIO
       end
 
       protected :open_
+
     end
   end
 end
@@ -87,7 +90,7 @@ module RIO
       end
       OUTPUT_SYMS = [:print,:printf,:puts,:putc,:write,
                      :print!,:printf!,:puts!,:putc!,:write!,
-                     :put_,:putrec,:<,:<<
+                     :put_,:putrec,:putrec!,:<,:<<
       ].build_hash { |sym| [sym.to_s,1] }
       def sym_state(sym,im,om)
        if OUTPUT_SYMS[sym.to_s] or RIO::Ext::OUTPUT_SYMS[sym.to_s]
@@ -140,11 +143,14 @@ module RIO
       # TEMP
       def dir?() false end
       def stream_state(cl)
+        #p callstr('stream_state',cl)
         #p "LOOP: retry:#{cx['retrystate']} => #{cl}" 
         return nil if cx['retrystate'] == cl
         cx['retrystate'] = cl
 
-        become(cl).add_rec_methods.add_filters.add_extensions.setup
+        become(cl).add_rec_methods.add_extensions.add_filters.setup
+        #become(cl).add_rec_methods.add_filters.add_extensions.setup
+        #become(cl).add_extensions.add_rec_methods.add_filters.setup
         #next_state.extend(Ops::Symlink::Existing) if symlink?
         #next_state
       end

data/lib/rio/version.rb

@@ -39,7 +39,7 @@
 module RIO
   # :stopdoc:
   module Version #:nodoc: all
-    VERSION = '0.3.4'
+    VERSION = '0.3.6'
 
     N = VERSION.split('.').freeze
     MAJOR = N[0].freeze

data/test/methods/path.rb

@@ -0,0 +1,12 @@
+#!/usr/local/bin/ruby
+
+require 'rio'
+rio('/a/b/c').path
+rio('b/c').path
+rio('C:/b/c').path
+rio('//ahost/a/b').path
+rio('file://ahost/a/b').path
+rio('file:///a/b').path
+rio('file://localhost/a/b').path
+rio('http://ahost/index.html').path
+rio('stdin:').path

data/test/runtests.rb

@@ -3,6 +3,8 @@ Dir.chdir File.dirname(__FILE__)
 $devlib=File.expand_path('../lib/')
 $:.unshift $devlib unless $:[0] == $devlib
 
+$mswin32 = (RUBY_PLATFORM =~ /mswin32/)
+
 require 'rio'
 require 'test/unit'
 

data/test/tc/abs.rb

@@ -3,10 +3,6 @@ if $0 == __FILE__
   Dir.chdir File.dirname(__FILE__)+'/../'
   $:.unshift File.expand_path('../lib/')
 end
-if $0 == __FILE__
-  Dir.chdir File.dirname(__FILE__)+'/../'
-  $:.unshift File.expand_path('../lib/')
-end
 require 'rio'
 require 'test/unit'
 require 'test/unit/testsuite'
@@ -22,7 +18,7 @@ class TC_RIO_abs < Test::Unit::TestCase
       hduri = ::URI.parse(hdurl)
       hd = rio(hduri)
       assert_equal('/',hd.path)
-      assert_equal('/',hd.fspath)
+      assert_nil(hd.fspath)
       assert_equal('http',hd.scheme)    
       assert_equal('localhost',hd.host)
       assert_equal(true,hd.abs?)
@@ -32,7 +28,7 @@ class TC_RIO_abs < Test::Unit::TestCase
       hdurl = 'http://localhost/'
       hd = rio(hdurl)
       assert_equal('/',hd.path)
-      assert_equal('/',hd.fspath)
+      assert_nil(hd.fspath)
       assert_equal('http',hd.scheme)    
       assert_equal('localhost',hd.host)
       assert_equal(true,hd.abs?)
@@ -43,7 +39,7 @@ class TC_RIO_abs < Test::Unit::TestCase
       hduri = ::URI.parse(hdurl)
       hd = rio(hduri)
       assert_equal('/',hd.path)
-      assert_equal('/',hd.fspath)
+      assert_nil(hd.fspath)
       assert_equal('http',hd.scheme)    
       assert_equal('localhost',hd.host)
       assert_equal(true,hd.abs?)
@@ -53,7 +49,7 @@ class TC_RIO_abs < Test::Unit::TestCase
       hdurl = 'http://localhost'
       hd = rio(hdurl)
       assert_equal('/',hd.path)
-      assert_equal('/',hd.fspath)
+      assert_nil(hd.fspath)
       assert_equal('http',hd.scheme)    
       assert_equal('localhost',hd.host)
       assert_equal(true,hd.abs?)
@@ -63,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_equal('/rio/hw.html',hd.fspath)
+      assert_nil(hd.fspath)
       assert_equal('http',hd.scheme)    
       assert_equal('localhost',hd.host)
       assert_equal(true,hd.abs?)
@@ -169,12 +165,12 @@ class TC_RIO_abs < Test::Unit::TestCase
       hdurl = '/tmp/'
       hd = rio(hdurl)
       assert_equal('/tmp/',hd.path)
-      assert_equal('/tmp',hd.fspath)
+      assert_equal('/tmp/',hd.fspath)
       assert_equal('file',hd.scheme)    
       assert_equal('',hd.host)
       assert_equal(true,hd.abs?)
       assert_equal(true,hd.absolute?)
-      assert_equal(hdurl.chop,hd.abs.to_s)
+      assert_equal(hdurl,hd.abs.to_s)
       assert_equal('file:///tmp/',hd.to_url)
       assert_equal('file:///tmp/',hd.abs.to_url)
 
@@ -188,23 +184,24 @@ class TC_RIO_abs < Test::Unit::TestCase
       assert_nil(hd.host)
       assert_equal(false,hd.abs?)
       assert_equal(false,hd.absolute?)
-      cwd = RIO::RL.fs2url(::Dir.getwd)
+      cwd = ::Dir.getwd
       assert_equal(cwd+'/'+hdurl,hd.abs.to_s)
       assert_equal('path:qp',hd.to_url)
-      assert_equal('file://'+cwd+'/'+hdurl,hd.abs.to_url)
+
+      assert_equal('file://'+RIO::RL.fs2url(cwd)+'/'+hdurl,hd.abs.to_url)
 
       hdurl = 'qp/'
       hd = rio(hdurl)
       assert_equal('qp/',hd.path)
-      assert_equal('qp',hd.fspath)
+      assert_equal('qp/',hd.fspath)
       assert_equal('path',hd.scheme)    
       assert_nil(hd.host)
       assert_equal(false,hd.abs?)
       assert_equal(false,hd.absolute?)
-      cwd = RIO::RL.fs2url(::Dir.getwd)
-      assert_equal(cwd+'/'+hdurl.chop,hd.abs.to_s)
+      cwd = ::Dir.getwd
+      assert_equal(cwd+'/'+hdurl,hd.abs.to_s)
       assert_equal('path:qp/',hd.to_url)
-      assert_equal('file://'+cwd+'/'+hdurl,hd.abs.to_url)
+      assert_equal('file://'+RIO::RL.fs2url(cwd)+'/'+hdurl,hd.abs.to_url)
 
       # case qp dir exists
       rio('qp').mkdir
@@ -217,23 +214,23 @@ class TC_RIO_abs < Test::Unit::TestCase
       assert_nil(hd.host)
       assert_equal(false,hd.abs?)
       assert_equal(false,hd.absolute?)
-      cwd = RIO::RL.fs2url(::Dir.getwd)
+      cwd = ::Dir.getwd
       assert_equal(cwd+'/'+hdurl,hd.abs.to_s)
-#      assert_equal('path:qp/',hd.to_url)
-#      assert_equal('file://'+cwd+'/'+hdurl+'/',hd.abs.to_url)
+      assert_equal('path:qp',hd.to_url)
+      assert_equal('file://'+RIO::RL.fs2url(cwd)+'/'+hdurl,hd.abs.to_url)
 
       hdurl = 'qp/'
       hd = rio(hdurl)
       assert_equal('qp/',hd.path)
-      assert_equal('qp',hd.fspath)
+      assert_equal('qp/',hd.fspath)
       assert_equal('path',hd.scheme)    
       assert_nil(hd.host)
       assert_equal(false,hd.abs?)
       assert_equal(false,hd.absolute?)
-      cwd = RIO::RL.fs2url(::Dir.getwd)
-      assert_equal(cwd+'/'+hdurl.chop,hd.abs.to_s)
+      cwd = ::Dir.getwd
+      assert_equal(cwd+'/'+hdurl,hd.abs.to_s)
       assert_equal('path:qp/',hd.to_url)
-      assert_equal('file://'+cwd+'/'+hdurl,hd.abs.to_url)
+      assert_equal('file://'+RIO::RL.fs2url(cwd)+'/'+hdurl,hd.abs.to_url)
 
       # case qp file exists
       rio('qp').rmtree.touch
@@ -246,10 +243,10 @@ class TC_RIO_abs < Test::Unit::TestCase
       assert_nil(hd.host)
       assert_equal(false,hd.abs?)
       assert_equal(false,hd.absolute?)
-      cwd = RIO::RL.fs2url(::Dir.getwd)
+      cwd = ::Dir.getwd
       assert_equal(cwd+'/'+hdurl,hd.abs.to_s)
       assert_equal('path:qp',hd.to_url)
-      assert_equal('file://'+cwd+'/'+hdurl,hd.abs.to_url)
+      assert_equal('file://'+RIO::RL.fs2url(cwd)+'/'+hdurl,hd.abs.to_url)
 
       io = RIO.root
       assert_kind_of(RIO::Rio,io)
@@ -263,7 +260,12 @@ class TC_RIO_abs < Test::Unit::TestCase
 
       io = RIO.cwd
       assert_kind_of(RIO::Rio,io)
-      cwd = RIO::RL.fs2url(::Dir.getwd)
+      cwd = ::Dir.getwd
+      assert_equal(cwd,io.path)
+
+      io = RIO.cwd
+      assert_kind_of(RIO::Rio,io)
+      cwd = ::Dir.getwd
       assert_equal(cwd,io.to_s)
 
       io = RIO.root/'tmp'

data/test/tc/all.rb

@@ -1,6 +1,12 @@
 require 'test/unit'
 require 'tc/testcase'
 
+#require 'tc/yaml'
+require 'tc/piper'
+require 'tc/cmdpipe'
+require 'tc/base'
+require 'tc/split'
+require 'tc/route'
 require 'tc/skip'
 require 'tc/skiplines'
 require 'tc/selnosel'
@@ -45,8 +51,8 @@ require 'tc/qae'
 require 'tc/qae_riovar'
 require 'tc/records'
 require 'tc/rename'
-require 'tc/symlink'
-require 'tc/symlink0'
-require 'tc/symlink1'
+require 'tc/symlink' unless $mswin32
+require 'tc/symlink0' unless $mswin32
+require 'tc/symlink1' unless $mswin32
 
 

data/test/tc/base.rb

@@ -0,0 +1,31 @@
+#!/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_base < Test::RIO::TestCase
+  @@once = false
+  def self.once
+    @@once = true
+  end
+  def setup
+    super
+    self.class.once unless @@once
+  end
+  def test_basic
+    r = rio('zippy',{:base => '/'})
+    assert_equal('/zippy',r.abs.path)
+  end
+  def test_2args
+    r = rio('tmp','zippy',{:base => '/'})
+    assert_equal('/tmp/zippy',r.abs.path)
+  end
+  def test_longer_base
+    r = rio('zippy',{:base => '/tmp'})
+    assert_equal('/tmp/zippy',r.abs.path)
+  end
+end

data/test/tc/cmdpipe.rb

@@ -0,0 +1,146 @@
+#!/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_cmdpipe < Test::RIO::TestCase
+  @@once = false
+  @@dname = 'd'
+  @@fnames = ['f0','f1','f2','g0','g1']
+
+  def self.once
+    @@once = true
+    rio(@@dname).rmtree.mkpath.chdir {
+      @@fnames.each { |fn|
+        make_lines_file(20,fn)
+      }
+    }
+  end
+  def setup
+    super
+    self.class.once unless @@once
+  end
+
+  def test_cmd_out
+    ls = rio(?-,'ls d')
+    out = rio(?").chomp
+    exp = @@fnames
+    rtn = ls | out
+    assert_equal(exp,out[])
+    assert_equal(rtn,out)
+  end
+
+  def test_cmd_cmd_out
+    ls = rio(?-,'ls d')
+    grep = rio(?-,'grep f')
+    out = rio(?").chomp
+    exp = @@fnames.select { |fn| fn =~ /f/ }
+    rtn = ls | grep | out
+    assert_equal(exp,out[])
+    assert_equal(rtn,out)
+  end
+
+  def test_cmd_cmd_cmd_out
+    ls = rio(?-,'ls d')
+    cmd = rio(?-,'grep f')
+    cmd2 = rio(?-,'grep 1')
+    out = rio(?").chomp
+    exp = @@fnames.select { |fn| fn =~ /f1/ }
+    rtn = ls | cmd | cmd2 | out
+    assert_equal(exp,out[])
+    assert_equal(rtn,out)
+  end
+
+  def test_file_out
+    inp = rio('d/f2')
+    out = rio(?")
+    rtn = inp | out
+    exp = inp[]
+    assert_equal(exp,out[])
+    assert_equal(rtn,out)
+  end
+
+  def test_file_cmd_out
+    inp = rio('d/f2')
+    cmd = rio(?-,'grep 1')
+    out = rio(?")
+    rtn = inp | cmd | out
+    exp = inp[/1/]
+    assert_equal(exp,out[])
+    assert_equal(rtn,out)
+  end
+
+  def test_file_cmd_cmd_out
+    inp = rio('d/f2')
+    cmd = rio(?-,'grep 1')
+    cmd2 = rio(?-,'grep 0')
+    out = rio(?")
+    rtn = inp | cmd | cmd2 | out
+    exp = inp[/10/]
+    assert_equal(exp,out[])
+    assert_equal(rtn,out)
+  end
+
+  def test_file_cmdpipe_out2
+    inp = rio('d/f2')
+    cmd = rio(?-,'grep 1')
+    cmd2 = rio(?-,'grep 0')
+
+    cmdpipe = inp | cmd | cmd2
+    assert_equal('cmdpipe',cmdpipe.scheme)
+
+    out = rio(?")
+    rtn = cmdpipe | out
+    exp = inp[/10/]
+    assert_equal(exp,out[])
+    assert_equal(rtn,out)
+
+    out = rio(?")
+    rtn = cmdpipe | out
+    exp = inp[/10/]
+    assert_equal(exp,out[])
+    assert_equal(rtn,out)
+  end
+
+  def test_file_cmdpipe_out
+    inp = rio('d/f2')
+    cmd = rio(?-,'grep 1')
+    cmd2 = rio(?-,'grep 0')
+    out = rio(?")
+
+    cmdpipe = cmd | cmd2
+    assert_equal('cmdpipe',cmdpipe.scheme)
+
+    rtn = inp | cmdpipe | out
+    exp = inp[/10/]
+    assert_equal(exp,out[])
+    assert_equal(rtn,out)
+  end
+
+  def test_cmdpipe_without
+    cmd = rio(?-,'grep 1')
+    cmd2 = rio(?-,'grep 0')
+    out = rio(?")
+
+    cmdpipe = rio(?|,cmd,cmd2,out)
+    assert_equal('cmdpipe',cmdpipe.scheme)
+
+    inp = rio('d/f2')
+    rtn = inp | cmdpipe
+    exp = inp[/10/]
+    assert_equal(exp,out[])
+    assert_equal(rtn,out)
+
+    inp = rio('d/f1')
+    rtn = inp | cmdpipe
+    exp = inp[[/1/,/0/]]
+    assert_equal(exp,out[])
+    assert_equal(rtn,out)
+
+  end
+
+end