splib 1.4.1 → 1.4.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+1.4.2
+    * Modify Float#within_delta? to use #between? like any
+        reasonable person would
+    * Add a priority setting for Splib.exec
+    * Add process tracking with Splib.exec so we don't leave
+        children laying around if we get shutdown
 1.4.1
     * Updates in Monitor to attempt to force
         threads to stay put

data/Rakefile

@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
     s.name              = 'splib'
     s.author            = 'spox'
     s.email             = 'spox@modspox.com'
-    s.version           = '1.4.1'
+    s.version           = '1.4.2'
     s.summary           = 'Spox Library'
     s.platform          = Gem::Platform::RUBY
     s.files             = %w(LICENSE README.rdoc CHANGELOG Rakefile) + Dir.glob("{bin,lib,spec,test}/**/*")

data/lib/splib/Exec.rb

@@ -2,6 +2,13 @@ require 'timeout'
 
 module Splib
 
+    @@processes = []
+    Kernel.at_exit{@@processes.each{|p| Process.kill('KILL', pro.pid) }}
+
+    # Returns current array of running Processes
+    def self.running_procs
+        @@processes
+    end
     # command:: command string to execute
     # timeout:: length of time to execute
     # maxbytes:: maximum number return bytes allowed
@@ -18,17 +25,23 @@ module Splib
     # command:: command to execute
     # timeout:: maximum number of seconds to run
     # maxbytes:: maximum number of result bytes to accept
+    # priority:: set priority of the process
     # Execute a system command (use with care)
     # This is the normal exec command that is used
-    def self.standard_exec(command, timeout=10, maxbytes=500)
-        timout = timeout.to_i
+    def self.standard_exec(command, timeout=10, maxbytes=500, priority=nil)
+        timeout = timeout.to_i
         maxbytes = maxbytes.to_i
+        priority = priority.to_i
         output = []
         pro = nil
         begin
             if(timeout > 0)
                 Timeout::timeout(timeout) do
                     pro = IO.popen(command)
+                    @@processes << pro
+                    if(priority > 0)
+                        Process.setpriority(Process::PRIO_PROCESS, pro.pid, priority)
+                    end
                     until(pro.closed? || pro.eof?)
                         output << pro.getc.chr
                         if(maxbytes > 0 && output.size > maxbytes)
@@ -38,6 +51,7 @@ module Splib
                 end
             else
                 pro = IO.popen(command)
+                @@processes << pro
                 until(pro.closed? || pro.eof?)
                     output << pro.getc.chr
                     if(maxbytes > 0 && output.size > maxbytes)
@@ -48,6 +62,7 @@ module Splib
             output = output.join('')
         ensure
             Process.kill('KILL', pro.pid) if Process.waitpid2(pro.pid, Process::WNOHANG).nil? # make sure the process is dead
+            @@processes.delete(pro)
         end
         return output
     end
@@ -58,6 +73,7 @@ module Splib
     # command:: command to execute
     # timeout:: maximum number of seconds to run
     # maxbytes:: maximum number of result bytes to accept
+    # priority:: set priority of the process
     # Execute a system command (use with care)
     # This is the threaded exec command that is generally used
     # with JRuby. The regular timeout does not work when executing
@@ -66,6 +82,7 @@ module Splib
     def self.thread_exec(command, timeout=10, maxbytes=500)
         timeout = timeout.to_i
         maxbytes = maxbytes.to_i
+        priority = priority.to_i
         current = Thread.current
         output = []
         pro = nil
@@ -73,6 +90,10 @@ module Splib
             boom = Complete.new
             begin
                 pro = IO.popen(command)
+                @@processes << pro
+                if(priority > 0)
+                    Process.setpriority(Process::PRIO_PROCESS, pro.pid, priority)
+                end
                 until(pro.closed? || pro.eof?)
                     output << pro.getc.chr
                     if(maxbytes > 0 && output.size > maxbytes)
@@ -85,13 +106,21 @@ module Splib
             current.raise boom unless boom.is_a?(Timeout::Error)
         end
         begin
-            timeout > 0 ? sleep(timeout) : sleep
-            thread.raise Timeout::Error.new
-            raise Timeout::Error.new
-        rescue Complete
-            # do nothing
+            begin
+                if(timeout > 0)
+                    thread.join(timeout)
+                    thread.raise Timeout::Error.new
+                    raise Timeout::Error.new
+                else
+                    thread.join
+                end
+                output.join('')
+            rescue Complete
+                # ignore this exception
+            end
         ensure
             Process.kill('KILL', pro.pid) unless pro.nil?
+            @@processes.delete(pro)
         end
         output.join('')
     end

data/lib/splib/Float.rb

@@ -7,12 +7,7 @@ module Splib
             raise ArgumentError.new('Missing required argument: :delta') unless args[:delta]
             e = args[:expected].to_f
             d = args[:delta].to_f
-            mult = 0
-            if(pos = d.to_s.index('.'))
-                mult = (d.to_s.length - (pos + 1))
-            end
-            mult = 10 ** mult
-            ((e*mult) - (self*mult)).abs <= (d*mult)
+            self.between?(e-d, e+d)
         end
     end
 end

data/test/cases/Exec.rb

@@ -15,4 +15,16 @@ class ExecTest < Test::Unit::TestCase
         end
         assert_equal("test\n", Splib.exec('echo test'))
     end
+
+    def test_running
+        output = nil
+        Thread.new do
+            output = Splib.exec('ruby -e \'sleep(0.4); puts "done"\'')
+        end
+        sleep(0.1)
+        assert_equal(1, Splib.running_procs.size)
+        sleep(0.5)
+        assert_equal("done\n", output)
+        assert_equal(0, Splib.running_procs.size)
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: splib
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors: 
 - spox
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 -08:00
+date: 2010-01-29 00:00:00 -08:00
 default_executable: 
 dependencies: []