taskjuggler 3.7.1 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5a0de8b9d1e062a746ba217051e7351d2481644f649f585528c7caabd6b69a9
-  data.tar.gz: 6223c62cafa2db90ae8d4cc8759f5b5cff458b884833a4b6355284df450459c5
+  metadata.gz: ac8d1b5b2a3a8a3de01a39de2ef9533e1c86ade627b4a27ccf83427dac988093
+  data.tar.gz: 7dea4a421b72b1a6645b0699bfb4076eaa4fc46fcd1274066503dc2c36d7a343
 SHA512:
-  metadata.gz: 70a76a0185eba07950375e0b44bcb32f74bada5b652d96f131fe4bf62cba6dabbd3d90b6f3216159e3d826836a74e228e1ef278b43f4bfbc6743c10aee41a48c
-  data.tar.gz: 76324478980524c4c7a6be0039388d6116db7891037d179e094723c7ca74d7b19325c9668a0dc626e78e7b2346614a32b24a48aa53d1430c70773aa18a35c462
+  metadata.gz: a07a210795fb27f09a3a8cc09fcef2ceb21c0f08d47cedb8655b3cc1df8201b7f309278dd1464961a5c9e06164d12ae85f979435a3007701428fe852801ffccc
+  data.tar.gz: dd87f1321f59cbd9399a2b25ab7d5f3d16a01952579f3b54abfb7e2794a0f322c047e4bfb93434569eaea9cf1fd98a7ca6737ed20bea9e5c00816c6ab0f64bc4

data/CHANGELOG

@@ -1,3 +1,21 @@
+= 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

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/tjp.vim

@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     TaskJuggler
 " Maintainer:   TaskJuggler Developers <taskjuggler-devel@googlegroups.com>
-" Last Change:  2020-03-14 17:32:05 +0100
+" Last Change:  2023-02-25 11:11:12 +0100
 " This file was automatically generated by VimSyntax.rb
 
 if exists("b:current_syntax")
@@ -21,6 +21,10 @@ syn keyword tjp_macro macro contained
 syn keyword tjp_project project contained
 syn keyword tjp_supplement supplement contained
 
+syn keyword tjp_account account contained
+hi def link tjp_account Function
+syn keyword tjp_accountreport accountreport contained
+hi def link tjp_accountreport Function
 syn keyword tjp_export export contained
 hi def link tjp_export Function
 syn keyword tjp_nikureport nikureport contained
@@ -47,11 +51,13 @@ syn keyword tjp_timesheetreport timesheetreport contained
 hi def link tjp_timesheetreport Function
 syn keyword tjp_tracereport tracereport contained
 hi def link tjp_tracereport Function
-syn keyword tjp_account account contained
-hi def link tjp_account Function
-syn keyword tjp_accountreport accountreport contained
-hi def link tjp_accountreport Function
 
+syn keyword tjp_aggregate aggregate contained
+hi def link tjp_aggregate Type
+syn keyword tjp_credits credits contained
+hi def link tjp_credits Type
+syn keyword tjp_flags_account flags contained
+hi def link tjp_flags_account Type
 syn keyword tjp_allocate allocate contained
 hi def link tjp_allocate Type
 syn keyword tjp_alternative alternative contained
@@ -646,12 +652,6 @@ syn keyword tjp_workinghours_resource workinghours contained
 hi def link tjp_workinghours_resource Type
 syn keyword tjp_workinghours_shift workinghours contained
 hi def link tjp_workinghours_shift Type
-syn keyword tjp_aggregate aggregate contained
-hi def link tjp_aggregate Type
-syn keyword tjp_credits credits contained
-hi def link tjp_credits Type
-syn keyword tjp_flags_account flags contained
-hi def link tjp_flags_account Type
 
 syn match tjparg contained /\${.*}/
 syn match tjpcomment /#.*$/
@@ -662,6 +662,8 @@ syn match tjpdate /\s\d\{4}-\d\{1,2}-\d\{1,2}\(-\d\{1,2}:\d\{1,2}\(:\d\{1,2}\)\?
 syn match tjptime /\s\d\{1,2}:\d\d\(:\d\d\)\?/
 
 syn cluster tjpcommon contains=tjpcomment,tjpdate,tjptime,tjpstring,tjpnumber
+syn region tjpblk_account start=/^\s*account\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_account,tjp_account,tjpblk_account,tjp_aggregate,tjp_credits,tjp_flags_account
+syn region tjpblk_accountreport start=/^\s*accountreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_accountreport,tjp_accountroot,tjp_auxdir_report,tjp_balance,tjp_caption,tjp_center,tjp_columns,tjpblk_columns,tjp_currencyformat,tjp_end_report,tjp_epilog,tjp_flags_report,tjp_footer,tjp_formats,tjp_header,tjp_headline,tjp_hidejournalentry,tjp_hideaccount,tjp_hideresource,tjp_hidetask,tjp_height,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_rawhtmlhead,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_right,tjp_rollupaccount,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortaccounts,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title,tjp_width
 syn region tjpblk_allocate start=/^\s*allocate\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_allocate,tjp_alternative,tjp_select,tjp_persistent,tjp_mandatory,tjp_shifts_allocate contained
 syn region tjpblk_export start=/^\s*export\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_export,tjp_definitions,tjp_formats_export,tjp_hideresource,tjp_hidetask,tjp_loadunit,tjp_purge,tjp_end_report,tjp_period_report,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_start_report,tjp_resourceattributes,tjp_rollupresource,tjp_rolluptask,tjp_scenarios_export,tjp_taskattributes,tjp_taskroot_export,tjp_timezone_export
 syn region tjpblk_date_extend start=/^\s*date\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_date_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
@@ -712,8 +714,6 @@ syn region tjpblk_task_timesheet start=/^\s*task\s.*{\s*$/ end=/^\s*}\s*$/ trans
 syn region tjpblk_timesheetreport start=/^\s*timesheetreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_timesheetreport,tjp_hideresource,tjp_hidetask,tjp_end_report,tjp_period_report,tjp_start_report,tjp_sortresources,tjp_sorttasks
 syn region tjpblk_tracereport start=/^\s*tracereport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_tracereport,tjp_accountroot,tjp_auxdir_report,tjp_balance,tjp_caption,tjp_center,tjp_columns,tjpblk_columns,tjp_currencyformat,tjp_end_report,tjp_epilog,tjp_flags_report,tjp_footer,tjp_formats,tjp_header,tjp_headline,tjp_hidejournalentry,tjp_hideaccount,tjp_hideresource,tjp_hidetask,tjp_height,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_rawhtmlhead,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_right,tjp_rollupaccount,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortaccounts,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title,tjp_width
 syn region tjpblk_status_timesheet start=/^\s*status\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_status_timesheet,tjp_details,tjp_flags_timesheet,tjp_summary contained
-syn region tjpblk_account start=/^\s*account\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_account,tjp_account,tjpblk_account,tjp_aggregate,tjp_credits,tjp_flags_account
-syn region tjpblk_accountreport start=/^\s*accountreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_accountreport,tjp_accountroot,tjp_auxdir_report,tjp_balance,tjp_caption,tjp_center,tjp_columns,tjpblk_columns,tjp_currencyformat,tjp_end_report,tjp_epilog,tjp_flags_report,tjp_footer,tjp_formats,tjp_header,tjp_headline,tjp_hidejournalentry,tjp_hideaccount,tjp_hideresource,tjp_hidetask,tjp_height,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_rawhtmlhead,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_right,tjp_rollupaccount,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortaccounts,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title,tjp_width
 syn region tjpblk_macro start=/macro\s\+\h\w*\s*\[/ end=/\]$/ transparent fold contains=ALL
 syn region tjpstring start=/"/ skip=/\\"/ end=/"/
 syn region tjpstring start=/'/ skip=/\\'/ end=/'/

data/examples/ProjectTemplate/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/examples/Tutorial/tutorial.tjp

@@ -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/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/BatchProcessor.rb

@@ -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/MessageHandler.rb

@@ -248,7 +248,6 @@ class TaskJuggler
 
       timeStamp = Time.new.strftime("%Y-%m-%d %H:%M:%S")
       begin
-        @logFile.untaint
         File.open(@logFile, 'a') do |f|
           f.write("#{timeStamp} #{type} #{@appName}[#{Process.pid}]: " +
                   "#{message}\n")

data/lib/taskjuggler/ResourceScenario.rb

@@ -3,7 +3,7 @@
 #
 # = ResourceScenario.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, 2020
 #               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -322,6 +322,34 @@ class TaskJuggler
       end
     end
 
+    # A list of the tasks that the resource has been  allocated to work on in
+    # the report time frame.
+    def query_duties(query)
+      list = []
+      iv = TimeInterval.new(query.start, query.end)
+      @duties.each do |task|
+        if task.hasResourceAllocated?(@scenarioIdx, iv, @property)
+          if query.listItem
+            rti = RichText.new(query.listItem, RTFHandlers.create(@project)).
+              generateIntermediateFormat
+            unless rti
+              error('bad_resource_ts_query',
+                    "Syntax error in query statement for task attribute " +
+                    "'resources'.")
+            end
+            q = query.dup
+            q.property = task
+            q.scopeProperty = @property
+            rti.setQuery(q)
+            list << "<nowiki>#{rti.to_s}</nowiki>"
+          else
+            list << "<nowiki>#{task.name} (#{task.id})</nowiki>"
+          end
+        end
+      end
+      query.assignList(list)
+    end
+
     # The effort allocated to the Resource in the specified interval. In case a
     # Task is given as scope property only the effort allocated to this Task is
     # taken into account.

data/lib/taskjuggler/RuntimeConfig.rb

@@ -48,7 +48,7 @@ class RuntimeConfig
     return false unless (p = @config)
     sections.each do |sec|
       p = p['_' + sec]
-      unless p
+      unless p && p.is_a?(Hash)
         debug("Section #{section} not found in config file")
         return false
       end

data/lib/taskjuggler/SheetHandlerBase.rb

@@ -166,11 +166,12 @@ class TaskJuggler
                   inReplyTo = nil)
       case @emailDeliveryMethod
       when 'smtp'
-        Mail.defaults do
-          delivery_method :smtp, {
+        settings_dto = {
             :address => @smtpServer,
-            :port => 25
-          }
+            :port => 25,
+        }
+        Mail.defaults do
+          delivery_method :smtp, settings_dto
         end
       when 'sendmail'
         Mail.defaults do

data/lib/taskjuggler/StatusSheetReceiver.rb

@@ -35,9 +35,9 @@ class TaskJuggler
       @logFile = 'statussheets.log'
 
       # Regular expression to identify status sheets.
-      @sheetHeader = /^[ ]*statussheet\s([a-z][a-z0-9_]*)\s[0-9\-:+]*\s-\s([0-9]*-[0-9]*-[0-9]*)/
+      @sheetHeader = /^[ ]*statussheet\s([a-zA-Z_][a-zA-Z0-9_]*)\s[0-9\-:+]*\s-\s([0-9]*-[0-9]*-[0-9]*)/
       # Regular expression to extract the sheet signature (time period).
-      @signatureFilter = /^[ ]*statussheet\s[a-z][a-z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
+      @signatureFilter = /^[ ]*statussheet\s[a-zA-Z_][a-zA-Z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
       @emailSubject = "Status report from %s for %s"
     end
 

data/lib/taskjuggler/StatusSheetSender.rb

@@ -39,7 +39,7 @@ class TaskJuggler
       # The log file
       @logFile = 'statussheets.log'
 
-      @signatureFilter = /^[ ]*statussheet\s[a-z][a-z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
+      @signatureFilter = /^[ ]*statussheet\s[a-zA-Z_][a-zA-Z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
       @introText = <<'EOT'
 Please find enclosed your weekly status report template. Please fill out the
 form and send it back to the sender of this email. You can either use the

data/lib/taskjuggler/TaskScenario.rb

@@ -1508,6 +1508,7 @@ class TaskJuggler
             end
             q = query.dup
             q.property = resource
+            q.scopeProperty = @property
             rti.setQuery(q)
             list << "<nowiki>#{rti.to_s}</nowiki>"
           else
@@ -2179,8 +2180,12 @@ class TaskJuggler
       # been set already.
       if @scheduled && @effort == 0 && @length == 0 && @duration == 0 &&
          !@milestone
-        @start = @project.idxToDate(firstSlotIdx) unless @start
-        @end = @project.idxToDate(lastSlotIdx + 1) unless @end
+        unless @start || !firstSlotIdx
+          @start = @project.idxToDate(firstSlotIdx)
+        end
+        unless @end || !lastSlotIdx
+          @end = @project.idxToDate(lastSlotIdx + 1)
+        end
       end
     end
 

data/lib/taskjuggler/TextParser/Scanner.rb

@@ -169,7 +169,7 @@ class TaskJuggler::TextParser
 
       def initialize(fileName, log, textScanner)
         super(log, textScanner)
-        @fileName = fileName.dup.untaint
+        @fileName = fileName.dup
         data = (fileName == '.' ? $stdin : File.new(@fileName, 'r')).read
         begin
           @stream = StringIO.new(data.forceUTF8Encoding)

data/lib/taskjuggler/TimeSheetReceiver.rb

@@ -32,9 +32,9 @@ class TaskJuggler
       @logFile = 'timesheets.log'
 
       # Regular expression to identify time sheets.
-      @sheetHeader = /^[ ]*timesheet\s([a-z][a-z0-9_]*)\s[0-9\-:+]*\s-\s([0-9]*-[0-9]*-[0-9]*)/
+      @sheetHeader = /^[ ]*timesheet\s([a-zA-Z_][a-zA-Z0-9_]*)\s[0-9\-:+]*\s-\s([0-9]*-[0-9]*-[0-9]*)/
       # Regular expression to extract the sheet signature (time period).
-      @signatureFilter = /^[ ]*timesheet\s[a-z][a-z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
+      @signatureFilter = /^[ ]*timesheet\s[a-zA-Z_][a-zA-Z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
       @emailSubject = "Report from %s for %s"
     end
 

data/lib/taskjuggler/TimeSheetSender.rb

@@ -38,7 +38,7 @@ class TaskJuggler
       # The log file
       @logFile = 'timesheets.log'
 
-      @signatureFilter = /^[ ]*timesheet\s[a-z][a-z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
+      @signatureFilter = /^[ ]*timesheet\s[a-zA-Z_][a-zA-Z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
       @introText = <<'EOT'
 Please find enclosed your weekly report template. Please fill out
 the form and send it back to the sender of this email. You can either

data/lib/taskjuggler/TimeSheets.rb

@@ -325,9 +325,10 @@ class TaskJuggler
     def totalGrossWorkingSlots
       project = @resource.project
       # Calculate the number of weeks in the report
-      weeksToReport = (@interval.end - @interval.start) / (60 * 60 * 24 * 7)
+      weeksToReport = (@interval.end - @interval.start).to_f /
+        (60 * 60 * 24 * 7)
 
-      daysToSlots(project.weeklyWorkingDays * weeksToReport)
+      daysToSlots((project.weeklyWorkingDays * weeksToReport).to_i)
     end
 
     # Compute the total number of actual working time slots of the

data/lib/taskjuggler/TjpSyntaxRules.rb

@@ -3,7 +3,7 @@
 #
 # = TjpSyntaxRules.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, 2020
 #               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -673,7 +673,7 @@ EOT
   def rule_color
     pattern(%w( $STRING ), lambda {
       col = @val[0]
-      unless /#[0-9A-Fa-f]{3}/ =~ col || /#[0-9A-Fa-f]{3}/ =~ col
+      unless /#[0-9A-Fa-f]{3}/ =~ col || /#[0-9A-Fa-f]{6}/ =~ col
         error('bad_color',
               "Color values must be specified as '#RGB' or '#RRGGBB' values",
               @sourceFileInfo[0])
@@ -3932,7 +3932,13 @@ EOT
     descr('The duration of a task')
 
     singlePattern('_duties')
-    descr('List of tasks that the resource is allocated to')
+    descr(<<'EOT'
+List of tasks that the resource is allocated to
+
+The list can be customized by the [[listitem.column|listitem]] and
+[[listtype.column|listtype]] attribute.
+EOT
+         )
 
     singlePattern('_efficiency')
     descr('Measure for how efficient a resource can perform tasks')

data/lib/taskjuggler/XMLDocument.rb

@@ -52,7 +52,7 @@ class TaskJuggler
 
     # Write the XMLDocument to the specified file.
     def write(filename)
-      f = filename == '.' ? $stdout : File.new(filename.untaint, 'w')
+      f = filename == '.' ? $stdout : File.new(filename, 'w')
       @elements.each do |element|
         f.puts element.to_s(0)
       end

data/lib/taskjuggler/apps/Tj3Daemon.rb

@@ -37,7 +37,7 @@ class TaskJuggler
       @port = nil
       @webServer = false
       @webServerPort = 8080
-      @webdPidFile = File.join(Dir.getwd, ".tj3webd-#{$$}.pid").untaint
+      @webdPidFile = File.join(Dir.getwd, ".tj3webd-#{$$}.pid")
     end
 
     def processArguments(argv)
@@ -92,7 +92,7 @@ EOT
       # Set some config variables if corresponding data was provided via the
       # command line.
       broker.port = @port if @port
-      broker.uriFile = @uriFile.untaint
+      broker.uriFile = @uriFile
       broker.projectFiles = sortInputFiles(files) unless files.empty?
       broker.daemonize = @daemonize
       # Create log files for standard IO for each child process if the daemon

data/lib/taskjuggler/apps/Tj3WebD.rb

@@ -89,7 +89,7 @@ EOT
       # Set some config variables if corresponding data was provided via the
       # command line.
       webServer.port = @port if @port
-      webServer.uriFile = @uriFile.untaint
+      webServer.uriFile = @uriFile
       webServer.webServerPort = @webServerPort if @webServerPort
       webServer.daemonize = @daemonize
       webServer.pidFile = @pidFile

data/lib/taskjuggler/daemon/ProjectServer.rb

@@ -137,9 +137,9 @@ class TaskJuggler
     # directory. The second one is the master project file (.tjp file).
     # Additionally a list of optional .tji files can be provided.
     def loadProject(args)
-      dirAndFiles = args.dup.untaint
+      dirAndFiles = args.dup
       # The first argument is the working directory
-      Dir.chdir(args.shift.untaint)
+      Dir.chdir(args.shift)
 
       # Save a time stamp of when the project file loading started.
       @modifiedCheck = TjTime.new