ruby_process 0.0.5 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.7

data/lib/ruby_process.rb

@@ -74,11 +74,16 @@ class Ruby_process
     if args and args[:exec]
       cmd = "#{args[:exec]}"
     else
-      cmd = "ruby"
+      if !ENV["rvm_ruby_string"].to_s.empty?
+        cmd = "#{ENV["rvm_ruby_string"]}"
+      else
+        cmd = "ruby"
+      end
     end
     
     cmd << " \"#{File.realpath(File.dirname(__FILE__))}/../scripts/ruby_process_script.rb\" --pid=#{@my_pid}"
     cmd << " --debug" if @args[:debug]
+    cmd << " \"--title=#{@args[:title]}\"" if !@args[:title].to_s.strip.empty?
     
     #Start process and set IO variables.
     require "open3"
@@ -117,7 +122,7 @@ class Ruby_process
         self.destroy
       end
       
-      return nil
+      return self
     else
       return self
     end
@@ -164,7 +169,7 @@ class Ruby_process
   
   #Sends a command to the other process. This should not be called manually, but is used by various other parts of the framework.
   def send(obj, &block)
-    raise "Ruby-process is dead." if !alive?
+    alive_check!
     
     #Parse block.
     if block
@@ -196,11 +201,22 @@ class Ruby_process
       :type => :send,
       :obj => obj
     ))
+    @answers[id] = Queue.new
     @io_out.puts(line)
-    sleep 0.001
+    
     return answer_read(id)
   end
   
+  #Returns true if the child process is still running. Otherwise false.
+  def alive?
+    begin
+      self.alive_check!
+      return true
+    rescue
+      return false
+    end
+  end
+  
   private
   
   def debug(str_full)
@@ -215,15 +231,14 @@ class Ruby_process
     end
   end
   
-  #Returns true if the child process is still running. Otherwise false.
-  def alive?
-    return false if !@io_out or !@io_in or @io_in.closed?
-    return true
-  end
-  
   #Raises an error if the subprocess is no longer alive.
   def alive_check!
-    raise "Process is dead." unless alive?
+    raise "No 'io_out'." if !@io_out
+    raise "No 'io_in'." if !@io_in
+    raise "'io_in' was closed." if @io_in.closed?
+    raise "No listen thread." if !@thr_listen
+    raise "Listen thread wasnt alive?" if !@thr_listen.alive?
+    
     return nil
   end
   
@@ -267,39 +282,29 @@ class Ruby_process
   #Waits for an answer to appear in the answers-hash. Then deletes it from hash and returns it.
   def answer_read(id)
     debug "Waiting for answer #{id}\n" if @debug
+    answer = @answers[id].pop
     
-    loop do
-      if @answers.key?(id)
-        debug "Returning answer #{id}\n" if @debug
-        answer = @answers[id]
-        @answers.delete(id)
-        
-        if answer.is_a?(Hash) and answer[:type] == :error and answer.key?(:class) and answer.key?(:msg) and answer.key?(:bt)
-          begin
-            raise "#{answer[:class]}: #{answer[:msg]}"
-          rescue => e
-            bt = []
-            answer[:bt].each do |btline|
-              bt << "(#{@pid}): #{btline}"
-            end
-            
-            bt += e.backtrace
-            e.set_backtrace(bt)
-            raise e
-          end
-        elsif answer.is_a?(Hash) and answer[:type] == :proxy_obj and answer.key?(:id)
-          return proxyobj_get(answer[:id], answer[:pid])
+    debug "Returning answer #{id}\n" if @debug
+    @answers.delete(id)
+    
+    if answer.is_a?(Hash) and answer[:type] == :error and answer.key?(:class) and answer.key?(:msg) and answer.key?(:bt)
+      begin
+        raise "#{answer[:class]}: #{answer[:msg]}"
+      rescue => e
+        bt = []
+        answer[:bt].each do |btline|
+          bt << "(#{@pid}): #{btline}"
         end
         
-        return answer
+        bt += e.backtrace
+        e.set_backtrace(bt)
+        raise e
       end
-      
-      debug "No answer by ID #{id} - sleeping...\n" if @debug
-      sleep 0.01
-      alive_check!
-      raise @listen_err if @listen_err
-      raise "Not listening." if !@thr_listen or !@thr_listen.alive?
+    elsif answer.is_a?(Hash) and answer[:type] == :proxy_obj and answer.key?(:id)
+      return proxyobj_get(answer[:id], answer[:pid])
     end
+    
+    return answer
   end
   
   #Starts the listen-thread that listens for, and executes, commands.
@@ -336,9 +341,9 @@ class Ruby_process
               data = Base64.strict_encode64(Marshal.dump(:type => :answer, :id => obj[:id], :answer => res))
               @io_out.puts(data)
             end
-          elsif obj[:type] == :answer
-            debug "Answer #{obj[:id]} saved.\n" if @debug
-            @answers[obj[:id]] = obj[:answer]
+          elsif obj[:type] == :answer and id = obj[:id].to_i
+            debug "Answer #{id} saved.\n" if @debug
+            @answers[id] << obj[:answer]
           else
             raise "Unknown object: '#{obj}'."
           end
@@ -363,39 +368,4 @@ class Ruby_process
       end
     end
   end
-end
-
-#This class handels the calling of methods on objects in the other process seamlessly.
-class Ruby_process::Proxyobj
-  #Hash that contains various information about the proxyobj.
-  attr_reader :args
-  
-  #Constructor. This should not be called manually but through a running 'Ruby_process'.
-  #===Examples
-  # proxy_obj = rp.new(:String, "Kasper") #=> <Ruby_process::Proxyobj>
-  # proxy_obj = rp.static(:File, :open, "/tmp/somefile") #=> <Ruby_process::Proxyobj>
-  def initialize(args)
-    @args = args
-  end
-  
-  #Returns the object as the real object transfered by using the marshal-lib.
-  #===Examples
-  # str = rp.new(:String, "Kasper") #=> <Ruby_process::Proxyobj>
-  # str.__rp_marshal #=> "Kasper"
-  def __rp_marshal
-    return Marshal.load(@args[:rp].send(:cmd => :obj_marshal, :id => @args[:id]))
-  end
-  
-  #Proxies all calls to the process-object.
-  #===Examples
-  # str = rp.new(:String, "Kasper") #=> <Ruby_process::Proxyobj::1>
-  # length_int = str.length #=> <Ruby_process::Proxyobj::2>
-  # length_int.__rp_marshal #=> 6
-  def method_missing(method, *args, &block)
-    debug "Method-missing-args-before: #{args} (#{@my_pid})\n" if @debug
-    real_args = @args[:rp].parse_args(args)
-    debug "Method-missing-args-after: #{real_args}\n" if @debug
-    
-    return @args[:rp].send(:cmd => :obj_method, :id => @args[:id], :method => method, :args => real_args, &block)
-  end
 end

data/lib/ruby_process_cproxy.rb

@@ -27,8 +27,15 @@ class Ruby_process::Cproxy
     @@lock.synchronize do
       @@instances += 1
       
+      #Check if the sub-process is alive.
+      if @@subproc and !@@subproc.alive?
+        @@subproc.destroy
+        @@subproc = nil
+      end
+      
+      #Start a new subprocess if none is defined and active.
       if !@@subproc
-        @@subproc = Ruby_process.new
+        @@subproc = Ruby_process.new(:title => "cproxy", :debug => false)
         @@subproc.spawn_process
       end
     end

data/lib/ruby_process_proxyobj.rb

@@ -0,0 +1,50 @@
+#This class handels the calling of methods on objects in the other process seamlessly.
+class Ruby_process::Proxyobj
+  #Hash that contains various information about the proxyobj.
+  attr_reader :args
+  
+  #Constructor. This should not be called manually but through a running 'Ruby_process'.
+  #===Examples
+  # proxy_obj = rp.new(:String, "Kasper") #=> <Ruby_process::Proxyobj>
+  # proxy_obj = rp.static(:File, :open, "/tmp/somefile") #=> <Ruby_process::Proxyobj>
+  def initialize(args)
+    @args = args
+  end
+  
+  #Returns the object as the real object transfered by using the marshal-lib.
+  #===Examples
+  # str = rp.new(:String, "Kasper") #=> <Ruby_process::Proxyobj>
+  # str.__rp_marshal #=> "Kasper"
+  def __rp_marshal
+    return Marshal.load(@args[:rp].send(:cmd => :obj_marshal, :id => @args[:id]))
+  end
+  
+  #Overwrite certain convert methods.
+  RUBY_METHODS = [:to_i, :to_s, :to_str, :to_f]
+  RUBY_METHODS.each do |method_name|
+    define_method(method_name) do |*args, &blk|
+      return @args[:rp].send(:cmd => :obj_method, :id => @args[:id], :method => method_name, :args => args, &blk).__rp_marshal
+    end
+  end
+  
+  #Overwrite certain methods.
+  PROXY_METHODS = [:send]
+  PROXY_METHODS.each do |method_name|
+    define_method(method_name) do |*args, &blk|
+      self.method_missing(method_name, *args, &blk)
+    end
+  end
+  
+  #Proxies all calls to the process-object.
+  #===Examples
+  # str = rp.new(:String, "Kasper") #=> <Ruby_process::Proxyobj::1>
+  # length_int = str.length #=> <Ruby_process::Proxyobj::2>
+  # length_int.__rp_marshal #=> 6
+  def method_missing(method, *args, &block)
+    debug "Method-missing-args-before: #{args} (#{@my_pid})\n" if @debug
+    real_args = @args[:rp].parse_args(args)
+    debug "Method-missing-args-after: #{real_args}\n" if @debug
+    
+    return @args[:rp].send(:cmd => :obj_method, :id => @args[:id], :method => method, :args => real_args, &block)
+  end
+end

data/ruby_process.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby_process}
-  s.version = "0.0.5"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-10-14}
+  s.date = %q{2012-10-16}
   s.description = %q{A framework for spawning and communicating with other Ruby-processes}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -37,9 +37,11 @@ Gem::Specification.new do |s|
     "include/args_handeling.rb",
     "lib/ruby_process.rb",
     "lib/ruby_process_cproxy.rb",
+    "lib/ruby_process_proxyobj.rb",
     "ruby_process.gemspec",
     "scripts/ruby_process_script.rb",
     "spec/cproxy_spec.rb",
+    "spec/hard_load_spec.rb",
     "spec/ruby_process_spec.rb",
     "spec/spec_helper.rb"
   ]

data/scripts/ruby_process_script.rb

@@ -13,8 +13,10 @@ pid = nil
 ARGV.each do |arg|
   if arg == "--debug"
     debug = true
-  elsif match = arg.match(/--pid=(\d+)/)
+  elsif match = arg.match(/--pid=(\d+)$/)
     pid = match[1].to_i
+  elsif match = arg.match(/--title=(.+)$/)
+    #ignore - its for finding process via 'ps aux'.
   else
     raise "Unknown argument: '#{arg}'."
   end

data/spec/hard_load_spec.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "RubyProcess" do
+  it "should be able to do basic stuff" do
+    Ruby_process::Cproxy.run do |data|
+      sp = data[:subproc]
+      sp.new(:String, "Wee")
+      
+      ts = []
+      
+      1.upto(50) do |tcount|
+        ts << Thread.new do
+          1.upto(250) do
+            str = sp.new(:String, "Kasper Johansen")
+            
+            res1 = str.include?("Kasper")
+            str << " More"
+            
+            res2 = str.include?("Johansen")
+            str << " Even more"
+            
+            res3 = str.include?("Christina")
+            str << " Much more"
+            
+            raise "Expected res1 to be true but it wasnt: '#{res1}'." if res1 != true
+            raise "Expected res2 to be true but it wasnt: '#{res2}'." if res2 != true
+            raise "Expected res3 to be false but it wasnt: '#{res3}'." if res3 != false
+            
+            print "."
+          end
+        end
+      end
+      
+      ts.each do |t|
+        t.join
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_process
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 +02:00
+date: 2012-10-16 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wref
-  requirement: &12566380 !ruby/object:Gem::Requirement
+  requirement: &19833520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12566380
+  version_requirements: *19833520
 - !ruby/object:Gem::Dependency
   name: tsafe
-  requirement: &12565660 !ruby/object:Gem::Requirement
+  requirement: &19832660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12565660
+  version_requirements: *19832660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12564900 !ruby/object:Gem::Requirement
+  requirement: &19831800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *12564900
+  version_requirements: *19831800
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &12564260 !ruby/object:Gem::Requirement
+  requirement: &19830660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *12564260
+  version_requirements: *19830660
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &12563400 !ruby/object:Gem::Requirement
+  requirement: &19828180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *12563400
+  version_requirements: *19828180
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &12562600 !ruby/object:Gem::Requirement
+  requirement: &19827260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *12562600
+  version_requirements: *19827260
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &12561560 !ruby/object:Gem::Requirement
+  requirement: &19826400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +88,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12561560
+  version_requirements: *19826400
 description: A framework for spawning and communicating with other Ruby-processes
 email: k@spernj.org
 executables: []
@@ -117,9 +117,11 @@ files:
 - include/args_handeling.rb
 - lib/ruby_process.rb
 - lib/ruby_process_cproxy.rb
+- lib/ruby_process_proxyobj.rb
 - ruby_process.gemspec
 - scripts/ruby_process_script.rb
 - spec/cproxy_spec.rb
+- spec/hard_load_spec.rb
 - spec/ruby_process_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -138,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4244816793884101144
+      hash: 1714435591026867569
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: