rio 0.3.7 → 0.3.8

data/lib/rio/context/cxx.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

data/lib/rio/context/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

data/lib/rio/context/gzip.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

data/lib/rio/context/methods.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
@@ -42,7 +42,7 @@ require 'rio/context/stream'
 require 'rio/context/dir'   
 require 'rio/context/skip'   
 require 'rio/filter'   
-require 'rio/context/closeoneof'   
+require 'rio/context/autoclose'   
 require 'rio/context/gzip'   
 require 'rio/context/copying'   
 
@@ -76,37 +76,7 @@ module RIO
     end
   end
 
-  module Cx
-    module Methods
-      def closeoncopy(arg=true,&block) cxx('closeoncopy',arg,&block) end
-      def nocloseoncopy(arg=false,&block) nocxx('closeoncopy',arg,&block) end
-      def closeoncopy?() cxx?('closeoncopy') end 
-      def closeoncopy_(arg=true)  cxx_('closeoncopy',arg) end
-      protected :closeoncopy_
-    end
-  end
-
-  module Cx
-    module Methods
-      def noautoclose(arg=false,&block)
-        closeoncopy(arg).closeoneof(arg,&block)
-      end
-      def noautoclose_(arg=false)
-        closeoncopy_(arg).closeoneof_(arg)
-      end
-      protected :noautoclose_
-    end
-  end
 
-  module Cx
-    module Methods
-      def autorewind(arg=true,&block) cxx('autorewind',arg,&block) end
-      def noautorewind(arg=false,&block) nocxx('autorewind',arg,&block) end
-      def autorewind?() cxx?('autorewind') end 
-      def autorewind_(arg=true)  cxx_('autorewind',arg) end
-      protected :autorewind_
-    end
-  end
 
   module Cx
     module Methods
@@ -183,7 +153,8 @@ module RIO
       protected :ext_
     end
   end
-
+end
+module RIO
   module Cx
     module Methods
       def a()  cx['outputmode'] = Mode::Str.new('a');  self end
@@ -194,6 +165,7 @@ module RIO
       def r!() cx['inputmode']  = Mode::Str.new('r+'); self end
       def outputmode?() cxx?('outputmode') end
       def inputmode?()  cxx?('inputmode')  end
+      def +@() a() end
     end
   end
 end

data/lib/rio/context/skip.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

data/lib/rio/context/stream.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

data/lib/rio/context.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
@@ -51,6 +51,21 @@ module RIO
         @values.delete(key)
         @explicit.delete(key)
       end
+      def get_keystate(key)
+        key_exists = @values.key?(key)
+        key_val = @values[key]
+        key_explicit = @explicit[key]
+        [key,key_exists,key_val,key_explicit]
+      end
+      def set_keystate(key,key_exists,key_val,key_explicit)
+        if(key_exists) then
+          @values[key] = key_val
+          @explicit[key] = key_explicit
+        else
+          @values.delete(key)
+          @explicit.delete(key)
+        end
+      end
       def set_(key,val)
         @values[key] = val unless @explicit[key]
       end

data/lib/rio/cp.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
@@ -42,11 +42,33 @@ class String #:nodoc: all
     self
   end
 end
+require 'rio/no_warn'
+
 module RIO
   module Cp #:nodoc: all
     module Util
       module InOut
         def cpclose(*args,&block)
+          if args.empty?
+            oldcoc = self.cx.get_keystate('closeoncopy')
+            self.cx['closeoncopy'] = false
+            rtn = yield
+            rtn.cx.set_keystate(*oldcoc)
+            rtn.copyclose
+          else
+            if (ario = args[0]).kind_of?(Rio)
+              oldcoc = ario.cx.get_keystate('closeoncopy')
+              ario.cx['closeoncopy'] = false
+              rtn = yield
+              ario.cx.set_keystate(*oldcoc)
+              ario.copyclose
+              rtn
+            else
+              yield
+            end
+          end
+        end
+        def cpclose0(*args,&block)
           if args.empty?
             oldcoc,self.cx['closeoncopy'] = self.cx['closeoncopy'],false
             rtn = yield
@@ -141,10 +163,12 @@ module RIO
 
         def cpto_rio_(arg,sym)
           ario = ensure_rio(arg)
+          #p ario
           ario = ario.join(self.filename) if ario.dir?
           ario.cpclose {
             ario = ario.iostate(sym)
             self.copying(ario).each { |el|
+#              p el
               ario.putrec(el)
 #              ario << el
             }.copying_done(ario)
@@ -166,15 +190,16 @@ module RIO
             case arg
             when ::Array then cpfrom_array_(arg)
             when ::IO then cpfrom_obj_(arg)
-            when ::String then self.put_(arg)
+            when ::String then 
+              self.put_(arg)
             else cpfrom_rio_(arg)
             end
             self
         end
         def cpfrom_rio_(arg)
           ensure_rio(arg).copying(self).each { |el|
-            self.putrec(el)
-#            self << el
+            #self.putrec(el)
+            self << el
           }.copying_done(self)
         end
       end
@@ -206,7 +231,8 @@ module RIO
         end
         def spcp(arg)
           if arg.kind_of?(Rio) and arg.scheme == 'ftp'
-            arg < new_rio(rl.path)
+            arg.copy_from(new_rio(rl.path))
+            #arg < new_rio(rl.path)
             self
           else
             nil
@@ -255,7 +281,6 @@ module RIO
           end
         end
         def cpfrom_rio_(ario)
-          #p callstr('cpfrom_rio_',ario)
           dest = self.join(ario.filename)
           case
           when ario.symlink?
@@ -289,7 +314,7 @@ module RIO
         alias :copy_to :>
         alias :append_to :>>
 
-        private
+        protected
 
         def cpto_rio_(ario)
           ario = ario.join(self.filename) if ario.exist?
@@ -306,7 +331,8 @@ module RIO
         include Util::Output
         def <(arg)  
           if _switch_direction?(arg)
-            arg > self
+            #arg > self
+            arg.copy_to(self)
             self
           else 
             _cpsrc(arg) < arg

data/lib/rio/def.rb

@@ -0,0 +1,54 @@
+#--
+# =============================================================================== 
+# Copyright (c) 2005, 2006 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
+# =============================================================================== 
+#++
+#
+# To create the documentation for Rio run the command
+#  ruby build_doc.rb
+# from the distribution directory. Then point your browser at the 'doc/rdoc' directory.
+#
+# Suggested Reading
+# * RIO::Doc::SYNOPSIS
+# * RIO::Doc::INTRO
+# * RIO::Doc::HOWTO
+# * RIO::Rio
+#
+# <b>Rio is pre-alpha software. 
+# The documented interface and behavior is subject to change without notice.</b>
+
+require 'rio/base'
+
+module RIO 
+  # See also: RIO::Doc::SYNOPSIS; RIO::Doc::INTRO; RIO::Doc::HOWTO.
+  class Rio < Base #:doc:
+  end
+end
+
+if $0 == __FILE__
+  eval DATA.read, nil, $0, __LINE__+4
+end
+
+__END__
+
+puts
+puts("Run the tests that came with the distribution")
+puts("From the distribution directory use 'test/runtests.rb'")
+puts

data/lib/rio/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
@@ -43,9 +43,6 @@ module RIO
   module Dir #:nodoc: all
     class Base < State::Base
       include Ops::Path::Str
-      def self.copy_(src,dst)
-        Impl::U.cp_r(src,dst) 
-      end
       def open?() !ioh.nil? end
     end
 
@@ -60,21 +57,27 @@ module RIO
 
       def check?() self.directory? end
       def when_missing(sym,*args) dopen() end
+
+      protected
+
+      def stream_rl_
+        self.rl.dir_rl()
+        #RIO::Dir::RL.new(self.to_uri, {:fs => self.fs})
+      end
+
+      public
+
       def dopen() 
-        self.rl = RIO::Dir::RL.new(self.to_uri)
+        self.rl = self.stream_rl_
         become 'Dir::Open'
       end
     end 
     class Open < Base
       def check?() true  end
-      def open(m=nil,*args)
-        open_(*args)
-      end
+      def open(m=nil,*args) open_(*args) end
       def open_(*args) 
         unless open?
-          ios = self.rl.open(*args)
-          self.ioh = IOH::Dir.new(ios)
-#          self.ioh = self.rl.open()
+          self.ioh = self.rl.open()
         end
         self 
       end
@@ -96,18 +99,14 @@ module RIO
     class Stream < Base
       include Ops::Dir::Stream
       def check?() open? end
-      def when_missing(sym,*args) 
-        #p callstr('when_missing',sym,*args)
-        retryreset() 
-      end
+      def when_missing(sym,*args) retryreset() end
       def base_state() 'Dir::Close' end
-
-      def reset()
-        self.close.softreset()
-      end
+      def reset() self.close.softreset() end
       alias :copyclose :reset
     end
     class Close < Base
+      def reopen(*args) self.close_.softreset.open(*args) end
+
       def close() 
         #p callstr('close')+" mode='#{mode?}' ioh=#{self.ioh} open?=#{open?}"
         return self unless self.open? 

data/lib/rio/doc/HOWTO.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
@@ -269,7 +269,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    # method 1
    array = ario['*.txt']
    # method 2
-   array = ario[/\.txt/]
+   array = ario[/\.txt$/]
    # method 3
    array = ario.entries['*.txt']
   
@@ -277,7 +277,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    # method 1
    array = ario.files['*.txt']
    # method 2
-   array = ario.files[/\.txt/]
+   array = ario.files[/\.txt$/]
    # method 3
    array = ario.files['*.txt']
   
@@ -285,7 +285,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    # method 1
    array = ario.all['*.txt']
    # method 2
-   array = ario.all[/\.txt/]
+   array = ario.all[/\.txt$/]
    # method 3
    array = ario.all.entries['*.txt']
   
@@ -294,7 +294,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    # method 1
    array = ario.norecurse('.svn').all['*.txt']
    # method 2
-   array = ario.norecurse(/^\.svn$/).all[/\.txt/]
+   array = ario.norecurse(/^\.svn$/).all[/\.txt$/]
    # method 3
    array = ario.norecurse('.svn').entries['*.txt']
    # method 4
@@ -302,6 +302,17 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    # method 5
    array = ario.norecurse('.svn')['*.txt']
   
+* Put all directories (recursively) into an array
+   # method 1
+   array = ario.dirs[]
+   # method 2
+   array = ario.dirs.to_a
+
+* Put all entries (recursively) into an array, but limit the depth of recursion to 2
+   # method 1
+   array = ario.norecurse(3).to_a
+
+
 * Iterate through ruby files in a directory and subdirectories skipping 
   those in the '.svn', and 'pkg' directories
    # method 1
@@ -337,7 +348,7 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
    # method 1
    array = ario.skipdirs['.svn']
    # method 2
-   array = ario.skipdirs[/^\.svn/]
+   array = ario.skipdirs[/^\.svn$/]
    # method 3
    array = ario.skipdirs('.svn').to_a
    # method 4
@@ -649,6 +660,11 @@ IO, File, Dir, Pathname, FileUtils, Tempfile, StringIO, OpenURI, Zlib, and CSV.
      htmfile.rename.extname = '.html'
    end
 
+* Move a file in an arbitrary directory into the current working directory.
+   # method 1
+   rio('arb/i/trary/di/rec/tory/afile').rename.dirname = '.'
+
+
 ---
 
 === Manipulate a Rio's path