rio 0.4.2 → 0.5.1

data/lib/rio/ops/stream/read.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
-#
 
 
 
@@ -59,7 +48,7 @@ module RIO
 
         public
 
-        def contents()                  _post_eof_close { ior.gets(nil) || "" }         end
+        def contents()                  _post_eof_close { ior.read || "" }         end
         def readlines(*args)            _post_eof_close { ior.readlines(*args) }        end
         def each_line(*args,&block)     
           _post_eof_close { ior.each_line(*args,&block) } 

data/lib/rio/ops/stream/write.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
-#
 
 
 module RIO

data/lib/rio/ops/symlink.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
-#
 
 
 # module RIO
@@ -53,7 +42,9 @@ module RIO
       module Existing
         include ExistOrNot
         def delete(*args)
-          rm(*args)
+          rtn_reset {
+            fs.delete(self.to_s)
+          }
         end
         def unlink(*args)
           delete(*args)

data/lib/rio/path.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,29 +18,22 @@
 # 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/state'
 require 'rio/ops/path'
 require 'rio/ops/symlink'
 require 'rio/cp'
-module RIO
 
+module RIO
+  
   module Path #:nodoc: all
+
+
+
     # Empty: 
     #  nil? or empty? => Emp
     #  else => Sin
@@ -51,12 +44,12 @@ module RIO
       private
 
       def _assume_cwd()
-        self.rl = Path::RL.new('.')
+        self.rl = Path::RRL.new('.')
         self.softreset
       end
       def _assume_stdio()
         require 'rio/scheme/stdio'
-        self.rl = RIO::StdIO::RL.new
+        self.rl = RIO::StdIO::RRL.new
         self.softreset
       end
 

data/lib/rio/path/reset.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
-#
 
 
 # cell phone number: 954-6752.

data/lib/rio/piper.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
-#
 
 
 module RIO
@@ -103,19 +92,6 @@ module RIO
         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

data/lib/rio/piper/cp.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
-#
 
 
 module RIO
@@ -41,36 +30,70 @@ module RIO
 
         protected
 
-        def process_pipe_arg_(npiper)
-          end_rio = npiper.rios[-1]
-          case end_rio.scheme
+        def process_pipe_arg0_(npiper)
+          erio = npiper.rios[-1]
+          case erio.scheme
           when 'cmdio'
             new_rio(:cmdpipe,npiper)
           when 'cmdpipe'
-            if end_rio.has_output_dest?
+            if erio.has_output_dest?
               npiper.run
-              end_rio
+              erio
             else
               new_rio(:cmdpipe,npiper)
             end
           else
             npiper.run
-            end_rio
+            erio
+          end
+        end
+
+        def process_pipe_arg_(ario)
+          case ario.scheme
+          when 'cmdio'
+            new_rio(:cmdpipe,ario)
+          when 'cmdpipe'
+            new_rio(:cmdpipe,ario)
+          else
+            new_rio(:cmdpipe,ario)
           end
         end
 
       end
       module Input
         include Util
+        #def last_rio(r)
+        #  r.scheme == 'cmdpipe' ? last_rio(r.rl.query[-1]) : r
+        #end
+        def last_rio(r)
+          r = r.rl.query[-1] while r.scheme == 'cmdpipe'
+          r
+        end
+        #define_method(:last_rio) do |r|
+        #  if r.scheme == 'cmdpipe'
+        #    r = r.rl.query[-1]
+        #    redo
+        #  else
+        #    r
+        #  end
+        #end
+        def has_output_dest?(nrio)
+          !%w[cmdio cmdpipe].include?(last_rio(nrio).scheme)
+        end
+
         def |(arg)
-          #p "#{self} | #{arg}"
+          #p 'HERE 3'
           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)
+          nrio = new_rio(:cmdpipe,self.clone_rio,ario)
+          
+          if has_output_dest?(nrio) 
+            #p 'nrio.run'
+            nrio.run 
+          else
+            #p 'nrio'
+            nrio
+          end
+
         end
       end
     end

data/lib/rio/prompt.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
-#
 
 #
 

data/lib/rio/rectype.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
-#
 
 
 module RIO
@@ -43,6 +32,9 @@ module RIO
           #p callstr('get_',sep_string.inspect)
           self.ior.gets(sep_string)
         end
+        def io_enum
+          self.ior.to_enum
+        end
         def each_rec_(&block) 
           ih = self.ior
           ih.each_line { |line|
@@ -55,8 +47,8 @@ module RIO
       module Output
         def put_(rec,*args)
           #p callstr('put_',rec,*args)
-          #p self.ioh
-          self.ioh.print(rec.to_s)
+          #p self.ioh.ios
+          self.iow.print(rec.to_s)
         end  
       end
     end