rio 0.3.1 → 0.3.2

data/lib/rio/rl/uri.rb

@@ -45,7 +45,7 @@ module RIO
         #p callstr('initialize',u,*args)
         # u should be a ::URI or something that can be parsed to one
         args = get_base(*args)
-        @uri = ( u.kind_of?(::URI) ? u.dup : parse_url(u.to_s) )
+        @uri =  _mkuri(u)
         self.join(*args)
         @uri.path = '/' if @uri.absolute? and @uri.path == ''
       end
@@ -56,6 +56,13 @@ module RIO
         @uri = @uri.clone unless @uri.nil?
         @base = @base.clone unless @base.nil?
       end
+      def _mkuri(arg)
+        (arg.kind_of?(::URI) ?  arg.dup : parse_url(arg.to_s))
+      end
+      def base(arg=nil)
+        @base = _mkuri(arg) unless arg.nil? or @uri.absolute?
+        (@base.nil? ? @uri : @base)
+      end
       def join(*args)
 #        self.class.joinuri(self.uri,*args)
         return @uri if args.empty?
@@ -83,9 +90,6 @@ module RIO
       def merge(other)
         self.class.new(@uri.merge(other.uri))
       end
-      def base()
-        (@base.nil? ? @uri : @base)
-      end
       def get_base(*args)
         #      args.each { |a| p "get_base len=#{args.length} #{a.class}##{a.to_s}" }
         @base = nil

data/lib/rio/scheme/cmdio.rb

@@ -42,7 +42,7 @@ module RIO
 
     class RL < RL::SysIOBase 
       RIOSCHEME = 'cmdio'
-      RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].freeze
+      RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].to_s.freeze
       def initialize(cmd="")
         @cmd = cmd
       end

data/lib/rio/scheme/path.rb

@@ -77,6 +77,7 @@ module RIO
         end
         def input() stream_state('Path::Stream::Input') end
         def output() stream_state('Path::Stream::Output') end
+
         def inout() stream_state('Path::Stream::InOut') end
       end
 

data/lib/rio/scheme/stdio.rb

@@ -42,7 +42,7 @@ module RIO
 
     class RL < RL::SysIOBase 
       RIOSCHEME = 'stdio'
-      RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].freeze
+      RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].to_s.freeze
       attr_reader :scheme
       def initialize(sch=RIOSCHEME)
         @scheme = sch

data/lib/rio/scheme/strio.rb

@@ -46,7 +46,7 @@ module RIO
 
     class RL < RL::IOIBase 
       RIOSCHEME = 'strio'
-      RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].freeze
+      RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].to_s.freeze
       def initialize(str="")
         @str = str
       end

data/lib/rio/scheme/sysio.rb

@@ -42,7 +42,7 @@ module RIO
 
     class RL < RL::SysIOBase
       RIOSCHEME = 'sysio'
-      RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].freeze
+      RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].to_s.freeze
       def opaque() sprintf('0x%08x',self.ios.object_id) end
       # must be able to process both
       # parse('rio:sysio',ios)

data/lib/rio/scheme/tcp.rb

@@ -42,6 +42,7 @@ module RIO
     require 'rio/rl/ioi'
     class RL < RL::IOIBase 
       RIOSCHEME = 'tcp'.freeze
+      attr_reader :host
       def initialize(host,port)
         @host = host
         @port = port

data/lib/rio/scheme/temp.rb

@@ -0,0 +1,184 @@
+#--
+# =============================================================================== 
+# Copyright (c) 2005, 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
+#  rake rdoc
+# 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 'tmpdir'
+module RIO
+  module Temp
+    RESET_STATE = 'Temp::Reset'
+
+    require 'rio/rl/base'
+    class RL < RL::Base 
+      RIOSCHEME = 'temp'
+      RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].to_s.freeze
+      DFLT_PREFIX = 'rio'
+      DFLT_TMPDIR = ::Dir::tmpdir
+      attr_reader :prefix,:tmpdir
+      def initialize(file_prefix=DFLT_PREFIX,temp_dir=DFLT_TMPDIR)
+        #puts "initialize(#{file_prefix.inspect},#{temp_dir.inspect})"
+        @prefix = file_prefix || DFLT_PREFIX
+        @tmpdir = temp_dir || DFLT_TMPDIR
+      end
+      #def path() nil end
+      def scheme() self.class.const_get(:RIOSCHEME) end
+      def opaque()
+        td = @tmpdir.to_s
+        td += '/' unless td.nil? or td.empty? or (td.ends_with?('/') and td != '/')
+        td+@prefix
+      end
+      
+      SPLIT_RE = %r|(?:(.*)/)?([^/]*)$|.freeze
+      def self.splitrl(s)
+        sub,opq,whole = split_riorl(s)
+        if opq.nil? or opq.empty?
+          []
+        elsif bm = SPLIT_RE.match(opq)
+          tdir = bm[1] unless bm[1].nil? or bm[1].empty?
+          tpfx = bm[2] unless bm[2].nil? or bm[2].empty?
+          [tpfx,tdir]
+        else
+          []
+        end
+      end
+    end
+    module Dir
+      require 'rio/rl/path'
+      RESET_STATE = RIO::RL::PathBase::RESET_STATE
+      require 'tmpdir'
+      class RL < RIO::RL::PathBase 
+        RIOSCHEME = 'tempdir'
+        DFLT_PREFIX = Temp::RL::DFLT_PREFIX
+        DFLT_TMPDIR = Temp::RL::DFLT_TMPDIR
+        attr_reader :prefix,:tmpdir,:tmprl
+        def initialize(file_prefix=DFLT_PREFIX,temp_dir=DFLT_TMPDIR)
+          #puts "initialize(#{file_prefix.inspect},#{temp_dir.inspect})"
+          @prefix = file_prefix || DFLT_PREFIX
+          @tmpdir = temp_dir || DFLT_TMPDIR
+          require 'rio/tempdir'
+          @td = ::Tempdir.new( @prefix.to_s, @tmpdir.to_s)
+          super(@td.to_s)
+        end
+        SPLIT_RE = Temp::RL::SPLIT_RE
+        def self.splitrl(s)
+          Temp::RL.splitrl(s)
+        end
+      end
+    end
+    module File
+      require 'rio/rl/path'
+      RESET_STATE = 'Temp::Stream::Open'
+      class RL < RIO::RL::PathBase 
+        RIOSCHEME = 'tempfile'
+        DFLT_PREFIX = Temp::RL::DFLT_PREFIX
+        DFLT_TMPDIR = Temp::RL::DFLT_TMPDIR
+        attr_reader :prefix,:tmpdir,:tmprl
+        def initialize(file_prefix=DFLT_PREFIX,temp_dir=DFLT_TMPDIR)
+          #puts "initialize(#{file_prefix.inspect},#{temp_dir.inspect})"
+          @prefix = file_prefix || DFLT_PREFIX
+          @tmpdir = temp_dir || DFLT_TMPDIR
+          require 'tempfile'
+          @tf = ::Tempfile.new( @prefix.to_s, @tmpdir.to_s)
+          super(@tf.path)
+        end
+        def open(mode='ignored',tf=nil,td=nil)
+          @tf
+        end
+        def close 
+          super
+          @tf = nil
+        end
+        SPLIT_RE = Temp::RL::SPLIT_RE
+        def self.splitrl(s)
+          Temp::RL.splitrl(s)
+        end
+      end
+    end
+    require 'rio/state'
+    class Reset < State::Base
+      def initialize(*args)
+        super
+        @tempobj = nil
+      end
+      def check?() true end
+      def dir(prefix=rl.prefix,tmpdir=rl.tmpdir)
+        self.rl = RIO::Temp::Dir::RL.new(prefix, tmpdir)
+        become 'Dir::Existing'
+      end
+      def mkdir()
+        dir()
+      end
+      def chdir(&block)
+        dir.chdir(&block)
+      end
+      def file(prefix=rl.prefix,tmpdir=rl.tmpdir)
+        self.rl = RIO::Temp::File::RL.new(prefix, tmpdir)
+        become 'Temp::Stream::Open'
+      end
+      def scheme() rl.scheme() end
+      def host() rl.host() end
+      def opaque() rl.opaque() end
+      def to_s() rl.url() end
+      def exist?() false end
+      def file?() false end
+      def dir?() false end
+      def open?() false end
+      def closed?() true end
+      def when_missing(sym,*args)
+        if @tempobj.nil?
+          file()
+        else
+          gofigure(sym,*args)
+        end
+      end
+    end
+    require 'rio/stream/open'
+    module Stream
+      class Open < RIO::Stream::Open
+        def iostate(sym)
+          mode('w+').noautoclose_.open_.inout()
+        end
+#        def inout() stream_state('Temp::Stream::InOut') end
+      end
+#      require 'rio/stream'
+#      class InOut < RIO::Stream::InOut
+#        def base_state() 'Temp::Stream::Close' end
+#      end
+#      class Close < RIO::Stream::Close
+#        def base_state() 'Temp::Reset' end
+#      end
+
+    end
+  end
+end

data/lib/rio/state.rb

@@ -40,6 +40,7 @@ require 'rio/context'
 require 'rio/context/methods'
 require 'rio/ext'
 require 'rio/symantics'
+$trace_states = false
 module RIO
 
                    
@@ -109,7 +110,7 @@ module RIO
       # it's job is create an instance of the next state
       # and change the value in the handle that is shared with the fs object
       def become(new_class,*args)
-        #p "become : #{self.class.to_s} => #{new_class.to_s} (#{self.mode?})" if $trace_states
+        p "become : #{self.class.to_s} => #{new_class.to_s} (#{self.mode?})" if $trace_states
 #
         return self if new_class == self.class
 
@@ -124,7 +125,7 @@ module RIO
         "missing: "+self.class.to_s+'['+self.to_url+']'+'.'+sym.to_s+'('+args.join(',')+')'
       end
       def method_missing(sym,*args,&block)
-        #p method_missing_trace_str(sym,*args) if $trace_states
+        p method_missing_trace_str(sym,*args) if $trace_states
 
         obj = when_missing(sym,*args)
         raise RuntimeError,"when_missing returns nil" if obj.nil?
@@ -163,15 +164,25 @@ module RIO
 
       def to_rl() self.rl.rl end
 
-      def fspath() @rl.fspath end
-      def path() @rl.path() end
-      def to_s() @rl.to_s() end
+
+      extend Forwardable
+#      def_instance_delegators(:rl,:path,:to_s,:fspath,:opaque,:host,:length)
+      def_instance_delegators(:rl,:path,:to_s,:fspath,:length)
+
+#      def fspath() @rl.fspath end
+#      def path() @rl.path() end
+#      def opaque() @rl.opaque() end
+#      def scheme() @rl.scheme() end
+#      def host() @rl.host() end
+#      def to_s() @rl.to_s() end
+#      def length() @rl.length end
+
+
       def ==(other) @rl == other end
       def ===(other) self == other end
       def =~(other) other =~ self.to_s end
       def to_url() @rl.url end
       def to_uri() @rl.uri end
-      def length() @rl.length end
       alias to_str to_s
 
       def hash() @rl.to_s.hash end

data/lib/rio/stream.rb

@@ -61,7 +61,7 @@ module RIO
 
     class IOBase < Base
       # Mixin the appropriate ops
-      #include Ops::Path::Str
+      include Ops::Path::Str
       include Ops::Stream::Status
       include Ops::Stream::Manip
       

data/lib/rio/stream/open.rb

@@ -66,7 +66,7 @@ module RIO
         #p callstr('open_',args.inspect)+" mode='#{mode?}' (#{mode?.class}) ioh=#{self.ioh} open?=#{open?}"
         unless open?
           ios = self.rl.open(mode?,*args)
-          noclose_(false) if ios.tty?
+          noautoclose_(false) if ios.tty?
           self.ioh = IOH::Stream.new(ios)
         end
         self

data/lib/rio/tempdir.rb

@@ -0,0 +1,132 @@
+=begin rdoc
+
+== tempdir.rb - provides class Tempdir
+
+=== Synopsis
+In order to
+
+1. create a temporary directory with a name starting with "hoge", 
+2. show the name of that directory, and
+3. show its properties with the system "ls -dl" command:
+
+  require 'tempdir'
+
+  d = Tempdir.new("hoge")
+  p d.to_s
+  system("ls", "-dl", d.to_s)
+
+After the run, the directory will appear to be removed. That is: if you
+are not running inside it, which may provide you a means to create a
+directory with a unique name that will be available after the run.
+
+=== Description
+<i>tempdir.rb</i> provides the Tempdir class, which is analogous to the
+Tempfile class, but manipulates temporary directories. Derived from a
+proposal of nobu.nokada@softhome.net. He added the class to
+tempfile.rb, but since it does not seem to appear in cvs, I'll keep
+it apart in tempdir.rb.
+
+=end
+
+require 'tmpdir'
+
+module AutoRemoval
+  MAX_TRY = 10
+  @@cleanlist = []
+
+  private
+
+  def make_tmpname(basename, n)
+    sprintf('%s%d.%d', basename, $$, n)
+  end
+  private :make_tmpname
+
+  def createtmp(basename, tmpdir=Dir::tmpdir)	# :nodoc:
+    if $SAFE > 0 and tmpdir.tainted?
+      tmpdir = '/tmp'
+    end
+
+    lock = nil
+    n = failure = 0
+
+    begin
+      Thread.critical = true
+      begin
+        tmpname = File.join(tmpdir, make_tmpname(basename, n))
+        n += 1
+      end until !@@cleanlist.include?(tmpname) and yield(tmpname)
+    rescue
+      p $!
+      failure += 1
+      retry if failure < MAX_TRY
+      raise "cannot generate tempfile `%s'" % tmpname
+    ensure
+      Thread.critical = false
+    end
+
+    tmpname
+  end
+
+  def self.callback(path, clear)	# :nodoc:
+    @@cleanlist << path
+    data = [path]
+    pid = $$
+    return Proc.new {
+      if pid == $$ 
+        path, tmpfile = *data
+
+        print "removing ", path, "..." if $DEBUG
+
+        tmpfile.close if tmpfile
+
+        # keep this order for thread safeness
+        if File.exist?(path)
+          clear.call(path)
+        end
+        @@cleanlist.delete(path)
+
+        print "done\n" if $DEBUG
+      end
+    }, data
+  end
+
+  def self.unregister(path)
+    @@cleanlist.delete(path)
+  end
+end
+
+require 'pathname'
+class Tempdir < Pathname
+  include AutoRemoval
+
+  def initialize(*args)
+    require 'fileutils'
+
+    tmpname = createtmp(*args) do |tmpname|
+      unless File.exist?(tmpname)
+        Dir.mkdir(tmpname, 0700)
+      end
+    end
+
+    super(tmpname)
+    @clean_proc, = AutoRemoval.callback(tmpname, FileUtils.method(:rm_rf))
+    ObjectSpace.define_finalizer(self, @clean_proc)  end
+
+  def open(basename, *modes, &block)
+    File.open(self+basename, *modes, &block)
+  end
+
+  def clear
+    FileUtils.rm_rf(@tmpname)
+    @clean_proc.call
+    ObjectSpace.undefine_finalizer(self)
+  end
+end
+
+if __FILE__ == $0
+#  $DEBUG = true
+  d = Tempdir.new("hoge")
+  p d.to_s
+  system("ls", "-dl", d.to_s)
+  p d
+end