subexec 0.2.2 → 0.2.3

data/lib/subexec.rb

@@ -1,32 +1,32 @@
 # # Subexec
 # * by Peter Kieltyka
 # * http://github/nulayer/subexec
-# 
+#
 # ## Description
-# 
+#
 # Subexec is a simple library that spawns an external command with
 # an optional timeout parameter. It relies on Ruby 1.9's Process.spawn
 # method. Also, it works with synchronous and asynchronous code.
-# 
+#
 # Useful for libraries that are Ruby wrappers for CLI's. For example,
 # resizing images with ImageMagick's mogrify command sometimes stalls
 # and never returns control back to the original process. Subexec
 # executes mogrify and preempts if it gets lost.
-# 
+#
 # ## Usage
-# 
+#
 # # Print hello
 # sub = Subexec.run "echo 'hello' && sleep 3", :timeout => 5
 # puts sub.output     # returns: hello
 # puts sub.exitstatus # returns: 0
-# 
+#
 # # Timeout process after a second
 # sub = Subexec.run "echo 'hello' && sleep 3", :timeout => 1
-# puts sub.output     # returns: 
+# puts sub.output     # returns:
 # puts sub.exitstatus # returns:
 
 class Subexec
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 
   attr_accessor :pid,
                 :command,
@@ -41,7 +41,7 @@ class Subexec
     sub.run!
     sub
   end
-  
+
   def initialize(command, options={})
     self.command    = command
     self.lang       = options[:lang]      || "C"
@@ -49,7 +49,7 @@ class Subexec
     self.log_file   = options[:log_file]
     self.exitstatus = 0
   end
-  
+
   def run!
     if RUBY_VERSION >= '1.9' && RUBY_ENGINE != 'jruby'
       spawn
@@ -60,43 +60,43 @@ class Subexec
 
 
   private
-  
+
     def spawn
       # TODO: weak implementation for log_file support.
       # Ideally, the data would be piped through to both descriptors
-      r, w = IO.pipe      
-      if !log_file.nil?
-        self.pid = Process.spawn({'LANG' => self.lang}, command, [:out, :err] => [log_file, 'a'])
-      else
-        self.pid = Process.spawn({'LANG' => self.lang}, command, STDERR=>w, STDOUT=>w)
-      end
+      r, w = IO.pipe
+
+      log_to_file = !log_file.nil?
+      log_opts = log_to_file ? {[:out, :err] => [log_file, 'a']} : {STDERR=>w, STDOUT=>w}
+      self.pid = Process.spawn({'LANG' => self.lang}, command, log_opts)
       w.close
-      
+
       @timer = Time.now + timeout
       timed_out = false
 
-      waitpid = Proc.new do
-        begin
-          flags = (timeout > 0 ? Process::WUNTRACED|Process::WNOHANG : 0)
-          Process.waitpid(pid, flags)
+      self.output = ''
+
+      append_to_output = Proc.new do
+        self.output << r.readlines.join('')  unless log_to_file
+      end
+
+      loop do
+        ret = begin
+          Process.waitpid(pid, Process::WUNTRACED|Process::WNOHANG)
         rescue Errno::ECHILD
           break
         end
-      end
 
-      if timeout > 0
-        loop do
-          ret = waitpid.call
+        break if ret == pid
 
-          break if ret == pid
-          sleep 0.01
-          if Time.now > @timer
-            timed_out = true
-            break
-          end
+        append_to_output.call
+
+        if timeout > 0 && Time.now > @timer
+          timed_out = true
+          break
         end
-      else
-        waitpid.call
+
+        sleep 0.01
       end
 
       if timed_out
@@ -106,18 +106,18 @@ class Subexec
       else
         # The subprocess exited on its own
         self.exitstatus = $?.exitstatus
-        self.output = r.readlines.join("")
+        append_to_output.call
       end
       r.close
-      
+
       self
     end
-  
+
     def exec
       if !(RUBY_PLATFORM =~ /win32|mswin|mingw/).nil?
         self.output = `set LANG=#{lang} && #{command} 2>&1`
       else
-        self.output = `LANG=#{lang} && export $LANG && #{command} 2>&1`
+        self.output = `LANG=#{lang} && export LANG && #{command} 2>&1`
       end
       self.exitstatus = $?.exitstatus
     end

metadata

@@ -1,48 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: subexec
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.2.3
+  prerelease:
 platform: ruby
 authors:
 - Peter Kieltyka
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
+    none: false
+  prerelease: false
+  type: :development
 description: Subexec spawns a subprocess with an optional timeout
 email:
 - peter@nulayer.com
@@ -53,28 +55,36 @@ files:
 - README.md
 - lib/subexec.rb
 homepage: http://github.com/nulayer/subexec
-licenses: []
-post_install_message: 
+licenses:
+- MIT
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      segments:
+      - 0
+      version: !binary |-
+        MA==
+      hash: 2
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      segments:
+      - 0
+      version: !binary |-
+        MA==
+      hash: 2
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: Subexec spawns a subprocess with an optional timeout
 test_files: []
-has_rdoc: