jobQueue 1.0.4 → 1.0.5

data/bin/prun.rb

@@ -39,7 +39,7 @@ ARGV.each do|f|
   # read file line per line
   lines = File.open(f).readlines.map(&:chomp)
   q     = SystemJobs.new(options[:workers],options[:debug])
-  puts q.workers if options[:debug]
+  puts "Run with #{q.workers} threads"
   lines.each {|line| q.push(line) }
   q.run
 end

data/gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name              = "jobQueue"
-  s.version           = '1.0.4'
+  s.version           = '1.0.5'
   s.platform          = Gem::Platform::RUBY
   s.bindir            = 'bin'
   s.files             = ["lib/jobqueue.rb","bin/prun.rb"] + ["gemspec","LICENSE","README.rdoc"]

data/lib/jobqueue.rb

@@ -93,11 +93,8 @@ class SystemJobs < JobQueue
     @threads = (1..@workers).map {|i|
       Thread.new(@queue,@debug) {|q,dbg|
         until ( q == ( task = q.deq ) )
-          if dbg
-            puts IO.popen(task.first).read
-          else
-            IO.popen(task.first)
-          end
+          ret = IO.popen(task.first).read
+          #puts ret if dbg
         end
       }
     }

data/test/test_jobqueue.rb

@@ -199,4 +199,42 @@ class TestJobQueue < Test::Unit::TestCase
     @jq.run
     (0..size).each {|i| assert_equal(2*i,a.h[i]) }
   end
+
+  def test_Shell
+    return true if @jq
+    script = Tempfile.open("jobQueue")
+    (1..8).each {|i| script << "date;echo #{i}; sleep 1\n" }
+    script.close
+    #puts script.path
+    #puts IO.popen("cat "+script.path).read
+
+    # test in debug mode
+    tstart = Time.new
+    puts IO.popen("bin/prun.rb -d -j 4 #{script.path}").read
+    tend = Time.new
+    trun = tend - tstart
+    assert(2.0 < trun,"Test (debug mode) runs to fast: #{trun}, lower limit 2")
+    assert(trun < 3  ,"Test (debug mode) runs to slow: #{trun}, upper limit 3")
+    # test in normal mode
+    tstart = Time.new
+    puts IO.popen("bin/prun.rb -j 4 #{script.path}").read
+    tend = Time.new
+    trun = tend - tstart
+    assert(2.0 < trun,"Test (normal mode) runs to fast: #{trun}, lower limit 2")
+    assert(trun < 3  ,"Test (normal mode) runs to slow: #{trun}, upper limit 3")
+    # with 8 threads
+    tstart = Time.new
+    puts IO.popen("bin/prun.rb -d -j 8 #{script.path}").read
+    tend = Time.new
+    trun = tend - tstart
+    assert(1.0 < trun,"Test (debug mode) runs to fast: #{trun}, lower limit 1")
+    assert(trun < 2.0,"Test (debug mode) runs to slow: #{trun}, lower limit 2")
+    # test in normal mode
+    tstart = Time.new
+    puts IO.popen("bin/prun.rb -j 8 #{script.path}").read
+    tend = Time.new
+    trun = tend - tstart
+    assert(1.0 < trun,"Test (debug mode) runs to fast: #{trun}, lower limit 1")
+    assert(trun < 2.0,"Test (debug mode) runs to slow: #{trun}, lower limit 2")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jobQueue
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000 Z
+date: 2012-01-17 00:00:00.000000000 Z
 dependencies: []
 description: Run Shell commands or Ruby methods in parallel
 email: stark.dreamdetective@gmail.com