rio 0.4.2 → 0.5.1

data/lib/rio/no_warn.rb

@@ -1,6 +1,6 @@
 #--
-# =============================================================================== 
-# Copyright (c) 2005,2006,2007,2008 Christopher Kleckner
+# ===========================================================================
+# Copyright (c) 2005-2012 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -18,20 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Rio; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# =============================================================================== 
+# =========================================================================== 
 #++
 #
-# To create the documentation for Rio run the command
-#  ruby build_doc.rb
-# from the distribution directory.
-#
-# Suggested Reading
-# * RIO::Doc::SYNOPSIS
-# * RIO::Doc::INTRO
-# * RIO::Doc::HOWTO
-# * RIO::Doc::EXAMPLES
-# * RIO::Rio
-#
 
 
 module RIO

data/lib/rio/nullio.rb

@@ -1,6 +1,6 @@
 #--
-# =============================================================================== 
-# Copyright (c) 2005,2006,2007,2008 Christopher Kleckner
+# ===========================================================================
+# Copyright (c) 2005-2012 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -18,20 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Rio; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# =============================================================================== 
+# =========================================================================== 
 #++
 #
-# To create the documentation for Rio run the command
-#  ruby build_doc.rb
-# from the distribution directory.
-#
-# Suggested Reading
-# * RIO::Doc::SYNOPSIS
-# * RIO::Doc::INTRO
-# * RIO::Doc::HOWTO
-# * RIO::Doc::EXAMPLES
-# * RIO::Rio
-#
 
 
 

data/lib/rio/open3.rb

@@ -1,6 +1,6 @@
 #--
-# =============================================================================== 
-# Copyright (c) 2005,2006,2007,2008 Christopher Kleckner
+# ===========================================================================
+# Copyright (c) 2005-2012 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -18,20 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Rio; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# =============================================================================== 
+# =========================================================================== 
 #++
 #
-# To create the documentation for Rio run the command
-#  ruby build_doc.rb
-# from the distribution directory.
-#
-# Suggested Reading
-# * RIO::Doc::SYNOPSIS
-# * RIO::Doc::INTRO
-# * RIO::Doc::HOWTO
-# * RIO::Doc::EXAMPLES
-# * RIO::Rio
-#
 
 
 # 
@@ -39,8 +28,6 @@
 #
 # = Rio
 #
-# Copyright (c) 2005,2006,2007,2008 Christopher Kleckner
-#
 #
 
 

data/lib/rio/ops.rb

@@ -0,0 +1,33 @@
+#--
+# ===========================================================================
+# Copyright (c) 2005-2012 Christopher Kleckner
+# All rights reserved
+#
+# This file is part of the Rio library for ruby.
+#
+# Rio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Rio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Rio; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# =========================================================================== 
+#++
+#
+module RIO
+  module Ops
+    autoload :Path, 'rio/ops/path'
+    autoload :Dir, 'rio/ops/dir'
+    autoload :File, 'rio/ops/file'
+    autoload :Stream, 'rio/ops/stream'
+    autoload :Symlink, 'rio/ops/symlink'
+    autoload :FileOrDir, 'rio/ops/either'
+  end
+end

data/lib/rio/ops/construct.rb

@@ -1,6 +1,6 @@
 #--
-# =============================================================================== 
-# Copyright (c) 2005,2006,2007,2008 Christopher Kleckner
+# ===========================================================================
+# Copyright (c) 2005-2012 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -18,20 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Rio; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# =============================================================================== 
+# =========================================================================== 
 #++
 #
-# To create the documentation for Rio run the command
-#  ruby build_doc.rb
-# from the distribution directory.
-#
-# Suggested Reading
-# * RIO::Doc::SYNOPSIS
-# * RIO::Doc::INTRO
-# * RIO::Doc::HOWTO
-# * RIO::Doc::EXAMPLES
-# * RIO::Rio
-#
 
 module RIO
   CONSTRUCTOR_SYMS = [

data/lib/rio/ops/create.rb

@@ -1,6 +1,6 @@
 #--
-# =============================================================================== 
-# Copyright (c) 2005,2006,2007,2008 Christopher Kleckner
+# ===========================================================================
+# Copyright (c) 2005-2012 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -18,20 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Rio; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# =============================================================================== 
+# =========================================================================== 
 #++
 #
-# To create the documentation for Rio run the command
-#  ruby build_doc.rb
-# from the distribution directory.
-#
-# Suggested Reading
-# * RIO::Doc::SYNOPSIS
-# * RIO::Doc::INTRO
-# * RIO::Doc::HOWTO
-# * RIO::Doc::EXAMPLES
-# * RIO::Rio
-#
 
 
 module RIO
@@ -39,22 +28,19 @@ module RIO
     module Path
       module Create
         def join(*args) 
-          before = self.rl.to_s
-          arl = self.rl
-          nrio = new_rio(arl,*args) 
-          after = self.rl.to_s
-          #p "b=#{before} a=#{after}"
-          nrio
+          rtn_rio {
+            uri.clone.join(*args)
+          }
         end
         #alias :catpath :join
-        def join!(*args) 
-          rl.join(*args)
-          softreset
+        def join!(*args)
+          rtn_reset {
+            uri.join(*args)
+          }
         end
         #alias :catpath! :join!
         def /(arg)
-          ans = join(arg)
-          return ans
+          join(arg)
         end
 
         def getwd(*args,&block) 

data/lib/rio/ops/dir.rb

@@ -1,6 +1,6 @@
 #--
-# =============================================================================== 
-# Copyright (c) 2005,2006,2007,2008 Christopher Kleckner
+# ===========================================================================
+# Copyright (c) 2005-2012 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -18,25 +18,14 @@
 # You should have received a copy of the GNU General Public License
 # along with Rio; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# =============================================================================== 
+# =========================================================================== 
 #++
 #
-# To create the documentation for Rio run the command
-#  ruby build_doc.rb
-# from the distribution directory.
-#
-# Suggested Reading
-# * RIO::Doc::SYNOPSIS
-# * RIO::Doc::INTRO
-# * RIO::Doc::HOWTO
-# * RIO::Doc::EXAMPLES
-# * RIO::Rio
-#
 
 
 require 'rio/grande'
 require 'rio/cp'
-require 'rio/ops/either'
+#require 'rio/ops/either'
 
 module RIO
 #   module Impl
@@ -83,12 +72,14 @@ module RIO
         include ExistOrNot
         include ::RIO::Ops::FileOrDir::NonExisting
         def mkdir(*args)
-          fs.mkdir(self.to_s,*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.to_s,*args); 
+          fs.mkpath(self.path,*args); 
           #fs.mkpath(self,*args); 
           softreset()
         end
@@ -127,11 +118,11 @@ module RIO
         def mkdir(*args) self end
         def mkpath(*args) self end
         def rmdir(*args) 
-          fs.rmdir(self.to_s,*args); 
+          fs.rmdir(self.path,*args); 
           softreset()
         end
-        def rmtree(*args) fs.rmtree(self.to_s,*args); softreset() end
-        def rm(*args) fs.rm(self.to_s,*args); 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
@@ -239,8 +230,8 @@ module RIO
             ent.cx = self.cx.bequeath(ent.cx)
             ent
           else
-            # KIT: should this be RL.fs2url(ent) ???
             if indir
+
               new_rio_cx(indir.rl,ent)
             else
               new_rio_cx(ent)
@@ -249,8 +240,11 @@ 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)
-            #p "handle_ent_1: #{erio.cx.inspect}"
             if stream_iter?
               # case for iterating files in a directory (e.g. rio('adir').lines) 
               _add_stream_iter_cx(erio).each(&block) if erio.file? and sel.match?(erio)
@@ -264,7 +258,7 @@ module RIO
               _add_recurse_iter_cx(erio).each(&block) if rsel.match?(erio)
             end
             
-          rescue ::Errno::ENOENT, ::URI::InvalidURIError => ex
+          rescue ::Errno::ENOENT => ex
             $stderr.puts(ex.message+". Skipping.")
           end
         end
@@ -274,7 +268,6 @@ module RIO
           sel = Match::Entry::Selector.new(cx['entry_sel'])
           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

data/lib/rio/ops/either.rb

@@ -1,6 +1,6 @@
 #--
-# =============================================================================== 
-# Copyright (c) 2005,2006,2007,2008 Christopher Kleckner
+# ===========================================================================
+# Copyright (c) 2005-2012 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -18,23 +18,12 @@
 # You should have received a copy of the GNU General Public License
 # along with Rio; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# =============================================================================== 
+# =========================================================================== 
 #++
 #
-# To create the documentation for Rio run the command
-#  ruby build_doc.rb
-# from the distribution directory.
-#
-# Suggested Reading
-# * RIO::Doc::SYNOPSIS
-# * RIO::Doc::INTRO
-# * RIO::Doc::HOWTO
-# * RIO::Doc::EXAMPLES
-# * RIO::Rio
-#
 
 
-require 'rio/exception'
+#require 'rio/exception'
 require 'fileutils'
 module RIO
   module Impl
@@ -71,10 +60,9 @@ module RIO
             softreset.rename(*args,&block)
           else
             rtn_reset { 
-              dst = ensure_rio(args.shift)
+              dst = args.shift.to_s
               #p "rename: #{self} => #{dst}"
-              fs.mv(self,dst,*args) 
-              dst.reset
+              fs.mv(uri.path,dst,*args) unless uri.path == dst
             } 
           end
         end
@@ -83,27 +71,36 @@ module RIO
             softreset.rename(*args,&block)
           else
             rtn_reset { 
-              dst = ensure_rio(args.shift)
-              #p "rename!: #{self} => #{dst}"
-              fs.mv(self,dst,*args) unless self == dst 
-              dst.reset
-              self.rl = dst.rl.clone
+              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
         end
         alias :mv :rename
-        def basename=(arg)
-          rename!(_path_with_basename(arg))
+        def dirname=(arg)
+          dst = ::Alt::URI.create(path: uri.path)
+          dst.dirname = arg.to_s
+          rename!(dst.path)
         end
         def filename=(arg)
-          rename!(_path_with_filename(arg))
+          dst = ::Alt::URI.create(path: uri.path)
+          dst.filename = arg.to_s
+          rename!(dst.path)
         end
-        def extname=(ex)
-          rename!(_path_with_ext(ex))
-          cx['ext'] = ex
+        def basename=(arg)
+          dst = ::Alt::URI.create(path: uri.path)
+          dst.ext = cx['ext'] if cx.has_key?('ext')
+          dst.basename = arg.to_s
+          rename!(dst.path)
         end
-        def dirname=(arg)
-          rename!(_path_with_dirname(arg))
+        def extname=(arg)
+          dst = ::Alt::URI.create(path: uri.path)
+          dst.ext = cx['ext'] if cx.has_key?('ext')
+          dst.extname = arg.to_s
+          rename!(dst.path)
+          cx['ext'] = arg
         end
 
         def ss_type?

data/lib/rio/ops/file.rb

@@ -1,6 +1,6 @@
 #--
-# =============================================================================== 
-# Copyright (c) 2005,2006,2007,2008 Christopher Kleckner
+# ===========================================================================
+# Copyright (c) 2005-2012 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -18,25 +18,14 @@
 # You should have received a copy of the GNU General Public License
 # along with Rio; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# =============================================================================== 
+# =========================================================================== 
 #++
 #
-# To create the documentation for Rio run the command
-#  ruby build_doc.rb
-# from the distribution directory.
-#
-# Suggested Reading
-# * RIO::Doc::SYNOPSIS
-# * RIO::Doc::INTRO
-# * RIO::Doc::HOWTO
-# * RIO::Doc::EXAMPLES
-# * RIO::Rio
-#
 
 
-require 'rio/cp'
-require 'rio/piper/cp'
-require 'rio/ops/either'
+#require 'rio/cp'
+#require 'rio/piper/cp'
+#require 'rio/ops/either'
 
 # module RIO
 #   module Impl
@@ -75,27 +64,41 @@ module RIO
         def empty?() 
           self.selective? ? self.to_a.empty? : self.size == 0 
         end
-        def rm(*args) 
+        def delete(*args) 
           rtn_reset { 
-            fs.rm(self,*args) 
+            fs.delete(self,*args) 
           } 
         end
-        alias :delete :rm
+        alias :rm :delete
         alias :unlink :delete
-        alias :delete! :rm
+        alias :delete! :delete
         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 truncate(sz=0) 
+          rtn_reset { 
+            sz = 0 if sz < 0
+            fs.truncate(self.to_s,sz) 
+          } 
+        end
         def clear() truncate(0) end
       end
       module NonExisting
         include ExistOrNot
         include FileOrDir::NonExisting
 
-        def rm(*args) rtn_self { ; } end
-        alias delete rm
+        def delete(*args) rtn_self { ; } end
+        alias :rm :delete
         alias :unlink :delete
-        alias delete! rm
-        def touch(*args) rtn_reset { fs.touch(self,*args) } end
+        alias :delete! :delete
+        def touch(*args) 
+          rtn_reset { 
+            # fs.touch(self,*args) 
+            ::File.open(self.to_s, 'a') {
+              ;
+            }
+          }
+ 
+        end
+        def truncate(sz=0) self.touch.truncate(sz) end
       end
     end
   end