rio 0.5.1 → 0.6.0

data/lib/rio/rl/ioi.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -37,7 +37,6 @@ module RIO
       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)

data/lib/rio/rl/path.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -33,8 +33,6 @@ module RIO
       RESET_STATE = 'Path::Reset'
 
       def arg0_info_(arg0,*args)
-        #p "arg0_info_(#{arg0.inspect},#{args.inspect})"
-        #p callstr('init_from_args_',arg0.inspect,args)
         vuri,vbase,vfs = nil,nil,nil
         case arg0
         when RIO::Rio, URIBase, ::Alt::URI::Base, ::Alt::URI::File
@@ -44,7 +42,6 @@ module RIO
         else
           raise(ArgumentError,"'#{arg0}'[#{arg0.class}] can not be used to create a Rio")
         end
-        #puts "path.rb arg0_info_: vuri=#{vuri}"
         [vuri,vbase,vfs]
       end
       def build_arg0_(path_str)
@@ -67,27 +64,11 @@ module RIO
         return self if args.empty?
         join_(args.map{ |arg| arg.to_s})
       end
-      #def fspath() 
-      #  if use_host?
-      #    '//' + uri.host + RL.url2fs(self.urlpath)
-      #  else 
-      #    RL.url2fs(self.urlpath)
-      #  end
-      #end
-#      def fspath=(pt)
-#        if pt =~ %r|^//(#{HOST})(/.*)?$|
-#          @host = $1
-#          @fspath = $2 || '/'
-#        else
-#          @fspath = pt
-#        end
-#      end
       def to_s()
         self.fspath
       end
       def self.splitrl(s)
         sch,opq,whole = split_riorl(s)
-        #p sch,opq,whole
         case sch
         when 'file' then [whole]
         else [opq]

data/lib/rio/rl/pathmethods.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -83,7 +83,6 @@ module RIO
         self.class.new(uri.merge(other.uri))
       end
       def calc_abs_uri_(path_str,base_str)
-        #p path_str,base_str
         path = URI(path_str)
         return path unless base_str
         if path_str[0,1] != '/' and base_str[0,1] == '/'
@@ -99,7 +98,6 @@ module RIO
         ::File.dirname(self.path_no_slash)
       end
 
-
     end
   end
 end

data/lib/rio/rl/uri.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -32,9 +32,6 @@ require 'rio/alturi'
 module RIO
   module RL
     class URIBase < WithPath
-      #SCHEME = URI::REGEXP::PATTERN::SCHEME
-      #HOST = URI::REGEXP::PATTERN::HOST
-
       attr_accessor :uri
       def initialize(u,*args)
         # u should be a ::URI or something that can be parsed to one
@@ -50,7 +47,6 @@ module RIO
         @uri.path = '/' if @uri.absolute? and @uri.path == ''
       end
       def arg0_info_(arg0,*args)
-        #p "arg0_info_(#{arg0.inspect},#{args.inspect})"
         vuri,vbase,vfs = nil,nil,nil
         case arg0
         when RIO::Rio
@@ -64,7 +60,6 @@ module RIO
         else
           raise(ArgumentError,"'#{arg0}'[#{arg0.class}] can not be used to create a Rio")
         end
-        #puts "uri.rb arg0_info_: vuri=#{vuri}"
         [vuri,vbase,vfs]
       end
       def init_from_args_(arg0,*args)
@@ -75,7 +70,6 @@ module RIO
         fs = vfs if vfs 
       end
       def _get_base_from_arg(arg)
-        #p "_get_base: #{arg.inspect}"
         case arg
         when RIO::Rio
           arg.abs.to_uri
@@ -94,7 +88,6 @@ module RIO
           opts = args.pop
           if b = opts[:base]
             @base = _get_base_from_arg(b)
-            #@base.path.sub!(%r{/*$},'/')
           end
           if fs = opts[:fs]
             @fs = fs
@@ -123,7 +116,6 @@ module RIO
       end
       def urlpath() uri.path end
       def urlpath=(arg) 
-        #p uri,arg
         uri.path = arg 
       end
       def path()
@@ -149,7 +141,6 @@ module RIO
       end
       def pathroot()
         u = uri.clone
-        #u.query = nil
         case scheme
         when 'file'
           if self.urlpath =~ %r'^(/[a-zA-Z]):' then $1+':/'
@@ -170,7 +161,6 @@ module RIO
         @base || self.uri
       end
       def base=(arg)
-        #p "uri.rb:base= arg=#{arg.inspect}"
         @base = _uri(arg)
       end
       def join(*args)

data/lib/rio/rl/withpath.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -100,9 +100,6 @@ end
 module RIO
   module RL
     class WithPath < RIO::RL::Base
-      #SCHEME = URI::REGEXP::PATTERN::SCHEME
-      #HOST = URI::REGEXP::PATTERN::HOST
-
       # returns the path as the file system sees it. Spaces are spaces and not
       # %20 etc. This is the path that would be passed to the fs object.
       # For windows RLs this includes the '//host' part and the 'C:' part
@@ -112,7 +109,6 @@ module RIO
       end
 
       def fspath=(fpth)
-        #p "FSPATH= #{fpth} => #{RL.fs2url(fpth)}"
         uri.netpath = fpth
       end
       
@@ -132,7 +128,6 @@ module RIO
       end
       def pathdepth()
         pth = self.path_no_slash
-        #is_root?(pth) ? 0 : pth.count('/')
         pth.count('/')
       end
 
@@ -147,14 +142,11 @@ module RIO
         thebase ||= self.base
         base_uri = _uri(thebase)
         path_uri = self.uri.clone
-        #p "abs: base_uri=#{base_uri.inspect}"
-        #p "abs: path_uri=#{path_uri.inspect}"
         if path_uri.scheme == 'file' and base_uri.scheme != 'file'
           abs_uri = path_uri.abs(base_uri)
         else
           abs_uri = path_uri.abs(base_uri)
         end
-        #p "abs: abs_uri=#{abs_uri.inspect}"
         _build(abs_uri,{:fs => self.fs})
       end
 
@@ -194,11 +186,10 @@ module RIO
 
       end
 
-      # changes this RLs path so that is consists of this RL's path
+      # changes this RLs path so that it consists of this RL's path
       # combined with those of its arguments.
       def join(*args)
         return self if args.empty?
-        #sa = args.map { |arg| ::URI.escape(arg.to_s,ESCAPE) }
         sa = args.map { |arg| arg.to_s }
         join_(sa)
       end
@@ -213,15 +204,6 @@ module RIO
       # like File#dirname
       # returns a RL
       def dirname() 
-        #u = uri.clone
-        #u.path = fs.dirname(uri.path).sub(%r{/*$},'/')
-        #puts
-        #if uri.scheme == 'file'
-        #  u.host = self.host
-        #else
-        #  u.scheme = uri.scheme
-        #  u.host = uri.host
-        #end
         RIO::RL::Builder.build(uri.dirname)
       end
         
@@ -260,17 +242,7 @@ module RIO
       def _build(*args) RIO::RL::Builder.build(*args) end
 
       def uri_from_string_(str)
-        #p "uri_from_string(#{str})"
         ::Alt::URI.parse(str)
-        #case str
-        #when %r%^file://(#{HOST})?(/.*)?$% then ::URI.parse(str)
-        #when %r/^[a-zA-Z]:/ then 
-        #  ::URI.parse(str)
-        #when %r/^#{SCHEME}:/ then ::URI.parse(str)
-        #when %r{^/} then ::URI.parse('file://'+str+( ( str[-1,0] == '/' ) ? "" : "/"))
-        #when %r{^/} then ::URI.parse('file://'+RL.fs2url(str))
-        #else ::URI.parse(str)
-        #end
       end
     end
   end

data/lib/rio/rrl/base.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -28,9 +28,6 @@ module RIO
   end
 end
 
-
-
-
 module RIO
   module RRL
 
@@ -58,8 +55,6 @@ module RIO
       def ===(other) self == other end
       def =~(other) other =~ self.to_str end
       def length() self.to_s.length end
-
-      extend Forwardable
       def url() uri.to_s end
       
       def close() 

data/lib/rio/rrl/builder.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -35,7 +35,6 @@ module RIO
         return rl
       end
       def self.build(*a)
-        #puts "build: #{a.inspect} (#{a.map(&:class).inspect})" 
         a.flatten!
         a.push('') if a.empty?
         case a[0]
@@ -46,7 +45,6 @@ module RIO
         when ?$
           a[0] = 'rio:strio:'
         when ::String
-          #p a[0].encoding,a[0]
           case a[0]
           when /^[a-zA-Z]:/
             a[0] = 'rio:file:///'+a[0]
@@ -55,10 +53,8 @@ module RIO
           when %r|^//|
             a[0] = 'rio:file:'+a[0]
           when %r|^/|
-              a[0] = 'file://'+a[0]
-#            return Factory.instance.riorl_class('file').new(*a)
+            a[0] = 'file://'+a[0]
           else
-            #a[0] = 'path:'+a[0]
             return Factory.instance.riorl_class('path').new(*a)
           end
         when RIO::Rio
@@ -110,9 +106,7 @@ module RIO
         a0 = a.shift
         sch = /^(rio:)?([^:]+):/.match(a0)[2]
 
-        #sch = Base.subscheme(a0)
         cl = Factory.instance.riorl_class(sch)
-        #p "cl=#{cl} a=#{a.inspect}"
         cl.parse(a0,*a)  unless cl.nil?
 
       end

data/lib/rio/rrl/chmap.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -28,16 +28,6 @@ require 'rio/local'
 module RIO
   module RRL
     CHMAP = { 
-      '_'    => 'sysio',
-      '-'    => 'stdio',
-      '='    => 'stderr',
-      '"'    => 'strio',
-      '?'    => 'temp',
-      '['    => 'aryio',
-      '`'    => 'cmdio',
-      '|'    => 'cmdpipe',
-      '#'    => 'fd',
-
       ?_    => 'sysio',
       ?-    => 'stdio',
       ?=    => 'stderr',

data/lib/rio/rrl/ioi.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -36,10 +36,8 @@ module RIO
       end
       def scheme() self.class.const_get(:RIOSCHEME) end
       def opaque() '' end
-      #def self.splitrl(s) nil end
       def fspath() nil end
       def path() uri.path end
-      #def path() self.class.const_get(:RIOPATH) end
       def to_s() url() end
       def open(ios)
         IOH::Stream.new(ios)

data/lib/rio/rrl/path.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -25,10 +25,6 @@
 
 module RIO
   autoload :Stream, 'rio/stream'
-  #autoload :Ops, 'rio/ops'
-  #require 'rio/stream'
-  #require 'rio/stream/open'
-  #require 'rio/ops/symlink'
 end
 
 require 'rio/rrl/withpath'
@@ -63,10 +59,6 @@ module RIO
       def dir_rl()
         RIO::Dir::RRL.new(self.uri, {:fs => self.fs})
       end
-      #def absolute?
-      #  p "Path::RRL (rrl/path.rb) absolute?"
-      #  false
-      #end
     end
   end
   module File
@@ -86,8 +78,6 @@ module RIO
 
     class RRL < RIO::Path::RRL
       def open()
-        #IOH::Dir.new(fs.dir.open(self.fspath, :encoding => 'UTF-8'))
-        #p "Dir::RRL #{self.path},#{self.fspath}"
         IOH::Dir.new(fs.dir.open(self.fspath))
       end
       def dir_rl()

data/lib/rio/rrl/withpath.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -22,18 +22,10 @@
 #++
 #
 
-
-
 require 'rio/alturi'
 require 'rio/uriref'
 require 'rio/fwd'
-
-#require 'rio/local'
-#require 'rio/rrl/chmap'
-#require 'rio/rrl/base'
-
 require 'rio/exception/notimplemented'
-#require 'rio/rrl/builder'
 require 'rio/fs'
 
 module RIO
@@ -53,11 +45,6 @@ module RIO
       # returns an appriate FS object for the scheme
       def openfs_() nodef() end
 
-      # returns the path portion of a URL. All spaces would be %20
-      # returns a String
-      #def urlpath() nodef() end
-      #def urlpath=(arg) nodef(arg) end
-
       # For RLs that are on the file system this is fspath()
       # For RLs that are remote (http,ftp) this is urlpath()
       # For RLs that have no path this is nil
@@ -65,11 +52,6 @@ module RIO
       def path() nodef{} end
       def path=(arg) nodef(arg) end
 
-      # returns A URI object representation of the RL if one exists
-      # otherwise it returns nil
-      # returns a URI
-      #def uri() nodef() end
-
       # when the URL is legal it is the URI scheme
       # otherwise it is one of Rio's schemes
       # returns a String
@@ -109,7 +91,6 @@ end
 module RIO
   module RRL
     class WithPath < RIO::RRL::Base
-      extend Forwardable
       extend Fwd
 
       # The value of urlpath() with any trailing slash removed
@@ -124,34 +105,24 @@ module RIO
       end
       def pathdepth()
         pth = self.path_no_slash
-        #is_root?(pth) ? 0 : pth.count('/')
         pth.count('/')
       end
 
-      def_delegators :uri,:netpath, :netpath=, :fspath, :fspath=
-      def_delegators :uri, :abs, :rel, :route_to, :route_from
-      def_delegators :uri, :join, :rel, :route_to, :route_from
+      fwd :uri,:netpath, :fspath
+      fwd_readers :uri, :abs, :rel, :route_to, :route_from
+      fwd_readers :uri, :join, :rel, :route_to, :route_from
       fwd :uri, :dirname, :basename, :extname, :filename
       fwd :uri, :scheme, :authority, :path, :query, :fragment
       fwd :uri, :host, :port, :userinfo, :netpath, :user, :password
 
       def absolute?
-        #p 'rrl/withpath.rb absolute?'
         uri.absolute?
       end
-      # Marty Cell 319-210-3284
-      #def abs?
-      #  p 'rrl/withpath.rb abs?'
-      #  uri.absolute?
-      #nd
-      #fwd :uri, :base
       def base
-        #p "IN BASE: uri=#{uri.inspect}" 
         uri.base
       end
 
       def base=(other)
-        #p "IN BASE: uri=#{uri.inspect}" 
         uri.base = other
       end
 
@@ -169,16 +140,13 @@ module RIO
         pparts = pathpart.split("/")
         
         rootpath = ::Alt::URI.create(:scheme => scheme, :authority => authpart, :path => rootpathpart).to_s
-        #p "ROOTPATH=#{rootpath}"
         sparts = [rootpath,pparts].flatten
-        #p "SPARTS=#{sparts.inspect}"
-        #p ::Dir.getwd
         basepart = if rootpath.empty?
                      ::Alt::URI.create(:scheme => 'file', :authority => "", :path => ::Dir.getwd + "/").to_s
                    else
                      rootpath
                    end
-        #p "basepart=#{basepart}"
+
         bparts = [basepart]
         bparts << basepart.clone
 
@@ -186,7 +154,7 @@ module RIO
           basepart += sparts[n] + "/"
           bparts << basepart.clone
         end
-        #p "BPARTS=#{bparts.inspect}"
+
         if sparts[0].empty?
           sparts.shift
           bparts.shift
@@ -208,11 +176,7 @@ module RIO
       def initialize(u,*args)
         # u should be a ::URI or something that can be parsed to one
         #p callstr('initialize',u,*args)
-        #p "URIBASE u=#{u} (#{u.class}) args=#{args.inspect} "
         args,opts = _get_opts_from_args(args)
-        #opts[:fs] ||= openfs_
-        #opts[:encoding] = opts[:fs] ? opts[:fs].encoding : nil
-        #p "URIBase OPTS=#{opts.inspect} U=#{u.inspect}"
         uriref = case u
                  when ::Alt::URI::Base
                    _uriref_from_alturi(u,opts,*args)
@@ -226,10 +190,10 @@ module RIO
                  else
                    _uriref_from_alturi(::Alt::URI.parse(u.to_s,opts),opts,*args)
                  end
-        #p "URIBASE uriref=#{uriref} (#{uriref.inspect}) "
+
         super(uriref,opts[:fs])
         opts[:fs] ||= openfs_
-        #p opts[:fs]
+
         self.uri.parts.encoding ||= opts[:fs].encoding
       end
 
@@ -237,8 +201,6 @@ module RIO
 
       def _uriref_from_alturi(alturi,opts,*args)
         alturi.join(*args)
-        #p "ZIPPY #{alturi.absolute?} #{alturi.inspect} opts=#{opts.inspect}"
-        #p "withpath: _uriref_from_alturi enc=#{opts[:encoding].inspect}"
         ::RIO::URIRef.build(alturi,opts)
       end
       def _get_opts_from_args(args)
@@ -253,7 +215,6 @@ module RIO
 
       def self.parse(*a)
         u = a.shift.sub(/^rio:/,'')
-        #p "URIBASE#parse u=#{u} (#{u.class}) args=#{a.inspect} "
         new(u,*a)
       end
       def initialize_copy(other)
@@ -261,7 +222,6 @@ module RIO
       end
       def openfs_()
         #p callstr('openfs_')
-        #p "URIBase: openfs_  enc=#{::Dir.pwd.encoding}"
         self.fs || RIO::FS::LOCAL
       end
     end