rio 0.3.7 → 0.3.8

data/lib/rio/rl/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
@@ -47,6 +47,7 @@ module RIO
       HOST = URI::REGEXP::PATTERN::HOST
       SCHEME = URI::REGEXP::PATTERN::SCHEME
 
+      #attr :fs
       def initialize(pth,*args)
 
         @host = nil  # host or nil
@@ -71,12 +72,17 @@ module RIO
         else
           self.fspath = pth
         end
-        args = _get_base_from_args(args)
+        args = _get_opts_from_args(args)
         self.join(*args) unless args.empty?
         unless self.absolute? or @base
           @base = RL.fs2url(::Dir.getwd)+'/'
         end
         @fspath.sub!(%r|/\.$|,'/')
+        #@fs = openfs_ 
+        super
+      end
+      def openfs_
+        RIO::FS::Native.create()
       end
       def pathroot()
         return nil unless absolute?
@@ -89,15 +95,21 @@ module RIO
       end
       include PathMethods
 
-      def _get_base_from_args(args)
+      def _get_opts_from_args(args)
         @base = nil
-        if !args.empty? and args[-1].kind_of?(::Hash) and (b = args.pop[:base])
-          @base = case b
-                when %r%^file://(#{HOST})?(/.*)?$% then b
-                when %r%^/% then b
-                else RL.fs2url(::Dir.getwd)+'/'+b
-                end
-          @base.squeeze('/')
+        if !args.empty? and args[-1].kind_of?(::Hash) 
+          opts = args.pop
+          if b = opts[:base]
+            @base = case b
+                    when %r%^file://(#{HOST})?(/.*)?$% then b
+                    when %r%^/% then b
+                    else RL.fs2url(::Dir.getwd)+'/'+b
+                    end
+            @base.squeeze('/')
+          end
+          if fs = opts[:fs]
+            @fs = fs
+          end
         end
         args
       end
@@ -170,10 +182,6 @@ module RIO
       end
 
 
-      def dirname()
-        Impl::U.dirname(self.path_no_slash)
-      end
-
     end
   end
 end

data/lib/rio/rl/pathmethods.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
@@ -52,6 +52,10 @@ module RIO
 
         [ur,pr,up]
       end
+      def pathdepth()
+        pth = self.path_no_slash
+        (pth == '/' ? 0 : pth.count('/'))
+      end
       def split()
         if absolute?
           parts = self._parts
@@ -74,6 +78,7 @@ module RIO
         sa = args.map { |arg| ::URI.escape(arg.to_s,ESCAPE) }
         sa.unshift(self.urlpath) unless self.urlpath.empty?
         self.urlpath = sa.join('/').squeeze('/')
+        self
       end
 
       def parse_url(str)
@@ -90,6 +95,11 @@ module RIO
         self.class.new(uri.merge(other.uri))
       end
 
+      def dirname()
+        ::File.dirname(self.path_no_slash)
+      end
+
+
     end
   end
 end

data/lib/rio/rl/uri.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,26 +36,33 @@
 
 
 require 'rio/rl/base'
+require 'rio/fs/url'
+
 module RIO
   module RL
     class URIBase < Base
-      attr_reader :uri
-      attr_writer :base
       SCHEME = URI::REGEXP::PATTERN::SCHEME
+      attr_reader :uri
+      #attr :fs
       def initialize(u,*args)
         #p callstr('initialize',u,*args)
         # u should be a ::URI or something that can be parsed to one
-        args = _get_base_from_args(args)
+        args = _get_opts_from_args(args)
         @uri =  _mkuri(u)
         self.join(*args)
         @uri.path = '/' if @uri.absolute? and @uri.path == ''
+        #@fs = self.openfs_
+        super
+      end
+      def openfs_()
+        RIO::FS::URL.create()
       end
       def initialize_copy(*args)
         super
         @uri = @uri.clone unless @uri.nil?
         @base = @base.clone unless @base.nil?
       end
-      def _get_base_from_args(args)
+      def _get_opts_from_args(args)
         #      args.each { |a| p "get_base len=#{args.length} #{a.class}##{a.to_s}" }
         @base = nil
         if !args.empty? and args[-1].kind_of?(::Hash) and (b = args.pop[:base])

data/lib/rio/scheme/aryio.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
@@ -34,7 +34,7 @@
 # <b>Rio is pre-alpha software. 
 # The documented interface and behavior is subject to change without notice.</b>
 
-
+__END__
 require 'rio/rl/ioi'
 require 'rio/arrayio'
 require 'rio/stream'

data/lib/rio/scheme/cmdio.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,7 @@ module RIO
         when self.class then @cmd = cmd.cmd
         else @cmd = cmd
         end
+        super
       end
       def opaque() 
         URI.escape(@cmd,RIO::RL::ESCAPE)
@@ -59,7 +60,7 @@ module RIO
       def open(m)
         #p "opening #{@cmd}"
         #raise RuntimeError, "Should Not Open"
-        ::IO.popen(@cmd,m.to_s)
+        super(::IO.popen(@cmd,m.to_s))
       end
 
       # must be able to process

data/lib/rio/scheme/cmdpipe.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
@@ -58,6 +58,7 @@ module RIO
         else
           @piper = Piper::Base.new(*args)
         end
+        super
       end
       def initialize_copy(*args)
         @piper = @piper.clone
@@ -112,39 +113,6 @@ module RIO
 #          become 'CmdPipe::Stream::Open'
 #        end
       end
-      class Open < RIO::Stream::Open
-        def input() stream_state('CmdPipe::Stream::Input') end
-        def output() stream_state('CmdPipe::Stream::Output') end
-        def inout() stream_state('CmdPipe::Stream::InOut') end
-        def open_(*args)
-          unless open?
-            ios = self.rl.open(mode?,*args)
-            self.ioh = ios #IOH::Stream.new(ios)
-          end
-          self
-        end
-      end
-
-      module Ops
-      end
-
-      class Input < RIO::Stream::Input
-        include Ops
-        def ior
-          ioh.rd
-        end
-      end
-
-      class Output < RIO::Stream::Output
-        include Ops
-        def iow
-          ioh.wr
-        end
-      end
-
-      class InOut < RIO::Stream::InOut
-        include Ops
-      end
     end
   end
 end

data/lib/rio/scheme/fd.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
@@ -45,9 +45,10 @@ module RIO
       RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].freeze
       def initialize(fd)
         @fd = fd
+        super
       end
       def open(m,*args)
-        ::IO.new(@fd,m.to_s)
+        super(::IO.new(@fd,m.to_s))
       end
       def opaque() "#{@fd}" end
       # must be able to process

data/lib/rio/scheme/ftp.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
@@ -37,21 +37,39 @@
 
 require 'net/ftp'
 require 'open-uri'
-require 'rio/ftp/conn'
+require 'rio/ftp/fs'
+require 'rio/rl/path'
+require 'rio/ftp/dir'
+require 'rio/ftp/ftpfile'
 
 module RIO
   module FTP #:nodoc: all
-    RESET_STATE = 'FTP::State::Reset'
+    #RESET_STATE = 'FTP::State::Reset'
+    RESET_STATE = RIO::RL::PathBase::RESET_STATE
     
     require 'rio/rl/uri'
 
     class RL < RIO::RL::URIBase
+      def initialize(*args)
+        super
+        @ftype = nil
+        @names = nil
+      end
       def self.splitrl(s) 
         sub,opq,whole = split_riorl(s)
         [whole] 
       end
+      def openfs_
+        RIO::FTP::FS.create(@uri)
+      end
       def open(*args)
-        RIO::FTP::Conn.new(@uri)
+        IOH::Dir.new(RIO::FTP::Dir::Stream.new(@uri))
+      end
+      def file_rl() 
+        RIO::FTP::Stream::RL.new(@uri) 
+      end
+      def dir_rl() 
+        self 
       end
     end
     module Stream
@@ -60,8 +78,19 @@ module RIO
           sub,opq,whole = split_riorl(s)
           [whole] 
         end
-        def open(*args)
-          @uri.open
+        def openfs_
+          RIO::FTP::FS.create(@uri)
+        end
+        def open(m)
+          case
+          when m.primarily_write?
+            RIO::IOH::Stream.new(RIO::FTP::FTPFile.new(fs.remote_path(@uri.to_s),fs.conn))
+          else
+            RIO::IOH::Stream.new(@uri.open)
+          end
+        end
+        def file_rl() 
+          self
         end
       end
     end

data/lib/rio/scheme/http.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/{context/closeoneof.rb → scheme/null.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,16 +35,22 @@
 # The documented interface and behavior is subject to change without notice.</b>
 
 
-require 'rio/context/cxx.rb'
+require 'rio/rl/ioi'
+require 'rio/stream'
+require 'rio/stream/open'
 
-module RIO  
-  module Cx
-    module Methods
-      def closeoneof(arg=true,&block) cxx('closeoneof',arg,&block) end
-      def nocloseoneof(arg=false,&block) nocxx('closeoneof',arg,&block) end
-      def closeoneof?() cxx?('closeoneof') end 
-      def closeoneof_(arg=true)  cxx_('closeoneof',arg) end
-      protected :closeoneof_
+module RIO
+  module Null #:nodoc: all
+    RESET_STATE = RL::IOIBase::RESET_STATE
+
+    class RL < RL::IOIBase 
+      RIOSCHEME = 'null'
+
+      def open(m,*args)
+        require 'rio/ios/null'
+        super(RIO::IOS::Null.new(nil,m))
+      end
     end
   end
 end
+__END__

data/lib/rio/scheme/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
@@ -36,28 +36,41 @@
 
 
 require 'rio/rl/path'
+require 'rio/ioh'
 module RIO
   module Path #:nodoc: all
     RESET_STATE = RL::PathBase::RESET_STATE
 
     class RL < RL::PathBase 
+      def file_rl()
+        RIO::File::RL.new(self.uri, {:fs => self.fs})
+      end
+      def dir_rl()
+        RIO::Dir::RL.new(self.uri, {:fs => self.fs})
+      end
     end
   end
   module File
     RESET_STATE = RL::PathBase::RESET_STATE
 
-    class RL < RL::PathBase 
+    class RL < RIO::Path::RL
       def open(m)
-        ::File.open(self.fspath,m.to_s)
+        IOH::Stream.new(fs.file.open(self.fspath,m.to_s))
+      end
+      def file_rl()
+        self
       end
     end
   end
   module Dir
     RESET_STATE = RL::PathBase::RESET_STATE
 
-    class RL < RL::PathBase 
+    class RL < RIO::Path::RL
       def open()
-        ::Dir.open(self.fspath)
+        IOH::Dir.new(fs.dir.open(self.fspath))
+      end
+      def dir_rl()
+        self
       end
     end
   end
@@ -66,36 +79,21 @@ module RIO
   require 'rio/ops/symlink'
   module Path
     module Stream
+      module Ops
+        include RIO::Ops::Path::Str
+      end
+
       class Open < RIO::Stream::Open
-        include Ops::Path::Status
-        include Ops::Path::URI
-        include Ops::Path::Query
+        include RIO::Ops::Path::Status
+        include RIO::Ops::Path::URI
+        include RIO::Ops::Path::Query
         def stream_state(cl)
           next_state = super
           next_state.extend(RIO::Ops::Symlink::Existing) if symlink?
-          next_state
+          next_state.extend(Ops)
         end
-        def input() stream_state('Path::Stream::Input') end
-        def output() stream_state('Path::Stream::Output') end
-
-        def inout() stream_state('Path::Stream::InOut') end
-      end
-
-      module Ops
-        include RIO::Ops::Path::Str
-      end
-
-      class Input < RIO::Stream::Input
-        include Ops
-      end
-
-      class Output < RIO::Stream::Output
-        include Ops
-      end
-
-      class InOut < RIO::Stream::InOut
-        include Ops
       end
     end
   end
 end
+__END__

data/lib/rio/scheme/stderr.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,8 +48,8 @@ module RIO
       end
       def opaque() '' end
       def open(*args)
-        self.ios = $stderr
-        super()
+        #self.ios = $stderr
+        super($stderr)
       end
     end
   end

data/lib/rio/scheme/stdio.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
       attr_reader :scheme
       def initialize(sch=RIOSCHEME)
         @scheme = sch
+        #super
       end
       def opaque() '' end
       require 'rio/iomode'
@@ -53,14 +54,14 @@ module RIO
         case 
         when m.primarily_read? 
           @scheme = 'stdin'
-          self.ios = $stdin.clone
+          return super($stdin.clone)
         when m.primarily_write? 
           @scheme = 'stdout'
-          self.ios = $stdout.clone
+          return super($stdout.clone)
         else 
           raise ArgumentError,sprintf("Can not %s a %s with mode '%s'",'open',self.class,m)
         end
-        super()
+        nil
       end
       def close()
         @scheme = RIOSCHEME