rio 0.3.7 → 0.3.8

data/lib/rio/ops/construct.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,21 +34,28 @@
 # <b>Rio is pre-alpha software. 
 # The documented interface and behavior is subject to change without notice.</b>
 
+module RIO
+  CONSTRUCTOR_SYMS = [
+      :strio,
+      :stdio,
+      :stderr,
+      :temp,
+      :tempfile,
+      :tempdir,
+      :tcp,
+      :cmdio,
+      :cmdpipe,
+      :sysio,
+      :fd,
+    ]
+end
 
 module RIO
   module Ops
     module Construct
-      def strio(*args,&block) Rio.rio(:strio,*args,&block) end
-      def stdio(*args,&block) Rio.rio(:stdio,*args,&block) end
-      def stderr(*args,&block) Rio.rio(:stderr,*args,&block) end
-      def temp(*args,&block)  Rio.rio(:temp,*args,&block)  end
-      def tempfile(*args,&block)  Rio.rio(:tempfile,*args,&block)  end
-      def tempdir(*args,&block)  Rio.rio(:tempdir,*args,&block)  end
-      def tcp(*args,&block)  Rio.rio(:tcp,*args,&block)  end
-      def cmdio(*args,&block)  Rio.rio(:cmdio,*args,&block)  end
-      def cmdpipe(*args,&block)  Rio.rio(:cmdpipe,*args,&block)  end
-      def sysio(*args,&block)  Rio.rio(:sysio,*args,&block)  end
-      def fd(*args,&block)  Rio.rio(:fd,*args,&block)  end
+      RIO::CONSTRUCTOR_SYMS.each { |sym|
+        module_eval "def #{sym}(*args,&block) Rio.rio(:#{sym},*args,&block) end"
+      }
     end
   end
 end

data/lib/rio/ops/create.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,23 +36,11 @@
 
 
 module RIO
-  module Impl
-    module U
-      def self.getwd() ::Dir.getwd() end
-      def self.rootdir()
-        require 'rio/local'
-        ::RIO::Local::ROOT_DIR        
-      end
-      def self.join(*args)
-        ::File.join(*args)
-      end
-    end
-  end
   module Ops
     module Path
       module Create
         def join(*args) 
-          new_rio(self,*args) 
+          new_rio(self.rl,*args) 
         end
         #alias :catpath :join
         def join!(*args) 
@@ -65,15 +53,18 @@ module RIO
         end
 
         def getwd(*args,&block) 
-          new_rio(RL::getwd,*args,&block) 
+          new_rio(fs.getwd,*args,&block) 
+        end
+        def cwd(*args,&block) 
+          new_rio(fs.cwd,*args,&block) 
         end
-        alias :cwd :getwd
+        
         def rootpath(*args,&block) 
-          new_rio(Impl::U.rootdir(),*args,&block) 
+          new_rio(fs.root(),*args,&block) 
         end
         alias :root :rootpath
         def cleanpath(*args)
-          new_rio(Impl::U.cleanpath(fspath,*args))
+          new_rio(fs.cleanpath(fspath,*args))
         end
       end
     end

data/lib/rio/ops/dir.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,41 +40,41 @@ 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 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
-        include ::RIO::Ops::FileOrDir::ExistOrNot
+        include RIO::Ops::FileOrDir::ExistOrNot
       end
     end
   end
@@ -84,13 +84,13 @@ module RIO
         include ExistOrNot
         include ::RIO::Ops::FileOrDir::NonExisting
         def mkdir(*args)
-          #          p callstr('mkdir',*args)
-          Impl::U.mkdir(self,*args); 
+          fs.mkdir(self.to_s,*args); 
           softreset() 
         end
         def mkpath(*args) 
           #          p callstr('mkpath',*args)
-          Impl::U.mkpath(self,*args); 
+          fs.mkpath(self.to_s,*args); 
+          #fs.mkpath(self,*args); 
           softreset()
         end
         def rmdir(*args) self end
@@ -124,13 +124,14 @@ module RIO
         def selective?
           %w[entry_sel stream_sel stream_nosel].any? { |k| cx.has_key?(k) }
         end
+        def empty?() self.to_a.empty? end
         def mkdir(*args) self end
         def mkpath(*args) self end
         def rmdir(*args) 
-          Impl::U.rmdir(self,*args); 
+          fs.rmdir(self.to_s,*args); 
           softreset()
         end
-        def rmtree(*args) Impl::U.rmtree(self,*args); softreset() end
+        def rmtree(*args) fs.rmtree(self.to_s,*args); softreset() end
 
         alias :delete :rmdir
         alias :delete! :rmtree
@@ -138,16 +139,16 @@ module RIO
 
         def chdir(*args,&block) 
           if block_given?
-            Impl::U.chdir(self,*args) { |dir|
+            fs.chdir(self.to_s,*args) { |dir|
               yield new_rio('.')
             }
           else
-            Impl::U.chdir(self,*args)
+            fs.chdir(self.path,*args)
             return new_rio('.')
           end
           self
         end
-
+        
         def ensure_rio_cx(arg0)
           return arg0 if arg0.kind_of?(::RIO::Rio)
           new_rio_cx(arg0)
@@ -156,11 +157,11 @@ module RIO
         def glob(*args,&block) 
           chdir do
             if block_given?
-              Impl::U.glob(*args) do |ent|
+              fs.glob(*args) do |ent|
                 yield new_rio_cx(self,ent)
               end
             else
-              return Impl::U.glob(*args).map { |ent| new_rio_cx(self,ent) }
+              return fs.glob(*args).map { |ent| new_rio_cx(self,ent) }
             end
           end
         end
@@ -181,7 +182,6 @@ module RIO
         def entries(*args,&block) _set_select('entries',*args,&block) end
 
         def each(*args,&block)
-          # p callstr('each',*args)
           each_(*args,&block)
         end
 
@@ -230,10 +230,16 @@ module RIO
           args = cx['skip_args'] || []
           self.skipentries(*args)
         end
-        def handle_ent_(estr,selfstr,sel,&block)
+        def ent_to_rio_(ent,indir)
+          if indir
+            new_rio_cx(indir.rl,ent)
+          else
+            new_rio_cx(ent)
+          end
+        end
+        def handle_ent_(ent,indir,sel,&block)
           begin
-            erio = new_rio_cx(selfstr ? Impl::U.join(selfstr,estr) : estr )
-            
+            erio = ent_to_rio_(ent,indir)
             if stream_iter?
               _add_stream_iter_cx(erio).each(&block) if erio.file? and sel.match?(erio)
             else
@@ -253,10 +259,10 @@ module RIO
           #p "#{callstr('each_',*args)} sel=#{cx['sel'].inspect} nosel=#{cx['nosel'].inspect}"
           handle_skipped()
           sel = Match::Entry::Selector.new(cx['entry_sel'])
-          selfstr = (self.to_s == '.' ? nil : self.to_s)
-          self.ioh.each do |estr|
-            next if 
-            handle_ent_(estr,selfstr,sel,&block) unless estr =~ /^\.(\.)?$/
+          indir = (self.to_s == '.' ? nil : self)
+          self.ioh.each do |ent|
+            #next if 
+            handle_ent_(ent,indir,sel,&block) unless ent =~ /^\.(\.)?$/
           end
           closeoneof? ? self.close : self
         end
@@ -264,9 +270,9 @@ module RIO
           #p "#{callstr('each_',*args)} sel=#{cx['sel'].inspect} nosel=#{cx['nosel'].inspect}"
           handle_skipped()
           sel = Match::Entry::Selector.new(cx['entry_sel'])
-          selfstr = (self.to_s == '.' ? nil : self.to_s)
-          while estr = self.ioh.read
-            handle_ent_(estr,selfstr,sel,&block) unless estr =~ /^\.(\.)?$/
+          indir = (self.to_s == '.' ? nil : self)
+          while ent = self.ioh.read
+            handle_ent_(ent,indir,sel,&block) unless ent =~ /^\.(\.)?$/
           end
           closeoneof? ? self.close : self
         end

data/lib/rio/ops/either.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
@@ -57,13 +57,14 @@ module RIO
       end
       module NonExisting
         include ExistOrNot
+        def empty?() false end
       end
 
       module Existing
         include ExistOrNot
 
-        def chmod(mod) rtn_self { Impl::U.chmod(mod,fspath) } end
-        def chown(owner,group) rtn_self { Impl::U.chown(owner,group,fspath) } end
+        def chmod(mod) rtn_self { fs.chmod(mod,fspath) } end
+        def chown(owner,group) rtn_self { fs.chown(owner,group,fspath) } end
         def must_exist() self end
 
         def rename(*args,&block)
@@ -72,7 +73,7 @@ module RIO
           else
             rtn_reset { 
               dst = ensure_rio(args.shift)
-              Impl::U.mv(self,dst,*args) 
+              fs.mv(self,dst,*args) 
               dst.reset
             } 
           end
@@ -83,7 +84,7 @@ module RIO
           else
             rtn_reset { 
               dst = ensure_rio(args.shift)
-              Impl::U.mv(self,dst,*args) 
+              fs.mv(self,dst,*args) 
               dst.reset
               self.rl = dst.rl.clone
             } 
@@ -117,12 +118,13 @@ module RIO
 
         require 'pathname'
         def realpath
-          new_rio(Impl::U.realpath(fspath))
+          new_rio(fs.realpath(fspath))
         end
         def mountpoint?
-          Impl::U.mountpoint?(fspath)
+          fs.mountpoint?(fspath)
         end
-
+        def empty?() self.to_a.empty? end
+        
       end
 
     end

data/lib/rio/ops/file.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,24 +39,24 @@ 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 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
@@ -73,15 +73,19 @@ module RIO
         def selective?
           %w[stream_sel stream_nosel].any? { |k| cx.has_key?(k) }
         end
+        def empty?() 
+          self.selective? ? self.to_a.empty? : self.size == 0 
+        end
         def rm(*args) 
           rtn_reset { 
-            Impl::U.rm(self,*args) 
+            fs.rm(self,*args) 
           } 
         end
         alias :delete :rm
         alias :delete! :rm
-
-        def touch(*args) rtn_self { Impl::U.touch(self,*args) } end
+        def touch(*args) rtn_self { fs.touch(self.to_s,*args) } end
+        def truncate(sz=0) rtn_reset { fs.truncate(self.to_s,sz) } end
+        def clear() truncate(0) end
       end
       module NonExisting
         include ExistOrNot
@@ -90,7 +94,7 @@ module RIO
         def rm(*args) rtn_self { ; } end
         alias delete rm
         alias delete! rm
-        def touch(*args) rtn_reset { Impl::U.touch(self,*args) } end
+        def touch(*args) rtn_reset { fs.touch(self,*args) } end
       end
     end
   end

data/lib/rio/ops/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
@@ -35,47 +35,49 @@
 # The documented interface and behavior is subject to change without notice.</b>
 
 
-require 'rio/impl/path'
+#require 'rio/impl/path'
 module RIO
   module Ops #:nodoc: all
     module Path
       module Test
-        def blockdev?(*args) Impl::U.blockdev?(self.to_s,*args) end
-        def chardev?(*args) Impl::U.chardev?(self.to_s,*args) end
-        def directory?(*args) Impl::U.directory?(self.to_s,*args) end
-        def exist?(*args) Impl::U.exist?(self.to_s,*args) end
-        def file?(*args) Impl::U.file?(self.to_s,*args) end
-        def pipe?(*args) Impl::U.pipe?(self.to_s,*args) end
-        def socket?(*args) Impl::U.socket?(self.to_s,*args) end
-        def symlink?(*args) Impl::U.symlink?(self.to_s,*args) end
+        def blockdev?(*args) fs.blockdev?(self.to_s,*args) end
+        def chardev?(*args) fs.chardev?(self.to_s,*args) end
+        def directory?(*args) fs.directory?(self.to_s,*args) end
+        def exist?(*args) fs.exist?(self.to_s,*args) end
+        def file?(*args) 
+          fs.file?(self.to_s,*args) 
+        end
+        def pipe?(*args) fs.pipe?(self.to_s,*args) end
+        def socket?(*args) fs.socket?(self.to_s,*args) end
+        def symlink?(*args) fs.symlink?(self.to_s,*args) end
         alias :dir? :directory?
         def open?() not self.closed? end
         def closed?() self.ioh.nil? end
       end
       module Status
         include Test
-        def fnmatch(*args) Impl::U.fnmatch(self.to_s,*args) end
-        def fnmatch?(*args) Impl::U.fnmatch?(self.to_s,*args) end
-        def ftype(*args) Impl::U.ftype(self.to_s,*args) end
-        def stat(*args) Impl::U.stat(self.to_s,*args) end
-        def atime(*args) Impl::U.atime(self.to_s,*args) end
-        def ctime(*args) Impl::U.ctime(self.to_s,*args) end
-        def mtime(*args) Impl::U.mtime(self.to_s,*args) end
-        def executable?(*args) Impl::U.executable?(self.to_s,*args) end 
-        def executable_real?(*args) Impl::U.executable_real?(self.to_s,*args) end 
-        def readable?(*args) Impl::U.readable?(self.to_s,*args) end 
-        def readable_real?(*args) Impl::U.readable_real?(self.to_s,*args) end 
-        def writable?(*args) Impl::U.writable?(self.to_s,*args) end 
-        def writable_real?(*args) Impl::U.writable_real?(self.to_s,*args) end
-        def sticky?(*args) Impl::U.sticky?(self.to_s,*args) end 
-        def owned?(*args) Impl::U.owned?(self.to_s,*args) end 
-        def grpowned?(*args) Impl::U.grpowned?(self.to_s,*args) end 
-        def setgid?(*args) Impl::U.setgid?(self.to_s,*args) end 
-        def setuid?(*args) Impl::U.setuid?(self.to_s,*args) end
-        def size(*args) Impl::U.size(self.to_s,*args) end 
-        def size?(*args) Impl::U.size?(self.to_s,*args) end 
-        def zero?(*args) Impl::U.zero?(self.to_s,*args) end
-        def root?(*args) Impl::U.root?(self.to_s) end
+        def fnmatch(*args) fs.fnmatch(self.to_s,*args) end
+        def fnmatch?(*args) fs.fnmatch?(self.to_s,*args) end
+        def ftype(*args) fs.ftype(self.to_s,*args) end
+        def stat(*args) fs.stat(self.to_s,*args) end
+        def atime(*args) fs.atime(self.to_s,*args) end
+        def ctime(*args) fs.ctime(self.to_s,*args) end
+        def mtime(*args) fs.mtime(self.to_s,*args) end
+        def executable?(*args) fs.executable?(self.to_s,*args) end 
+        def executable_real?(*args) fs.executable_real?(self.to_s,*args) end 
+        def readable?(*args) fs.readable?(self.to_s,*args) end 
+        def readable_real?(*args) fs.readable_real?(self.to_s,*args) end 
+        def writable?(*args) fs.writable?(self.to_s,*args) end 
+        def writable_real?(*args) fs.writable_real?(self.to_s,*args) end
+        def sticky?(*args) fs.sticky?(self.to_s,*args) end 
+        def owned?(*args) fs.owned?(self.to_s,*args) end 
+        def grpowned?(*args) fs.grpowned?(self.to_s,*args) end 
+        def setgid?(*args) fs.setgid?(self.to_s,*args) end 
+        def setuid?(*args) fs.setuid?(self.to_s,*args) end
+        def size(*args) fs.size(self.to_s,*args) end 
+        def size?(*args) fs.size?(self.to_s,*args) end 
+        def zero?(*args) fs.zero?(self.to_s,*args) end
+        def root?(*args) fs.root?(self.to_s) end
 
       end
       module URI
@@ -131,17 +133,17 @@ module RIO
       module Query
         def expand_path(*args)
           args[0] = args[0].to_s unless args.empty?
-          new_rio(RL.fs2url(Impl::U.expand_path(self.to_s,*args)))
+          new_rio(RL.fs2url(fs.expand_path(self.to_s,*args)))
         end
         def extname(*args) 
-          en = Impl::U.extname(rl.path_no_slash,*args) 
+          en = fs.extname(rl.path_no_slash,*args) 
           (en.empty? ? nil : en)
         end
         def split()
           require 'rio/to_rio'
           parts = self.rl.split
           # map to rios and extend the array with to_array
-          parts.map { |arl| rio(arl) }.extend(ToRio::Array)
+          parts.map { |arl| new_rio(arl) }.extend(ToRio::Array)
         end
         def basename(*args)
           unless args.empty?
@@ -149,15 +151,15 @@ module RIO
             self.ext(ex)
           end
           #p self.ext?.inspect
-          fn = Impl::U.basename(rl.path_no_slash,self.ext?)
+          fn = fs.basename(rl.path_no_slash,self.ext?)
           new_rio(fn,{:base => _calc_base()})
         end
         def filename()
-          fn = Impl::U.basename(rl.path_no_slash)
+          fn = fs.basename(rl.path_no_slash)
           new_rio(fn,{:base => _calc_base()})
         end
         def _calc_base()
-          dn = Impl::U.dirname(rl.path_no_slash)
+          dn = fs.dirname(rl.path_no_slash)
           dn[0] == ?/ ? dn : self.base.to_url + dn + '/' #'
 #          if dn[0] == ?/
 #            dn 
@@ -168,7 +170,7 @@ module RIO
         private :_calc_base
 
         def dirname(*args)
-          #new_rio(Impl::U.dirname(rl.path_no_slash,*args))
+          #new_rio(fs.dirname(rl.path_no_slash,*args))
           new_rio(rl.dirname)
         end
 
@@ -278,10 +280,10 @@ module RIO
             dst = self.ensure_rio(d)
             dst /= self.filename if dst.directory?
             if self.abs?
-              Impl::U.symlink(self,dst) 
+              fs.symlink(self,dst) 
             else
               #p "symlink(#{dst.route_to(self)},#{dst})"
-              Impl::U.symlink(dst.route_to(self),dst.to_s) 
+              fs.symlink(dst.route_to(self),dst.to_s) 
             end
             dst.reset
           } 
@@ -312,4 +314,4 @@ module RIO
     end
     
   end
-end # FS
+end