jobQueue 1.0.8 → 1.0.9

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011, Ralf Mueller (stark.dreamdetective@googlemail.com)
+Copyright (c) 2011-2012, Ralf Mueller (stark.dreamdetective@googlemail.com)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/bin/prun.rb

@@ -9,7 +9,7 @@ require 'jobqueue'
 # ==============================================================================
 
 nTh      = SystemJobs.maxnumber_of_processors
-options  = {:workers => nTh,:debug => false}
+options  = {:workers => nTh,:debug => true}
 optparse = OptionParser.new do|opts|
   opts.banner = "Usage: prun.rb [options] command-files"
 
@@ -17,8 +17,12 @@ optparse = OptionParser.new do|opts|
   opts.on('-j [NUM]',"Number of worker threads (default:#{nTh})") do |num|
     options[:workers] = num.to_i.abs
   end
-  opts.on('-d','--debug','Print output from workers on stdout') do
-    options[:debug] = true
+  opts.on('-D','--no-debug','subpress output from workers') do
+    options[:debug] = false
+  end
+  opts.on('-v','--version','Print version nummer') do
+    puts '1.0.9'
+    exit
   end
   # This displays the help screen, all programs are
   # assumed to have this option.
@@ -39,7 +43,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 "Run with #{q.workers} threads"
+  puts "Run with #{q.workers} threads" if options[:debug]
   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.8'
+  s.version           = '1.0.9'
   s.platform          = Gem::Platform::RUBY
   s.bindir            = 'bin'
   s.files             = ["lib/jobqueue.rb","bin/prun.rb"] + ["gemspec","LICENSE","README.rdoc"]

data/lib/jobqueue.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
 require 'thread'
-require 'pp'
+require 'open3'
 # ==============================================================================
 # Author: Ralf Mueller, ralf.mueller@zmaw.de
 #         suggestions from Robert Klemme (https://www.ruby-forum.com/topic/68001#86298)
@@ -96,7 +95,12 @@ class SystemJobs < JobQueue
     @threads = (1..@workers).map {|i|
       Thread.new(@queue,@debug) {|q,dbg|
         until ( q == ( task = q.deq ) )
-          ret = IO.popen(task.first).read
+          _, stdout, stderr, _ = Open3.popen3(task.first)
+
+          # Create a thread to read from each stream
+          [stdout,stderr].map {|stdio|
+            Thread.new { puts $_ until stdio.gets.nil? }
+          }.each {|t| t.join} if dbg
         end
       }
     }

data/test/test_jobqueue.rb

@@ -212,7 +212,7 @@ class TestJobQueue < Test::Unit::TestCase
     script.close
     filename = script.path
     puts IO.popen("cat "+script.path).read
-    cmd = lambda {|np,script| "ruby -rubygems ./bin/prun.rb -d -j #{np} #{script}"}
+    cmd = lambda {|np,script| "ruby -rubygems ./bin/prun.rb -j #{np} #{script}"}
 
     # test in debug mode
     tstart = Time.new

metadata

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