taskjuggler 3.6.0 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4626796ad19e4552b12b7a08991a6e1382a035bf
-  data.tar.gz: 331d901aba229c875bba6b22af9f7f390d390fe9
+SHA256:
+  metadata.gz: ac8d1b5b2a3a8a3de01a39de2ef9533e1c86ade627b4a27ccf83427dac988093
+  data.tar.gz: 7dea4a421b72b1a6645b0699bfb4076eaa4fc46fcd1274066503dc2c36d7a343
 SHA512:
-  metadata.gz: 51807219195d0c5fc94a5499d86223f2bb85ace75974b0aec3a7abda5d90d55a0c7234acfdf9e27ea00589e9343754bd54fa7d32d2cf566c9e061a9f7b10f692
-  data.tar.gz: ce602aa3883b46e5903c2456a473f0881df1c3ee2c65eddebe0c531836973a1983ae11f9d25b4ebe4fce1e818979e3ea66d16dc3966bfd227e4c04cfc30081c0
+  metadata.gz: a07a210795fb27f09a3a8cc09fcef2ceb21c0f08d47cedb8655b3cc1df8201b7f309278dd1464961a5c9e06164d12ae85f979435a3007701428fe852801ffccc
+  data.tar.gz: dd87f1321f59cbd9399a2b25ab7d5f3d16a01952579f3b54abfb7e2794a0f322c047e4bfb93434569eaea9cf1fd98a7ca6737ed20bea9e5c00816c6ab0f64bc4

data/CHANGELOG

@@ -1,3 +1,72 @@
+= Release 3.7.2 (2023-02-25)
+
+== New Features
+
+  * The 'duties' column now supports the 'listitem' attribute.
+
+== Bug Fixes
+
+  * File.exists? is no longer supported in Ruby 3.2.x
+  * Attempt to fix MS Project XML export for newer MSP versions.
+  * Eliminate use of useless variable
+  * Fix race condition that surfaces when using Ruby 3.x.
+  * Don't crash on division by zero for timesheets shorter than 1 week
+  * Properly escape double quotes in CSV file strings.
+  * Don't crash if task is overspeficied.
+  * Queries in listitems for some columns now respect scope property
+
+
+= Release 3.7.1 (2020-03-14)
+
+  * Bumping version to 3.7.1
+  * Storing the version in version.rb
+  * add novevents keyword to icalreport context
+  * Revert "Revert "Revert "    
+    This reverts commit d3c9d87a4fd58c9af15a44eb6c2b6c131f939912.
+  * Revert "Revert "    
+    This reverts commit 3ca91860374adefb5821ab70d1a3030883459231.
+  * Revert "    
+    This reverts commit 163fabe4f21b92a9828f65ccd186526af6c3b401.
+  * Revert "Revert "    
+    This reverts commit 3ca91860374adefb5821ab70d1a3030883459231.
+  * Revert "    
+    This reverts commit 163fabe4f21b92a9828f65ccd186526af6c3b401.
+  * Corrected some words.
+  * fix: In Windows and Cygwin generate file path for the booking file is
+    wrong
+    Reported-by: Yury Rumega
+    
+    When running the freeze command in Windows and Cygwin file path for the booking file is
+    generated wrongly.
+
+= Release 3.7.0 (2020-03-14)
+
+== New Features
+
+  * Adding a column that lists all annual leave days.
+  * Include man pages in gem
+  * man pages: Code modifications
+  * h2m files to enhance the generated man page
+  * rake task to build man pages using help2man
+  * Add reference line via 'markdate' parameter
+
+== Bug Fixes
+
+  * Don't use 'milestone' keyword in export reports.
+  * Fix a few warnings in the Gemfile
+  * Eliminate warnings seen with Ruby 2.5
+  * Fix endless loop when using sorting criteria in some reports.
+  * Don't crash in account definition.
+  * Correcting Typos undo: plural for pixel in German (pixel) different from English (pixels)
+  * Correcting Typos in manual pages and source file comments
+  * Correct spelling mistake in lib/taskjuggler/apps/Tj3Man.rb
+  * Clean the source tree using rake
+  * Fix crash when taskjuggler.rc is not valid YAML.
+  * syntax of xml comments to not have -- in the body
+  * Spec tests failed on some Ubuntu/Debian versions.
+  * Prioritize resource leave time over free time in resource reports
+
+
 = Release 3.6.0 (2016-03-12)
 
 == New Features

data/Rakefile

@@ -4,10 +4,13 @@ $:.unshift File.join(File.dirname(__FILE__))
 lib = File.expand_path('../lib', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 
+require 'rake'
+require 'rspec'
 require 'rake/clean'
+require 'bundler/gem_tasks'
 
 Dir.glob( 'tasks/*.rake').each do |fn|
-  begin 
+  begin
     load fn;
   rescue LoadError
     puts "#{fn.split('/')[1]} tasks unavailable: #{$!}"

data/data/css/tjreport.css

@@ -433,6 +433,10 @@ p.tj_journal {
   background-color:#EE0000;
   position:absolute;
 }
+.markdateline {
+  background-color:#000000;
+  position:absolute;
+}
 .white {
   background-color:#FFFFFF;
   position:absolute;

data/data/tjp.vim

@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     TaskJuggler
 " Maintainer:   TaskJuggler Developers <taskjuggler-devel@googlegroups.com>
-" Last Change:  2016-03-12 21:14:02 +0100
+" Last Change:  2023-02-25 11:11:12 +0100
 " This file was automatically generated by VimSyntax.rb
 
 if exists("b:current_syntax")
@@ -86,6 +86,8 @@ syn keyword tjp_columnid_annualleave annualleave
 hi def link tjp_columnid_annualleave Type
 syn keyword tjp_columnid_annualleavebalance annualleavebalance
 hi def link tjp_columnid_annualleavebalance Type
+syn keyword tjp_columnid_annualleavelist annualleavelist
+hi def link tjp_columnid_annualleavelist Type
 syn keyword tjp_columnid_alert alert
 hi def link tjp_columnid_alert Type
 syn keyword tjp_columnid_alertmessages alertmessages
@@ -346,6 +348,8 @@ syn keyword tjp_hidetask hidetask contained
 hi def link tjp_hidetask Type
 syn keyword tjp_icalreport icalreport contained
 hi def link tjp_icalreport Type
+syn keyword tjp_novevents novevents contained
+hi def link tjp_novevents Type
 syn keyword tjp_scenario_ical scenario contained
 hi def link tjp_scenario_ical Type
 syn keyword tjp_accountprefix accountprefix contained
@@ -414,6 +418,8 @@ syn keyword tjp_extend extend contained
 hi def link tjp_extend Type
 syn keyword tjp_now now contained
 hi def link tjp_now Type
+syn keyword tjp_markdate markdate contained
+hi def link tjp_markdate Type
 syn keyword tjp_outputdir outputdir contained
 hi def link tjp_outputdir Type
 syn keyword tjp_shorttimeformat shorttimeformat contained
@@ -665,7 +671,7 @@ syn region tjpblk_number_extend start=/^\s*number\s.*{\s*$/ end=/^\s*}\s*$/ tran
 syn region tjpblk_reference_extend start=/^\s*reference\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_reference_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
 syn region tjpblk_richtext_extend start=/^\s*richtext\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_richtext_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
 syn region tjpblk_text_extend start=/^\s*text\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_text_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
-syn region tjpblk_icalreport start=/^\s*icalreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_icalreport,tjp_hideresource,tjp_hidejournalentry,tjp_hidetask,tjp_end_report,tjp_period_report,tjp_start_report,tjp_rollupresource,tjp_rolluptask,tjp_scenario_ical
+syn region tjpblk_icalreport start=/^\s*icalreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_icalreport,tjp_hideresource,tjp_hidejournalentry,tjp_hidetask,tjp_end_report,tjp_period_report,tjp_start_report,tjp_rollupresource,tjp_rolluptask,tjp_novevents,tjp_scenario_ical
 syn region tjpblk_journalentry start=/^\s*journalentry\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_journalentry,tjp_alert,tjp_author,tjp_flags_journalentry,tjp_summary,tjp_details contained
 syn region tjpblk_dailymax start=/^\s*dailymax\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_dailymax,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
 syn region tjpblk_dailymin start=/^\s*dailymin\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_dailymin,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
@@ -678,7 +684,7 @@ syn region tjpblk_weeklymin start=/^\s*weeklymin\s.*{\s*$/ end=/^\s*}\s*$/ trans
 syn region tjpblk_navigator start=/^\s*navigator\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_navigator,tjp_hidereport
 syn region tjpblk_nikureport start=/^\s*nikureport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_nikureport,tjp_formats,tjp_headline,tjp_hideresource,tjp_hidetask,tjp_numberformat,tjp_end_report,tjp_period_report,tjp_start_report,tjp_title,tjp_timeoff_nikureport
 syn region tjpblk_extend start=/^\s*extend\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_extend,tjp_date_extend,tjpblk_date_extend,tjp_number_extend,tjpblk_number_extend,tjp_reference_extend,tjpblk_reference_extend,tjp_richtext_extend,tjpblk_richtext_extend,tjp_text_extend,tjpblk_text_extend contained
-syn region tjpblk_project start=/^\s*project\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_project,tjp_alertlevels,tjp_currencyformat,tjp_currency,tjp_dailyworkinghours,tjp_extend,tjpblk_extend,tjp_include_project,tjp_journalentry,tjpblk_journalentry,tjp_now,tjp_numberformat,tjp_outputdir,tjp_scenario,tjpblk_scenario,tjp_shorttimeformat,tjp_timeformat,tjp_timezone,tjp_timingresolution,tjp_trackingscenario,tjp_weekstartsmonday,tjp_weekstartssunday,tjp_workinghours_project,tjp_yearlyworkingdays
+syn region tjpblk_project start=/^\s*project\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_project,tjp_alertlevels,tjp_currencyformat,tjp_currency,tjp_dailyworkinghours,tjp_extend,tjpblk_extend,tjp_include_project,tjp_journalentry,tjpblk_journalentry,tjp_now,tjp_markdate,tjp_numberformat,tjp_outputdir,tjp_scenario,tjpblk_scenario,tjp_shorttimeformat,tjp_timeformat,tjp_timezone,tjp_timingresolution,tjp_trackingscenario,tjp_weekstartsmonday,tjp_weekstartssunday,tjp_workinghours_project,tjp_yearlyworkingdays
 syn region tjpblk_limits start=/^\s*limits\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_limits,tjp_dailymax,tjpblk_dailymax,tjp_dailymin,tjpblk_dailymin,tjp_maximum,tjpblk_maximum,tjp_minimum,tjpblk_minimum,tjp_monthlymax,tjpblk_monthlymax,tjp_monthlymin,tjpblk_monthlymin,tjp_weeklymax,tjpblk_weeklymax,tjp_weeklymin,tjpblk_weeklymin
 syn region tjpblk_include_properties start=/^\s*include\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_include_properties,tjp_accountprefix,tjp_reportprefix,tjp_resourceprefix,tjp_taskprefix
 syn region tjpblk_columns start=/^\s*columns\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_columns,tjp_celltext_column,tjp_cellcolor_column,tjp_end_column,tjp_fontcolor_column,tjp_halign_column,tjp_listitem_column,tjp_listtype_column,tjp_period_column,tjp_scale_column,tjp_start_column,tjp_timeformat1,tjp_timeformat2,tjp_title_column,tjp_tooltip_column,tjp_width_column contained

data/examples/ProjectTemplate/template.tjp

@@ -1,7 +1,7 @@
 /*
  * This file contains a project skeleton. It is part of the
  * TaskJuggler project management tool. You can use this as a basis to
- * start you own project file.
+ * start your own project file.
  */
 project your_project_id "Your Project Title"  2011-11-11-0:00--0500 +4m {
   # Set the default time zone for the project. If not specified, UTC
@@ -28,7 +28,7 @@ project your_project_id "Your Project Title"  2011-11-11-0:00--0500 +4m {
 
   # You can define your own attributes for tasks and resources. This
   # is handy to capture additional information about the project that
-  # is not directly impacting the project schedule but you like to
+  # is not directly impacting the project schedule, but which you like to
   # keep in one place.
   #extend task {
   #  reference spec "Link to Wiki page"
@@ -59,7 +59,7 @@ copyright "Claim your rights here"
 # used to filter out subsets of them during reporting.
 flags important, hidden
 
-# If you want to do budget planning for you project, you need to
+# If you want to do budget planning for your project, you need to
 # define some accounts.
 account cost "Project Cost" {
   account dev "Development"
@@ -67,10 +67,10 @@ account cost "Project Cost" {
 }
 account rev "Customer Payments"
 
-# The Profit&Loss analysis should be rev - cost accounts.
+# The Profit & Loss analysis should be rev - cost accounts.
 balance cost rev
 
-# Define you public holidays here.
+# Define your public holidays here.
 vacation "New Year's Day" 2012-01-02
 vacation "Birthday of Martin Luther King, Jr." 2012-01-16
 vacation "Washington's Birthday" 2012-02-20
@@ -83,7 +83,7 @@ vacation "Thanksgiving Day" 2012-11-22
 vacation "Christmas Day" 2012-12-25
 
 # The daily default rate of all resources. This can be overridden for each
-# resource. We specify this, so that we can do a good calculation of
+# resource. We specify this so we can do a good calculation of
 # the costs of the project.
 rate 400.0
 
@@ -123,7 +123,7 @@ task project "Project" {
 
 # Now the project has been specified completely. Stopping here would
 # result in a valid TaskJuggler file that could be processed and
-# scheduled. But no reports would be generated to visualize the
+# scheduled. Here reports will be generated to visualize the
 # results.
 
 navigator navbar {
@@ -242,9 +242,9 @@ taskreport overview "" {
 # Macro to set the background color of a cell according to the alert
 # level of the task.
 macro AlertColor [
-  cellcolor plan.alert = 0 "#00D000" # green
-  cellcolor plan.alert = 1 "#D0D000" # yellow
-  cellcolor plan.alert = 2 "#D00000" # red
+  cellcolor plan.alert = 0 "#90FF90" # green
+  cellcolor plan.alert = 1 "#FFFF90" # yellow
+  cellcolor plan.alert = 2 "#FF9090" # red
 ]
 
 taskreport status "" {

data/examples/Tutorial/tutorial.tjp

@@ -20,7 +20,7 @@ project acso "Accounting Software"  2002-01-16 +4m {
   # used, but this will likely be outside of the project range, so it
   # can't be seen in the reports.
   now 2002-03-05-13:00
-  # The currency for all money values is the Euro.
+  # The currency for all money values is the US Dollar.
   currency "USD"
 
   # We want to compare the baseline scenario to one with a slightly
@@ -405,9 +405,9 @@ taskreport overview "" {
 # Macro to set the background color of a cell according to the alert
 # level of the task.
 macro AlertColor [
-  cellcolor plan.alert = 0 "#00D000" # green
-  cellcolor plan.alert = 1 "#D0D000" # yellow
-  cellcolor plan.alert = 2 "#D00000" # red
+  cellcolor plan.alert = 0 "#90FF90" # green
+  cellcolor plan.alert = 1 "#FFFF90" # yellow
+  cellcolor plan.alert = 2 "#FF9090" # red
 ]
 
 taskreport status "" {

data/lib/taskjuggler/Allocation.rb

@@ -50,7 +50,7 @@ class TaskJuggler
     end
 
     # Set the selection mode identified by name specified in _str_. For
-    # efficiency reasons, we turn the name into a Fixnum value.
+    # efficiency reasons, we turn the name into an Integer value.
     def setSelectionMode(str)
       modes = %w( order minallocated minloaded maxloaded random )
       @selectionMode = modes.index(str)

data/lib/taskjuggler/AppConfig.rb

@@ -109,7 +109,7 @@ class AppConfig
     dirs = dataSearchDirs(baseDir)
     # Remove non-existing directories from the list again
     dirs.delete_if do |dir|
-      !File.exist?(dir.untaint)
+      !File.exist?(dir)
     end
     dirs
   end

data/lib/taskjuggler/AttributeBase.rb

@@ -3,7 +3,7 @@
 #
 # = AttributeBase.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2019
 #               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -136,7 +136,7 @@ class TaskJuggler
 
     def to_num
       v = get
-      if v.is_a?(Fixnum) || v.is_a?(Bignum) || v.is_a?(Float)
+      if v.is_a?(Integer) || v.is_a?(Float)
         v
       else
         nil
@@ -145,10 +145,16 @@ class TaskJuggler
 
     def to_sort
       v = get
-      if v.is_a?(Fixnum) || v.is_a?(Bignum) || v.is_a?(Float)
+      if v.is_a?(Integer) || v.is_a?(Float)
         v
       elsif v.respond_to?('to_s')
-        v.to_s
+        if v.respond_to?('join')
+          # If the attribute is an Array we convert it to a comma separated
+          # list.
+          v.join(', ')
+        else
+          v.to_s
+        end
       else
         nil
       end

data/lib/taskjuggler/Attributes.rb

@@ -264,12 +264,12 @@ class TaskJuggler
 
   end
 
-  class FixnumAttribute < AttributeBase
+  class IntegerAttribute < AttributeBase
     def initialize(property, type, container)
       super
     end
 
-    def FixnumAttribute::tjpId
+    def IntegerAttribute::tjpId
       'integer'
     end
   end

data/lib/taskjuggler/BatchProcessor.rb

@@ -16,7 +16,7 @@ require 'monitor'
 
 class TaskJuggler
 
-  # The JobInfo class is just a storage container for some batch job realted
+  # The JobInfo class is just a storage container for some batch job related
   # pieces of information. It contains things like a job id, the process id,
   # the stdout data and the like.
   class JobInfo
@@ -69,16 +69,16 @@ class TaskJuggler
     def initialize(maxCpuCores)
       @maxCpuCores = maxCpuCores
       # Jobs submitted by calling queue() are put in the @toRunQueue. The
-      # pusher Thread will pick them up and fork them off into another
+      # launcher Thread will pick them up and fork them off into another
       # process.
-      @toRunQueue = Queue.new
+      @toRunQueue =  [ ]
       # A hash that maps the JobInfo objects of running jobs by their PID.
       @runningJobs = { }
       # A list of jobs that wait to complete their writing.
       @spoolingJobs = [ ]
       # The wait() method will then clean the @toDropQueue, executes the post
       # processing block and removes all JobInfo related objects.
-      @toDropQueue = Queue.new
+      @toDropQueue = []
 
       # A semaphore to guard accesses to @runningJobs, @spoolingJobs and
       # following shared data structures.
@@ -106,28 +106,34 @@ class TaskJuggler
     # to identify the job upon completion. +block+ is a Ruby code block to be
     # executed in a separate process.
     def queue(tag = nil, &block)
-      raise 'You cannot call queue() while wait() is running!' if @jobsOut > 0
-
-      # If this is the first queued job for this run, we have to start the
-      # helper threads.
-      if @jobsIn == 0
-        # The JobInfo objects in the @toRunQueue are processed by the pusher
-        # thread.  It forkes off processes to execute the code block associated
-        # with the JobInfo.
-        @pusher = Thread.new { pusher }
-        # The popper thread waits for terminated childs and picks up the
-        # results.
-        @popper = Thread.new { popper }
-        # The grabber thread collects $stdout and $stderr data from each child
-        # process and stores them in the corresponding JobInfo.
-        @grabber = Thread.new { grabber }
-      end
 
       # Create a new JobInfo object for the job and push it to the @toRunQueue.
-      job = JobInfo.new(@jobsIn, block, tag)
-      # Increase job counter
-      @lock.synchronize { @jobsIn += 1 }
-      @toRunQueue.push(job)
+      @lock.synchronize do
+        raise 'You cannot call queue() while wait() is running!' if @jobsOut > 0
+
+        # If this is the first queued job for this run, we have to start the
+        # helper threads.
+        if @jobsIn == 0
+          # The JobInfo objects in the @toRunQueue are processed by the
+          # launcher thread.  It forkes off processes to execute the code
+          # block associated with the JobInfo.
+          @launcher = Thread.new { launcher }
+          # The receiver thread waits for terminated child processes and picks
+          # up the results.
+          @receiver = Thread.new { receiver }
+          # The grabber thread collects $stdout and $stderr data from each
+          # child process and stores them in the corresponding JobInfo.
+          @grabber = Thread.new { grabber }
+        end
+
+        # To track a job through the queues, we use a JobInfo object to hold
+        # all data associated with a job.
+        job = JobInfo.new(@jobsIn, block, tag)
+        # Increase job counter
+        @jobsIn += 1
+        # Push the job to the toRunQueue.
+        @toRunQueue.push(job)
+      end
     end
 
     # Wait for all jobs to complete. The code block will get the JobInfo
@@ -138,29 +144,27 @@ class TaskJuggler
 
       # When we have received as many jobs in the @toDropQueue than we have
       # started then we're done.
-      while !@lock.synchronize { @jobsIn == @jobsOut }
-        if @toDropQueue.empty?
-          sleep(@timeout)
-        else
-          # We have completed jobs.
-          while !@toDropQueue.empty?
-            # Pop a job from the @toDropQueue and call the block with it.
-            job = @toDropQueue.pop
-            # Remove the job related entries from the housekeeping tables.
-            @lock.synchronize { @jobsOut += 1 }
-
+      while @lock.synchronize { @jobsOut < @jobsIn }
+        job = nil
+        @lock.synchronize do
+          if !@toDropQueue.empty? && (job = @toDropQueue.pop)
             # Call the post-processing block that was passed to wait() with
             # the JobInfo object as argument.
+            @jobsOut += 1
             yield(job)
           end
         end
+
+        unless job
+          sleep(@timeout)
+        end
       end
 
       # Signal threads to stop
       @terminate = true
       # Wait for treads to finish
-      @pusher.join
-      @popper.join
+      @launcher.join
+      @receiver.join
       @grabber.join
 
       # Reset some variables so we can reuse the object for further job runs.
@@ -175,25 +179,22 @@ class TaskJuggler
 
     # This function runs in a separate thread to pop JobInfo items from the
     # @toRunQueue and create child processes for them.
-    def pusher
+    def launcher
       # Run until the terminate flag is set.
       until @terminate
-        if @toRunQueue.empty? ||
-           @lock.synchronize{ @runningJobs.length >= @maxCpuCores }
+        job = nil
+        unless @lock.synchronize { @runningJobs.length < @maxCpuCores &&
+                                   (job = @toRunQueue.pop) }
           # We have no jobs in the @toRunQueue or all CPU cores in use already.
           sleep(@timeout)
         else
           @lock.synchronize do
-            # Get a new job from the @toRunQueue
-            job = @toRunQueue.pop
-
             job.openPipes
-            # Add the receiver end of the pipe to the @pipes Array.
+            # Add the receiver end of the pipe to the pipes Arrays.
             @pipes << job.stdoutP
+            @pipes << job.stderrP
             # Map the pipe end to this JobInfo object.
             @pipeToJob[job.stdoutP] = job
-            # Same for $stderr.
-            @pipes << job.stderrP
             @pipeToJob[job.stderrP] = job
 
             pid = fork do
@@ -224,15 +225,20 @@ class TaskJuggler
 
     # This function runs in a separate thread to wait for completed jobs. It
     # waits for the process completion and stores the result in the
-    # corresponding JobInfo object.
-    def popper
+    # corresponding JobInfo object. Aborted jobs are pushed to the
+    # @toDropQueue while completed jobs are pushed to the @spoolingJobs queue.
+    def receiver
       until @terminate
-        if @runningJobs.empty?
-          # No pending jobs, wait a bit.
-          sleep(@timeout)
-        else
+        pid = retVal = nil
+        begin
           # Wait for the next job to complete.
           pid, retVal = Process.wait2
+        rescue Errno::ECHILD
+          # No running jobs. Wait a bit.
+          sleep(@timeout)
+        end
+
+        if pid && retVal
           job = nil
           @lock.synchronize do
             # Get the JobInfo object that corresponds to the process ID. The
@@ -242,7 +248,7 @@ class TaskJuggler
             # Remove the job from the @runningJobs Hash.
             @runningJobs.delete(pid)
             # Save the return value.
-            job.retVal = retVal.dup
+            job.retVal = retVal.exitstatus
             if retVal.signaled?
               cleanPipes(job)
               # Aborted jobs will probably not send an EOT. So we fastrack
@@ -269,22 +275,27 @@ class TaskJuggler
         res = nil
         begin
           @lock.synchronize do
-            if (res = select(@pipes, nil, @pipes, @timeout))
+            if (res = IO.select(@pipes, nil, nil, @timeout))
               # We have output data from at least one child. Check which pipe
               # actually triggered the select.
               res[0].each do |pipe|
                 # Find the corresponding JobInfo object.
                 job = @pipeToJob[pipe]
-                # Store the output.
+
+                # Store the standard output.
                 if pipe == job.stdoutP
                   # Look for the EOT character to signal the end of the text.
-                  if (c = pipe.getc) == ?\004
+                  if pipe.closed? || (c = pipe.read_nonblock(1)) == ?\004
                     job.stdoutEOT = true
                   else
                     job.stdout << c
                   end
-                else
-                  if (c = pipe.getc) == ?\004
+                end
+
+                # Store the error output.
+                if pipe == job.stderrP
+                  # Look for the EOT character to signal the end of the text.
+                  if pipe.closed? || (c = pipe.read_nonblock(1)) == ?\004
                     job.stderrEOT = true
                   else
                     job.stderr << c

data/lib/taskjuggler/FileList.rb

@@ -17,7 +17,7 @@ class TaskJuggler
   class FileRecord
 
     def initialize(fileName)
-      @name = fileName.dup.untaint
+      @name = fileName.dup
       @mtime = File.mtime(@name)
     end
 

data/lib/taskjuggler/Interval.rb

@@ -166,7 +166,7 @@ class TaskJuggler
     #
     # sbStart must be a TjTime of the scoreboard start
     # slotDuration must be the duration of the scoreboard slots in seconds
-    # a and b should be TjTime or Fixnum objects that describe the start and
+    # a and b should be TjTime or Integer objects that describe the start and
     # end time or index of the interval.
     #
     # TimeInterval.new(iv)
@@ -191,7 +191,7 @@ class TaskJuggler
         # If the third argument is a date we convert it to a scoreboard index.
         args[2] = dateToIndex(args[2]) if args[2].is_a?(TjTime)
 
-        if args[2].is_a?(Fixnum) || args[2].is_a?(Bignum)
+        if args[2].is_a?(Integer)
           super(args[2], args[2])
         else
           raise ArgumentError, "Illegal argument 3: #{args[0].class}"
@@ -204,11 +204,11 @@ class TaskJuggler
         args[2] = dateToIndex(args[2]) if args[2].is_a?(TjTime)
         args[3] = dateToIndex(args[3]) if args[3].is_a?(TjTime)
 
-        if !(args[2].is_a?(Fixnum) || args[2].is_a?(Bignum))
+        if !(args[2].is_a?(Integer))
           raise ArgumentError, "Interval start must be an index or TjTime, " +
                 "not a #{args[2].class}"
         end
-        if !(args[3].is_a?(Fixnum) || args[3].is_a?(Bignum))
+        if !(args[3].is_a?(Integer))
           raise ArgumentError, "Interval end must be an index or TjTime, " +
                 "not a #{args[3].class}"
         end
@@ -221,19 +221,18 @@ class TaskJuggler
         raise ArgumentError, "sbStart must be a TjTime object, not a" +
               "#{@sbStart.class}"
       end
-      unless @slotDuration.is_a?(Fixnum)
-        raise ArgumentError, "slotDuration must be a Fixnum, not a " +
+      unless @slotDuration.is_a?(Integer)
+        raise ArgumentError, "slotDuration must be an Integer, not a " +
               "#{@slotDuration.class}"
       end
 
     end
 
-    # Assign the start of the interval. +arg+ can be a Fixnum, Bignum or
+    # Assign the start of the interval. +arg+ can be an Integer or
     # TjTime object.
     def start=(arg)
       case arg
-      when Fixnum
-      when Bignum
+      when Integer
         @start = arg
       when TjTime
         @start = dateToIndex(arg)
@@ -242,12 +241,11 @@ class TaskJuggler
       end
     end
 
-    # Assign the start of the interval. +arg+ can be a Fixnum, Bignum or
+    # Assign the start of the interval. +arg+ can be an Integer or
     # TjTime object.
     def end=(arg)
       case arg
-      when Fixnum
-      when Bignum
+      when Integer
         @end = arg
       when TjTime
         @end = dateToIndex(arg)

data/lib/taskjuggler/Journal.rb

@@ -613,7 +613,7 @@ class TaskJuggler
     # This function returns a list of entries that have all the exact same
     # date and are the last entries before the deadline _date_. Only messages
     # with at least the required alert level _minLevel_ are returned. Messages
-    # with alert level _minLevel_ must be newer than _minDate_.
+    # with alert level _minLevel_ or higher must be newer than _minDate_.
     def currentEntries(date, property, minLevel, minDate, logExp)
       pEntries = getEntries(property) ?  getEntries(property).last(date) :
                  JournalEntryList.new
@@ -621,7 +621,7 @@ class TaskJuggler
       # date.
       pEntries.delete_if do |e|
         e.headline.empty? || e.alertLevel < minLevel ||
-        (e.alertLevel == minLevel && minDate && e.date < minDate)
+        (e.alertLevel >= minLevel && minDate && e.date < minDate)
       end
 
       unless pEntries.empty?