rio 0.3.4 → 0.3.6

data/lib/rio/ops/stream.rb

@@ -47,7 +47,7 @@ module RIO
           not self.closed?
         end
         def closed?() self.ioh.nil?  end
-        def eof?() closed? or ioh.eof? end
+        def eof?() closed? or ior.eof? end
       end
     end
 

data/lib/rio/ops/stream/input.rb

@@ -45,6 +45,7 @@ require 'rio/context/stream'
 require 'stringio'
 require 'rio/record'
 require 'rio/cp'
+require 'rio/piper/cp'
 
 
 module RIO
@@ -56,16 +57,17 @@ module RIO
         include Enumerable
         include Grande
         include Cp::Stream::Input
+        include Piper::Cp::Input
       end
     end
   end
 end
+require 'rio/piper'
 module RIO
   module Ops
     module Stream
       module Input
         public
-
         def each(*args,&block)
           #p callstr('each',*args)
           each_(*args,&block)
@@ -84,12 +86,31 @@ module RIO
           self
         end
 
-        def getrec()
+        def get()
           until self.eof?
             raw_rec = self._get_rec
             return to_rec_(raw_rec) if @get_selrej.match?(raw_rec,@recno)
           end
         end
+        def get_type(itertype,&block)
+          old_itertype = cx['stream_itertype']
+          _set_itertype(itertype)
+          begin
+            ans = yield
+          ensure
+            _set_itertype(old_itertype)
+          end
+          ans
+        end
+        def getline()
+          get_type('lines') { get() }
+        end
+        def getrow()
+          get_type('rows') { get() }
+        end
+        def getrec()
+          get_type('records') { get() }
+        end
         private
 
         def _ss_like_array(selrej)
@@ -102,6 +123,7 @@ module RIO
         # implemented in terms of an underlying iterator like each_line (see RIO::RecType::*)
         def each_(*args,&block)
           #p callstr('each_',*args)
+
           selrej,rangetops = create_selrej()
           want_ma = block.arity > 1
           catch(:stop_iter) do
@@ -118,7 +140,7 @@ module RIO
             end
             return self
           end
-          closeoneof? ? ioh.close_on_eof_(self) : self
+          closeoneof? ? ior.close_on_eof_(self) : self
         end
 
         # iterate over the records, yielding only with matching records
@@ -130,14 +152,14 @@ module RIO
           get_arg = self.get_arg_
           self.each_record_init_(*args)
           catch(:stop_iter) {
-            until ioh.eof?
+            until ior.eof?
               break unless raw_rec = self._get_rec(get_arg)
               rangetops = check_passed_ranges(selrej,@recno) if rangetops and @recno > rangetops[0]
               yield to_rec_(raw_rec) if selrej.match?(raw_rec,@recno)
             end
             return self
           }
-          closeoneof? ? ioh.close_on_eof_(self) : self
+          closeoneof? ? ior.close_on_eof_(self) : self
         end
         alias :each_row_ :each_
         def clear_selection()
@@ -183,7 +205,7 @@ module RIO
         end
 
         def on_closeoneof
-          #p "on_closeoneof #{self.object_id} #{self.ioh.object_id}"
+          #p "on_closeoneof #{self.object_id} #{self.ior.object_id}"
           self.close
         end
 
@@ -199,21 +221,21 @@ module RIO
         public
         
         def rewind(&block)
-          self.ioh.rewind
+          self.ior.rewind
           @recno = -1
           each(&block) if block_given?
           self
         end
 
         def close_read(&block)
-          self.ioh.close_read
+          self.ior.close_read
           each(&block) if block_given?
           self
         end
 
         def copy_stream(dst)
           #p callstr('copy_stream',dst)
-          ioh.copy_stream(dst)
+          ior.copy_stream(dst)
           self
         end
 

data/lib/rio/ops/stream/output.rb

@@ -57,10 +57,15 @@ module RIO
         include Cp::Stream::Output
         def putrec(rec,*args)
           self.put_(rec,*args)
+          self
+        end
+
+        def putrec!(rec,*args)
+          rtn_close { self.put_(rec,*args) }
         end
 
         def close_write(&block)
-          self.ioh.close_write
+          self.iow.close_write
           each(&block) if block_given?
           self
         end
@@ -81,7 +86,7 @@ module RIO
         end
 
         def copyclose()
-          #p "#{callstr('copyclose')} closeoncopy=#{cx['closeoncopy']} ioh=#{ioh}"
+          #p "#{callstr('copyclose')} closeoncopy=#{cx['closeoncopy']} iow=#{iow}"
           #raise RuntimeError,"copclose"
           if cx['closeoncopy']
             wclose

data/lib/rio/ops/stream/read.rb

@@ -41,41 +41,41 @@ module RIO
     module Stream
       module Read
         def contents() 
-          auto { ioh.gets(nil) }
+          auto { ior.gets(nil) }
         end
         def readlines(*args)
-          auto { ioh.readlines(*args) }
+          auto { ior.readlines(*args) }
         end
         def read(*args)
-          auto { ioh.read(*args) }
+          auto { ior.read(*args) }
         end
         def ungetc(*args)
-          ioh.ungetc(*args)
+          ior.ungetc(*args)
           self
         end
         def each_line(*args,&block)
           auto { 
-#            self.ioh.each_line(*args,&block) 
-            self.ioh.each_line { |line|
+#            self.ior.each_line(*args,&block) 
+            self.ior.each_line { |line|
               yield line
             } #(*args,&block) 
           }
         end
         def each_byte(*args,&block)
-          auto { ioh.each_byte(*args,&block) }
+          auto { ior.each_byte(*args,&block) }
         end
         def each_bytes(nb,*args,&block)
           #p callstr('each_bytes',nb,*args)
           auto {
-            until ioh.eof?
-              break unless s = ioh.read(nb)
+            until ior.eof?
+              break unless s = ior.read(nb)
               yield s
             end
           }
         end
 
         extend Forwardable
-        def_instance_delegators(:ioh,:readline,:readchar,:gets,:lineno)
+        def_instance_delegators(:ior,:readline,:readchar,:gets,:lineno)
       end 
     end 
   end

data/lib/rio/ops/stream/write.rb

@@ -39,16 +39,16 @@ module RIO
   module Ops
     module Stream
       module Write
-        def puts(*argv)    rtn_self { ioh.puts(*argv) } end
-        def puts!(*argv)   rtn_close { ioh.puts(*argv); } end
-        def putc(*argv)    rtn_self { ioh.putc(*argv) } end
-        def putc!(*argv)   rtn_close { ioh.putc(*argv) } end
-        def printf(*argv)  rtn_self { ioh.printf(*argv) } end
-        def printf!(*argv) rtn_close { ioh.printf(*argv) } end
-        def print(*argv)   rtn_self { ioh.print(*argv) } end
-        def print!(*argv)  rtn_close { ioh.print(*argv) } end
-        def write(*argv)   ioh.write(*argv) end
-        def write!(*argv)  then_close { ioh.write(*argv) } end
+        def puts(*argv)    rtn_self { iow.puts(*argv) } end
+        def puts!(*argv)   rtn_close { iow.puts(*argv); } end
+        def putc(*argv)    rtn_self { iow.putc(*argv) } end
+        def putc!(*argv)   rtn_close { iow.putc(*argv) } end
+        def printf(*argv)  rtn_self { iow.printf(*argv) } end
+        def printf!(*argv) rtn_close { iow.printf(*argv) } end
+        def print(*argv)   rtn_self { iow.print(*argv) } end
+        def print!(*argv)  rtn_close { iow.print(*argv) } end
+        def write(*argv)   iow.write(*argv) end
+        def write!(*argv)  then_close { iow.write(*argv) } end
         def _!(*argv) self.close.softreset end
         #       extend Forwardable
         #       def_instance_de

data/lib/rio/path.rb

@@ -71,7 +71,7 @@ module RIO
       protected
 
       def edir()
-        rl.path += '/' unless rl.path.empty? or rl.path[-1] == ?/
+        #rl.path += '/' unless rl.path.empty? or rl.path[-1] == ?/
         next_state = become('Dir::Existing')
         next_state.extend(Ops::Symlink::Existing) if symlink?
         next_state
@@ -97,7 +97,7 @@ module RIO
       def check?() not exist? end
 
       def ndir() 
-        rl.path += '/' unless rl.path.empty? or rl.path[-1] == ?/
+        #rl.path += '/' unless rl.path.empty? or rl.path[-1] == ?/
         become('Dir::NonExisting')
       end
       def nfile() become('File::NonExisting') end

data/lib/rio/path/reset.rb

@@ -44,7 +44,7 @@ module RIO
     # For now this is all states, but that could change
     class Reset < State::Base
       def base_state() 
-#        p "RETURNING WIERD BASE STATE"
+        #p "RETURNING WIERD BASE STATE"
         Reset 
       end
 

data/lib/rio/piper.rb

@@ -0,0 +1,123 @@
+#--
+# =============================================================================== 
+# 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>
+
+
+module RIO
+  module Piper #:nodoc: all
+    class Base
+      attr_reader :rios
+      def initialize(r1,r2,*args)
+        @rios = []
+        add_arg(r1)
+        add_arg(r2)
+        args.each { |r|
+          add_arg(r)
+        }
+      end
+      def add_arg(arg)
+        case arg
+        when Base
+          @rios += arg.rios
+        when Rio
+          case arg.scheme
+          when 'cmdpipe'
+            arg_piper = arg.rl.piper
+            @rios += arg_piper.rios
+          else
+            @rios << arg
+          end
+        else
+          raise ArgumentError,"Argument (#{arg}) is a #{arg.class}, should be a Rio or a Piper"
+        end
+      end
+      def initialize_copy(*args)
+        super
+        @rios = @rios.map{ |r| r.clone }
+      end
+      def has_output_dest?
+        case @rios[-1].scheme
+        when 'cmdio' then false
+        else true
+        end
+      end
+      def new_with(*args)
+        cp = self.clone
+        args.each { |r|
+          cp.push(r)
+        }
+        cp
+      end
+      def push(r)
+        @rios << r
+      end
+      def run_to(r)
+        @rios << r
+        run
+        self
+      end
+      def rd() @rios[-1] end
+      def wr() @rios[0] end
+      
+      def run
+        #dups = @rios.map { |r| r.clone }
+        dups = @rios
+        (1...dups.size-1).each { |i| dups[i].w! }
+        (1...dups.size).each { |i|
+          #p "#{dups[i-1].cx.inspect} > #{dups[i].cx.inspect}"
+          dups[i-1] > dups[i]
+          #p dups[i-1].closed?
+        }
+        dups.each { |r| r.close.softreset }
+        dups[-1]
+      end
+
+      def runeth
+        dups = @rios.map { |r| r.clone }
+
+        (1...dups.size-1).each { |i| dups[i].w! }
+        
+        threads = []
+        (1...dups.size).each { |i|
+          threads << Thread.new(dups[i-1],dups[i]) { |src,dst|
+            src > dst
+          } 
+        }
+        threads.each { |aThread| aThread.join }
+      end
+    end
+    
+  end
+end

data/lib/rio/piper/cp.rb

@@ -0,0 +1,81 @@
+#--
+# =============================================================================== 
+# 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>
+
+
+module RIO
+  module Piper #:nodoc: all
+    module Cp
+      module Util
+
+        protected
+
+        def process_pipe_arg_(npiper)
+          end_rio = npiper.rios[-1]
+          case end_rio.scheme
+          when 'cmdio'
+            new_rio(:cmdpipe,npiper)
+          when 'cmdpipe'
+            if end_rio.has_output_dest?
+              npiper.run
+              end_rio
+            else
+              new_rio(:cmdpipe,npiper)
+            end
+          else
+            npiper.run
+            end_rio
+          end
+        end
+
+      end
+      module Input
+        include Util
+        def |(arg)
+          #p "#{self} | #{arg}"
+          ario = ensure_cmd_rio(arg)
+          #cp = Rio.new(self.rl)
+          #cp.cx = self.cx.clone
+          #cp.ioh = self.ioh.clone unless self.ioh.nil?
+          cp = clone_rio()
+          npiper = Piper::Base.new(cp,ario)
+          process_pipe_arg_(npiper)
+        end
+      end
+    end
+  end
+end
+
+__END__