taskjuggler 3.1.0 → 3.2.0

data/spec/ProjectBroker_spec.rb

@@ -23,8 +23,9 @@ class TaskJuggler
     pb.logStdIO = false
     pb.port = 0
     # Don't generate any debug or info messages
-    pb.log.outputLevel = 1
-    pb.log.logLevel = 1
+    mh = MessageHandlerInstance.instance
+    mh.outputLevel = 1
+    mh.logLevel = 1
     t = Thread.new { pb.start }
     yield
     pb.stop

data/spec/StatusSheets_spec.rb

@@ -26,7 +26,6 @@ class TaskJuggler
     include DaemonControl
 
     before(:all) do
-      @beforeExecuted = true
       # Make sure we run in the same directory as the spec file.
       @pwd = pwd
       cd(File.dirname(__FILE__))
@@ -122,9 +121,9 @@ timesheet r2 2011-03-14-00:00-+0000 - 2011-03-21-00:00-+0000 {
 }
 EOT
       res = stdIoWrapper(prj) do
-        Tj3Client.new.main(%w( --unsafe --silent add . ))
+        Tj3Client.new.main(%w( --unsafe add . ))
       end
-      unless res.stdErr =~ /Project sstest loaded/
+      unless res.stdErr.include?("Info: Project(s) . added")
         raise "Project not loaded: #{res.stdErr}"
       end
       raise "Can't load project: #{res.stdErr}" unless res.returnValue == 0
@@ -132,8 +131,10 @@ EOT
       res = stdIoWrapper do
         Tj3SsSender.new.main(%w( --dryrun --silent -e 2011-03-23 ))
       end
+      unless res.returnValue == 0
+        raise " Status sheet template generation failed: #{res.stdErr}"
+      end
       @sss_mails = collectMails(res.stdOut)
-      raise " Status sheet generation failed" unless res.returnValue == 0
 
       @sheet = <<'EOT'
 # --------8<--------8<--------

data/spec/TableColumnSorter_spec.rb

@@ -0,0 +1,78 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = TraceReport_spec.rb -- The TaskJuggler III Project Management Software
+#
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+#               by Chris Schlaeger <chris@linux.com>
+#
+# 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.
+#
+
+require 'rubygems'
+
+require 'taskjuggler/TableColumnSorter'
+
+class TaskJuggler
+
+  describe TableColumnSorter do
+
+    before do
+      @table = [ %w( One Two Three ), [ 1, 2, 3 ] ]
+      @sorter = TableColumnSorter.new(@table)
+    end
+
+    it "should not change for same header" do
+      t = @sorter.sort(%w( One Two Three ))
+      t.should == @table
+      @sorter.discontinuedColumns.should == 0
+    end
+
+    it "should not change for all remove" do
+      t = @sorter.sort(%w( ))
+      t.should == @table
+      @sorter.discontinuedColumns.should == 3
+    end
+
+    it "should move Two to back" do
+      t = @sorter.sort(%w( One Three ))
+      t.should == [ %w( One Three Two ), [ 1, 3, 2 ] ]
+      @sorter.discontinuedColumns.should == 1
+    end
+
+    it "should not change when last columns is missing" do
+      t = @sorter.sort(%w( One Two ))
+      t.should == @table
+      @sorter.discontinuedColumns.should == 1
+    end
+
+    it "should insert Four in front" do
+      t = @sorter.sort(%w( Four One Two Three ))
+      t.should == [ %w( Four One Two Three ), [ nil, 1, 2, 3 ] ]
+      @sorter.discontinuedColumns.should == 0
+    end
+
+    it "should insert Four and Five at end" do
+      t = @sorter.sort(%w( One Two Three Four Five ))
+      t.should == [ %w( One Two Three Four Five ), [ 1, 2, 3, nil, nil ] ]
+      @sorter.discontinuedColumns.should == 0
+    end
+
+    it "should insert Four at end and move Three to back" do
+      t = @sorter.sort(%w( One Two Four ))
+      t.should == [ %w( One Two Four Three ), [ 1, 2, nil, 3 ] ]
+      @sorter.discontinuedColumns.should == 1
+    end
+
+    it "should keep first columns and insert new directly after" do
+      t = @sorter.sort(%w( One Four Five ))
+      t.should == [ %w( One Four Five Two Three), [ 1, nil, nil, 2, 3 ] ]
+      @sorter.discontinuedColumns.should == 2
+    end
+
+  end
+
+end
+

data/spec/TimeSheets_spec.rb

@@ -31,6 +31,7 @@ class TaskJuggler
 
       cleanup
       startDaemon(<<'EOT'
+  emailDeliveryMethod: smtp
   smtpServer: foobar.com
 _timesheets:
   projectId: tstest
@@ -76,9 +77,9 @@ task t3 "T3" {
 }
 EOT
       res = stdIoWrapper(prj) do
-        Tj3Client.new.main(%w( --unsafe --silent add . ))
+        Tj3Client.new.main(%w( --unsafe add . ))
       end
-      unless res.stdErr =~ /Project tstest loaded/
+      unless res.stdErr.include?("Info: Project(s) . added")
         raise "Project not loaded: #{res.stdErr}"
       end
       raise "Can't load project" unless res.returnValue == 0
@@ -86,6 +87,9 @@ EOT
       res = stdIoWrapper do
         Tj3TsSender.new.main(%w( --dryrun --silent -e 2011-03-21 ))
       end
+      if res.stdErr != ''
+        raise "Tj3TsSender failed: #{res.stdErr}"
+      end
       @tss_mails = collectMails(res.stdOut)
       raise "Timesheet generation failed" unless res.returnValue == 0
 

data/spec/Tj3Daemon_spec.rb

@@ -42,10 +42,10 @@ class TaskJuggler
     it 'should be able to load a project' do
       prj = 'project foo "Foo" 2011-03-14 +1d task "Foo"'
       res = stdIoWrapper(prj) do
-        Tj3Client.new.main(%w( --unsafe --silent add . ))
+        Tj3Client.new.main(%w( --unsafe add . ))
       end
       res.returnValue.should == 0
-      res.stdErr.should match /Project foo loaded/
+      res.stdErr.should match /Project\(s\) \. added/
     end
 
   end

data/spec/TraceReport_spec.rb

@@ -0,0 +1,117 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = TimeSheets_spec.rb -- The TaskJuggler III Project Management Software
+#
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+#               by Chris Schlaeger <chris@linux.com>
+#
+# 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.
+#
+
+require 'taskjuggler/TaskJuggler'
+require 'taskjuggler/StdIoWrapper'
+require 'taskjuggler/apps/Tj3'
+
+class TaskJuggler
+
+
+  describe TraceReport do
+
+    include StdIoWrapper
+
+    before(:all) do
+      tf = 'tracereport'
+      @tf = tf + '.csv'
+      @prj = <<"EOT"
+project "Test" 2012-03-01 +2m {
+  now 2012-03-11
+}
+
+resource r "R"
+
+task t1 "T1" {
+  effort 10d
+  allocate r
+}
+task t2 "T2" {
+  depends t1
+  duration 5d
+}
+task t3 "T3" {
+  depends t2
+}
+
+tracereport '#{tf}' {
+  columns complete
+}
+EOT
+    end
+
+    after(:all) do
+      File.delete(@tf)
+    end
+
+    it 'should generate a trace report' do
+      File.delete(@tf) if File.exists?(@tf)
+      tj3(@prj)
+      ref = <<'EOT'
+"Date";"t1:plan.complete";"t2:plan.complete";"t3:plan.complete"
+"2012-03-11";70.0;0.0;0.0
+EOT
+     checkCSV(@tf, ref)
+    end
+
+    it 'should replace the existing line' do
+      before = File.read(@tf)
+      tj3(@prj)
+      after = File.read(@tf)
+      before.should == after
+    end
+
+    it 'should add a new line for another day' do
+      prj = @prj.gsub(/now 2012-03-11/, 'now 2012-03-18')
+      tj3(prj)
+      ref = <<'EOT'
+"Date";"t1:plan.complete";"t2:plan.complete";"t3:plan.complete"
+"2012-03-11";70.0;0.0;0.0
+"2012-03-18";100.0;65.83333333333333;0.0
+EOT
+     checkCSV(@tf, ref)
+    end
+
+    it 'should add to a file without data columns' do
+      File.write(@tf, <<'EOT'
+"Date"
+"2012-03-11"
+EOT
+                )
+      tj3(@prj)
+      ref = <<'EOT'
+"Date";"t1:plan.complete";"t2:plan.complete";"t3:plan.complete"
+"2012-03-11";70.0;0.0;0.0
+EOT
+     checkCSV(@tf, ref)
+    end
+
+    private
+
+    def tj3(prj)
+      res = stdIoWrapper(prj) do
+        Tj3.new.main(%w( --silent --add-trace . ))
+      end
+      res.stdOut.should == ''
+      res.stdErr.should == ''
+      res.returnValue.should == 0
+    end
+
+    def checkCSV(file, ref)
+     File.read(file).should == ref
+    end
+
+  end
+
+end
+

data/taskjuggler.gemspec

@@ -63,7 +63,7 @@ EOT
   s.has_rdoc = true
   s.extra_rdoc_files = %w( README.rdoc COPYING CHANGELOG )
 
-  s.add_dependency('mail', '>= 2.2.15')
+  s.add_dependency('mail', '>= 2.4.3')
   s.add_dependency('term-ansicolor', '>= 1.0.7')
   s.add_development_dependency('rspec', '>= 2.5.0')
   s.platform = Gem::Platform::RUBY

data/test/MessageChecker.rb

@@ -11,13 +11,15 @@
 # published by the Free Software Foundation.
 #
 
+require 'taskjuggler/MessageHandler'
+
 module MessageChecker
 
   # Check that all messages that were generated during the TaskJuggler run
   # match the references specified in the test file.
   def checkMessages(tj, file)
     refMessages = collectMessages(file)
-    tj.messageHandler.messages.each do |message|
+    TaskJuggler::MessageHandlerInstance.instance.messages.each do |message|
       assert(ref = refMessages.pop, "Unexpected #{message.type.to_s} #{message.id}: #{message}")
       assert_equal(ref[0], message.type.to_s,
           "Error in #{file}: Got #{message.type.to_s} instead of #{ref[0]}")

data/test/ReferenceGenerator.rb

@@ -48,7 +48,7 @@ class TaskJuggler
       deleteOldReports(tjpFile[0..-5])
 
       puts "Generating references for #{tjpFile}"
-      tj = TaskJuggler.new(true)
+      tj = TaskJuggler.new
       tj.parse([ tjpFile ]) || error("Parser failed for ${tjpFile}")
       tj.schedule || error("Scheduler failed for #{tjpFile}")
       tj.generateReports(outputDir) ||

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

@@ -25,7 +25,7 @@ resource team "Team" {
   }
 }
 resource r3 "R3" {
-  shift s1 2011-12-19 +3w
+  shifts s1 2011-12-19 +3w
   leaves sick 2012-01-04 +2d
 }
 

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

@@ -1,5 +1,6 @@
 "BSI";"Name";"Effort";"2007-12-10-00:00:00";"2007-12-17-00:00:00";"2007-12-24-00:00:00";"2007-12-31-00:00:00";"2008-01-07-00:00:00";"2008-01-14-00:00:00";"2008-01-21-00:00:00";"2008-01-28-00:00:00";"2008-02-04-00:00:00";"2008-02-11-00:00:00";"2008-02-18-00:00:00"
 3;"Jack";17.0;"";"";"";"";3.0;5.0;4.0;"";5.0;"";""
+4;"  Virtual View";5.0;"";"";"";"";"";"";"";"";5.0;"";""
 2;"  Execute Work";17.0;"";"";"";"";3.0;5.0;4.0;"";5.0;"";""
 2.2;"    Step 2";5.0;"";"";"";"";"";"";"";"";5.0;"";""
 "    2.2.2";"      Step 2.2";5.0;"";"";"";"";"";"";"";"";5.0;"";""
@@ -8,6 +9,7 @@
 1;"  Plan Work";12.5;"";5.0;2.5;5.0;"";"";"";"";"";"";""
 1.2;"    Plan B";7.5;"";5.0;2.5;"";"";"";"";"";"";"";""
 1.3;"    Plan C";5.0;"";"";"";5.0;"";"";"";"";"";"";""
+4;"  Virtual View";17.5;"";5.0;2.5;"";"";"";"";"";5.0;5.0;""
 2;"  Execute Work";25.0;"";"";"";"";5.0;5.0;5.0;5.0;5.0;"";""
 2.1;"    Step 1";20.0;"";"";"";"";5.0;5.0;5.0;5.0;"";"";""
 2.2;"    Step 2";5.0;"";"";"";"";"";"";"";"";5.0;"";""
@@ -16,6 +18,7 @@
 2;"Joe";14.0;"";5.0;5.0;"";2.0;"";"";"";2.0;"";""
 1;"  Plan Work";10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
 1.1;"    Plan A";10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
+4;"  Virtual View";2.0;"";"";"";"";2.0;"";"";"";"";"";""
 2;"  Execute Work";4.0;"";"";"";"";2.0;"";"";"";2.0;"";""
 2.2;"    Step 2";2.0;"";"";"";"";2.0;"";"";"";"";"";""
 "    2.2.1";"      Step 2.1";2.0;"";"";"";"";2.0;"";"";"";"";"";""

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

@@ -0,0 +1,9 @@
+"Id";"Active Tasks";"Open Tasks";"Closed Tasks"
+"_Task_1";2;3;2
+"_Task_1._Task_2";0;0;1
+"_Task_1._Task_4";1;2;1
+"_Task_1._Task_4._Task_5";0;0;1
+"_Task_1._Task_4._Task_6";1;1;0
+"_Task_1._Task_4._Task_7";1;1;0
+"_Task_1._Task_3";1;1;0
+"_Task_8";1;1;0

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

@@ -1,7 +1,7 @@
 "BSI";"Name";"Start";"End";"Duration";"Effort";"2007-12-10-00:00:00-+0000";"2007-12-17-00:00:00-+0000";"2007-12-24-00:00:00-+0000";"2007-12-31-00:00:00-+0000";"2008-01-07-00:00:00-+0000";"2008-01-14-00:00:00-+0000";"2008-01-21-00:00:00-+0000";"2008-01-28-00:00:00-+0000";"2008-02-04-00:00:00-+0000";"2008-02-11-00:00:00-+0000";"2008-02-18-00:00:00-+0000"
 1;"Plan Work";"2007-12-16-00:00:00-+0000";"2008-01-04-18:00:00-+0000";19.8;22.5;"";10.0;7.5;5.0;"";"";"";"";"";"";""
-1;"  Jill";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
-2;"  Joe";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
+1;"  Jill";"";"";"";12.5;"";5.0;2.5;5.0;"";"";"";"";"";"";""
+2;"  Joe";"";"";"";10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
 1.1;"  Plan A";"2007-12-17-09:00:00-+0000";"2007-12-28-18:00:00-+0000";11.4;10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
 2;"    Joe";"";"";"";10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
 1.2;"  Plan B";"2007-12-17-09:00:00-+0000";"2007-12-26-14:00:00-+0000";9.2;7.5;"";5.0;2.5;"";"";"";"";"";"";"";""
@@ -9,30 +9,33 @@
 1.3;"  Plan C";"2007-12-31-09:00:00-+0000";"2008-01-04-18:00:00-+0000";4.4;5.0;"";"";"";5.0;"";"";"";"";"";"";""
 1;"    Jill";"";"";"";5.0;"";"";"";5.0;"";"";"";"";"";"";""
 4;"Virtual View";"2007-12-17-09:00:00-+0000";"2008-02-15-18:00:00-+0000";60.4;24.5;"";5.0;2.5;"";2.0;"";"";"";10.0;5.0;""
+3;"  Jack";"";"";"";5.0;"";"";"";"";"";"";"";"";5.0;"";""
+1;"  Jill";"";"";"";17.5;"";5.0;2.5;"";"";"";"";"";5.0;5.0;""
+2;"  Joe";"";"";"";2.0;"";"";"";"";2.0;"";"";"";"";"";""
 1.2;"  Plan B";"2007-12-17-09:00:00-+0000";"2007-12-26-14:00:00-+0000";9.2;7.5;"";5.0;2.5;"";"";"";"";"";"";"";""
-1;"    Jill";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
+1;"    Jill";"";"";"";7.5;"";5.0;2.5;"";"";"";"";"";"";"";""
 2.2;"  Step 2";"2008-01-07-09:00:00-+0000";"2008-02-08-18:00:00-+0000";32.4;12.0;"";"";"";"";2.0;"";"";"";10.0;"";""
-3;"    Jack";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
-1;"    Jill";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
-2;"    Joe";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
+3;"    Jack";"";"";"";5.0;"";"";"";"";"";"";"";"";5.0;"";""
+1;"    Jill";"";"";"";5.0;"";"";"";"";"";"";"";"";5.0;"";""
+2;"    Joe";"";"";"";2.0;"";"";"";"";2.0;"";"";"";"";"";""
 "2.2.1";"    Step 2.1";"2008-01-07-09:00:00-+0000";"2008-01-08-18:00:00-+0000";1.4;2.0;"";"";"";"";2.0;"";"";"";"";"";""
-2;"      Joe";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
+2;"      Joe";"";"";"";2.0;"";"";"";"";2.0;"";"";"";"";"";""
 "2.2.2";"    Step 2.2";"2008-02-04-09:00:00-+0000";"2008-02-08-18:00:00-+0000";4.4;10.0;"";"";"";"";"";"";"";"";10.0;"";""
-3;"      Jack";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
-1;"      Jill";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
+3;"      Jack";"";"";"";5.0;"";"";"";"";"";"";"";"";5.0;"";""
+1;"      Jill";"";"";"";5.0;"";"";"";"";"";"";"";"";5.0;"";""
 2.3;"  Milestone 1";"2008-02-08-18:00:00-+0000";"2008-02-08-18:00:00-+0000";0.0;0.0;"";"";"";"";"";"";"";"";"";"";""
 3;"  Check Work";"2008-02-11-09:00:00-+0000";"2008-02-15-18:00:00-+0000";4.4;5.0;"";"";"";"";"";"";"";"";"";5.0;""
-1;"    Jill";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
+1;"    Jill";"";"";"";5.0;"";"";"";"";"";"";"";"";"";5.0;""
 2;"Execute Work";"2008-01-07-09:00:00-+0000";"2008-02-08-18:00:00-+0000";32.4;46.0;"";"";"";"";10.0;10.0;9.0;5.0;12.0;"";""
-3;"  Jack";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
-1;"  Jill";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
-2;"  Joe";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
+3;"  Jack";"";"";"";17.0;"";"";"";"";3.0;5.0;4.0;"";5.0;"";""
+1;"  Jill";"";"";"";25.0;"";"";"";"";5.0;5.0;5.0;5.0;5.0;"";""
+2;"  Joe";"";"";"";4.0;"";"";"";"";2.0;"";"";"";2.0;"";""
 2.1;"  Step 1";"2008-01-07-09:00:00-+0000";"2008-02-01-18:00:00-+0000";25.4;20.0;"";"";"";"";5.0;5.0;5.0;5.0;"";"";""
 1;"    Jill";"";"";"";20.0;"";"";"";"";5.0;5.0;5.0;5.0;"";"";""
 2.2;"  Step 2";"2008-01-07-09:00:00-+0000";"2008-02-08-18:00:00-+0000";32.4;12.0;"";"";"";"";2.0;"";"";"";10.0;"";""
-3;"    Jack";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
-1;"    Jill";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
-2;"    Joe";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
+3;"    Jack";"";"";"";5.0;"";"";"";"";"";"";"";"";5.0;"";""
+1;"    Jill";"";"";"";5.0;"";"";"";"";"";"";"";"";5.0;"";""
+2;"    Joe";"";"";"";2.0;"";"";"";"";2.0;"";"";"";"";"";""
 "2.2.1";"    Step 2.1";"2008-01-07-09:00:00-+0000";"2008-01-08-18:00:00-+0000";1.4;2.0;"";"";"";"";2.0;"";"";"";"";"";""
 2;"      Joe";"";"";"";2.0;"";"";"";"";2.0;"";"";"";"";"";""
 "2.2.2";"    Step 2.2";"2008-02-04-09:00:00-+0000";"2008-02-08-18:00:00-+0000";4.4;10.0;"";"";"";"";"";"";"";"";10.0;"";""

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

@@ -8,6 +8,7 @@
 "  Execute Work";"";5.0;5.0;32.4;"";5.0;5.0;10.0
 "    Step 1";"";5.0;5.0;25.4;"";5.0;5.0;10.0
 "Joe";"";2.0;"";"";"";2.0;"";2.0
+"  Virtual View";"";2.0;"";60.4;"";2.0;"";2.0
 "  Execute Work";"";2.0;"";32.4;"";2.0;"";2.0
 "    Step 2";"";2.0;"";32.4;"";2.0;"";2.0
 "      Step 2.1";"";2.0;"";1.4;"";2.0;"";2.0

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

@@ -7,13 +7,25 @@ project prj "LogExp" "1.0" 2009-10-19-00:00-+0000 - 2009-12-18-20:00-+0000 {
 
 projectids prj
 
+resource r "R"
 
 task _Task_1 "T" {
-  start 2009-10-19-00:00-+0000
-  milestone
+  start 2009-10-19-15:00-+0000
+  end 2009-10-19-23:00-+0000
+  scheduling asap
   scheduled
 }
 supplement task _Task_1 {
+  booking r 2009-10-19-15:00-+0000 + 8.0h { overtime 2 }
   priority 500
   projectid prj
 }
+supplement resource r {
+  workinghours sun off
+               workinghours mon 9:00 - 17:00
+               workinghours tue 9:00 - 17:00
+               workinghours wed 9:00 - 17:00
+               workinghours thu 9:00 - 17:00
+               workinghours fri 9:00 - 17:00
+               workinghours sat off
+}