rio 0.5.1 → 0.6.0

data/lib/rio/scheme/aryio.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.

data/lib/rio/scheme/cmdio.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.
@@ -40,7 +40,6 @@ module RIO
       
       attr_reader :ior,:iow
       def initialize(u,*a)
-        # p "CMDIO initialize: u=#{u.inspect} a=#{a.inspect}"
         super(u)
         a = a.map(&:to_s)
         com = case c = a.shift
@@ -52,8 +51,8 @@ module RIO
           self.query = a
         end
       end
-      extend Forwardable
-      def_delegators :uri, :path=, :path
+      extend RIO::Fwd
+      fwd :uri, :path
       def query
         uri.query
       end
@@ -67,8 +66,6 @@ module RIO
       alias :cmd :path
       alias :args :query
       def fib_proc(m)
-        #fibproc
-        #p "CMD=#{cmd},args=#{args.inspect}"
         poargs = args.nil? ? cmd : [cmd,args]
         if m.allows_write?
           Cmd::FibPipeProc.new(poargs,m.to_s)
@@ -82,7 +79,6 @@ module RIO
       end
       def open(m)
         poarg = args.nil? ? cmd : [cmd,args].flatten
-        #p "CMDIO poarg=#{poarg.inspect}"
         io = IO.popen(poarg,m.to_s)
         super(io)
       end
@@ -97,14 +93,6 @@ module RIO
         
         def cmd() rl.path end
         def cmd_args() rl.query end
-        #def cmd_str() [cmd,cmd_args].flatten.join(' ') end
-        #def |(arg)
-        #  #p "CMDIO#| #{self}|#{arg}"
-        #  nrio = new_rio(:cmdpipe,self,arg)
-        #  end_rio = nrio.rl.query[-1]
-        #  p "CmdIO#end_rio=#{end_rio}"
-        #  nrio
-        #end
       end
     end
   end

data/lib/rio/scheme/cmdpipe.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.
@@ -130,9 +130,6 @@ module RIO
           nrio = new_rio(self,ario)
           has_output_dest?(nrio) ? nrio.run :  nrio
         end
-        #def last_rio(r)
-        #  r.scheme == 'cmdpipe' ? last_rio(r.rl.query[-1]) : r
-        #end
         def last_rio(r)
           r = r.rl.query[-1] while r.scheme == 'cmdpipe'
           r
@@ -159,7 +156,6 @@ module RIO
           orio.touch if orio && orio.scheme.nil? # TODO: is this right???
           output = Cmd::ToOutput.new(orio)
           output.resume procs + [input]
-          #p "RUN orio.scheme=#{orio.scheme}"
           orio
         end
 

data/lib/rio/scheme/fd.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.

data/lib/rio/scheme/ftp.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,18 +32,11 @@ require 'rio/ftp/ftpfile'
 
 module RIO
   module FTP #:nodoc: all
-    #RESET_STATE = 'FTP::State::Reset'
     RESET_STATE = RIO::RRL::PathBase::RESET_STATE
     
     require 'rio/rrl/withpath'
 
     class RRL < RIO::RRL::URIBase
-    #  def initialize(arg0,*args)
-    #    p callstr('initialize',arg0.inspect,args.inspect)
-    #    super(*_sup_args(arg0,*args))
-    #    @ftype = nil
-    #    @names = nil
-    #  end
       def _sup_args(arg0,*args)
         if arg0 == 'ftp:'
           hn = args.shift || 'localhost'
@@ -58,39 +51,9 @@ module RIO
           return [arg0] + args
         end
       end
-#       def arg0_info_(arg0,*args)
-#         #p "arg0_info_(#{arg0.inspect},#{args.inspect})"
-#         vuri,vbase,vfs = nil,nil,nil
-#         case arg0
-#         when RIO::Rio
-#           return _init_from_arg(arg0.rl)
-#         when RIO::RRL::URIBase,RIO::FTP::RL
-#           vuri,vbase,vfs = arg0.uri,arg0.base,arg0.fs
-#         when ::URI 
-#           vuri = arg0
-#         when ::String 
-#           vuri = uri_from_string_(arg0) || ::URI.parse(arg0)
-#         else
-#           raise(ArgumentError,"'#{arg0}'[#{arg0.class}] can not be used to create a Rio")
-#         end
-#         [vuri,vbase,vfs]
-#       end
-#       def build_arg0_(path_str)
-#         path_str
-#       end
-#      def join(*args)
-#        return self if args.empty?
-#        join_(args.map{ |arg| RIO::RL.fs2url(arg.to_s)})
-#      end
       def typecode() uri.typecode end
       def typecode=(val) uri.typecode = val end
 
-#      def self.splitrl(s)
-#        #p "splitrl(#{s})"
-#        sub,opq,whole = split_riorl(s)
-#        #p sub,opq,whole
-#        [whole] 
-#      end
       def openfs_
         #p callstr('openfs_',self.uri)
         RIO::FTP::FS.create(self.uri)
@@ -119,9 +82,7 @@ module RIO
           when m.primarily_write?
             RIO::IOH::Stream.new(RIO::FTP::FTPFile.new(fs.remote_path(@uri.to_s),fs.conn))
           else
-            #p "scheme/ftp uri=#{@uri.inspect}"
             u = URI.parse(@uri.to_s)
-            #p "scheme/ftp u=#{u.inspect}"
             hndl = u.open
             RIO::IOH::Stream.new(hndl)
           end

data/lib/rio/scheme/http.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.
@@ -29,10 +29,6 @@ module RIO
     
     require 'rio/rrl/withpath'
     class RRL < RIO::RRL::URIBase
-      #def self.splitrl(s) 
-      #  sub,opq,whole = split_riorl(s)
-      #  [whole] 
-      #end
       require 'uri'
       require 'open-uri'
       def open(*args)
@@ -60,8 +56,15 @@ module RIO
         include Ops::Path::Status
         include Ops::Path::URI
         include Ops::Path::Query
-        extend Forwardable
-        def_instance_delegators(:ioh,:meta,:status,:charset,:content_encoding,:content_type,:last_modified,:base_uri)
+        extend RIO::Fwd
+        fwd_readers :ioh,
+                    :meta,
+                    :status,
+                    :charset,
+                    :content_encoding,
+                    :content_type,
+                    :last_modified,
+                    :base_uri
       end
 
     end

data/lib/rio/scheme/null.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.

data/lib/rio/scheme/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.
@@ -22,66 +22,4 @@
 #++
 #
 
-
-# require 'rio/rl/path'
-# require 'rio/ioh'
-# module RIO
-#   module Path #:nodoc: all
-#     RESET_STATE = RIO::RL::PathBase::RESET_STATE
-
-#     class RL < RIO::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 = RIO::RL::PathBase::RESET_STATE
-
-#     class RL < RIO::Path::RL
-#       def open(m)
-#         IOH::Stream.new(fs.file.open(self.fspath,m.to_s))
-#       end
-#       def file_rl()
-#         self
-#       end
-#     end
-#   end
-#   module Dir
-#     RESET_STATE = RIO::RL::PathBase::RESET_STATE
-
-#     class RL < RIO::Path::RL
-#       def open()
-#         IOH::Dir.new(fs.dir.open(self.fspath))
-#       end
-#       def dir_rl()
-#         self
-#       end
-#     end
-#   end
-#   require 'rio/stream'
-#   require 'rio/stream/open'
-#   require 'rio/ops/symlink'
-#   module Path
-#     module Stream
-#       module Ops
-#         include RIO::Ops::Path::Str
-#       end
-
-#       class Open < RIO::Stream::Open
-#         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.extend(Ops)
-#         end
-#       end
-#     end
-#   end
-# end
 __END__

data/lib/rio/scheme/stderr.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
         super(::Alt::URI.parse(u))
       end
       def open(*args)
-        #self.ios = $stderr
         super($stderr)
       end
     end

data/lib/rio/scheme/stdio.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.
@@ -34,8 +34,8 @@ module RIO
       def initialize(u)
         super(u)
       end
-      extend Forwardable
-      def_delegators :uri, :path=, :path
+      extend RIO::Fwd
+      fwd :uri, :path
       require 'rio/iomode'
       def open(m)
         case 

data/lib/rio/scheme/strio.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
       RIOPATH = RIO::RRL::CHMAP.invert[RIOSCHEME].to_s.freeze
       attr_accessor :str
       def initialize(u,str="")
-        #p "StrIO::RRL initialize: u=#{u.inspect} str=#{str.inspect}"
         alturi = ::Alt::URI.parse(u.to_s)
         super(alturi)
         self.query ||= str
@@ -62,7 +61,6 @@ module RIO
       alias :stringio :query
       alias :stringio= :query=
       def open(m,*args)
-        #p "STRIO open: m=#{m} args=#{args.inspect}"
         strio = self.stringio
         str = strio.string
         nstrio = self.stringio.reopen(str,m.to_s)

data/lib/rio/scheme/sysio.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.

data/lib/rio/scheme/tcp.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.
@@ -41,7 +41,6 @@ module RIO
       end
       require 'socket'
       def open(*args)
-        #          @host = 'localhost' if @host.nil? or @host.empty?
         super(::TCPSocket.new(@host || 'localhost',@port))
       end
       def to_s() self.url end

data/lib/rio/scheme/temp.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.
@@ -34,10 +34,7 @@ module RIO
       RIOPATH = RIO::RRL::CHMAP.invert[RIOSCHEME].to_s.freeze
       DFLT_PREFIX = 'rio'
       DFLT_TMPDIR = ::Dir::tmpdir
-      # p 'DFLT_TMPDIR=' + DFLT_TMPDIR 
       def initialize(u,file_prefix=DFLT_PREFIX,temp_dir=DFLT_TMPDIR)
-        # p "Temp::RRL::initialize u=#{u} file_prefix=#{file_prefix} temp_dir=#{temp_dir}"
-        # puts "Temp::RRL CALLER: ",caller[0..8]
         alturi = case u
                  when ::Alt::URI::Base then u
                  else ::Alt::URI.parse(u.to_s)
@@ -45,17 +42,15 @@ module RIO
         prefix = alturi.query || file_prefix.to_s
         tmpdir = (alturi.path.nil? || alturi.path.empty?) ? 
           temp_dir.to_s : alturi.path
-        #alturi = ::Alt::URI.create(:scheme => 'temp', :path => temp_dir,
-        #                           :query => file_prefix)
-        # p 'HERE'
         super(alturi)
-        # p "alturi=#{alturi}"
         self.path = tmpdir
         self.query = prefix
       end
 
-      extend Forwardable
-      def_delegators :uri, :path=, :path, :query, :query=, :scheme
+      extend RIO::Fwd
+      fwd :uri, :path, :query
+      fwd_reader :uri, :scheme
+
       alias :prefix :query
       alias :tmpdir :path
 
@@ -71,7 +66,6 @@ module RIO
 
         def initialize(u,file_prefix=DFLT_PREFIX,temp_dir=DFLT_TMPDIR)
           require 'rio/tempdir'
-          # p "Temp::Dir u=#{u.inspect} file_prefix=#{file_prefix} temp_dir=#{temp_dir}"
           alturi = case u
                    when ::Alt::URI::Base then u
                    else ::Alt::URI.parse(u.to_s)
@@ -79,17 +73,12 @@ module RIO
           prefix = alturi.query || file_prefix.to_s
           tmpdir = (alturi.path.nil? || alturi.path.empty?) ? 
              temp_dir.to_s : alturi.path
-          #p "Temp::Dir prefix=#{prefix} tmpdir=#{tmpdir}"
           td = ::Tempdir.new( prefix, tmpdir)
-          #td = "file:///" + td if td.to_s =~ /^[a-zA-Z]:/
-          #p "Temp::Dir td=#{td.to_s.inspect}"
           td = "file:///" + td.to_s if td.to_s =~ /^[a-zA-Z]:/
           super(td.to_s)
-          #self.query = file_prefix.to_s
-          #self.path = temp_dir.to_s
         end
-        extend Forwardable
-        def_delegators :uri, :path=, :path, :query, :query=
+        extend RIO::Fwd
+        fwd :uri, :path, :query
         alias :prefix :query
         alias :tmpdir :path
 
@@ -108,8 +97,6 @@ module RIO
 
         def initialize(u,file_prefix=DFLT_PREFIX,temp_dir=DFLT_TMPDIR)
           require 'tempfile'
-           #p "Temp::File::initialize u=#{u.inspect} file_prefix=#{file_prefix.inspect} temp_dir=#{temp_dir.inspect}"
-          # puts "Temp::File CALLER: ",caller[0..8]
           # FIXME: Temporary fix for jruby 1.4 - make tmpdir absolute
           #tmpdir_rio = rio(@tmpdir).abs
           alturi = case u
@@ -119,28 +106,18 @@ module RIO
           prefix = alturi.query || file_prefix.to_s
           tmpdir = (alturi.path.nil? || alturi.path.empty?) ? 
              temp_dir.to_s : alturi.path
-          # p "Temp::File::initialize alturi=#{alturi} prefix=#{prefix} tmpdir=#{tmpdir}"
 
           @tf = ::Tempfile.new( prefix, tmpdir)
 
-          #puts "TF=#{@tf.inspect}"
-          # @tf = ::Tempfile.new( @prefix.to_s, @tmpdir.to_s)
-
           # FIXME: Temporary fix for jruby 1.4 - fix slashes
           pth =  @tf.path
           pth.gsub!("\\","/")
           pth = "file:///" + pth if pth =~ /^[a-zA-Z]:/
 
-          #p "PTH=#{pth}"
-          # @tf = "file:///" + @tf if @tf.to_s =~ /^[a-zA-Z]:/
-          #
-          #p "Temp::File pth=#{pth.inspect}"
           super(::Alt::URI.parse(pth))
-          #self.query = file_prefix
-          #self.path = temp_dir
         end
-        extend Forwardable
-        def_delegators :uri, :path=, :path, :query, :query=
+        extend RIO::Fwd
+        fwd :uri, :path, :query
         def file_rl() 
           RIO::File::RRL.new(self.uri,{:fs => self.fs})
         end
@@ -157,7 +134,6 @@ module RIO
     class Reset < State::Base
       def initialize(*args)
         super
-        #p args
         @tempobj = nil
       end
       def self.default_cx
@@ -166,13 +142,9 @@ module RIO
 
       def check?() true end
       def mkdir(prefix=rl.prefix,tmpdir=rl.tmpdir)
-        # p "scheme/temp.rb mkdir(): prefix="+prefix+" tmpdir="+tmpdir
         self.rl = RIO::Temp::Dir::RRL.new("",prefix, tmpdir)
         become 'Dir::Existing'
       end
-#      def mkdir()
-#        dir()
-#      end
       def chdir(&block)
         self.mkdir.chdir(&block)
       end
@@ -205,7 +177,6 @@ module RIO
           mode_('w+').open_.inout()
         end
       end
-
     end
   end
 end