taskjuggler 3.6.0 → 3.7.2

data/lib/taskjuggler/TaskJuggler.rb

@@ -29,7 +29,7 @@ class TaskJuggler
   attr_accessor :maxCpuCores, :warnTsDeltas, :generateTraces
 
   # Create a new TaskJuggler object. _console_ is a boolean that determines
-  # whether or not messsages can be written to $stderr.
+  # whether or not messages can be written to $stderr.
   def initialize
     @project = nil
     @parser = nil
@@ -141,7 +141,7 @@ class TaskJuggler
     res
   end
 
-  # Generate all specified reports. The project must have be scheduled before
+  # Generate all specified reports. The project must have been scheduled before
   # this method can be called. It returns true if no error occured, false
   # otherwise.
   def generateReports(outputDir = nil)
@@ -289,7 +289,7 @@ class TaskJuggler
   end
 
   # Check the content of the file _fileName_ and interpret it as a time sheet.
-  # If the sheet is syntaxtically correct and matches the loaded project, true
+  # If the sheet is syntactically correct and matches the loaded project, true
   # is returned. Otherwise false.
   def checkTimeSheet(fileName)
     begin
@@ -333,7 +333,7 @@ class TaskJuggler
   end
 
   # Check the content of the file _fileName_ and interpret it as a status
-  # sheet.  If the sheet is syntaxtically correct and matches the loaded
+  # sheet.  If the sheet is syntactically correct and matches the loaded
   # project, true is returned. Otherwise false.
   def checkStatusSheet(fileName)
     begin

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

@@ -43,9 +43,9 @@ class TaskJuggler::TextParser
 
     # This class is used to handle the low-level input operations. It knows
     # whether it deals with a text buffer or a file and abstracts this to the
-    # Scanner. For each nested file the scanner puts an StreamHandle on the
+    # Scanner. For each nested file the scanner puts a StreamHandle on the
     # stack while the file is scanned. With this stack the scanner can resume
-    # the processing of the enclosing file once the included files has been
+    # the processing of the enclosing file once the included files have been
     # completely processed.
     class StreamHandle
 
@@ -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)
@@ -281,7 +281,7 @@ class TaskJuggler::TextParser
     end
 
 
-    # Start the processing. if _fileNameIsBuffer_ is true, we operate on a
+    # Start the processing. If _fileNameIsBuffer_ is true, we operate on a
     # String, else on a File.
     def open(fileNameIsBuffer = false)
       @fileNameIsBuffer = fileNameIsBuffer

data/lib/taskjuggler/TextParser.rb

@@ -123,7 +123,7 @@ class TaskJuggler
     # Add a new rule to the rule set. _name_ must be a unique identifier. The
     # function also sets the class variable @cr to the new rule. Subsequent
     # calls to TextParser#pattern, TextParser#optional or
-    # TextParser#repeatable will then implicitely operate on the most recently
+    # TextParser#repeatable will then implicitly operate on the most recently
     # added rule.
     def newRule(name)
       # Use a symbol instead of a String.

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

@@ -46,11 +46,11 @@ class TaskJuggler
       @sourceFileInfo = nil
     end
 
-    # Store the number of worked time slots. If the value is a Fixnum, it can
+    # Store the number of worked time slots. If the value is an Integer, it can
     # be directly assigned. A Float is interpreted as percentage and must be
     # in the rage of 0.0 to 1.0.
     def work=(value)
-      if value.is_a?(Fixnum)
+      if value.is_a?(Integer)
         @work = value
       else
         # Must be percent value
@@ -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/Tj3AppBase.rb

@@ -51,16 +51,15 @@ class TaskJuggler
       @opts.summary_width = @optsSummaryWidth
       @opts.summary_indent = ' ' * @optsSummaryIndent
 
-      @opts.banner = "#{AppConfig.softwareName} v#{AppConfig.version} - " +
-                     "#{AppConfig.packageInfo}\n\n" +
-                     "Copyright (c) #{AppConfig.copyright.join(', ')}\n" +
+      @opts.banner = "Copyright (c) #{AppConfig.copyright.join(', ')}\n" +
                      "              by #{AppConfig.authors.join(', ')}\n\n" +
                      "#{AppConfig.license}\n" +
                      "For more info about #{AppConfig.softwareName} see " +
                      "#{AppConfig.contact}\n\n" +
                      "Usage: #{AppConfig.appName} [options] " +
                      "#{@mandatoryArgs}\n\n"
-      @opts.separator ""
+
+      @opts.separator "\nOptions:"
       @opts.on('-c', '--config <FILE>', String,
                format('Use the specified YAML configuration file')) do |arg|
          @configFile = arg
@@ -75,7 +74,7 @@ class TaskJuggler
                format(<<'EOT'
 Don't use ANSI contol sequences to color the terminal output. Colors should
 only be used when spooling to an ANSI terminal. In case the detection fails,
-you can this option to force colors to be off.
+you can use this option to force colors to be off.
 EOT
                      )) do
         Term::ANSIColor::coloring = false
@@ -91,8 +90,23 @@ EOT
         quit
       end
       @opts.on_tail('--version', format('Show version info')) do
-        puts "#{AppConfig.softwareName} v#{AppConfig.version} - " +
-          "#{AppConfig.packageInfo}"
+# Display the software name and version in GNU format
+# as expected by help2man
+# https://www.gnu.org/prep/standards/standards.html#g_t_002d_002dversion
+        puts "#{AppConfig.appName} (#{AppConfig.softwareName}) #{AppConfig.version}\n"
+# To also display the copyright and license statements in GNU format
+# uncomment the following and remove the equivalent statements from
+# --help
+# +
+#<<'EOT'
+#Copyright (C) 2016 Chris Schlaeger <cs@taskjuggler.org>
+#License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>
+#This 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.
+#
+#For more info about TaskJuggler see http://www.taskjuggler.org
+#EOT
         quit
       end
 
@@ -128,7 +142,7 @@ EOT
         args = processArguments(argv)
 
         # If DEBUG mode has been enabled, we restore the INT trap handler again
-        # to get Ruby backtrackes.
+        # to get Ruby backtraces.
         Kernel.trap('INT', intHandler) if $DEBUG
 
         unless @silent
@@ -146,7 +160,7 @@ EOT
           retVal = appMain(args)
           MessageHandlerInstance.instance.trapSetup = false
         rescue TjRuntimeError
-          # We have hit a sitatuation that we can't recover from. A message
+          # We have hit a situation that we can't recover from. A message
           # was severed via the MessageHandler to inform the user and we now
           # abort the program.
           return 1

data/lib/taskjuggler/Tj3Config.rb

@@ -3,7 +3,8 @@
 #
 # = Tj3Config.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016,
+#               2020
 #               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -13,12 +14,13 @@
 
 require 'taskjuggler/UTF8String'
 require 'taskjuggler/AppConfig'
+require 'taskjuggler/version'
 
-AppConfig.version = '3.6.0'
+AppConfig.version = VERSION
 AppConfig.packageName = 'taskjuggler'
 AppConfig.softwareName = 'TaskJuggler'
 AppConfig.packageInfo = 'A Project Management Software'
-AppConfig.copyright = [ (2006..2016).to_a ]
+AppConfig.copyright = [ (2006..2020).to_a ]
 AppConfig.authors = [ 'Chris Schlaeger <cs@taskjuggler.org>' ]
 AppConfig.contact = 'http://www.taskjuggler.org'
 AppConfig.license = <<'EOT'

data/lib/taskjuggler/TjpExample.rb

@@ -75,7 +75,9 @@ class TaskJuggler
       @file.each_line do |line|
         if line[0, mark.length] == mark
           # We've found an annotation line. Get the tag and indicator.
-          dum, dum, dum, tag, indicator = line.split
+          tokens = line.split
+          tag = tokens[3]
+          indicator = tokens[4]
 
           if indicator == '+'
             # Start a new snip