taskjuggler 0.0.6 → 0.0.7

data/doc/lib/reports/GanttMilestone_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-03-30 09:54:14 +0200</dd>
+			<dd class="modified-date">2010-05-06 20:28:59 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/GanttRouter_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-01-31 07:57:06 +0100</dd>
+			<dd class="modified-date">2010-05-06 20:28:59 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/GanttTaskBar_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-02-27 17:20:40 +0100</dd>
+			<dd class="modified-date">2010-08-15 15:53:02 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/HTMLGraphics_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-03-30 09:54:14 +0200</dd>
+			<dd class="modified-date">2010-05-06 20:28:59 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/Navigator_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-05-31 14:27:13 +0200</dd>
+			<dd class="modified-date">2010-06-01 07:39:58 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/NikuReport_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-07-02 14:51:20 +0200</dd>
+			<dd class="modified-date">2010-07-09 08:18:27 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/ReportBase_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-06-02 09:23:35 +0200</dd>
+			<dd class="modified-date">2010-08-24 19:55:18 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/ReportContext_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-06-02 10:16:24 +0200</dd>
+			<dd class="modified-date">2010-06-03 07:55:36 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/ReportTableCell_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-06-30 08:50:53 +0200</dd>
+			<dd class="modified-date">2010-09-07 21:33:06 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/ReportTableColumn_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-01-31 07:57:06 +0100</dd>
+			<dd class="modified-date">2010-05-06 20:28:59 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/ReportTableLegend_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-03-08 09:14:09 +0100</dd>
+			<dd class="modified-date">2010-05-06 20:28:59 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/ReportTableLine_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-01-31 07:57:06 +0100</dd>
+			<dd class="modified-date">2010-05-06 20:28:59 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/ReportTable_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-06-01 17:38:05 +0200</dd>
+			<dd class="modified-date">2010-06-01 20:29:54 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/Report_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-06-02 10:44:56 +0200</dd>
+			<dd class="modified-date">2010-08-15 15:53:02 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/ResourceListRE_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-06-01 15:49:36 +0200</dd>
+			<dd class="modified-date">2010-06-01 20:29:54 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/StatusSheetReport_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-06-01 15:49:51 +0200</dd>
+			<dd class="modified-date">2010-07-09 18:44:36 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/TableReport_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-06-16 13:55:58 +0200</dd>
+			<dd class="modified-date">2010-08-15 15:53:02 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/TaskListRE_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-06-01 15:47:49 +0200</dd>
+			<dd class="modified-date">2010-06-01 20:29:54 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/TextReport_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-03-12 09:27:24 +0100</dd>
+			<dd class="modified-date">2010-08-15 15:53:02 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/TimeSheetReport_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-06-01 15:50:18 +0200</dd>
+			<dd class="modified-date">2010-08-15 15:53:02 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/reports/TjpExportRE_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-06-16 17:06:20 +0200</dd>
+			<dd class="modified-date">2010-08-15 15:53:03 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/taskjuggler3_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-06-29 09:26:35 +0200</dd>
+			<dd class="modified-date">2010-06-29 19:03:11 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/tj3client_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-06-29 13:54:30 +0200</dd>
+			<dd class="modified-date">2010-08-15 15:53:03 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/tj3d_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-06-01 09:25:24 +0200</dd>
+			<dd class="modified-date">2010-08-15 15:53:03 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/tj3man_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-01-31 07:57:06 +0100</dd>
+			<dd class="modified-date">2010-05-06 20:28:59 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/tj3ss_receiver_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-03-24 20:57:44 +0100</dd>
+			<dd class="modified-date">2010-05-06 20:28:59 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/tj3ss_sender_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-05-03 13:17:48 +0200</dd>
+			<dd class="modified-date">2010-05-06 20:28:59 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/tj3ts_receiver_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-05-20 14:29:08 +0200</dd>
+			<dd class="modified-date">2010-05-21 17:45:32 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/tj3ts_sender_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-03-24 20:57:44 +0100</dd>
+			<dd class="modified-date">2010-05-06 20:28:59 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/doc/lib/tj3ts_summary_rb.html

@@ -24,7 +24,7 @@
 	<div id="metadata">
 		<dl>
 			<dt class="modified-date">Last Modified</dt>
-			<dd class="modified-date">2010-03-24 20:57:44 +0100</dd>
+			<dd class="modified-date">2010-05-06 20:28:59 +0200</dd>
 
 			
 			<dt class="requires">Requires</dt>

data/lib/Allocation.rb

@@ -33,9 +33,12 @@ class TaskJuggler
       # The selection mode determines how the candidate is selected from the
       # list of candidates.
       # 0 : 'order'        : select by order of list
-      # 1 : 'minallocated' : select candidate with lowest allocation probability
-      # 2 : 'minloaded'    : select candidate with lowest allocated overall load
-      # 3 : 'maxloaded'    : select candidate with highest allocated overall load
+      # 1 : 'minallocated' : select candidate with lowest allocation
+      #                      probability
+      # 2 : 'minloaded'    : select candidate with lowest allocated overall
+      #                      load
+      # 3 : 'maxloaded'    : select candidate with highest allocated overall
+      #                      load
       # 4 : 'random'       : select a random candidate
       @selectionMode = selectionMode
       @persistent = persistent
@@ -56,8 +59,8 @@ class TaskJuggler
       @candidates << candidate
     end
 
-    # Returns true if we either have no shifts defined or the defined shifts are
-    # active at _date_.
+    # Returns true if we either have no shifts defined or the defined shifts
+    # are active at _date_.
     def onShift?(date)
       return @shifts.onShift?(date) if @shifts
 

data/lib/BatchProcessor.rb

@@ -132,6 +132,9 @@ class TaskJuggler
     # Wait for all jobs to complete. The code block will get the JobInfo
     # objects for each job to pick up the results.
     def wait
+      # Don't wait if there are no jobs.
+      return if @jobsIn == 0
+
       # When we have received as many jobs in the @toDropQueue than we have
       # started then we're done.
       while !@lock.synchronize { @jobsIn == @jobsOut }
@@ -230,9 +233,10 @@ class TaskJuggler
           pid, retVal = Process.wait2
           job = nil
           @lock.synchronize do
-            # Get the JobInfo object that corresponds to the process ID.
-            job = @runningJobs[pid]
-            raise "Unknown pid #{pid}" if job.nil?
+            # Get the JobInfo object that corresponds to the process ID. The
+            # blocks passed to queue() or wait() may fork child processes as
+            # well. If we get their PID, we can just ignore them.
+            next if (job = @runningJobs[pid]).nil?
             # Remove the job from the @runningJobs Hash.
             @runningJobs.delete(pid)
             # Save the return value.

data/lib/FileList.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = FileList.rb -- The TaskJuggler III Project Management Software
+#
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+
+class TaskJuggler
+
+  # The FileRecord stores the name of a file and the modification time.
+  class FileRecord
+
+    def initialize(fileName)
+      @name = fileName.dup.untaint
+      @mtime = File.mtime(@name)
+    end
+
+    def modified?
+      File.mtime(@name) > @mtime
+    end
+
+  end
+
+  # The FileList class stores a list of file names. Each file name is unique
+  # and more information about the file is contained in FileRecord entries.
+  class FileList
+
+    # Create a new, empty FileList.
+    def initialize
+      @files = {}
+    end
+
+    # Add the file with _fileName_ to the list. If it's already in the list,
+    # it will not be added again.
+    def <<(fileName)
+      return if fileName == '.' || @files.include?(fileName)
+
+      @files[fileName] = FileRecord.new(fileName)
+    end
+
+    # Return true if any of the files in the list have been modified after
+    # they were added to the list.
+    def modified?
+      @files.each_value do |f|
+        return true if f.modified?
+      end
+      false
+    end
+
+  end
+
+end
+

data/lib/Journal.rb

@@ -54,8 +54,7 @@ class TaskJuggler
 
     # Just for debugging
     def to_s # :nodoc:
-      puts "Headline: #{@headline}"
-      puts "Property: #{@property.class}"
+      "Headline: #{@headline}\nProperty: #{@property.class}"
     end
 
   end
@@ -103,6 +102,11 @@ class TaskJuggler
       end
     end
 
+    # Like Array::delete_if
+    def delete_if
+      @entries.delete_if { |e| yield(e) }
+    end
+
     # Like Array::empty?
     def empty?
       @entries.empty?
@@ -113,27 +117,35 @@ class TaskJuggler
       @entries.include?(entry)
     end
 
+    # Like Array::first but list is first sorted.
+    def first
+      sort!
+      @entries.first
+    end
+
     # Returns the last elements (by date) if date is nil or the last elements
     # right before the given _date_. If there are multiple entries with
     # exactly the same date, all are returned. Otherwise the result Array will
     # only contain one element. In case no matching entry is found, the Array
     # will be empty.
     def last(date = nil)
-      result = []
+      result = JournalEntryList.new
       sort!
-      # If we have no date, return the latest entry.
-      return [ @entries.last ] unless date
 
       @entries.reverse_each do |e|
         if result.empty?
+          # We haven't found any yet. So add the first one we find before the
+          # cut-off date.
           result << e if e.date <= date
         elsif result.first.date == e.date
+          # Now we only accept other entries with the exact same date.
           result << e
         else
+          # We've found all entries we are looking for.
           break
         end
       end
-      result
+      result.sort!
     end
 
     # Sort the list of entries. First by ascending by date, than by alertLevel
@@ -142,7 +154,7 @@ class TaskJuggler
       if block_given?
         @entries.sort! { |a, b| yield(a, b) }
       else
-        return if @sorted
+        return self if @sorted
 
         @entries.sort! { |a, b| a.date != b.date ?
                                 a.date <=> b.date :
@@ -152,6 +164,7 @@ class TaskJuggler
                                  b.property.sequenceNo) }
       end
       @sorted = true
+      self
     end
 
   end
@@ -203,16 +216,16 @@ class TaskJuggler
     end
 
     # Return a list of all JournalEntry objects for the given _task_ that
-    # are dated between _startDate_ and _endDate_, are from Author _resource_
-    # and have at least the alert level _alertLevel. If an optional parameter
-    # is nil, it always matches the entry.
+    # are dated between _startDate_ and _endDate_ (end date not included), are
+    # from Author _resource_ and have at least the alert level _alertLevel. If
+    # an optional parameter is nil, it always matches the entry.
     def entriesByTask(task, startDate = nil, endDate = nil,
                       resource = nil, alertLevel = nil)
       list = []
       @entries.each do |entry|
         if entry.property == task &&
-           (startDate.nil? || entry.date > startDate) &&
-           (endDate.nil? || entry.date <= endDate) &&
+           (startDate.nil? || entry.date >= startDate) &&
+           (endDate.nil? || entry.date < endDate) &&
            (resource.nil? || entry.author == resource) &&
            (alertLevel.nil? || entry.alertLevel >= alertLevel) &&
            !entry.headline.empty?
@@ -222,6 +235,21 @@ class TaskJuggler
       list
     end
 
+    # Return a list of all JournalEntry objects for the given _task_ or any of
+    # its sub tasks that are dated between _startDate_ and _endDate_, are from
+    # Author _resource_ and have at least the alert level _alertLevel. If an
+    # optional parameter is nil, it always matches the entry.
+    def entriesByTaskR(task, startDate = nil, endDate = nil,
+                      resource = nil, alertLevel = nil)
+      list = entriesByTask(task, startDate, endDate, resource, alertLevel)
+
+      task.children.each do |t|
+        list += entriesByTaskR(t, startDate, endDate, resource, alertLevel)
+      end
+
+      list
+    end
+
     def entries(startDate = nil, endDate = nil, property = nil,
                 alertLevel = nil)
       list = []
@@ -273,26 +301,28 @@ 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 not be newer than _minDate_.
+    # with alert level _minLevel_ must be newer than _minDate_.
     def currentEntries(date, property, minLevel, minDate)
       pEntries = @propertyToEntries[property] ?
-                 @propertyToEntries[property].last(date) : []
+                 @propertyToEntries[property].last(date) : JournalEntryList.new
       # Remove entries below the minium alert level or before the timeout
       # date.
-      pEntries.delete_if { |e| e.alertLevel < minLevel  || e.headline.empty? ||
-                               (e.alertLevel == minLevel && e.date <= minDate) }
+      pEntries.delete_if do |e|
+        e.headline.empty? || e.alertLevel < minLevel ||
+        (e.alertLevel == minLevel && minDate && e.date < minDate)
+      end
 
-      return [] if pEntries.empty?
+      return pEntries if pEntries.empty?
 
       # Check parents for a more important or more up-to-date message.
       p = property.parent
       while p do
         ppEntries = @propertyToEntries[p] ?
-                    @propertyToEntries[p].last(date) : []
+                    @propertyToEntries[p].last(date) : JournalEntryList.new
 
         # A parent has a more up-to-date message.
         if !ppEntries.empty? && ppEntries.first.date >= pEntries.first.date
-          return []
+          return JournalEntryList.new
         end
 
         p = p.parent
@@ -309,31 +339,41 @@ class TaskJuggler
     def currentEntriesR(date, property, minLevel = 0, minDate = nil)
       # See if this property has any current JournalEntry objects.
       pEntries = @propertyToEntries[property] ?
-                 @propertyToEntries[property].last(date) : []
+                 @propertyToEntries[property].last(date) : JournalEntryList.new
+      # Remove entries below the minium alert level or before the timeout
+      # date.
+      pEntries.delete_if do |e|
+        e.headline.empty? || e.alertLevel < minLevel ||
+        (e.alertLevel == minLevel && minDate && e.date < minDate)
+      end
+
+      # Determine the highest alert level of the pEntries.
+      maxPAlertLevel = 0
+      pEntries.each do |e|
+        maxPAlertLevel = e.alertLevel if e.alertLevel > maxPAlertLevel
+      end
 
       entries = JournalEntryList.new
       latestDate = nil
+      maxAlertLevel = 0
       # Now gather all current entries of the child properties and find the
       # date that is closest to and right before the given _date_.
       property.children.each do |p|
-        currentEntriesR(date, p).each do |e|
+        currentEntriesR(date, p, minLevel, minDate).each do |e|
+          # Find the date of the most recent entry.
           latestDate = e.date if latestDate.nil? || e.date > latestDate
-          next if e.headline.empty? || e.alertLevel < minLevel ||
-                  (e.alertLevel == minLevel && minDate && e.date < minDate)
+          # Find the highest alert level.
+          maxAlertLevel = e.alertLevel if e.alertLevel > maxAlertLevel
           entries << e
         end
       end
-      # If no child property has a more current JournalEntry than this
-      # property and this property has JournalEntry objects, than those are
-      # taken.
-      if !pEntries.empty? && (latestDate.nil? ||
+      # If no child property has a more current JournalEntry or one with a
+      # higher alert level than this property and this property has
+      # JournalEntry objects, than those are taken.
+      if !pEntries.empty? && (maxPAlertLevel > maxAlertLevel ||
+                              latestDate.nil? ||
                               pEntries.first.date >= latestDate)
-        entries = JournalEntryList.new
-        pEntries.each do |e|
-          next if e.headline.empty? || e.alertLevel < minLevel ||
-                  (e.alertLevel == minLevel && minDate && e.date < minDate)
-          entries << e
-        end
+        return pEntries
       end
       # Otherwise return the list provided by the childen.
       entries