rio 0.3.8 → 0.3.9

data/lib/rio/fs/base.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, 2006 Christopher Kleckner
+# Copyright (c) 2005,2006,2007 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -23,16 +23,15 @@
 #
 # 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.
+# from the distribution directory.
 #
 # Suggested Reading
 # * RIO::Doc::SYNOPSIS
 # * RIO::Doc::INTRO
 # * RIO::Doc::HOWTO
+# * RIO::Doc::EXAMPLES
 # * RIO::Rio
 #
-# <b>Rio is pre-alpha software. 
-# The documented interface and behavior is subject to change without notice.</b>
 
 module RIO
   module FS

data/lib/rio/fs/impl.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, 2006 Christopher Kleckner
+# Copyright (c) 2005,2006,2007 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -23,16 +23,15 @@
 #
 # 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.
+# from the distribution directory.
 #
 # Suggested Reading
 # * RIO::Doc::SYNOPSIS
 # * RIO::Doc::INTRO
 # * RIO::Doc::HOWTO
+# * RIO::Doc::EXAMPLES
 # * RIO::Rio
 #
-# <b>Rio is pre-alpha software. 
-# The documented interface and behavior is subject to change without notice.</b>
 
 module RIO
   module FS #:nodoc: all
@@ -113,7 +112,7 @@ module RIO
       def cp_r(s,d)  @util.cp_r(s.to_s,d.to_s) end
       def rmtree(s) @util.rmtree(s.to_s) end
       def mkpath(s) @util.mkpath(s.to_s) end
-      def rm(s) @util.rm(s.to_s) end
+      def rm(s) @file.delete(s.to_s) end
       def touch(s) @util.touch(s.to_s) end
 
       # file or dir

data/lib/rio/fs/native.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, 2006 Christopher Kleckner
+# Copyright (c) 2005,2006,2007 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -23,16 +23,15 @@
 #
 # 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.
+# from the distribution directory.
 #
 # Suggested Reading
 # * RIO::Doc::SYNOPSIS
 # * RIO::Doc::INTRO
 # * RIO::Doc::HOWTO
+# * RIO::Doc::EXAMPLES
 # * RIO::Rio
 #
-# <b>Rio is pre-alpha software. 
-# The documented interface and behavior is subject to change without notice.</b>
 
 require 'rio/fs/impl'
 require 'rio/fs/base'

data/lib/rio/fs/stream.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, 2006 Christopher Kleckner
+# Copyright (c) 2005,2006,2007 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -23,16 +23,15 @@
 #
 # 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.
+# from the distribution directory.
 #
 # Suggested Reading
 # * RIO::Doc::SYNOPSIS
 # * RIO::Doc::INTRO
 # * RIO::Doc::HOWTO
+# * RIO::Doc::EXAMPLES
 # * RIO::Rio
 #
-# <b>Rio is pre-alpha software. 
-# The documented interface and behavior is subject to change without notice.</b>
 
 require 'rio/fs/impl'
 require 'rio/fs/base'

data/lib/rio/fs/url.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, 2006 Christopher Kleckner
+# Copyright (c) 2005,2006,2007 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -23,16 +23,15 @@
 #
 # 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.
+# from the distribution directory.
 #
 # Suggested Reading
 # * RIO::Doc::SYNOPSIS
 # * RIO::Doc::INTRO
 # * RIO::Doc::HOWTO
+# * RIO::Doc::EXAMPLES
 # * RIO::Rio
 #
-# <b>Rio is pre-alpha software. 
-# The documented interface and behavior is subject to change without notice.</b>
 
 require 'rio/fs/impl'
 require 'rio/fs/base'

data/lib/rio/ftp/conncache.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, 2006 Christopher Kleckner
+# Copyright (c) 2005,2006,2007 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -23,16 +23,15 @@
 #
 # 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.
+# from the distribution directory.
 #
 # Suggested Reading
 # * RIO::Doc::SYNOPSIS
 # * RIO::Doc::INTRO
 # * RIO::Doc::HOWTO
+# * RIO::Doc::EXAMPLES
 # * RIO::Rio
 #
-# <b>Rio is pre-alpha software. 
-# The documented interface and behavior is subject to change without notice.</b>
 
 
 require 'net/ftp'
@@ -42,9 +41,14 @@ require 'singleton'
 module RIO
   module FTP
     class Connection
-      attr_reader :uri,:netftp,:remote_root
+      attr_reader :uri,:remote_root,:netftp
       def initialize(uri)
         @uri = uri.clone
+        @netftp = nil
+        @remote_root = nil
+        _init_connection()
+      end
+      def _init_connection
         @netftp = ::Net::FTP.new()
         @netftp.connect(@uri.host,@uri.port)
         if @uri.user
@@ -53,6 +57,7 @@ module RIO
           @netftp.login
         end
         @remote_root = @netftp.pwd
+        @remote_root = '' if @remote_root == '/'
       end
       def method_missing(sym,*args,&block)
         @netftp.__send__(sym,*args,&block)
@@ -73,6 +78,14 @@ module RIO
         key = urikey(uri)
         unless @conns.has_key?(key)
           @conns[key] = Connection.new(uri)
+#          c = @conns[key]
+#          ObjectSpace.define_finalizer(c,proc { 
+#                                         p "Quit and Close #{uri}"
+#                                         if c and !c.closed?
+#                                           c.quit 
+#                                           c.close
+#                                         end
+#                                       })
           @count[key] = 0
         end
         @count[key] += 1
@@ -81,6 +94,7 @@ module RIO
       def close(uri)
         key = urikey(uri)
         @count[key] -= 1
+        #p "Closed #{uri} count=#{@count[key]}"
       end
     end
   end

data/lib/rio/ftp/dir.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, 2006 Christopher Kleckner
+# Copyright (c) 2005,2006,2007 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -23,16 +23,15 @@
 #
 # 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.
+# from the distribution directory.
 #
 # Suggested Reading
 # * RIO::Doc::SYNOPSIS
 # * RIO::Doc::INTRO
 # * RIO::Doc::HOWTO
+# * RIO::Doc::EXAMPLES
 # * RIO::Rio
 #
-# <b>Rio is pre-alpha software. 
-# The documented interface and behavior is subject to change without notice.</b>
 
 require 'net/ftp'
 require 'uri'

data/lib/rio/ftp/fs.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, 2006 Christopher Kleckner
+# Copyright (c) 2005,2006,2007 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -23,16 +23,15 @@
 #
 # 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.
+# from the distribution directory.
 #
 # Suggested Reading
 # * RIO::Doc::SYNOPSIS
 # * RIO::Doc::INTRO
 # * RIO::Doc::HOWTO
+# * RIO::Doc::EXAMPLES
 # * RIO::Rio
 #
-# <b>Rio is pre-alpha software. 
-# The documented interface and behavior is subject to change without notice.</b>
 
 require 'net/ftp'
 require 'uri'
@@ -42,17 +41,24 @@ require 'rio/ftp/conncache'
 module RIO
   module FTP
     class FS 
-      attr_reader :uri,:conn,:remote_root
+      attr_reader :uri
       def initialize(uri)
         @uri = uri.clone
-        @conn = ConnCache.instance.connect(@uri)
-        @remote_root = @conn.remote_root
-        @remote_root = '' if @remote_root == '/'
         @file = ::File
+        @conn = nil
       end
       def self.create(*args)
         new(*args)
       end
+      def remote_root
+        conn.remote_root
+      end
+      def conn
+        @conn ||= ConnCache.instance.connect(@uri)
+      end
+
+
+
       def root()
         uri = @uri.clone
         uri.path = '/'
@@ -61,13 +67,13 @@ module RIO
       include RIO::FS::Str
 
       
-      def pwd() @conn.pwd end
+      def pwd() conn.pwd end
       def getwd()
         self.pwd
       end
       def cwd()
         remote_wd = self.pwd
-        remote_rel = remote_wd.sub(/^#{@remote_root}/,'')
+        remote_rel = remote_wd.sub(/^#{self.remote_root}/,'')
         wduri = uri.clone
         wduri.path = remote_rel
         wduri.to_s
@@ -77,55 +83,55 @@ module RIO
       end
       def chdir(url,&block)
         if block_given?
-          wd = @conn.pwd
-          @conn.chdir(remote_path(url))
+          wd = conn.pwd
+          conn.chdir(remote_path(url))
           begin
             rtn = yield remote_path(url)
           ensure
-            @conn.chdir(wd)
+            conn.chdir(wd)
           end
           return rtn
         else
-          @conn.chdir(remote_path(url))
+          conn.chdir(remote_path(url))
         end
       end
       def mkdir(url)
-        @conn.mkdir(remote_path(url))
+        conn.mkdir(remote_path(url))
       end
       def mv(src_url,dst_url)
-        @conn.rename(remote_path(src_url),remote_path(dst_url))
+        conn.rename(remote_path(src_url),remote_path(dst_url))
       end
       def size(url)
-        @conn.size(remote_path(url))
+        conn.size(remote_path(url))
       end
       def zero?(url)
         size(url) == 0
       end
       def mtime(url)
-        @conn.mtime(remote_path(url))
+        conn.mtime(remote_path(url))
       end
       def rmdir(url)
-        @conn.rmdir(remote_path(url))
+        conn.rmdir(remote_path(url))
       end
       def rm(url)
-        @conn.delete(remote_path(url))
+        conn.delete(remote_path(url))
       end
 
       def get_ftype(url)
         pth = remote_path(url)
         ftype = nil
         begin
-          @conn.mdtm(pth)
+          conn.mdtm(pth)
           ftype = 'file'
         rescue Net::FTPPermError
-          wd = @conn.pwd
+          wd = conn.pwd
           begin
-            @conn.chdir(pth)
+            conn.chdir(pth)
             ftype = 'dir'
           rescue Net::FTPPermError
             ftype = 'nada'
           ensure
-            @conn.chdir(wd)
+            conn.chdir(wd)
           end
         end
         ftype

data/lib/rio/grande.rb

@@ -1,6 +1,6 @@
 #--
 # =============================================================================== 
-# Copyright (c) 2005, 2006 Christopher Kleckner
+# Copyright (c) 2005,2006,2007 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -23,16 +23,15 @@
 #
 # 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.
+# from the distribution directory.
 #
 # Suggested Reading
 # * RIO::Doc::SYNOPSIS
 # * RIO::Doc::INTRO
 # * RIO::Doc::HOWTO
+# * RIO::Doc::EXAMPLES
 # * RIO::Rio
 #
-# <b>Rio is pre-alpha software. 
-# The documented interface and behavior is subject to change without notice.</b>
 
 
 require 'rio/match'
@@ -42,15 +41,36 @@ module RIO
     def [](*args)
       #p "#{callstr('[]',*args)} ss_type=#{cx['ss_type']} stream_iter=#{stream_iter?}"
       ss_args = cx['ss_args'] = args
+      rtn = nil
       if ss_args and (ss_type = ss_type?(_ss_keys()))
-        return self.__send__(ss_type,*(ss_args)).to_a
+        rtn = self.__send__(ss_type,*(ss_args)).to_a
       else
-        return to_a()
+        rtn = to_a()
       end
+      _ss_returns_first? ? _ss_return_first(rtn) : rtn
+    end
+
+    private
+
+    def _ss_return_first(ary)
+      _ss_clear_single_return()
+      ary[0] 
+    end
+
+    SINGLE_RETURN_KEYS = %[line record row]
+
+    def _ss_clear_single_return
+      SINGLE_RETURN_KEYS.each do |key|
+        cx.delete(key)
+      end
+    end
+
+    def _ss_returns_first?
+      cx['line'] || cx['record'] || cx['row']
     end
 
     def fixnumss(*args)
-      #p "#{callstr('[]',*args)} ss_type=#{cx['ss_type']} stream_iter=#{stream_iter?}"
+
       #p args[0].class,ss_type?(_ss_keys())
       ss_args = cx['ss_args'] = args
       if ss_args.length == 1 and ss_args[0].kind_of?(Fixnum) and !cx.has_key?('dirlines')