lib/rio/scheme/cmdio.rb in rio-0.4.2 vs lib/rio/scheme/cmdio.rb in rio-0.5.1

@@ -1,8 +1,8 @@
 #--
-# =============================================================================== 
-# 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.
 #
 # Rio is free software; you can redistribute it and/or modify
@@ -16,65 +16,96 @@
 # 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
-#  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/stream'
+require 'rio/stream/open'
+require 'rio/fibpipe'
+require 'rio/rrl/ioi'
+require 'rio/rrl/chmap'
 
+
+
 module RIO
   module CmdIO #:nodoc: all
-    require 'rio/rl/ioi'
-    RESET_STATE = 'Stream::Duplex::Open'
+     RESET_STATE = 'Stream::Duplex::Open'
 
-    class RL < RL::SysIOBase 
+    class RRL < RRL::SysIOBase 
       RIOSCHEME = 'cmdio'
-      RIOPATH = RIO::RL::CHMAP.invert[RIOSCHEME].to_s.freeze
-      attr_reader :cmd
-      def initialize(cmd="")
-        case cmd
-        when self.class then @cmd = cmd.cmd
-        else @cmd = cmd
+      RIOPATH = RIO::RRL::CHMAP.invert[RIOSCHEME].to_s.freeze
+      
+      attr_reader :ior,:iow
+      def initialize(u,*a)
+        # p "CMDIO initialize: u=#{u.inspect} a=#{a.inspect}"
+        super(u)
+        a = a.map(&:to_s)
+        com = case c = a.shift
+              when self.class then c.cmd
+              else c
+              end
+        unless com.nil?
+          self.path = com
+          self.query = a
         end
-        super
       end
-      def opaque() 
-        URI.escape(@cmd,RIO::RL::ESCAPE)
+      extend Forwardable
+      def_delegators :uri, :path=, :path
+      def query
+        uri.query
       end
+      def query=(args)
+        uri.query = args
+      end
+      def self.parse(*a)
+        u = a.shift.sub(/^rio:/,'')
+        new(u,*a)
+      end
+      alias :cmd :path
+      alias :args :query
+      def fib_proc(m)
+        #fibproc
+        #p "CMD=#{cmd},args=#{args.inspect}"
+        poargs = args.nil? ? cmd : [cmd,args]
+        if m.allows_write?
+          Cmd::FibPipeProc.new(poargs,m.to_s)
+        else
+          Cmd::FibSourceProc.new(poargs,m.to_s)
+        end
+      end
+
       def to_s()
-        @cmd
+        [cmd,args].flatten.join(' ').strip
       end
       def open(m)
-        #p "opening #{@cmd}"
-        #raise RuntimeError, "Should Not Open"
-        super(::IO.popen(@cmd,m.to_s))
+        poarg = args.nil? ? cmd : [cmd,args].flatten
+        #p "CMDIO poarg=#{poarg.inspect}"
+        io = IO.popen(poarg,m.to_s)
+        super(io)
       end
 
-      # must be able to process
-      # parse('rio:cmdio',cmd)
-      # parse('rio:cmdio:escaped_cmd')
-      SPLIT_RE = %r|(?:(.+))$|.freeze
-      def self.splitrl(s)
-        sub,opq,whole = split_riorl(s)
-        if bm = SPLIT_RE.match(opq)
-          escaped_cmd = bm[1]
-          cmd = URI.unescape(escaped_cmd)
-          [cmd]
-        end
-      end
 
+    end
+  end
+  module Stream
+    module Duplex
+      class Open < RIO::Stream::Open
+        include Piper::Cp::Input
+        
+        def cmd() rl.path end
+        def cmd_args() rl.query end
+        #def cmd_str() [cmd,cmd_args].flatten.join(' ') end
+        #def |(arg)
+        #  #p "CMDIO#| #{self}|#{arg}"
+        #  nrio = new_rio(:cmdpipe,self,arg)
+        #  end_rio = nrio.rl.query[-1]
+        #  p "CmdIO#end_rio=#{end_rio}"
+        #  nrio
+        #end
+      end
     end
   end
 end