jobQueue 1.0.9 → 1.0.10

data/README.rdoc

@@ -80,6 +80,8 @@ please use personal mail, ruby-lang mailing list or github
 
 == Changelog
 
+* 1.0.10: more flexible logging control (new switches '-l' and '-b'
+* 1.0.9: print out stdout and stderr from the jobs given to prun.rb, use '-D' to avoid printing
 * 1.0.8: support AIX for getting the maximum number of processors, improve processor count for jruby and rbx
 
 == Credits
@@ -99,6 +101,6 @@ jobQueue use the BSD License
 
 Author::   Ralf Mueller <stark.dreamdetective@gmail.com>
 Requires:: Ruby 1.9 or later
-License::  Copyright 2011-2012 by Ralf Mueller
+License::  Copyright 2011-2013 by Ralf Mueller
            Released under BSD-style license.  See the LICENSE
            file included in the distribution.

data/bin/prun.rb

@@ -9,7 +9,7 @@ require 'jobqueue'
 # ==============================================================================
 
 nTh      = SystemJobs.maxnumber_of_processors
-options  = {:workers => nTh,:debug => true}
+options  = {:workers => nTh,:debug => :buffered}
 optparse = OptionParser.new do|opts|
   opts.banner = "Usage: prun.rb [options] command-files"
 
@@ -18,10 +18,16 @@ optparse = OptionParser.new do|opts|
     options[:workers] = num.to_i.abs
   end
   opts.on('-D','--no-debug','subpress output from workers') do
-    options[:debug] = false
+    options[:debug] = :off
+  end
+  opts.on('-l','--logging','stdout and stderr are printed as produced by the child processes') do
+    options[:debug] = :flushed
+  end
+  opts.on('-b','--buffering','stdout and stderr are buffered and printed when jobs are finished (default)') do
+    options[:debug] = :buffered
   end
   opts.on('-v','--version','Print version nummer') do
-    puts '1.0.9'
+    puts '1.0.10'
     exit
   end
   # This displays the help screen, all programs are
@@ -43,7 +49,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" if options[:debug]
+  puts "Run with #{q.workers} threads" unless :off == 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.9'
+  s.version           = '1.0.10'
   s.platform          = Gem::Platform::RUBY
   s.bindir            = 'bin'
   s.files             = ["lib/jobqueue.rb","bin/prun.rb"] + ["gemspec","LICENSE","README.rdoc"]

data/lib/jobqueue.rb

@@ -11,7 +11,7 @@ class JobQueue
   attr_reader :workers, :threads
 
   # Create a new queue qith a given number of worker threads
-  def initialize(nWorkers=JobQueue.maxnumber_of_processors,debug=false)
+  def initialize(nWorkers=JobQueue.maxnumber_of_processors,debug=:off)
     @workers = nWorkers
     @queue   = Queue.new
     @debug   = debug
@@ -92,19 +92,42 @@ end
 # Special class for runing operating system commands with Ruby's system call
 class SystemJobs < JobQueue
   def run
+    if :off == @debug then
+      $stdout.reopen("/dev/null", "w")
+      $stderr.reopen("/dev/null", "w")
+    end
+
     @threads = (1..@workers).map {|i|
-      Thread.new(@queue,@debug) {|q,dbg|
-        until ( q == ( task = q.deq ) )
-          _, stdout, stderr, _ = Open3.popen3(task.first)
+      Thread.new(@queue,@debug) {|queue,debug|
+        Thread.current.abort_on_exception = true
+        until ( queue == ( task = queue.deq ) )
+          case debug
+          when :buffered
+            # output is buffered until jobs are finished
+            stderr_and_stdout,waitThr = Open3.capture2e(task.first)
+            puts stderr_and_stdout
+
+          when :flushed
+            # stdout and stderr are read + printed in parallel
+            _, stderr, stdout, waitThr = Open3.popen3(task.first)
+            # Create a thread to read from each stream
+            [stdout,stderr].map {|stream|
+              Thread.new(stream,debug) {|_stream|
+                Thread.current.abort_on_exception = true
+                puts $_ until _stream.gets.nil?
+              }
+            }.map(&:join)
 
-          # 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
+          when :off
+            # no output at all (switched off globally at the beginning of this method)'
+            system(task.first)
+          else
+            raise ArgumentError,"Unknown debug mode '#{debug}'!"
+          end
         end
       }
     }
     @threads.size.times { @queue.enq @queue}
-    @threads.each {|t| t.join}
+    @threads.map(&:join)
   end
 end

metadata

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