rio 0.3.7 → 0.3.8

data/lib/rio/ops/stream/input.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,7 +43,6 @@ require 'rio/rectype'
 require 'rio/ops/stream/read'
 require 'rio/context/stream'
 require 'stringio'
-require 'rio/record'
 require 'rio/cp'
 require 'rio/piper/cp'
 
@@ -73,7 +72,9 @@ module RIO
           each_(*args,&block)
           self
         end
-
+        def empty?()
+          self.eof?
+        end
         def each_record(*args,&block)
           #p callstr('each_record',*args)
           each_record_(*args,&block)
@@ -91,6 +92,9 @@ module RIO
             raw_rec = self._get_rec
             return to_rec_(raw_rec) if @get_selrej.match?(raw_rec,@recno)
           end
+          self.close if closeoneof?
+          nil
+#          (closeoneof? ? self.on_eof_close{ nil } : nil)
         end
         def get_type(itertype,&block)
           old_itertype = cx['stream_itertype']
@@ -138,9 +142,9 @@ module RIO
                 end
               end
             end
-            return self
+            return closeoneof? ? self.close : self
           end
-          closeoneof? ? ior.close_on_eof_(self) : self
+          closeoneof? ? self.close : self
         end
 
         # iterate over the records, yielding only with matching records
@@ -159,7 +163,7 @@ module RIO
             end
             return self
           }
-          closeoneof? ? ior.close_on_eof_(self) : self
+          closeoneof? ? self.close : self
         end
         alias :each_row_ :each_
         def clear_selection()
@@ -204,7 +208,7 @@ module RIO
           selrej.rangetops
         end
 
-        def on_closeoneof
+        def on_closeoneof()
           #p "on_closeoneof #{self.object_id} #{self.ior.object_id}"
           self.close
         end

data/lib/rio/ops/stream/output.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/ops/stream/read.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
@@ -40,42 +40,45 @@ module RIO
   module Ops
     module Stream
       module Read
-        def contents() 
-          auto { ior.gets(nil) }
-        end
-        def readlines(*args)
-          auto { ior.readlines(*args) }
+
+        private
+
+        def _post_eof_close(&block)
+          rtn = yield
+          self.close if closeoneof?
+          rtn
         end
-        def read(*args)
-          auto { ior.read(*args) }
+        def _pre_eof_close(&block)
+          begin
+            closit = ior.eof? && closeoneof?
+            rtn = yield
+          ensure
+            self.close if closit
+          end
+          rtn
         end
+
+        public
+
+        def contents()                  _post_eof_close { ior.gets(nil) || "" }         end
+        def readlines(*args)            _post_eof_close { ior.readlines(*args) }        end
+        def each_line(*args,&block)     _post_eof_close { ior.each_line(*args,&block) } end
+        def each_byte(*args,&block)     _post_eof_close { ior.each_byte(*args,&block) } end
+        def each_bytes(nb,*args,&block) _post_eof_close { ior.each_bytes(nb,&block) }   end
+
+        def read(*args)                 _pre_eof_close { ior.read(*args) }               end
+        def gets(*args)                 _pre_eof_close { ior.gets(*args) }               end
+        def readline(*args)             _pre_eof_close { ior.readline(*args) }           end
+        def readpartial(*args)          _pre_eof_close { ior.readpartial(*args) }        end
+        def readchar(*args)             _pre_eof_close { ior.readchar(*args) }           end
+        def getc(*args)                 _pre_eof_close { ior.getc(*args) }               end
+
         def ungetc(*args)
           ior.ungetc(*args)
           self
         end
-        def each_line(*args,&block)
-          auto { 
-#            self.ior.each_line(*args,&block) 
-            self.ior.each_line { |line|
-              yield line
-            } #(*args,&block) 
-          }
-        end
-        def each_byte(*args,&block)
-          auto { ior.each_byte(*args,&block) }
-        end
-        def each_bytes(nb,*args,&block)
-          #p callstr('each_bytes',nb,*args)
-          auto {
-            until ior.eof?
-              break unless s = ior.read(nb)
-              yield s
-            end
-          }
-        end
-
-        extend Forwardable
-        def_instance_delegators(:ior,:readline,:readchar,:gets,:lineno)
+        def lineno()     ior.lineno       end
+        def lineno=(arg) ior.lineno = arg end
       end 
     end 
   end

data/lib/rio/ops/stream/write.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
@@ -39,7 +39,9 @@ module RIO
   module Ops
     module Stream
       module Write
-        def puts(*argv)    rtn_self { iow.puts(*argv) } end
+        def puts(*argv)    
+          rtn_self { iow.puts(*argv) } 
+        end
         def puts!(*argv)   rtn_close { iow.puts(*argv); } end
         def putc(*argv)    rtn_self { iow.putc(*argv) } end
         def putc!(*argv)   rtn_close { iow.putc(*argv) } end
@@ -50,8 +52,6 @@ module RIO
         def write(*argv)   iow.write(*argv) end
         def write!(*argv)  then_close { iow.write(*argv) } end
         def _!(*argv) self.close.softreset end
-        #       extend Forwardable
-        #       def_instance_de
       end
     end    
   end    

data/lib/rio/ops/stream.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
@@ -48,16 +48,20 @@ module RIO
         end
         def closed?() self.ioh.nil?  end
         def eof?() closed? or ior.eof? end
+        def stat() ioh ? ioh.stat : nil end # 
       end
     end
 
     module Stream
       module Manip
+        def pid() ioh ? ioh.pid : nil end
+        def to_io() ioh ? ioh.to_io : nil end
+        def tty?() ioh ? ioh.tty? : false end
+        def isatty() ioh ? ioh.isatty : false end
         def binmode() rtn_self { self.ioh.binmode } end
         def flush() rtn_self { self.ioh.flush } end
         def fsync() rtn_self { self.ioh.fsync } end
         def seek(amount,whence=IO::SEEK_SET) rtn_self { self.ioh.seek(amount,whence) } end
-
         extend Forwardable
         def_instance_delegators(:ioh,:pos,:pos=,:fileno,:to_i,
                                 :fcntl,:ioctl)

data/lib/rio/ops/symlink.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
@@ -35,18 +35,20 @@
 # The documented interface and behavior is subject to change without notice.</b>
 
 
+# module RIO
+#   module Impl
+#     module U
+#       def self.readlink(s,*args) ::File.readlink(s,*args) end
+#       def self.lstat(s,*args) ::File.lstat(s,*args) end
+#     end
+#   end
+# end
 module RIO
-  module Impl
-    module U
-      def self.readlink(s,*args) ::File.readlink(s,*args) end
-      def self.lstat(s,*args) ::File.lstat(s,*args) end
-    end
-  end
   module Ops
     module Symlink
       module ExistOrNot
-        def readlink(*args) new_rio(Impl::U.readlink(self.to_s,*args)) end
-        def lstat(*args) Impl::U.lstat(self.to_s,*args) end
+        def readlink(*args) new_rio(fs.readlink(self.to_s,*args)) end
+        def lstat(*args) fs.lstat(self.to_s,*args) end
 
       end
       module Existing

data/lib/rio/path/reset.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
@@ -55,15 +55,15 @@ module RIO
 
       def when_missing(sym,*args)
 #        p callstr('when_missing',sym,*args)
-        if empty?
+        if to_s.empty?
           pathempty()
         else
           pathstring()
         end
       end
 
-      extend Forwardable
-      def_instance_delegators(:path,:empty?)
+#      extend Forwardable
+#      def_instance_delegators(:path,:empty?)
     end 
   end 
     

data/lib/rio/path.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
@@ -49,6 +49,22 @@ module RIO
     class Empty < State::Base
       include Ops::Path::Empty
       def check?() fspath.nil? or fspath.empty? end
+      def [](*args)
+        self.rl = Path::RL.new('.')
+        softreset[*args]
+      end
+      def each(&block)
+        self.rl = Path::RL.new('.')
+        softreset.each(&block)
+      end
+      def read(*args)
+        self.rl = Path::RL.new('.')
+        softreset.read(*args)
+      end
+      def get(*args)
+        self.rl = Path::RL.new('.')
+        softreset.get(*args)
+      end
       def when_missing(sym,*args) gofigure(sym,*args) end
     end 
 
@@ -68,26 +84,21 @@ module RIO
         end
       end
 
-      protected
+      private
 
-      def edir()
-        #rl.path += '/' unless rl.path.empty? or rl.path[-1] == ?/
-        next_state = become('Dir::Existing')
-        next_state.extend(Ops::Symlink::Existing) if symlink?
-        next_state
-      end
-      def efile() 
-        next_state = become('File::Existing')
-        next_state.extend(Ops::Symlink::Existing) if symlink?
-        next_state
-      end
-      def npath() 
-        next_state = become('Path::NonExisting')
-        next_state.extend(Ops::Symlink::NonExisting) if symlink?
+      def _fs_state(become_state,symlink_mod)
+        next_state = become(become_state)
+        next_state.extend(symlink_mod) if symlink?
         next_state
       end
 
-    end # class PathString
+      protected
+
+      def edir() _fs_state('Dir::Existing',Ops::Symlink::Existing) end
+      def efile() _fs_state('File::Existing',Ops::Symlink::Existing) end
+      def npath() _fs_state('Path::NonExisting',Ops::Symlink::NonExisting) end
+
+    end
 
     # A transition state. Anything but simple path tests must cause a transition out of this state.
     class NonExisting < State::Base
@@ -96,10 +107,7 @@ module RIO
 
       def check?() not exist? end
 
-      def ndir() 
-        #rl.path += '/' unless rl.path.empty? or rl.path[-1] == ?/
-        become('Dir::NonExisting')
-      end
+      def ndir() become 'Dir::NonExisting' end
       def nfile() become('File::NonExisting') end
 
       def when_missing(sym,*args)
@@ -110,8 +118,8 @@ module RIO
           nfile()
         end
       end
-    end # class NPath
+    end
 
-  end # module Rsc
+  end
 
 end

data/lib/rio/piper/cp.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/piper.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/prompt.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/rectype.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
@@ -42,10 +42,11 @@ module RIO
         def get_arg_() $/ end
         def get_(sep_string=get_arg_)
           #p callstr('get_',sep_string.inspect)
-          self.ioh.gets(sep_string)
+          self.ior.gets(sep_string)
         end
         def each_rec_(&block) 
-          each_line { |line|
+          self.ior.each_line { |line|
+          #self.ior.each { |line|
             yield line
           }
           self
@@ -54,8 +55,9 @@ module RIO
       module Output
         def put_(rec,*args)
           #p callstr('put_',rec,*args)
+          #p self.ioh
           self.ioh.print(rec.to_s)
-        end
+        end  
       end
     end
     module Bytes
@@ -64,12 +66,12 @@ module RIO
           cx['bytes_n']  
         end
         def get_(nb=get_arg_())
-          self.ioh.read(nb)
+          self.ior.read(nb)
         end
         def each_rec_(&block) 
           #p callstr('each_rec_ (EachIter::Bytes)')
           #        p 'each_rec_ => each_line'
-          each_bytes(cx['bytes_n']) { |b|
+          self.ior.each_bytes(cx['bytes_n']) { |b|
             yield b
           }
           self

data/lib/rio/rl/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
@@ -112,10 +112,11 @@ module RIO
     SUBSEPAR = ':'
 
     class Base
+      attr :fs
       def initialize(*args)
-        
+        @fs = openfs_
       end
-
+      def openfs_() nil end
       def self.subscheme(s)
         /^rio:([^:]+):/.match(s)[1]
       end

data/lib/rio/rl/builder.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,6 +47,7 @@ module RIO
       def self.build(*a)
         #puts "build: #{a.inspect}" 
         a.flatten!
+        a.push('') if a.empty?
         case a[0]
         when ::String
           case a[0]
@@ -65,9 +66,10 @@ module RIO
         when RIO::Rio
           a[0] = a[0].to_rl
         when RL::Base
-          a0 = a.shift
+          a0 = a.shift.clone
+          return (a.empty? ? a0 : a0.join(*a))
           #p 'THERE',a0,a0.clone
-          return a0.clone
+          #return a0.clone.join(*a)
           #return a0.class.new(a0.clone,*a)
         when ::URI
           a0 = a.shift
@@ -75,7 +77,17 @@ module RIO
           o = cl.new(a0,*a) unless cl.nil?
           return o
         when ::Symbol
-          a[0] = 'rio:' + a[0].to_s + ':'
+          case a[0]
+          when :zpath
+            a0 = a.shift
+            cl = Factory.instance.riorl_class(a0.to_s)
+            o = cl.new(*a) unless cl.nil?
+            return o
+          else
+            a[0] = 'rio:' + a[0].to_s + ':'
+          end
+        when ::NilClass
+          a[0] = 'rio:null:'
         when ?? , ?= , ?_ , ?", ?[, ?#, ?`, ?|
           a[0] = 'rio:'+CHMAP[a[0]]+':'
         when ?-

data/lib/rio/rl/ioi.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
@@ -36,16 +36,24 @@
 
 
 require 'rio/rl/base'
+require 'rio/ioh'
+require 'rio/fs/stream'
 
 module RIO
   module RL
     class IOIBase < Base
       RESET_STATE = 'Stream::Open'
+      def openfs_()
+        RIO::FS::Stream.create()
+      end
       def scheme() self.class.const_get(:RIOSCHEME) end
       def opaque() '' end
       def self.splitrl(s) nil end
       #def path() self.class.const_get(:RIOPATH) end
       def to_s() url() end
+      def open(ios)
+        IOH::Stream.new(ios)
+      end
     end
   end
   module RL
@@ -55,12 +63,14 @@ module RIO
       protected(:ios=)
       def initialize(ios=nil)
         @ios = ios
+        super
       end
       def initialize_copy(cp)
         @ios = cp.ios.clone unless cp.ios.nil?
       end
-      def open(*args)
-        @ios
+      def open(ios=nil)
+        @ios = ios unless ios.nil?
+        super(@ios)
       end
         
     end