taskjuggler 3.6.0 → 3.7.2

data/tasks/manual.rake

@@ -2,10 +2,12 @@
 
 require 'taskjuggler/apps/Tj3Man'
 
+CLOBBER.include "manual/html/"
+
 desc 'Generate User Manual'
 task :manual do
   htmldir = 'manual/html'
-  rm_rf htmldir if File.exists? htmldir
+  rm_rf htmldir if File.exist? htmldir
   mkdir_p htmldir
   # Make sure we can run 'rake manual' from all subdirs.
   ENV['TASKJUGGLER_DATA_PATH'] =

data/tasks/test.rake

@@ -2,6 +2,11 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'test')
 
 require 'rake/testtask'
 
+CLEAN.include "test/TestSuite/Export-Reports/refs/Leave.tjp"
+CLEAN.include "test/TestSuite/Export-Reports/refs/ListAttributes.tjp"
+CLEAN.include "test/TestSuite/Export-Reports/refs/Macro-4.tjp"
+CLEAN.include "test/TestSuite/Export-Reports/refs/TraceReport.tjp"
+
 # TEST TASK
 desc 'Run all unit tests in the test directory'
 Rake::TestTask.new(:unittest) do |t|

data/tasks/vim.rake

@@ -2,6 +2,8 @@
 
 require 'taskjuggler/VimSyntax'
 
+CLOBBER.include "data/tjp.vim"
+
 desc 'Generate vim.tjp Vim syntax file'
 task :vim do
   TaskJuggler::VimSyntax.new.generate('data/tjp.vim')

data/test/TestSuite/CSV-Reports/quotes.tjp

@@ -0,0 +1,20 @@
+project "targets" "1.0" 2007-12-16 +3m {
+  timezone 'UTC'
+}
+
+task t1 "T1"
+task t2 "T2" {
+  depends !t1
+}
+task t3 "T3" {
+  depends !t1
+}
+task t4 "T4 with \"quotes\"" {
+  depends !t3
+}
+
+taskreport '.' {
+  formats csv
+  columns name, targets
+}
+

data/test/TestSuite/CSV-Reports/refs/quotes.csv

@@ -0,0 +1,5 @@
+"Name";"Targets"
+"T1";"T2 (t2) 2007-12-16, T4 with ""quotes"" (t4) 2007-12-16"
+"T2";""
+"T3";"T4 with ""quotes"" (t4) 2007-12-16"
+"T4 with ""quotes""";""

data/test/TestSuite/Export-Reports/refs/AccountReport.tjp

@@ -45,7 +45,6 @@ task _Task_1 "Products" {
   task _Task_6 "Final Payment" {
     depends _Task_1.mf
     start 2012-10-22-17:00-+0000
-    milestone
     scheduled
   }
 }

data/test/TestSuite/Export-Reports/refs/AdoptedTasks.tjp

@@ -10,12 +10,10 @@ projectids prj
 
 task t1 "T1" {
   start 2011-03-05-00:00-+0000
-  milestone
   scheduled
 }
 task t2 "T2" {
   start 2011-03-05-00:00-+0000
-  milestone
   scheduled
 }
 task t3 "T3" {

data/test/TestSuite/Export-Reports/refs/AlertLevels.tjp

@@ -15,7 +15,6 @@ projectids prj
 
 task _Task_1 "Holiday Season" {
   start 2011-11-24-00:00-+0000
-  milestone
   scheduled
 }
 supplement task _Task_1 {

data/test/TestSuite/Export-Reports/refs/Allocate-1.tjp

@@ -25,7 +25,6 @@ task t1 "Task 1" {
   }
   task m1 "Milestone 1" {
     start 2003-06-05-06:00-+0000
-    milestone
     scheduled
   }
 }

data/test/TestSuite/Export-Reports/refs/AutoID.tjp

@@ -32,7 +32,6 @@ resource _Resource_1 "Foo" {
 task _Task_1 "Foo" {
   task _Task_2 "Bar" {
     start 2009-10-04-00:00-+0000
-    milestone
     scheduled
   }
 }

data/test/TestSuite/Export-Reports/refs/AutoMacros.tjp

@@ -10,7 +10,6 @@ projectids prj
 
 task items "Project breakdown" {
   start 2006-09-22-00:00-+0000
-  milestone
   scheduled
 }
 supplement task items {

data/test/TestSuite/Export-Reports/refs/Currencyformat.tjp

@@ -10,7 +10,6 @@ projectids prj
 
 task t "Task" {
   start 2007-01-01-00:00-+0000
-  milestone
   scheduled
 }
 supplement task t {

data/test/TestSuite/Export-Reports/refs/CustomAttributes.tjp

@@ -38,9 +38,7 @@ resource _Resource_1 "R"
 
 task _Task_1 "T" {
   start 2013-04-24-00:00-+0000
-  milestone
   scheduled
-  two:milestone
 }
 supplement task _Task_1 {
   Claim "A '''big''' statement."

data/test/TestSuite/Export-Reports/refs/Depends1.tjp

@@ -11,7 +11,6 @@ projectids prj
 task foo1 "foo1" {
   task foo2 "foo2" {
     start 2007-12-04-07:00-+0000
-    milestone
     scheduled
   }
   task foo3 "foo3" {

data/test/TestSuite/Export-Reports/refs/Durations.tjp

@@ -18,7 +18,6 @@ task t "Enclosing" {
   }
   task intervalTask "Interval Task" {
     start 2007-06-17-06:00-+0000
-    milestone
     scheduled
   }
   task lengthTask "Length Task" {

data/test/TestSuite/Export-Reports/refs/Efficiency.tjp

@@ -14,7 +14,6 @@ resource confRoom "Conference Room"
 
 task t "An important date" {
   start 2007-07-21-06:00-+0000
-  milestone
   scheduled
 }
 supplement task t {

data/test/TestSuite/Export-Reports/refs/Gap.tjp

@@ -10,19 +10,16 @@ projectids prj
 
 task t1 "Task 1" {
   start 2005-05-29-06:00-+0000
-  milestone
   scheduled
 }
 task t2 "Task 2" {
   depends t1
   start 2005-06-03-06:00-+0000
-  milestone
   scheduled
 }
 task t3 "Task 3" {
   depends t1
   start 2005-06-03-23:00-+0000
-  milestone
   scheduled
 }
 supplement task t1 {

data/test/TestSuite/Export-Reports/refs/Include.tjp

@@ -14,7 +14,6 @@ resource _Resource_4 "R2"
 
 task _Task_1 "Foo" {
   start 2010-02-26-00:00-+0000
-  milestone
   scheduled
 }
 supplement task _Task_1 {

data/test/TestSuite/Export-Reports/refs/Journal.tjp

@@ -11,7 +11,6 @@ resource tux "Tux"
 
 task t1 "Task1" {
   start 2009-05-05-06:00-+0000
-  milestone
   scheduled
 }
 supplement task t1 {

data/test/TestSuite/Export-Reports/refs/Macro-1.tjp

@@ -12,7 +12,6 @@ resource tux2 "Tux2"
 
 task t1 "Task1" {
   start 2008-01-18-00:00-+0000
-  milestone
   scheduled
 }
 task t2 "Task2" {

data/test/TestSuite/Export-Reports/refs/Macro-2.tjp

@@ -10,12 +10,10 @@ projectids prj
 
 task _Task_1 " Crème brûlée   Prepare " {
   start 2010-04-28-00:00-+0000
-  milestone
   scheduled
 }
 task _Task_2 "task" {
   start 2010-04-28-00:00-+0000
-  milestone
   scheduled
 }
 supplement task _Task_1 {

data/test/TestSuite/Export-Reports/refs/Macro-3.tjp

@@ -10,7 +10,6 @@ projectids foo600
 
 task _Task_1 "foo" {
   start 2009-12-01-00:00-+0000
-  milestone
   scheduled
 }
 supplement task _Task_1 {

data/test/TestSuite/Export-Reports/refs/Manager.tjp

@@ -23,7 +23,6 @@ resource _Resource_1 "The Company" {
 
 task _Task_1 "T" {
   start 2010-04-03-00:00-+0000
-  milestone
   scheduled
 }
 supplement task _Task_1 {

data/test/TestSuite/Export-Reports/refs/Milestone.tjp

@@ -10,12 +10,10 @@ projectids prj
 
 task project_start "Project Start" {
   start 2005-07-15-06:00-+0000
-  milestone
   scheduled
 }
 task deadline "Important Deadline" {
   start 2005-07-20-06:00-+0000
-  milestone
   scheduled
 }
 supplement task project_start {

data/test/TestSuite/Export-Reports/refs/Numberformat.tjp

@@ -10,7 +10,6 @@ projectids prj
 
 task t "Task" {
   start 2000-01-01-00:00-+0000
-  milestone
   scheduled
 }
 supplement task t {

data/test/TestSuite/Export-Reports/refs/Precedes1.tjp

@@ -11,7 +11,6 @@ projectids prj
 task foo1 "foo1" {
   task foo2 "foo2" {
     start 2003-12-04-07:00-+0000
-    milestone
     scheduled
   }
   task foo3 "foo3" {

data/test/TestSuite/Export-Reports/refs/Project.tjp

@@ -10,7 +10,6 @@ projectids prj
 
 task t "Task" {
   start 2007-01-01-07:00-+0000
-  milestone
   scheduled
 }
 supplement task t {

data/test/TestSuite/Export-Reports/refs/ProjectIDs.tjp

@@ -10,17 +10,14 @@ projectids prj, prj1, prj2
 
 task t1 "Task 1" {
   start 2006-08-22-06:00-+0000
-  milestone
   scheduled
 }
 task t2 "Task 2" {
   start 2006-08-22-06:00-+0000
-  milestone
   scheduled
 }
 task t3 "Task 3" {
   start 2006-08-22-06:00-+0000
-  milestone
   scheduled
 }
 supplement task t1 {

data/test/TestSuite/Export-Reports/refs/Reports.tjp

@@ -30,7 +30,6 @@ task t2 "FooTask2" {
 }
 task t3 "FooTask3" {
   start 2000-01-01-07:00-+0000
-  milestone
   scheduled
 }
 supplement task t1 {

data/test/TestSuite/Export-Reports/refs/Resource.tjp

@@ -15,7 +15,6 @@ resource team "A team" {
 
 task t "An important date" {
   start 2005-06-10-06:00-+0000
-  milestone
   scheduled
 }
 supplement task t {

data/test/TestSuite/Export-Reports/refs/ResourceRoot.tjp

@@ -19,7 +19,6 @@ resource r5 "R5"
 
 task _Task_1 "T" {
   start 2010-11-10-00:00-+0000
-  milestone
   scheduled
 }
 supplement task _Task_1 {

data/test/TestSuite/Export-Reports/refs/RollupResource.tjp

@@ -19,7 +19,6 @@ resource r5 "R5"
 
 task _Task_1 "T" {
   start 2010-11-10-00:00-+0000
-  milestone
   scheduled
 }
 supplement task _Task_1 {

data/test/TestSuite/Export-Reports/refs/Scenario.tjp

@@ -16,10 +16,8 @@ projectids prj
 
 task t "Task" {
   start 2007-05-29-06:00-+0000
-  milestone
   scheduled
   actual:start 2007-06-03-06:00-+0000
-  actual:milestone
 }
 supplement task t {
   priority 500

data/test/TestSuite/Export-Reports/refs/Timezone.tjp

@@ -10,7 +10,6 @@ projectids tz
 
 task item "Project" {
   start 2005-06-06-09:00-+0000
-  milestone
   scheduled
 }
 supplement task item {

data/test/TestSuite/Export-Reports/refs/Vacation.tjp

@@ -16,7 +16,6 @@ resource tuxus "Tuxus"
 
 task t "An important date" {
   start 2005-07-22-06:00-+0000
-  milestone
   scheduled
 }
 supplement task t {

data/test/TestSuite/Export-Reports/refs/navigator.tjp

@@ -11,24 +11,20 @@ projectids prj
 task foo "Foo" {
   task _Task_2 "Foo 1" {
     start 2011-12-12-00:00-+0000
-    milestone
     scheduled
   }
   task _Task_3 "Foo 2" {
     start 2011-12-12-00:00-+0000
-    milestone
     scheduled
   }
 }
 task bar "Bar" {
   task _Task_5 "Bar 1" {
     start 2011-12-12-00:00-+0000
-    milestone
     scheduled
   }
   task _Task_6 "Bar 2" {
     start 2011-12-12-00:00-+0000
-    milestone
     scheduled
   }
 }

data/test/TestSuite/Export-Reports/refs/template.tjp

@@ -18,12 +18,10 @@ task project "Project" {
   task wp1 "Workpackage 1" {
     task t1 "Task 1" {
       start 2011-11-11-05:00-+0000
-      milestone
       scheduled
     }
     task t2 "Task 2" {
       start 2011-11-11-05:00-+0000
-      milestone
       scheduled
     }
   }
@@ -31,12 +29,10 @@ task project "Project" {
     depends project.wp1
     task t1 "Task 1" {
       start 2011-11-11-05:00-+0000
-      milestone
       scheduled
     }
     task t2 "Task 2" {
       start 2011-11-11-05:00-+0000
-      milestone
       scheduled
     }
   }
@@ -44,13 +40,11 @@ task project "Project" {
     task _Task_9 "Item 1" {
       depends project.wp1
       start 2011-11-11-05:00-+0000
-      milestone
       scheduled
     }
     task _Task_10 "Item 2" {
       depends project.wp2
       start 2011-11-11-05:00-+0000
-      milestone
       scheduled
     }
   }

data/test/TestSuite/Export-Reports/refs/textreport.tjp

@@ -10,7 +10,6 @@ projectids prj
 
 task _Task_1 "Foo" {
   start 2011-12-11-00:00-+0000
-  milestone
   scheduled
 }
 supplement task _Task_1 {

data/test/TestSuite/Export-Reports/refs/tutorial.tjp

@@ -104,34 +104,26 @@ task AcSo "Accounting Software" {
   task deliveries "Milestones" {
     task start "Project start" {
       start 2002-01-16-00:00-+0000
-      milestone
       scheduled
       delayed:start 2002-01-19-23:00-+0000
-      delayed:milestone
     }
     task prev "Technology Preview" {
       depends AcSo.software.backend
       start 2002-02-28-14:00-+0000
-      milestone
       scheduled
       delayed:start 2002-03-05-14:00-+0000
-      delayed:milestone
     }
     task beta "Beta version" {
       depends AcSo.test.alpha
       start 2002-04-03-10:00-+0000
-      milestone
       scheduled
       delayed:start 2002-04-11-09:00-+0000
-      delayed:milestone
     }
     task done "Ship Product to Customer" {
       depends AcSo.test.beta, AcSo.manual
       start 2002-04-18-13:00-+0000
-      milestone
       scheduled
       delayed:start 2002-04-26-12:00-+0000
-      delayed:milestone
     }
   }
 }

data/test/TestSuite/Syntax/Correct/Booking.tjp

@@ -20,7 +20,7 @@ supplement resource tux {
                2007-01-09-13:00 +4h
   # This is a common mistake. With standard working hours, this will
   # yield a zero time booking! The interval is midnight to 8am. So
-  # it's outside of the working hours and 'sloppy 2' surpresses the
+  # it's outside of the working hours and 'sloppy 2' suppresses the
   # warning.
   booking test 2007-01-11 +8h { sloppy 2 }
   # Use 'overtime' to book off-hour slots. This booking will book the

data/test/TestSuite/Syntax/Correct/Currencyformat.tjp

@@ -1,7 +1,7 @@
 project prj "Project" "1.0" 2007-01-01 - 2007-03-01 {
   timezone "Europe/Berlin"
   # German currency format: e. g.  -10.000,20 5.014,11
-  numberformat "-" "" "." "," 2
+  currencyformat "-" "" "." "," 2
 
   # US currency format: e. g. (10,000.20) 5,014.11
   currencyformat "(" ")" "," "." 2

data/test/TestSuite/Syntax/Correct/template.tjp

@@ -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/test/TestSuite/Syntax/Correct/tutorial.tjp

@@ -33,6 +33,11 @@ project acso "Accounting Software"  2002-01-16 +4m {
 # *** EXAMPLE: now +
   now 2002-03-05-13:00
 # *** EXAMPLE: now -
+  # The date that is used to show additional line on a Gannt chart
+  # and can be specified by the user.
+# *** EXAMPLE: markdate +
+  markdate 2002-08-07-03:00
+# *** EXAMPLE: markdate -
   # The currency for all money values is the Euro.
 # *** EXAMPLE: currency +
   currency "USD"
@@ -559,9 +564,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/test/test_BatchProcessor.rb

@@ -32,6 +32,10 @@ class TestProject < Test::Unit::TestCase
     @t.kill
   end
 
+  def test_basic
+    doRun(1, 1) { sleep 0.1 }
+  end
+
   def test_simple
     doRun(1, 1) { sleep 0.1 }
     doRun(1, 2) { sleep 0.1 }
@@ -63,7 +67,6 @@ class TestProject < Test::Unit::TestCase
     @cnt = 0
     lock = Monitor.new
     bp.wait do |j|
-      puts "Signal error" if j.retVal.signaled?
       postprocess(j)
       lock.synchronize { @cnt += 1 }
     end
@@ -75,12 +78,12 @@ class TestProject < Test::Unit::TestCase
     yield
     $stderr.puts "Error #{n}" if n % 2 == 0
     puts "Job #{n} finished"
+    # Return the job ID as return value
     n
   end
 
   def postprocess(job)
-    assert_equal(job.retVal.exitstatus, job.jobId, 'JobID mismatch')
-    assert_equal(job.retVal.pid, job.pid, 'PID mismatch')
+    assert_equal(job.retVal, job.jobId, 'PID mismatch')
     assert_equal("job #{job.jobId}", job.tag)
     text = <<"EOT"
 Job #{job.jobId} started

data/test/test_ProjectFileScanner.rb

@@ -56,7 +56,7 @@ EOT
       [:LITERAL, '-', 6],
       [:LITERAL, '$', 6],
       [:MACRO, 'A Macro', 6],
-      [:TIME, time(15, 23), 7],
+      [:TIME, mktime(15, 23), 7],
       [:STRING, 'A string', 7],
       [:STRING, "It's a string", 8],
       [:STRING, "A\nmult\"i line\nstring", 9],
@@ -101,12 +101,12 @@ EOT
 24:00
 EOT
     ref = [
-      [:TIME, time(0, 0), 1],
-      [:TIME, time(0, 0), 2],
-      [:TIME, time(1, 0), 3],
-      [:TIME, time(11, 59), 4],
-      [:TIME, time(12, 1), 5],
-      [:TIME, time(24, 0), 6],
+      [:TIME, mktime(0, 0), 1],
+      [:TIME, mktime(0, 0), 2],
+      [:TIME, mktime(1, 0), 3],
+      [:TIME, mktime(11, 59), 4],
+      [:TIME, mktime(12, 1), 5],
+      [:TIME, mktime(24, 0), 6],
       [:eof, '<END>', 7]
     ]
 
@@ -172,7 +172,7 @@ EOT
 
   private
 
-  def time(h, m)
+  def mktime(h, m)
     (h * 60 + m) * 60
   end