rio 0.4.2 → 0.5.1

data/lib/rio/ext/zipfile/rl.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 'uri'
 require 'rio/uri/file'

data/lib/rio/ext/zipfile/rootdir.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/fs/base'
 require 'zip/zip'

data/lib/rio/ext/zipfile/state.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/ops/path'

data/lib/rio/ext/zipfile/wrap.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 'zip/zip'
 require 'zip/zipfilesystem'

data/lib/rio/factory.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,234 +18,114 @@
 # 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
-#
 
 
-# class String
-#  def to_fs
-#    require 'rio/resource'
-#    RIO::Resource::Pathname.new(self)
-#  end
-# end
 require 'singleton'
 require 'rio/handle'
-require 'rio/rl/builder'
-#require 'rio/state/machine'
+require 'rio/rrl/builder'
 
-module RIO
-#   class StateDesc
-#     attr_accessor :class_name,:class_file
-#     def initialize(class_name,class_file)
-#       @class_name = class_name
-#       @class_file = class_file
+# module RIO
+#   autoload :Path, 'rio/rrl/path'
+#   module Path
+#     autoload :Str,'rio/path'
+#     autoload :Reset , 'rio/path/reset'
+#     autoload :Empty , 'rio/path'
+#     autoload :NonExisting , 'rio/path'
+#     module Stream
+#       autoload :Open , 'rio/scheme/path'
 #     end
 #   end
-#   module StateMap
-#     class Base
-#       STATE_FILE = {
-#         'Path::Reset' => 'rio/path/reset',
-#         'Path::Empty' => 'rio/path',
-#         'Path::Str' => 'rio/path',
-#         'Path::NonExisting' => 'rio/path',
-        
-#         'File::Existing' => 'rio/file',
-#         'File::NonExisting' => 'rio/file',
-        
-#         'Dir::Existing' => 'rio/dir',
-#         'Dir::Open' => 'rio/dir',
-#         'Dir::Close' => 'rio/dir',
-#         'Dir::Stream' => 'rio/dir',
-#         'Dir::NonExisting' => 'rio/dir',
-        
-#         'Stream::Reset' => 'rio/stream',
-#         'Stream::Open' => 'rio/stream/open',
-#         'Stream::Input' => 'rio/stream',
-#         'Stream::Output' => 'rio/stream',
-#         'Stream::InOut' => 'rio/stream',
-#         'Stream::Close' => 'rio/stream/open',
-#       }
-#       def class_name(state_name)
-#         'State::' + state_name
-#       end
-#       def file_name(state_name)
-#         STATE_FILE[state_name]
-#       end
-#       def path_reset() 'Path::Reset' end
-#       def path_empty() 'Path::Empty' end
-#       def path_str() 'Path::Str' end
-#       def path_nonexisting() 'Path::NonExisting' end
-#       def file_existing() 'File::Existing' end
-#       def file_nonexisting() 'File::NonExisting' end
-#       def dir_existing() 'Dir::Existing' end
-#       def dir_open() 'Dir::Open' end
-#       def dir_close() 'Dir::Close' end
-#       def dir_stream() 'Dir::Stream' end
-#       def dir_nonexisting() 'Dir::NonExisting' end
-#       def stream_reset() 'Stream::Reset' end
-#       def stream_open() 'Stream::Open' end
-#       def stream_input() 'Stream::Input' end
-#       def stream_output() 'Stream::Output' end
-#       def stream_inout() 'Stream::InOut' end
-#       def stream_close() 'Stream::Close' end
+#   autoload :StdIO, 'rio/scheme/stdio'
+#   autoload :StdErr, 'rio/scheme/stderr'
+#   autoload :Null, 'rio/scheme/null'
+#   module Null
+#     module Stream 
+#       autoload :Open , 'rio/scheme/null'
 #     end
 #   end
-#   module Path
-#     class StateMap < RIO::StateMap::Base
-#       def stream_open() 'Path::Stream::Open' end
+#   autoload :Temp, 'rio/scheme/temp'
+#   module Temp
+#     autoload :Reset , 'rio/scheme/temp'
+#     module Stream
+#       autoload :Open , 'rio/scheme/temp'
 #     end
 #   end
-#   module Path
-#     class StateMap < RIO::StateMap::Base
-#       STATE_FILE = { 'Stream::Open' => 'rio/scheme/path' }
-#       def stream_open() 'Path::Stream::Open' end
+#   autoload :StrIO, 'rio/scheme/strio'
+#   module StrIO
+#     module Stream
+#       autoload :Open , 'rio/scheme/strio'
 #     end
 #   end
+#   autoload :CmdPipe, 'rio/scheme/cmdpipe'
 #   module CmdPipe
-#     class StateMap < RIO::StateMap::Base
-#       def stream_reset() 'CmdPipe::Stream::reset' end
+#     module Stream
+#       autoload :Reset , 'rio/scheme/cmdpipe'
 #     end
 #   end
-
-#   module States
-#     class Base
+#   autoload :AryIO, 'rio/scheme/aryio'
+#   autoload :HTTP, 'rio/scheme/http'
+#   module HTTP
+#     module Stream
+#       autoload :Input , 'rio/scheme/http'
+#       autoload :Open , 'rio/scheme/http'
 #     end
 #   end
+#   autoload :FTP, 'rio/scheme/ftp'
+#   autoload :TCP, 'rio/scheme/tcp'
+#   autoload :SysIO, 'rio/scheme/sysio'
+#   autoload :FD, 'rio/scheme/fd'
+#   autoload :CmdIO, 'rio/scheme/cmdio'
 
-#   class StateMapper
-#     include Singleton
-
-#     STD_STATE_FILES = {
-#       'Path::Reset' => 'rio/path/reset',
-#       'Path::Empty' => 'rio/path',
-#       'Path::Str' => 'rio/path',
-#       'Path::NonExisting' => 'rio/path',
-
-#       'File::Existing' => 'rio/file',
-#       'File::NonExisting' => 'rio/file',
-
-#       'Dir::Existing' => 'rio/dir',
-#       'Dir::Open' => 'rio/dir',
-#       'Dir::Close' => 'rio/dir',
-#       'Dir::Stream' => 'rio/dir',
-#       'Dir::NonExisting' => 'rio/dir',
+# end
+# module RIO
+#   module Dir
+#     autoload :Existing, 'rio/dir'
+#     autoload :NonExisting, 'rio/dir'
+#     autoload :Open , 'rio/dir'
+#     autoload :Close , 'rio/dir'
+#     autoload :Stream , 'rio/dir'
+#   end
+#   module File
+#     autoload :NonExisting, 'rio/file'
+#     autoload :Existing, 'rio/file'
+#   end
+# end
+# module RIO
+#   module Stream
+#     autoload :Close , 'rio/stream/open'
+#     autoload :Reset , 'rio/stream'
+#     autoload :Open , 'rio/stream/open'
+#     autoload :Input , 'rio/stream'
+#     autoload :Output , 'rio/stream'
+#     autoload :InOut , 'rio/stream'
+#     module Duplex
+#       autoload :Open , 'rio/stream/duplex'
+#       autoload :Input , 'rio/stream/duplex'
+#       autoload :Ouput , 'rio/stream/duplex'
+#       autoload :InOut , 'rio/stream/duplex'
+#       autoload :Close , 'rio/stream/duplex'
+#       autoload :Reset , 'rio/stream/duplex'
+#     end
+#   end
+# end
 
-#       'Stream::Reset' => 'rio/stream',
-#       'Stream::Open' => 'rio/stream/open',
-#       'Stream::Input' => 'rio/stream',
-#       'Stream::Output' => 'rio/stream',
-#       'Stream::InOut' => 'rio/stream',
-#       'Stream::Close' => 'rio/stream/open',
-#     }
-#     SCHEME_STATE_FILES = {
-#       'Stream::Duplex::Open' => 'rio/stream/duplex',
 
-#       #'Path::Stream::Open' => 'rio/scheme/path',
 
-#       #'StrIO::Stream::Open' => 'rio/scheme/strio',
 
-#       #'Null::Stream::Open' => 'rio/scheme/null',
 
-#       #'CmdPipe::Stream::Reset' => 'rio/scheme/cmdpipe',
 
-#       #'HTTP::Stream::Input' => 'rio/scheme/http',
-#       #'HTTP::Stream::Open' => 'rio/scheme/http',
+#      'Ext::YAML::Doc::Existing' , 'rio/ext/yaml/doc',
+#      'Ext::YAML::Doc::Open' , 'rio/ext/yaml/doc',
+#      'Ext::YAML::Doc::Stream' , 'rio/ext/yaml/doc',
+#      'Ext::YAML::Doc::Close' , 'rio/ext/yaml/doc',
 
-#       'Temp::Reset' => 'rio/scheme/temp',
-#       'Temp::Stream::Open' => 'rio/scheme/temp',
 
-#       'Ext::YAML::Doc::Existing' => 'rio/ext/yaml/doc',
-#       'Ext::YAML::Doc::Open' => 'rio/ext/yaml/doc',
-#       'Ext::YAML::Doc::Stream' => 'rio/ext/yaml/doc',
-#       'Ext::YAML::Doc::Close' => 'rio/ext/yaml/doc',
-#     }
-#     def initialize()
-#       @state_cache = {}
-#     end
-#     def scheme_states()
-#       { 
-#         'path' => { 'Stream::Open' => 'Path::Stream::Open' },
-#         'file' => { 'Stream::Open' => 'Path::Stream::Open' },
-#         'strio' => { 'Stream::Open' => 'StrIO::Stream::Open' },
-#         'cmdpipe' => { 'Stream::Reset' => 'CmdPipe::Stream::Reset' },
-#         'http' => {'Stream::Input' => 'HTTP::Stream::Input', 
-#                    'Stream::Open' => 'HTTP::Stream::Open' },
-#       }
-#     end
-#     def known?(state_name)
-#       STD_STATE_FILES.has_key?(state_name) or SCHEME_STATE_FILES.has_key?(state_name)
-#     end
-#     def std_state_name(state_name)
-#       case 
-#       when STD_STATE_FILES.has_key?(state_name) then 'State::'+state_name
-#       when SCHEME_STATE_FILES.has_key?(state_name) then state_name
-#       else raise ArgumentError,"Unknown State Name (#{state_name})" 
-#       end
-#     end
-#     def mode_mixins()
-#       { 
-#         'Stream::Input' => { 'splitlines' => 'Ext::SplitLines::Stream::Input', },
-#         'Stream::Output' => { 'splitlines' => 'Ext::SplitLines::Stream::Output', },
-#       }
-#     end
-#     def mode_state_name(state_name,cx)
-#       mixins = mode_mixins()
-#       return state_name unless mixins.has_key?(state_name)
-#       modes = mstates[state_name]
-#       for mode in modes.keys
-#         next unless cx[mode]
-#         return modes[mode]
-#       end
-#     end
 
-#     def scheme_state_name(state_name,scheme)
-#       schemes = scheme_states()
-#       if schemes.has_key?(scheme)
-#         states = schemes[scheme]
-#         if states.has_key?(state_name)
-#           return scheme_states[scheme][state_name]
-#         end
-#       end
-#       return std_state_name(state_name)
-#     end
-#     def state_file(state_name,rio_handle)
-#       case 
-#       when STD_STATE_FILES.has_key?(state_name) then STD_STATE_FILES[state_name]
-#       when SCHEME_STATE_FILES.has_key?(state_name) then SCHEME_STATE_FILES[state_name]
-#       else raise ArgumentError,"Unknown State Name (#{state_name})" 
-#       end
-#     end
-#     def state2class(state_name,rio_handle=nil)
-#       scheme = rio_handle.rl.scheme unless rio_handle.nil?
-#       state = nil
-#       if scheme_cache = @state_cache[scheme]
-#         return state if state = scheme_cache[state_name]
-#       end
-#       mapped_name = rio_handle.nil? ? std_state_name(state_name) : scheme_state_name(state_name,rio_handle.rl.scheme)
-#       if self.known?(state_name)
-#         require self.state_file(state_name,rio_handle)
-#         @state_cache[scheme] ||= {}
-#         @state_cache[scheme][state_name] = RIO.module_eval(mapped_name)
-#         return @state_cache[scheme][state_name]
-#       else
-#         raise ArgumentError,"Unknown State Name (#{state_name})" 
-#       end
-#     end
-                   
-#   end
 
+module RIO
 
   class Factory  #:nodoc: all
     include Singleton
@@ -260,7 +140,7 @@ module RIO
       #p "subscheme_module(#{sch})"
       @ss_module[sch] ||= case sch
                           when 'file','path'
-                            require 'rio/scheme/path'
+                            require 'rio/rrl/path'
                             Path
                           when 'zipfile'
                             require 'rio/ext/zipfile/rl'
@@ -311,7 +191,7 @@ module RIO
                             require 'rio/scheme/cmdio'
                             CmdIO
                           else
-                            require 'rio/scheme/path'
+                            require 'rio/rrl/path'
                             Path
                           end
     end
@@ -339,6 +219,11 @@ module RIO
       'Stream::InOut' => 'rio/stream',
 
       'Stream::Duplex::Open' => 'rio/stream/duplex',
+      'Stream::Duplex::Input' => 'rio/stream/duplex',
+      'Stream::Duplex::Output' => 'rio/stream/duplex',
+      'Stream::Duplex::InOut' => 'rio/stream/duplex',
+      'Stream::Duplex::Close' => 'rio/stream/duplex',
+      'Stream::Duplex::Reset' => 'rio/stream/duplex',
 
       'Path::Stream::Open' => 'rio/scheme/path',
 
@@ -362,7 +247,10 @@ module RIO
 
     }
     def riorl_class(sch)
-      subscheme_module(sch).const_get(:RL) 
+      ssm = subscheme_module(sch)
+      cls = ssm.const_get(:RRL)
+
+      cls
     end
 
     def reset_state(rl)
@@ -380,22 +268,22 @@ module RIO
       end
     end
     def try_state_proc1(current_state,rio_handle)
-      #p "try_state_proc cur=#{current_state}[#{current_state.class}] han=#{rio_handle}[#{rio_handle.class}]"
       proc { |new_state_name|
-#        new_state_class = state2class(new_state_name)
         _change_state(state2class(new_state_name,rio_handle),current_state,rio_handle)
       }
     end
     def try_state_proc(current_state,rio_handle)
       proc { |new_state_name|
-#        new_state_class = state2class(new_state_name)
         _change_state(state2class(new_state_name),current_state,rio_handle)
       }
     end
 
     def _change_state(new_state_class,current_state,rio_handle)
       # wipe out the reference to this proc so GC can get rid of rsc
-      current_state.try_state = proc { p "try_state for "+current_state.to_s+" used already??" }
+      current_state.try_state = proc { 
+        p "try_state for "+current_state.to_s+" used already??" 
+        nil
+      }
       new_state = new_state_class.new_other(current_state)
       new_state.try_state = try_state_proc(new_state,rio_handle)
       
@@ -405,13 +293,9 @@ module RIO
     private :_change_state
 
     # factory creates a state from args
-    def create_state1(*args)
-      riorl = RIO::RL::Builder.build(*args)
-      create_handle(state2class(reset_state(riorl)).new(riorl))
-    end
     def create_state(*args)
-      riorl = RIO::RL::Builder.build(*args)
-      create_handle(state2class(reset_state(riorl)).new(riorl))
+      riorl = RIO::RRL::Builder.build(*args)
+      create_handle(state2class(reset_state(riorl)).new(rl: riorl))
     end
     def clone_state(state)
       create_handle(state.target.clone)
@@ -432,5 +316,4 @@ end
 
 __END__
 
-require 'test/unit'