rio 0.4.2 → 0.5.1

data/lib/rio/ftp/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,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 'net/ftp'
-require 'uri'
+require 'rio/alturi'
 require 'rio/fs/native'
 require 'rio/ftp/conncache'
 

data/lib/rio/ftp/fs.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 'net/ftp'
-require 'uri'
+require 'rio/alturi'
 require 'rio/fs/native'
 require 'rio/ftp/conncache'
 
@@ -51,17 +40,22 @@ module RIO
         new(*args)
       end
       def remote_root
-        conn.remote_root
+        conn.remote_root.sub(%r{/*$},'/')
+      end
+      def remote_wd
+        conn.pwd.sub(%r{/*$},'/')
       end
       def conn
         @conn ||= ConnCache.instance.connect(@uri)
       end
-
+      def encoding
+        conn.encoding
+      end
 
 
       def root()
         uri = @uri.clone
-        uri.path = '/'
+        uri[:path] = '/'
         uri.to_s
       end
       include RIO::FS::Str
@@ -69,24 +63,36 @@ module RIO
       
       def pwd() conn.pwd end
       def getwd()
+        #p "GETWD self.pwd=#{self.pwd}"
         self.pwd
       end
       def cwd()
-        remote_wd = self.pwd
+        remote_wd = self.pwd.sub(%r{/*$},'/')
         remote_rel = remote_wd.sub(/^#{self.remote_root}/,'')
         wduri = uri.clone
         wduri.path = remote_rel
         wduri.to_s
       end
       def remote_path(url)
-        self.remote_root+RIO::RL.url2fs(URI(url).path)
+        #p "remote_path: url=#{url.inspect}"
+        uri = Alt::URI.parse(url)
+        path = uri.path
+        wd = self.pwd
+        #p "remote_path remote_root=#{self.remote_root} path=#{path} wd=#{wd}"
+        rpth = if path.start_with?('/') 
+                 path 
+               else
+                 self.remote_wd + path
+               end
+        rpth
       end
       def chdir(url,&block)
+        #p "ftp::fs chdir url=#{url}"
         if block_given?
           wd = conn.pwd
           conn.chdir(remote_path(url))
           begin
-            rtn = yield remote_path(url)
+            rtn = yield remote_wd
           ensure
             conn.chdir(wd)
           end
@@ -96,7 +102,12 @@ module RIO
         end
       end
       def mkdir(url)
-        conn.mkdir(remote_path(url))
+        #p "ftp/fs/mkdir: url=#{url}"
+        rp = remote_path(url)
+        #p "ftp/fs/mkdir: rp=#{rp}"
+        #wd = conn.pwd
+        #p "ftp/fs/mkdir: wd=#{wd}"
+        conn.mkdir(rp)
       end
       def mv(src_url,dst_url)
         conn.rename(remote_path(src_url),remote_path(dst_url))
@@ -116,21 +127,25 @@ module RIO
       def rm(url)
         conn.delete(remote_path(url))
       end
+      def put(localfile,remote_file = ::File.basename(localfile))
+        conn.put(localfile,remote_path(remote_file))
+      end
 
       def get_ftype(url)
+        #p "get_ftype(#{url})"
         pth = remote_path(url)
-        #p url,pth
+        #p "URL=#{url},PTH=#{pth}"
         ftype = nil
         begin
           conn.mdtm(pth)
-          ftype = 'file'
+          ftype = :file
         rescue Net::FTPPermError
           wd = conn.pwd
           begin
             conn.chdir(pth)
-            ftype = 'dir'
+            ftype = :dir
           rescue Net::FTPPermError
-            ftype = 'nada'
+            ftype = :nada
           ensure
             conn.chdir(wd)
           end
@@ -138,41 +153,46 @@ module RIO
         ftype
       end
       def file?(url)
-        get_ftype(url) == 'file'
+        get_ftype(url) == :file
       end
       def directory?(url)
-        get_ftype(url) == 'dir'
+        get_ftype(url) == :dir
       end
       def exist?(url)
-        get_ftype(url) != 'nada'
+        get_ftype(url) != :nada
       end
       def symlink?(url)
         false
       end
       def mkpath(url)
-        tpath = rio(url)
-        tmprio = tpath.root
-        pathparts = tpath.path.split('/')[1..-1]
+        #p "mkpath: #{url.inspect}"
+        pathparts = url.split('/')
+        pathparts.shift if pathparts[0] == ""
+        pathparts[0] = '/' + pathparts[0] if url.start_with?('/')
+        pth = ""
         pathparts.each do |part|
-          tmprio.join!(part)
-          tmprio.mkdir
+          pth += pth.empty? ? part : '/' + part
+          mkdir(pth) unless exist?(pth)
         end
       end
       def rmtree(url)
-        ario = rio(url)
-        _rment(ario)
+        _rment(url)
       end
 
       private
 
-      def _rment(ario)
-        if ario.file?
-          ario.rm
-        else
-          ario.each do |ent|
+      def _rment(url)
+        #p "_rment(#{url})"
+        ftype = get_ftype(url)
+        case ftype
+        when :file
+          rm(url)
+        when :dir
+          nlst = conn.nlst(url)
+          nlst.each do |ent|
             _rment(ent)
           end
-          ario.rmdir
+          rmdir(url)
         end
       end
     end

data/lib/rio/fwd.rb

@@ -0,0 +1,15 @@
+require 'forwardable'
+
+module RIO
+  module Fwd
+    extend Forwardable
+    def fwd(target,*args)
+      self.module_exec(target,args) do |targ,a|
+        a.each do |sym|
+          def_delegator targ, sym
+          def_delegator targ, (sym.to_s+"=").to_sym
+        end
+      end
+    end
+  end
+end

data/lib/rio/grande.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
-#
 
 
 require 'rio/match'
@@ -57,7 +46,7 @@ module RIO
       ary[0] 
     end
 
-    SINGLE_RETURN_KEYS = %[line record row]
+    SINGLE_RETURN_KEYS = %w[line record row]
 
     def _ss_clear_single_return
       SINGLE_RETURN_KEYS.each do |key|

data/lib/rio/handle.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
-#
 
 
 require 'rio/base'
@@ -67,34 +56,3 @@ if $0 == __FILE__
 end
 
 __END__
-
-require 'test/unit'
-
-class TC_Handle < Test::Unit::TestCase
-  def test_handle
-    assert_nothing_raised { 
-      h = Handle.new()
-    }
-    h = Handle.new()
-    assert_nil(h.v)
-    object = String.new("Zippy")
-    h = FwdHandle.new(object,$stdout)
-    s = "Hello World\n"
-
-    rtn = h.fwd_rtn(:write,s)
-    assert_equal(rtn,s.length)
-
-    rtn = h.fwd_rtn_obj(:write,s)
-    assert_same(rtn,object)
-
-    rtn = h.fwd_rtn_new(:write,s)
-    assert_equal(object.class,rtn.class)
-    assert_not_same(object,rtn)
-    assert_equal(rtn,s.length.to_s)
-
-    rtn = h.write(s)
-    p rtn
-#    assert_equal(sdocdir,docdir.to_s)
-#    assert_instance_of(RIO::Rio,doc,"catpath does not return an FS")
-  end
-end

data/lib/rio/if.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
@@ -44,15 +33,20 @@ module RIO
 end
 
 require 'rio/if/internal'
-require 'rio/if/basic'
+#require 'rio/if/basic'
 
 module RIO
-  class Rio
-    require 'rio/if/grande'
-    require 'rio/if/grande_entry'
-    require 'rio/if/grande_stream'
-    
+  module IF
+    #autoload :Grande,           'rio/if/grande' 
+    require 'rio/if/grande' 
+
+    #autoload :GrandeEntry,      'rio/if/grande_entry' 
+    require 'rio/if/grande_entry' 
+    #autoload :GrandeStream,     'rio/if/grande_stream' 
+    require 'rio/if/grande_stream' 
+    #autoload :Test,             'rio/if/test'
     require 'rio/if/test'
+
     require 'rio/if/path'
     require 'rio/if/fileordir'
     require 'rio/if/file'
@@ -61,4 +55,5 @@ module RIO
     require 'rio/if/temp'
     require 'rio/if/string'
   end
+
 end

data/lib/rio/if/basic.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,47 +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
-#
-
-
 module RIO
   class Rio
 
     #def to_rl() target.to_rl end
     
-    # Returns the length of the Rio's String representation
-    # 
-    # To get the size of the underlying file system object use RIO::IF::Test#size
-    def length() target.length end
-
-    # Equality - calls to_s on _other_ and compares its return value 
-    # with the value returned by Rio#to_s
-    def ==(other) target == other end
-
-    # Equality (for case statements) same as Rio#==
-    def ===(other) target === other end
-
-    # Rios are hashed based on their String representation
-    def hash() target.hash end
-
-    # Returns true if their String representations are eql?
-    def eql?(other) target.eql?(other) end
-
-    # Match - invokes _other_.=~, passing the value returned by Rio#to_str
-    def =~(other) target =~ other end
       
   end
 end