rio 0.3.7 → 0.3.8

data/lib/rio/scheme/strio.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, Christopher Kleckner
+# Copyright (c) 2005, 2006 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,7 +22,7 @@
 #++
 #
 # To create the documentation for Rio run the command
-#  rake rdoc
+#  ruby build_doc.rb
 # from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
 #
 # Suggested Reading
@@ -47,8 +47,10 @@ module RIO
     class RL < RL::IOIBase 
       RIOSCHEME = 'strio'
       RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].to_s.freeze
+      attr_accessor :str
       def initialize(str="")
         @str = str
+        super
       end
 
       def opaque() sprintf('0x%08x',@str.object_id) end
@@ -67,32 +69,20 @@ module RIO
       end
 
       def open(m,*args)
-        ::StringIO.new(@str,m.to_s,*args)
+        super(::StringIO.new(@str,m.to_s,*args))
       end
     end
     module Stream
-      class Open < RIO::Stream::Open
-        def input() stream_state('StrIO::Stream::Input') end
-        def output() stream_state('StrIO::Stream::Output') end
-        def inout() stream_state('StrIO::Stream::InOut') end
-      end
-
       module Ops
         def string() ioh.string end
         def string=(p1) ioh.string = p1 end
       end
-
-      class Input < RIO::Stream::Input
-        include Ops
-      end
-
-      class Output < RIO::Stream::Output
-        include Ops
-      end
-
-      class InOut < RIO::Stream::InOut
-        include Ops
+      class Open < RIO::Stream::Open
+        def string=(p1) rl.str = p1 end
+        def string() rl.str end
+        def stream_state(*args) super.extend(Ops) end
       end
     end
   end
 end
+__END__

data/lib/rio/scheme/sysio.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, Christopher Kleckner
+# Copyright (c) 2005, 2006 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,7 +22,7 @@
 #++
 #
 # To create the documentation for Rio run the command
-#  rake rdoc
+#  ruby build_doc.rb
 # from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
 #
 # Suggested Reading
@@ -44,6 +44,9 @@ module RIO
       RIOSCHEME = 'sysio'
       RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].to_s.freeze
       def opaque() sprintf('0x%08x',self.ios.object_id) end
+      def open(*args)
+        super(*args)
+      end
       # must be able to process both
       # parse('rio:sysio',ios)
       # parse('rio:sysio:0xHEXIOS')

data/lib/rio/scheme/tcp.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, Christopher Kleckner
+# Copyright (c) 2005, 2006 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,7 +22,7 @@
 #++
 #
 # To create the documentation for Rio run the command
-#  rake rdoc
+#  ruby build_doc.rb
 # from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
 #
 # Suggested Reading
@@ -46,6 +46,7 @@ module RIO
       def initialize(host,port)
         @host = host
         @port = port
+        super
       end
       def opaque()
         sprintf('//%s:%s',@host,@port)
@@ -53,7 +54,7 @@ module RIO
       require 'socket'
       def open(*args)
         #          @host = 'localhost' if @host.nil? or @host.empty?
-        ::TCPSocket.new(@host || 'localhost',@port)
+        super(::TCPSocket.new(@host || 'localhost',@port))
       end
       def to_s() self.url end
       

data/lib/rio/scheme/temp.rb

@@ -50,6 +50,7 @@ module RIO
         #puts "initialize(#{file_prefix.inspect},#{temp_dir.inspect})"
         @prefix = file_prefix || DFLT_PREFIX
         @tmpdir = temp_dir || DFLT_TMPDIR
+        super
       end
       #def path() nil end
       def scheme() self.class.const_get(:RIOSCHEME) end
@@ -90,6 +91,10 @@ module RIO
           @td = ::Tempdir.new( @prefix.to_s, @tmpdir.to_s)
           super(@td.to_s)
         end
+        def dir_rl() 
+          RIO::Dir::RL.new(self.uri, {:fs => self.fs})
+          #self 
+        end
         SPLIT_RE = Temp::RL::SPLIT_RE
         def self.splitrl(s)
           Temp::RL.splitrl(s)
@@ -112,6 +117,10 @@ module RIO
           @tf = ::Tempfile.new( @prefix.to_s, @tmpdir.to_s)
           super(@tf.path)
         end
+        def file_rl() 
+        RIO::File::RL.new(self.uri,{:fs => self.fs})
+          #self 
+        end
         def open(mode='ignored')
           #p callstr('open',mode)
           @tf
@@ -133,6 +142,10 @@ module RIO
         #p args
         @tempobj = nil
       end
+      def self.default_cx
+        Cx::Vars.new( { 'closeoneof' => false, 'closeoncopy' => false } )
+      end
+
       def check?() true end
       def mkdir(prefix=rl.prefix,tmpdir=rl.tmpdir)
         self.rl = RIO::Temp::Dir::RL.new(prefix, tmpdir)
@@ -170,7 +183,7 @@ module RIO
     module Stream
       class Open < RIO::Stream::Open
         def iostate(sym)
-          mode('w+').noautoclose_.open_.inout()
+          mode_('w+').open_.inout()
         end
 #        def inout() stream_state('Temp::Stream::InOut') end
       end

data/lib/rio/state/error.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, Christopher Kleckner
+# Copyright (c) 2005, 2006 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,7 +22,7 @@
 #++
 #
 # To create the documentation for Rio run the command
-#  rake rdoc
+#  ruby build_doc.rb
 # from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
 #
 # Suggested Reading

data/lib/rio/state.rb

@@ -41,6 +41,7 @@ require 'rio/context/methods'
 require 'rio/ext'
 require 'rio/symantics'
 require 'rio/filter'
+require 'rio/fs/native'
 
 module RIO
 
@@ -54,29 +55,55 @@ module RIO
     # * the state changing mechanism
     # * and some basic error handling stubs
     class Base
-      KIOSYMS = [:gets,:open,:readline,:readlines,:chop,:to_a,:putc,:puts,:print,:printf,:split,
+      KIOSYMS = [:gets,:getc,:open,:readline,:readlines,:chop,:to_a,:putc,:puts,:print,:printf,:split,
                  :=~,:===,:==,:eql?,:sub,:sub!,:gsub,:gsub!,:load]
       @@kernel_cleaned ||= KIOSYMS.each { |sym| undef_method(sym) } 
+      undef_method(:rio)
     end 
     
     class Base
+      attr_accessor :try_state
+      #attr_accessor :handled_by
+
       attr_accessor :rl
       attr_accessor :ioh
-      attr_accessor :try_state
-      attr_accessor :cx
+      #attr_accessor :fs
 
-      attr_accessor :handled_by
+      attr_accessor :cx
 
       # Context handling
       include Cx::Methods
-
       include RIO::Ext::Cx
 
       
-      def initialize()
-        @rl = @cx = @ioh = nil
-#        @handled_by = self.class.to_s
+      def initialize(rl=nil,cx=nil,ioh=nil)
+        cx ||= self.class.default_cx
+        _init(rl,cx,ioh)
+        #        @handled_by = self.class.to_s
+      end
+#      def initialize(rl=nil,cx=nil,ioh=nil,fs=nil)
+#        fs ||= RIO::FS::Native.create()
+#        cx ||= self.class.default_cx
+#        _init(rl,cx,ioh,fs)
+#        #        @handled_by = self.class.to_s
+#      end
+      
+      def _init(riorl,cntx,iohandle=nil)
+        @rl = riorl
+        @cx = cntx
+        @ioh = iohandle
+#        raise Exception::FailedCheck.new(self) unless check?
+        self
       end
+#       def _init(riorl,cntx,iohandle=nil,fs=nil)
+#         @rl = riorl
+#         @cx = cntx
+#         @ioh = iohandle
+#         @fs = fs
+# #        raise Exception::FailedCheck.new(self) unless check?
+#         self
+#       end
+      private :_init
 
       def initialize_copy(*args)
         #p callstr('initialize_copy',args[0].inspect)
@@ -84,36 +111,32 @@ module RIO
         @rl = @rl.clone unless @rl.nil?
         @cx = @cx.clone unless @cx.nil?
         @ioh = @ioh.clone unless @ioh.nil?
+        # @fs = @fs
       end
 
-      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
+      def self.default_cx
+         Cx::Vars.new( { 'closeoneof' => true, 'closeoncopy' => true } )
       end
-      def init(riorl,cntx,iohandle=nil)
-        @rl = riorl
-        @cx = cntx
-        @ioh = iohandle
-#        raise Exception::FailedCheck.new(self) unless check?
-        self
-      end
-      
       def self.new_other(other)
-        new.copy_state(other)
-      end
-
-      def copy_state(other)
-        init(other.rl,other.cx,other.ioh)
+        new(other.rl,other.cx,other.ioh)
+        #new.copy_state(other)
       end
+#       def self.new_other(other)
+#         new(other.rl,other.cx,other.ioh,other.fs)
+#         #new.copy_state(other)
+#       end
 
       alias :ior :ioh
       alias :iow :ioh
 
+#      def copy_state(other)
+#        _init(other.rl,other.cx,other.ioh,other.fs)
+#      end
+
+#      def self.new_r(riorl)
+#        #new(riorl,default_cx)
+#        new(riorl)
+#      end
 
 
       # Section: State Switching
@@ -127,15 +150,20 @@ module RIO
         return self if new_class == self.class
 
         begin
-          try_state[new_class,*args]
+          new_state = try_state[new_class,*args]
         rescue Exception::FailedCheck => ex
           p "not a valid "+new_class.to_s+": "+ex.to_s+" '"+self.to_s+"'"
           raise
         end
+        became(new_state)
+        new_state
+      end
+      def became(obj)
+        RIO::Ext.became(obj)
       end
-
       def method_missing_trace_str(sym,*args)
-        "missing: "+self.class.to_s+'['+self.to_url+']'+'.'+sym.to_s+'('+args.join(',')+')'
+        "missing: "+self.class.to_s+'['+self.to_url+" {#{self.rl.fs}}"+']'+'.'+sym.to_s+'('+args.join(',')+')'
+        #"missing: "+self.class.to_s+'['+self.to_url+""+']'+'.'+sym.to_s+'('+args.join(',')+')'
       end
 
       def method_missing(sym,*args,&block)
@@ -177,7 +205,7 @@ module RIO
       end
 
       def to_rl() self.rl.rl end
-
+      def fs() self.rl.fs end
 
       extend Forwardable
       def_instance_delegators(:rl,:path,:to_s,:fspath,:urlpath,:length)
@@ -199,13 +227,31 @@ module RIO
       # (should this be here???)
       def new_rio(arg0,*args,&block)
         #return arg0 if arg0.nil? # watch out for dir.read! if you remove this line
-        Rio.rio(arg0,*args,&block)
+        nrio = Rio.rio(arg0,*args,&block)
+        #nrio.fs = self.fs
+        nrio
       end
       def new_rio_cx(*args)
         n = new_rio(*args)
         n.cx = self.cx.bequeath
+        #n.fs = self.fs
         n
       end
+      def clone_rio()
+        cp = Rio.new(self.rl)
+        cp.cx = self.cx
+        cp.ioh = self.ioh.clone unless self.ioh.nil?
+        #cp.fs = self.fs
+        cp
+      end
+      
+#      def rio(*args)
+#        if zipfile?
+#          open_.dstream.rio(*args)
+#        else
+#          new_rio_cx(*args)
+#        end
+#      end
       def ensure_rio(arg0)
         return arg0 if arg0.kind_of?(::RIO::Rio)
         new_rio(arg0)

data/lib/rio/stream/base.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, Christopher Kleckner
+# Copyright (c) 2005, 2006 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,7 +22,7 @@
 #++
 #
 # To create the documentation for Rio run the command
-#  rake rdoc
+#  ruby build_doc.rb
 # from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
 #
 # Suggested Reading
@@ -43,6 +43,11 @@ module RIO
       def iostate(*args) self end
       def stream?() true end
       def recno() nil end
+
+      # The copy code requires a directory test
+      # Streams are never directories
+      def dir?() false end
+
     end
 
   end

data/lib/rio/stream/duplex.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, Christopher Kleckner
+# Copyright (c) 2005, 2006 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,7 +22,7 @@
 #++
 #
 # To create the documentation for Rio run the command
-#  rake rdoc
+#  ruby build_doc.rb
 # from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
 #
 # Suggested Reading
@@ -41,12 +41,6 @@ require 'rio/stream/open'
 module RIO
   module Stream
     module Duplex
-      class Open < RIO::Stream::Open
-        def input() stream_state('Stream::Duplex::Input') end
-        def output() stream_state('Stream::Duplex::Output') end
-        def inout() stream_state('Stream::Duplex::InOut') end
-      end
-
       module Ops
         module Output
           def wclose()
@@ -56,9 +50,18 @@ module RIO
             self
           end
         end
-        module Input
-        end
       end
+      class Open < RIO::Stream::Open
+        def output() super.extend(Ops::Output) end
+        def inout() super.extend(Ops::Output) end
+      end
+    end
+  end
+end
+__END__
+module RIO
+  module Stream
+    module Duplex
 
       class Input < RIO::Stream::Input
         include Ops::Input

data/lib/rio/stream/open.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, Christopher Kleckner
+# Copyright (c) 2005, 2006 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,7 +22,7 @@
 #++
 #
 # To create the documentation for Rio run the command
-#  rake rdoc
+#  ruby build_doc.rb
 # from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
 #
 # Suggested Reading
@@ -41,14 +41,14 @@ require 'rio/ops/stream'
 require 'rio/ops/path'
 require 'rio/cp'
 require 'rio/piper/cp'
+require 'rio/util'
+
 
 module RIO
   module Stream
     class Open < Base
       include Ops::Stream::Status
-      #include Ops::Path::Status
       include Ops::Path::URI
-      #include Ops::Path::Query
       include Cp::Open::Output
       include Cp::Open::Input
       include Piper::Cp::Input
@@ -58,44 +58,77 @@ module RIO
       def open(m=nil,*args)
         #p callstr('open',m,*args)
         case
-
         when open? then open_(*args)
         when m.nil? then open_(*args)
         else mode(m).open_(*args)
         end
       end
+
+      protected
+
       def open_(*args)
         #p callstr('open_',args.inspect)+" mode='#{mode?}' (#{mode?.class}) ioh=#{self.ioh} open?=#{open?}"
-        unless open?
-          ios = self.rl.open(mode?,*args)
-          noautoclose_(false) if ios.tty?
-          self.ioh = IOH::Stream.new(ios)
-        end
+        self.ioh = self.rl.open(mode?,*args) unless open?
         self
       end
 
-      protected :open_
 
     end
   end
 end
 
 
-require 'rio/util'
 module RIO
   module Stream
     class Open < Base
-      def size() 
-        self.contents.size
+
+      public
+
+      #def size() self.contents.size end
+      #def empty?() self.eof? end
+
+      def iostate(sym)
+        if mode? && mode?.allows_both?
+          open_.inout()
+        else
+          implicit_state(sym)
+        end
       end
+
+      protected
+
       OUTPUT_SYMS = Util::build_sym_hash([:print,:printf,:puts,:putc,:write,
                                           :print!,:printf!,:puts!,:putc!,:write!,
                                           :put_,:putrec,:putrec!,:<,:<< ])
 
+      def when_missing(sym,*args) 
+        #p callstr('when_missing',sym,*args)+" mode?(#{mode?.class})=#{mode?}"
+        nobj = iostate(sym)
+        return nobj unless nobj.nil?
+        gofigure(sym,*args)
+      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_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
+      def output() stream_state('Stream::Output') end
+      def input()  stream_state('Stream::Input')  end
+      def inout()  stream_state('Stream::InOut')  end
+
+      private
+
       def sym_state(sym,im,om)
        if OUTPUT_SYMS[sym.to_s] or RIO::Ext::OUTPUT_SYMS[sym.to_s]
          om ||= (sym.to_s == '<<' ? 'a' : 'w')
-         #p "HEREHEREHERE om=#{om.inspect}"
          mode_(om).open_.output()
         else
          im ||= 'r'
@@ -126,55 +159,31 @@ module RIO
           sym_state(sym,inputmode?,outputmode?)
         end
       end
-      def iostate(sym)
-        #p callstr('iostate',sym)
-        if mode? && mode?.allows_both?
-          open_.inout()
-        else
-          implicit_state(sym)
-        end
-      end
-      def when_missing(sym,*args) 
-        #p callstr('when_missing',sym,*args)+" mode?(#{mode?.class})=#{mode?}"
-        nobj = iostate(sym)
-        return nobj unless nobj.nil?
-        gofigure(sym,*args)
-      end
-      # 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_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
-      def output() 
-        stream_state('Stream::Output')
-      end
-      def input() 
-        stream_state('Stream::Input')
-      end
-      def inout() 
-        stream_state('Stream::InOut')
-      end
-      
-      def gofigure(sym,*args)
-        super
-      end
+
     end
+
     class Close < State::Base
       include Ops::Stream::Status
-      def clear_selection()
-        cx.delete('stream_sel')
-        cx.delete('stream_nosel')
+
+      def check?() true end
+      def close() 
+        #p callstr('close')+" mode='#{mode?}' ioh=#{self.ioh} open?=#{open?}"
+        return self unless self.open? 
+        self.close_
+        cx['retrystate'] = nil
         self
       end
+
+      def reopen(*args) self.close.softreset.open(*args) end
+
+      protected
+
+      def base_state() 'Stream::Reset'  end
+      def when_missing(sym,*args) 
+        self.close_.retryreset()
+      end
+
       def close_() 
         #p callstr('close_')+" mode='#{mode?}' ioh=#{self.ioh} open?=#{open?}"
         return self unless self.open? 
@@ -184,29 +193,15 @@ module RIO
         self.rl.close
         self
       end
-      protected :close_
-      def close() 
-        #p callstr('close')+" mode='#{mode?}' ioh=#{self.ioh} open?=#{open?}"
-        return self unless self.open? 
-        self.close_
-        cx['retrystate'] = nil
+
+      private
+
+      def clear_selection()
+        cx.delete('stream_sel')
+        cx.delete('stream_nosel')
         self
       end
-      def get()
-        self.close_.softreset
-        nil
-      end
-      alias :getline :get
-      alias :getrow :get
-      alias :getrec :get
 
-      def check?() true end
-      def base_state() 'Stream::Reset'  end
-      def when_missing(sym,*args) 
-#        p callstr('when_missing',sym,*args)
-        self.close_.retryreset()
-      end
     end
-
   end
-end # module RIO
+end