rio 0.5.1 → 0.6.0

data/lib/rio/kernel.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.
@@ -38,4 +38,3 @@ module RIO
   end
 end
 
-#require 'rio'

data/lib/rio/local.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,15 +37,3 @@ if $0 == __FILE__
 end
 
 __END__
-
-require 'test/unit'
-
-class TC_FS_Local < Test::Unit::TestCase
-
-  def test_to_a
-    require 'rio/log'
-    RIO::Log.init
-    raise 'RuntimeError',"No tests defined for RIO::Args",callee
-  end
-
-end

data/lib/rio/match.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,7 +28,6 @@ module RIO
     module Common
 
       def ss_type?(keys)
-        #p cx,keys
         case cx['ss_type']
         when nil
           keys[0]

data/lib/rio/matchrecord.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.
@@ -55,13 +55,11 @@ module RIO
       end
       class Range < Base
         def match?(val,recno)
-          #p "match?(#{val},#{recno}) select_arg=#{@select_arg}"
           @select_arg === recno
         end
       end
-      class Fixnum < Base
+      class Integer < Base
         def match?(val,recno)
-          #p "match?(#{val},#{recno}) select_arg=#{@select_arg}"
           @select_arg === recno
         end
       end
@@ -71,14 +69,12 @@ module RIO
           @therio = therio
         end
         def match?(val,recno)
-          #p "match?(#{val},#{recno}) select_arg=#{@select_arg}"
           args = [val,recno,@therio]
           @select_arg.call(*args[0,@select_arg.arity])
         end
       end
       class Symbol < Base
         def match?(val,recno)
-          #p "match?(#{val},#{recno}) select_arg=#{@select_arg}"
           val.__send__(@select_arg)
         end
       end
@@ -92,13 +88,11 @@ module RIO
           @therio = therio
         end
         def match?(val,recno)
-          #p "match?(#{val},#{recno}) select_arg=#{@select_arg}"
           @select_arg.all? { |sel| sel.match?(val,recno) }
         end
       end
       class Case < Base
         def match?(val,recno)
-          #p "match?(#{val},#{recno}) select_arg=#{@select_arg}"
           @select_arg === val
         end
       end
@@ -112,8 +106,8 @@ module RIO
           Match::Record::Proc.new(arg,therio)
         when ::Symbol
           Match::Record::Symbol.new(arg)
-        when ::Fixnum
-          Match::Record::Fixnum.new(arg)
+        when ::Integer
+          Match::Record::Integer.new(arg)
         when ::Array
           Match::Record::And.new(arg,therio)
         else
@@ -141,14 +135,13 @@ module RIO
               @list << create_sel(therio,arg)
             end
           end
-          #p "SelList(#{args.inspect},#{@list.inspect})"
         end
         def inspect
           @list.inspect
         end
         def size() @list.size unless @list.nil? end
         def only_one_fixnum?()
-          @list && @list.size == 1 && @list[0].kind_of?(Match::Record::Fixnum)
+          @list && @list.size == 1 && @list[0].kind_of?(Match::Record::Integer)
         end
         def delete_at(index)
           @list.delete_at(index)
@@ -172,33 +165,14 @@ module RIO
         end
         def create_sel(therio,arg)
           Match::Record.create(therio,arg)
-#           case arg
-#           when ::Regexp
-#             Match::Record::RegExp.new(arg)
-#           when ::Range
-#             Match::Record::Range.new(arg)
-#           when ::Proc
-#             Match::Record::Proc.new(arg,therio)
-#           when ::Symbol
-#             Match::Record::Symbol.new(arg)
-#           when ::Fixnum
-#             Match::Record::Fixnum.new(arg)
-#           when ::Array
-#             Match::Record::And.new(arg)
-#           else
-#             raise ArgumentError,"Argument must be a Regexp,Range,Fixnum,Proc, or Symbol"
-#           end
         end
         def match?(val,recno)
-          # !@list.nil? && (@list.empty? || @list.detect { |sel| sel.match?(val,recno) } || false) && true
           return false unless @list
           return true if @list.empty?
           as = nil
           al = @list.detect { |sel| as = sel.match?(val,recno)
-            #p "1: #{$1} as[match?]: #{as.inspect}"
             as
           }
-          #p "[SelList.match?] as:#{as.inspect} al:#{al.inspect}"
           return as if al
           return false
         end
@@ -256,11 +230,8 @@ module RIO
           @always == false
         end
         def match?(val,recno)
-          #p "match?(#{val},#{recno}) #{self.inspect}"
           return @always if @always
-          #return @always unless @always.nil?
           as = nil
-          #ok = ((!@sel.nil? && (as = @sel.match?(val,recno))) && !(!@rej.nil? && @rej.match?(val,recno)))
           ok = ((@sel && (as = @sel.match?(val,recno))) && !(@rej && @rej.match?(val,recno)))
           return (ok ? as : ok)
         end

data/lib/rio/no_warn.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/nullio.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/open3.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,15 +22,6 @@
 #++
 #
 
-
-# 
-# = open3.rb
-#
-# = Rio
-#
-#
-
-
 require 'rio'
 require 'open3'
 

data/lib/rio/ops.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/ops/construct.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/ops/create.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,13 +32,11 @@ module RIO
             uri.clone.join(*args)
           }
         end
-        #alias :catpath :join
         def join!(*args)
           rtn_reset {
             uri.join(*args)
           }
         end
-        #alias :catpath! :join!
         def /(arg)
           join(arg)
         end

data/lib/rio/ops/dir.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,40 +25,8 @@
 
 require 'rio/grande'
 require 'rio/cp'
-#require 'rio/ops/either'
 
 module RIO
-#   module Impl
-#     module U
-#       def self.rmdir(s) ::Dir.rmdir(s.to_s) end
-#       def self.mkdir(s,*args) ::Dir.mkdir(s.to_s,*args) end
-#       def self.chdir(s,&block) ::Dir.chdir(s.to_s,&block) end
-#       def self.foreach(s,&block) ::Dir.foreach(s.to_s,&block) end
-#       def self.entries(s) ::Dir.entries(s.to_s) end
-#       def self.cp_r(s,d)
-#         require 'fileutils'
-#         ::FileUtils.cp_r(s.to_s,d.to_s)
-#       end
-#       def self.find(s,&block) 
-#         require 'find'
-#         Find.find(s.to_s) do |f|
-#           yield f
-#         end
-#       end
-#       def self.glob(gstr,*args,&block) 
-#         ::Dir.glob(gstr,*args,&block) 
-#       end
-#       def self.rmtree(s)
-#         require 'fileutils'
-#         ::FileUtils.rmtree(s.to_s)
-#       end
-#       def self.mkpath(s) 
-#         require 'fileutils'
-#         ::FileUtils.mkpath(s.to_s) 
-#       end
-#     end
-#   end
-
   module Ops
     module Dir
       module ExistOrNot
@@ -72,15 +40,11 @@ module RIO
         include ExistOrNot
         include ::RIO::Ops::FileOrDir::NonExisting
         def mkdir(*args)
-          #p "ops/dir/mkdir: self=#{self.to_s}"
-          #p "ops/dir/mkdir: self.path=#{self.path.inspect}"
           fs.mkdir(self.path,*args); 
           softreset() 
         end
         def mkpath(*args) 
-          #          p callstr('mkpath',*args)
           fs.mkpath(self.path,*args); 
-          #fs.mkpath(self,*args); 
           softreset()
         end
         def rmdir(*args) self end
@@ -122,7 +86,6 @@ module RIO
           softreset()
         end
         def rmtree(*args) fs.rmtree(self.path,*args); softreset() end
-        # def rm(*args) fs.rm(self.path,*args); softreset() end
         
         alias :delete :rmdir
         alias :unlink :delete
@@ -191,8 +154,9 @@ module RIO
         def rewind() ioh.rewind(); self end
         def seek(integer) ioh.seek(integer); self end
 
-        extend Forwardable
-        def_instance_delegators(:ioh,:tell,:pos,:pos=)
+        extend RIO::Fwd
+        fwd_reader :ioh,:tell
+        fwd :ioh, :pos
 
         protected
         require 'rio/entrysel'
@@ -216,13 +180,11 @@ module RIO
           end
         end
         def handle_skipped
-          #return unless cx.has_key?('skip_args') or cx['skipping']
           return self unless cx.has_key?('skip_args')
           args = cx['skip_args'] || []
           self.skipentries(*args)
         end
         def ent_to_rio_(ent,indir)
-          #p "ent_to_rio: ent=#{ent.inspect} indir=#{indir}"
           if ent.kind_of?(RIO::Rio)
             oldpath = ent.to_s
             ent.rl.urlpath = indir.to_s
@@ -240,9 +202,6 @@ module RIO
         end
         def handle_ent_(ent,indir,sel,&block)
           begin
-            #p "ENT=#{ent.inspect}"
-            #p "FS=#{rl.fs.inspect}"
-            #p "FS.ENCODING=#{rl.fs.encoding}"
             ent.force_encoding(rl.fs.encoding)
             erio = ent_to_rio_(ent,indir)
             if stream_iter?
@@ -251,7 +210,6 @@ module RIO
             else
               yield _add_iter_cx(erio) if sel.match?(erio)
             end
-            #p "handle_ent_2: #{erio.cx.inspect}"
             
             if cx.has_key?('all') and erio.directory?
               rsel = Match::Entry::SelectorClassic.new(cx['r_sel'],cx['r_nosel'])

data/lib/rio/ops/either.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.
@@ -61,7 +61,6 @@ module RIO
           else
             rtn_reset { 
               dst = args.shift.to_s
-              #p "rename: #{self} => #{dst}"
               fs.mv(uri.path,dst,*args) unless uri.path == dst
             } 
           end
@@ -73,7 +72,6 @@ module RIO
             rtn_reset { 
               cpath = uri.path
               uri.path = args.shift.to_s
-              #p "rename!: #{cpath} => #{uri.path}"
               fs.mv(cpath,uri.path,*args) unless uri.path == cpath
             } 
           end

data/lib/rio/ops/file.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,29 +22,6 @@
 #++
 #
 
-
-#require 'rio/cp'
-#require 'rio/piper/cp'
-#require 'rio/ops/either'
-
-# module RIO
-#   module Impl
-#     module U
-#       def self.copy(s,d)
-#         require 'fileutils'
-#         ::FileUtils.cp(s.to_s,d.to_s)
-#       end
-#       def self.rm(s)
-#         require 'fileutils'
-#         ::FileUtils.rm(s.to_s)
-#       end
-#       def self.touch(s)
-#         require 'fileutils'
-#         ::FileUtils.touch(s.to_s)
-#       end
-#     end
-#   end
-# end
 module RIO
   module Ops
     module File
@@ -91,7 +68,6 @@ module RIO
         alias :delete! :delete
         def touch(*args) 
           rtn_reset { 
-            # fs.touch(self,*args) 
             ::File.open(self.to_s, 'a') {
               ;
             }

data/lib/rio/ops/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.
@@ -24,7 +24,6 @@
 
 
 require 'rio/fwd'
-#require 'rio/impl/path'
 require 'rio/ops/create'
 require 'rio/ops/construct'
 module RIO
@@ -85,20 +84,14 @@ module RIO
             nrio = new_rio(rl.abs)
             nrio
           else
-            #new_rio(rl,{:base => ensure_rio(base).abs.to_uri}).abs
             brio = ensure_rio(base)
             new_rio(rl.abs(ensure_rio(base).to_s))
           end
         end
         def absolute?
-          #p "ops/path.rb absolute?"
           rl.absolute?
         end
         alias :abs? :absolute?
-        #def abs?
-        #  p "ops/path.rb abs?"
-        #  rl.abs?
-        #end
         def route_from(other)
           this_uri = rl.uri.abs
           other_uri = ensure_rio(other).rl.uri.abs
@@ -121,14 +114,12 @@ module RIO
           new_rio(rl.merge(ensure_rio(other).rl))
         end
         def base()
-          #p "BASE: " + rl.class.to_s
           new_rio(rl.base())
         end
         def setbase(b)
           rl.base(b)
           self
         end
-        extend Forwardable
         extend Fwd
         fwd :rl,:scheme,:host,:user,:password
         fwd :rl,:query,:fragment,:userinfo
@@ -159,12 +150,6 @@ module RIO
             parts << new_rio(sparts[n], {:base => bparts[n]})
           end
           parts.extend(ToRio::Array)
-          #parts.each do |part|
-          #  p "part=#{part.uri} abs=#{part.abs.uri}"
-          #end
-          # map to rios and extend the array with to_array
-          #parts.map { |arl| new_rio(arl) }.extend(ToRio::Array)
-          #parts.map { |arl| new_rio(arl) }
         end
         def basename(*args)
           unless args.empty?
@@ -185,7 +170,6 @@ module RIO
             softreset
             uri.ref.sub(re,arg.to_s)
           }
-          #new_rio(softreset.to_s.sub(re,arg.to_s))
         end
         def gsub(re,arg)
           new_rio(softreset.to_s.gsub(re,arg.to_s))
@@ -292,7 +276,6 @@ module RIO
             if self.abs?
               fs.symlink(self,dst) 
             else
-              #p "symlink(#{dst.route_to(self)},#{dst})"
               fs.symlink(dst.route_to(self).to_s,dst.to_s) 
             end
             dst.reset