rio 0.5.1 → 0.6.0

data/lib/rio/ext/zipfile/rootdir.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -36,7 +36,6 @@ module RIO
       def initialize(zipfilepath)
         @zipfilepath = zipfilepath
         @zipfile = Zip::ZipFile.new(@zipfilepath)
-        #puts @zipfile.methods.sort
         @topents = get_topents_
         @entidx = 0
       end
@@ -76,31 +75,3 @@ module RIO
 end
 
 __END__
-
-      
-      class CentralDir < RIO::FS::Native
-        def initialize(zipfilepath)
-          @zipfilepath = zipfilepath
-          @zipfile = Zip::ZipFile.new(@zipfilepath)
-          super
-        end
-        def mkdir(path)
-          @zipfile.mkdir(path)
-        end
-        def rmdir(path)
-          @zipfile.remove(path)
-        end
-        def file()
-          self
-        end
-        def open(zipfilepath)
-          @zipfilepath = zipfilepath
-          @zipfile = Zip::ZipFile.new(@zipfilepath)
-          RIO::ZipFile::CentralDir.new(@zipfile)
-        end
-
-      end
-
-    end
-  end
-end

data/lib/rio/ext/zipfile/state.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -38,113 +38,9 @@ module RIO
           else
             become('Path::Reset')
           end
-          #gofigure(sym,*args) 
         end
       end
     end
   end
 end
 __END__
-        class Base < State::Base
-          include Ops::Path::Str
-          def open?() !ioh.nil? end
-        end
-
-        class NonExisting < Base
-          include Ops::Dir::NonExisting
-          def check?() not self.exist?  end
-          def when_missing(sym,*args)  gofigure(sym,*args) end
-        end 
-        
-        class Existing < Base
-          include Ops::Dir::Existing
-          
-          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 = 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_(*args) 
-            unless open?
-              self.ioh = self.rl.open()
-            end
-            self 
-          end
-          def when_missing(sym,*args) 
-            nobj = open_.dstream() 
-            return nobj unless nobj.nil?
-            gofigure(sym,*args)
-          end
-          
-          def dstream() 
-            cl = 'Dir::Stream'
-            #p "LOOP: retry: #{cx['retrystate'].inspect} => #{cl}" 
-            return nil if cx['retrystate'] == cl
-            cx['retrystate'] = cl
-            
-            become(cl)
-          end
-        end
-        class Stream < Base
-          include Ops::Dir::Stream
-          def check?() open? end
-          def when_missing(sym,*args) retryreset() end
-          def base_state() 'Dir::Close' 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? 
-            self.close_
-            cx['retrystate'] = nil
-            self
-          end
-          
-          def close_() 
-            #p callstr('close_')+" ioh=#{self.ioh} open?=#{open?}"
-            return self unless self.open? 
-            self.clear_selection
-            self.ioh.close 
-            self.ioh = nil
-            self.rl.close
-            self
-          end
-          protected :close_
-          
-          CX_ENTRY_SEL_KEYS = %w[nostreamenum entry_sel skip_args ss_skipped]
-          def clear_selection()
-            CX_ENTRY_SEL_KEYS.each { |k|
-              cx.delete(k)
-            }
-            self
-          end
-          
-          def check?() true end
-          def when_missing(sym,*args) 
-            #        p callstr('when_missing',sym,*args)
-            self.close_.retryreset()
-          end
-        end
-      end 
-    end
-  end
-end # module RIO

data/lib/rio/ext/zipfile/wrap.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -48,8 +48,6 @@ module RIO
             super
           end
           def close()
-            p "CLOSE: #{@zipstream.inspect}"
-            #p self.__getobj__.methods.sort
             super
             @closed = true
           end
@@ -60,7 +58,6 @@ module RIO
           def initialize(zipfile)
             @zipfile = zipfile
             @infs = RIO::ZipFile::InFile::FS.new(@zipfile)
-            #puts @zipfile.methods.sort
             @topents = get_topents_
             @entidx = 0
           end
@@ -83,7 +80,6 @@ module RIO
             }
           end
           def close
-            p "JERE"
             @zipfile.commit if @zipfile.commit_required?
           end
         end
@@ -110,84 +106,3 @@ module RIO
   end
 end
 __END__
-
-
-
-    class CentralDir
-      include Enumerable
-
-      def initialize(zipfilepath)
-        @zipfilepath = zipfilepath
-        @zipfile = Zip::ZipFile.new(@zipfilepath)
-        #puts @zipfile.methods.sort
-        topents = {}
-        @zipfile.entries.map{ |ent|
-          top = ent.to_s.match(%r|^(/?[^/]+(/)?)|)[1]
-          topents[top] = ent if top == ent.to_s
-        }
-        fs = RIO::ZipFile::FS::InFile.new(@zipfile)
-        @topents = topents.values.map{ |v| rio(RIO::Path::RL.new(v.to_s,{:fs => fs})) }
-        @entidx = 0
-      end
-#      def method_missing(sym,*args,&block)
-#        @zipfile.__send__(sym,*args,&block)
-#      end
-      def read
-        return nil if @entidx >= @topents.size
-        @entidx += 1
-        @topents[@entidx-1]
-      end
-      def rewind
-        @entidx = 0
-      end
-      def each(&block)
-        @topents.each { |ent|
-          yield ent
-        }
-      end
-      def close
-      end
-    end
-    module FS
-      class Base < RIO::FS::Base
-      end
-      class InFile < Base
-        attr_reader :file,:dir
-        def initialize(zipfile)
-          @zipfile = zipfile
-          @file = @zipfile.file
-          @dir = @zipfile.dir
-          @test = @zipfile.file
-        end
-        include RIO::FS::File
-        include RIO::FS::Dir
-        include RIO::FS::Test
-        include RIO::FS::Str
-      end
-      
-      class CentralDir < RIO::FS::Native
-        def initialize(zipfilepath)
-          @zipfilepath = zipfilepath
-          @zipfile = Zip::ZipFile.new(@zipfilepath)
-          super
-        end
-        def mkdir(path)
-          @zipfile.mkdir(path)
-        end
-        def rmdir(path)
-          @zipfile.remove(path)
-        end
-        def file()
-          self
-        end
-        def open(zipfilepath)
-          @zipfilepath = zipfilepath
-          @zipfile = Zip::ZipFile.new(@zipfilepath)
-          RIO::ZipFile::CentralDir.new(@zipfile)
-        end
-
-      end
-
-    end
-  end
-end

data/lib/rio/factory.rb

@@ -1,6 +1,6 @@
 #--
 # ===========================================================================
-# Copyright (c) 2005-2012 Christopher Kleckner
+# Copyright (c) 2005-2017 Christopher Kleckner
 # All rights reserved
 #
 # This file is part of the Rio library for ruby.
@@ -27,104 +27,6 @@ require 'singleton'
 require 'rio/handle'
 require 'rio/rrl/builder'
 
-# 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
-#   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
-#   autoload :Temp, 'rio/scheme/temp'
-#   module Temp
-#     autoload :Reset , 'rio/scheme/temp'
-#     module Stream
-#       autoload :Open , 'rio/scheme/temp'
-#     end
-#   end
-#   autoload :StrIO, 'rio/scheme/strio'
-#   module StrIO
-#     module Stream
-#       autoload :Open , 'rio/scheme/strio'
-#     end
-#   end
-#   autoload :CmdPipe, 'rio/scheme/cmdpipe'
-#   module CmdPipe
-#     module Stream
-#       autoload :Reset , 'rio/scheme/cmdpipe'
-#     end
-#   end
-#   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'
-
-# 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
-
-
-
-
-
-
-#      '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',
-
-
-
-
 module RIO
 
   class Factory  #:nodoc: all
@@ -295,7 +197,7 @@ module RIO
     # factory creates a state from args
     def create_state(*args)
       riorl = RIO::RRL::Builder.build(*args)
-      create_handle(state2class(reset_state(riorl)).new(rl: riorl))
+      create_handle(state2class(reset_state(riorl)).new(rl:riorl))
     end
     def clone_state(state)
       create_handle(state.target.clone)

data/lib/rio/fibpipe.rb

@@ -41,13 +41,11 @@ module RIO
         fib.resume(*args)
       end
       def source_resume(*args)
-        # $stdout.printf("\n%s%-9s resumes-> %-12s (%s) ... ","  "*@@depth,self.fib.name,source.fib.name,args.join(","))
         @@depth += 1
         source.resume(*args)
       end
       def fiber_yield(*args)
         @@depth -= 1
-        # $stdout.printf("%s%s yields (%s)\n","  "*@@depth,self.fib.name,args.join(","))
         Fiber.yield(*args)
       end
       def dest_wait_for_reader
@@ -104,7 +102,6 @@ module RIO
       def duplex?() @is_duplex end
       def put(rec)
         data.out.write(rec)
-        #data.out.flush
       end
       def process_loop
         loop do 
@@ -117,14 +114,12 @@ module RIO
           rescue Errno::EINTR
             break
           rescue EOFError
-            # p "ToOutput: Loop Closing"
             data.in.close_read
             if duplex?
               data.out.close_write
             else
               data.out.close
             end
-            # p data.out.closed?
             dest_report_data_done unless dest?
             break
           end
@@ -256,9 +251,7 @@ module RIO
 
     class FibSourceProc < FromInput
       def initialize(*args)
-        #p "FibSourceProc args=#{args.inspect}"
         super(IO.popen(*args))
-        # @to_proc = ToProc.new(data.in)
       end
     end
 
@@ -280,94 +273,3 @@ module RIO
 end
 
 __END__
-ior = File.open('lines10.txt')
-iow = $stdout
-#input = RIO::Cmd::FromInput.new(ior)
-#input = RIO::Cmd::FromFile.new('lines10.txt')
-input = RIO::Cmd::FromEnum.new(ior.to_enum)
-#to_out = RIO::Cmd::ToStdout.new
-output = RIO::Cmd::ToOutput.new($stdout)
-cat = RIO::Cmd::FibPipeProc.new(['cat','-n'],'w+')
-cat2 = RIO::Cmd::FibPipeProc.new(['cat','-n'],'w+')
-
-output.resume [cat,cat2,input]
-puts
-puts
-
-ls = RIO::Cmd::FibSourceProc.new(['ls','-l'])
-grepc = RIO::Cmd::FibPipeProc.new(['grep','2010-02-06'],'w+')
-output = RIO::Cmd::ToOutput.new($stdout)
-
-output.resume [grepc,ls]
-
-__END__
-__END__
-
-ls = RIO::Cmd::FibSourceProc.new(['ls','-l'])
-output = RIO::Cmd::ToOutput.new($stdout)
-output.resume [ls]
-
-
-__END__
-cat = RIO::Cmd::FibPipeProc.new(['cat','-n'],'w+')
-
-p '--------------------------------------------------------->>>>>>>>>>>'
-to_stdout.resume [cat,from_file]
-
-
-__END__
-from_file = RIO::Cmd::FromFile.new("lines10.txt")
-cat = RIO::Cmd::FibPipeProc.new(['cat','-n'],'w+')
-to_stdout = RIO::Cmd::ToStdout.new
-
-p '--------------------------------------------------------->>>>>>>>>>>'
-to_stdout.resume [cat,from_file]
-
-
-__END__
-from_file = FromFile.new("lines10.txt")
-
-ioproc = IO.popen(['cat','-n'],'w+')
-to_proc = ToProc.new(ioproc)
-from_proc = FromProc.new(ioproc)
-
-ioproc2 = IO.popen(['cat','-n'],'w+')
-to_proc2 = ToProc.new(ioproc2)
-from_proc2 = FromProc.new(ioproc2)
-
-to_stdout = ToStdout.new
-
-
-to_stdout.resume [from_proc,to_proc,from_proc2,to_proc2,from_file]
-
-
-__END__
-from_proc = FromProc.new(IO.popen(['ls','-l']))
-fpi = ToStdout.new
-fpi.resume [from_proc]
-
-
-__END__
-#from_file = FromFile.new("lines10.txt")
-from_file = FromFile.new("lines10.txt")
-#from_procy = FromProc.new(IO.popen(['yes','what is the deal']))
-from_proc = FromProcSelect.new(['cat','-n'])
-to_stdout = ToStdout.new
-
-
-to_stdout.resume [from_proc,from_file]
-
-
-__END__
-feeder = FromFile.new("lines10.txt")
-fpi = ToStdout.new
-fpi.resume [feeder]
-
-__END__
-
-
-feeder = FromFile.new("lines10.txt")
-fpi = ToStdout.new
-fpi.resume [feeder]
-
-__END__