php_process 0.0.3 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.5

data/lib/php_process.rb

@@ -61,9 +61,13 @@ class Php_process
         @args[:on_err].call(str) if @args[:on_err]
         $stderr.print "Process error: #{str}" if @debug or @args[:debug_stderr]
         
-        if str.match(/^PHP Fatal error: (.+)\s+/)
+        if str.match(/^PHP Fatal error: (.+)\s*/)
           @fatal = str.strip
+        elsif str.match(/^Killed\s*$/)
+          @fatal = "Process was killed."
         end
+        
+        break if (!@args and str.to_s.strip.length <= 0) or (@stderr and @stderr.closed?)
       end
     end
     
@@ -316,6 +320,8 @@ class Php_process
   def start_read_loop
     @thread = Knj::Thread.new do
       @stdout.lines do |line|
+        break if line == nil or @stdout.closed?
+        
         data = line.split(":")
         args = PHP.unserialize(Base64.strict_decode64(data[2].strip))
         type = data[0]

data/lib/php_script.php

@@ -39,7 +39,7 @@ class php_process{
     $id = intval($data[1]);
     $args = unserialize(base64_decode($data[2]));
     if ($args === false){
-      throw new exception("The args-data was not unserializeable: " . utf8_encode(base64_decode($data[2])));
+      throw new exception("The args-data was not unserializeable: " . base64_decode($data[2]));
     }
     
     try{

data/php_process.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{php_process}
-  s.version = "0.0.3"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]

metadata

@@ -2,7 +2,7 @@
 name: php_process
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -690325750737638364
+      hash: -1085351998058726147
       segments: 
       - 0
       version: "0"