taskjuggler 0.0.11 → 0.1.0

data/lib/taskjuggler/TaskScenario.rb

@@ -1248,12 +1248,12 @@ class TaskJuggler
       a('startsuccs').each do |task, onEnd|
         if onEnd
           date = task['end', query.scenarioIdx].to_s(query.timeFormat)
-          dep "[->]"
+          dep = "[->]"
         else
           date = task['start', query.scenarioIdx].to_s(query.timeFormat)
-          dep "[->["
+          dep = "[->["
         end
-        list << generateDepencyListItem(query.listMode, task, dep, date)
+        list << generateDepencyListItem(query, task, dep, date)
       end
       # Than add the tasks that depend on the end of this task.
       a('endsuccs').each do |task, onEnd|
@@ -1264,7 +1264,7 @@ class TaskJuggler
           date = task['start', query.scenarioIdx].to_s(query.timeFormat)
           dep = "]->["
         end
-        list << generateDepencyListItem(query.listMode, task, dep, date)
+        list << generateDepencyListItem(query, task, dep, date)
       end
 
       query.assignList(list)
@@ -1282,7 +1282,7 @@ class TaskJuggler
           date = task['start', query.scenarioIdx].to_s(query.timeFormat)
           dep = "[->["
         end
-        list << generateDepencyListItem(query.listMode, task, dep, date)
+        list << generateDepencyListItem(query, task, dep, date)
       end
       # Than add the tasks that depend on the end of this task.
       a('endpreds').each do |task, onEnd|
@@ -1293,7 +1293,7 @@ class TaskJuggler
           date = task['start', query.scenarioIdx].to_s(query.timeFormat)
           dep = "[->]"
         end
-        list << generateDepencyListItem(query.listMode, task, dep, date)
+        list << generateDepencyListItem(query, task, dep, date)
       end
 
       query.assignList(list)
@@ -1308,19 +1308,16 @@ class TaskJuggler
       a('assignedresources').each do |resource|
         if resource.allocated?(@scenarioIdx,
                                Interval.new(query.start, query.end), @property)
-          case query.listMode
-          when 1
-            list << "#{resource.fullId}"
-          when 2
-            list << "#{resource.name}"
-          when 3, nil
-            list << "#{resource.name} (#{resource.fullId})"
-          when 4
-            list << "#{resource.fullId}: #{resource.name}"
+          if query.listItem
+            rti = RichText.new(query.listItem, RTFHandlers.create(@project),
+                               @project.messageHandler).
+                               generateIntermediateFormat
+            q = query.dup
+            q.property = resource
+            rti.setQuery(q)
+            list << "<nowiki>#{rti.to_s}</nowiki>"
           else
-            error('bad_listmode_qr',
-                  "Unsupported list mode #{query.listMode} used for " +
-                  "resources column.")
+            list << "<nowiki>#{resource.name} (#{resource.fullId})</nowiki>"
           end
         end
       end
@@ -1359,7 +1356,7 @@ class TaskJuggler
                             ['seqno', true, -1 ]])
       inputList.sort!
 
-      query.assignList(generateTaskList(inputList, query.listMode))
+      query.assignList(generateTaskList(inputList, query))
     end
 
     def query_targets(query)
@@ -1370,7 +1367,7 @@ class TaskJuggler
                              ['seqno', true, -1 ]])
       targetList.sort!
 
-      query.assignList(generateTaskList(targetList, query.listMode))
+      query.assignList(generateTaskList(targetList, query))
     end
 
 
@@ -1647,14 +1644,13 @@ class TaskJuggler
 
     def bookResources(date, slotDuration)
       # If there are no allocations defined, we can't do any bookings.
-      # In projection mode we do not allow bookings prior to the current date
-      # for any task (in strict mode) or tasks which have user specified
-      # bookings (sloppy mode).
+      # In projection mode we do not allow allocations prior to the current
+      # date. If the scenario is not scheduled in projection mode, this
+      # restriction only applies to tasks with bookings.
       if a('allocate').empty? ||
-         (@project.scenario(@scenarioIdx).get('projection') &&
-          date < @project['now'] &&
-          (@project.scenario(@scenarioIdx).get('strict') ||
-           a('assignedresources').empty?))
+         ((@project.scenario(@scenarioIdx).get('projection') ||
+          !a('booking').empty?) &&
+          date < @project['now'])
         return
       end
 
@@ -1805,7 +1801,7 @@ class TaskJuggler
     def bookBookings
       scheduled = a('scheduled')
       slotDuration = @project['scheduleGranularity']
-      a('booking').each do |booking|
+      findBookings.each do |booking|
         unless booking.resource.leaf?
           error('booking_resource_not_leaf',
                 "Booked resources may not be group resources",
@@ -2306,71 +2302,54 @@ class TaskJuggler
       amount
     end
 
-    def generateDepencyListItem(mode, task, dep, date)
-      str =
-        case mode
-        when 1
-          "#{task.fullId} #{dep} #{date}"
-        when 2
-          "#{task.name} #{dep} #{date}"
-        when 3, nil
-          "#{task.name} (#{task.fullId}) #{dep} #{date}"
-        when 4
-          "#{task.fullId}: #{task.name} #{dep} #{date}"
-        when 5
-          "#{task.fullId} #{dep}"
-        when 6
-          "#{task.name} #{dep}"
-        when 7
-          "#{task.name} (#{task.fullId}) #{dep}"
-        when 8
-          "#{task.fullId}: #{task.name} #{dep}"
-        when 9
-          "#{task.fullId}"
-        when 10
-          "#{task.name}"
-        when 11
-          "#{task.name} (#{task.fullId})"
-        when 12
-          "#{task.fullId}: #{task.name}"
-        else
-          error('bad_listmode_deps',
-                "Unsupported list mode #{query.listMode} used for " +
-                "dependency column. Use 1 - 12.")
-        end
-
-      "* <nowiki>#{str}</nowiki>"
+    def generateDepencyListItem(query, task, dep, date)
+      if query.listItem
+        rti = RichText.new(query.listItem, RTFHandlers.create(@project),
+                           @project.messageHandler).generateIntermediateFormat
+        q = query.dup
+        q.property = task
+        q.setCustomData('dependency', { :string => dep })
+        q.setCustomData('date', { :string => date })
+        rti.setQuery(q)
+        "<nowiki>#{rti.to_s}</nowiki>"
+      else
+        "<nowiki>#{task.name} (#{task.fullId}) #{dep} #{date}</nowiki>"
+      end
     end
 
-    def generateTaskList(taskList, mode)
+    def generateTaskList(taskList, query)
       list = []
       taskList.each do |task|
-        date = task['start', @scenarioIdx].to_s(@property.project['timeFormat'])
-        case mode
-        when 1
-          list << "#{task.fullId}"
-        when 2
-          list << "#{task.name}"
-        when 3
-          list << "#{task.name} (#{task.fullId})"
-        when 4
-          list << "#{task.fullId}: #{task.name}"
-        when 5
-          list << "#{task.fullId} (#{date})"
-        when 6
-          list << "#{task.name} (#{date})"
-        when 7, nil
-          list << "#{task.name} (#{task.fullId}) #{date}"
-        when 8
-          list << "#{task.fullId}: #{task.name} #{date}"
+        date = task['start', @scenarioIdx].
+               to_s(@property.project['timeFormat'])
+        if query.listItem
+          rti = RichText.new(query.listItem, RTFHandlers.create(@project),
+                             @project.messageHandler).generateIntermediateFormat
+          q = query.dup
+          q.property = task
+          q.setCustomData('date', { :string => date })
+          rti.setQuery(q)
+          list << "<nowiki>#{rti.to_s}</nowiki>"
         else
-          error('bad_listmode_qt',
-                "Bad listmode #{mode}. Use 1 - 8.")
+          list << "<nowiki>#{task.name} (#{task.fullId}) #{date}</nowiki>"
         end
       end
       list
     end
 
+    def findBookings
+      # Map the index back to the Scenario object.
+      scenario = @property.project.scenario(@scenarioIdx)
+      # Check if the current scenario should inherit its bookings from the
+      # parent. If so, redirect 'scenario' to the parent. The top-level
+      # scenario can never inherit bookings.
+      while !scenario.get('ownbookings') do
+        scenario = scenario.parent
+      end
+      # Return the bookings of the found scenario.
+      @property['booking', @property.project.scenarioIdx(scenario)]
+    end
+
   end
 
 end

data/lib/taskjuggler/TextParser.rb

@@ -278,18 +278,20 @@ class TaskJuggler
           transition = state.transition(token = getNextToken)
         end
 
+        # If we have looped-back we need to finish the pattern first. Final
+        # tokens of repeatable rules do have transitions!
+        if transition && transition.loopBack
+          finishPattern(token)
+          transition = state.transition(token = getNextToken)
+        end
+
         if transition
-          # Shift: This for normal state transitions. This may be from one
-          # token of a pattern to the next token of the same pattern, to the
-          # start of a new pattern or a loop-back to the start of a pattern of
-          # the same rule. The transition tells us what state we have to
-          # process next.
+          # Shift: This is for normal state transitions. This may be from one
+          # token of a pattern to the next token of the same pattern or to the
+          # start of a new pattern. The transition tells us what state we have
+          # to process next.
           state = transition.state
 
-          # If we have looped-back we need to finish the pattern first. Final
-          # tokens of repeatable rules do have transitions!
-          finishPattern(token) if transition.loopBack
-
           # Transitions that enter rules generate states which we need to
           # resume at when a rule has been completely processed. We push this
           # list of states on the @stack.
@@ -338,9 +340,9 @@ class TaskJuggler
             error("no_reduce",
                   "Unexpected token '#{token[1]}' found. " +
                   "Expecting one of " +
-                  "#{@stack.last.state.expectedTokens.join(', ')}")
+                  "#{@stack.last.state.expectedTokens.join(', ')}",
+                  @scanner.sourceFileInfo)
           end
-          returnToken(token) if token
           if finishPattern(token)
             # Accept: We're done with parsing.
             break
@@ -353,13 +355,17 @@ class TaskJuggler
     end
 
     def finishPattern(token)
+      # The method to finish this pattern may include another file or change
+      # the parser rules. Therefor we have to return the token to the scanner.
+      returnToken(token) if token
+
       #dumpStack
       # To finish a pattern we need to pop the StackElement with the token
       # values from the stack.
       stackEntry = @stack.pop
       if stackEntry.nil? || @stack.empty?
         # Check if we have reached the bottom of the stack.
-        token = getNextToken unless token
+        token = getNextToken
         if token[0] == :endOfText
           # If the token is the end of the top-level file, we're done. We push
           # back the StackEntry since it holds the overall result of the
@@ -371,7 +377,8 @@ class TaskJuggler
         # rules.
         error('unexpctd_token', "Unexpected token '#{token[1]}' found. " +
               "Expecting one of " +
-              "#{stackEntry.state.expectedTokens.join(', ')}")
+              "#{stackEntry.state.expectedTokens.join(', ')}",
+              @scanner.sourceFileInfo)
       end
       # Memorize if the rule for this pattern was repeatable. Then we will
       # store the result of the pattern in an Array.

data/lib/taskjuggler/TextParser/Scanner.rb

@@ -67,12 +67,18 @@ class TaskJuggler::TextParser
         @stream = nil
       end
 
-      def injectMacro(macro, args, text)
+      # Inject the String _text_ into the input stream at the current cursor
+      # position.
+      def injectText(text)
         pos = @scanner.pos
         @nextMacroEnd = pos + text.length
         @line = @line[0, pos] + text + @line[pos..-1]
         @scanner = StringScanner.new(@line)
         @scanner.pos = pos
+      end
+
+      def injectMacro(macro, args, text)
+        injectText(text)
 
         # Simple detection for recursive macro calls.
         return false if @macroStack.length > 20
@@ -213,6 +219,8 @@ class TaskJuggler::TextParser
       @patternsByMode = { }
       # The currently active scanner mode.
       @scannerMode = nil
+      # The mode that the scanner is in at the start and end of file
+      @defaultMode = defaultMode
       # Points to the currently active pattern set as defined by the mode.
       @activePatterns = nil
 
@@ -402,6 +410,14 @@ class TaskJuggler::TextParser
           @activePatterns.each do |type, re, postProc|
             if (match = @cf.scan(re))
               if match == :scannerEOF
+                if @scannerMode != @defaultMode
+                  # The stream resets the line number to 1. Since we still
+                  # know the start of the token, we setup @lineDelta so that
+                  # sourceFileInfo() returns the proper line number.
+                  @lineDelta = -(@startOfToken.lineNo - 1)
+                  error('runaway_token',
+                        "Unterminated token starting at #{@startOfToken}")
+                end
                 # We've found the end of an input file. Return a special token
                 # that describes the end of a file.
                 @finishLastFile = true

data/lib/taskjuggler/TimeSheetSummary.rb

@@ -158,12 +158,16 @@ EOT
       warnings = nil
       begin
         # Save a copy of the sheet for debugging purposes.
-        command = "tj3client --silent check-ts #{@projectId} #{sheetFile}"
-        status = Open4.popen4(command) do |pid, stdin, stdout, stderr|
-          # Send the report to the tj3client process via stdin.
-          report = stdout.read
-          warnings = stderr.read
+        command = [ '--unsafe', "--silent",  "check-ts", @projectId,
+                    sheetFile ]
+        res = stdIoWrapper do
+          Tj3Client.new.main(command)
         end
+        if res.returnValue != 0
+          error("summary sheets: #{err}")
+        end
+        report = res.stdOut
+        warnings = res.stdErr
       rescue
         fatal("Cannot summarize sheet: #{$!}")
       end

data/lib/taskjuggler/TimeSheets.rb

@@ -284,7 +284,12 @@ class TaskJuggler
         totalSlots += record.work
       end
 
-      if @resource['efficiency', @resource.project['trackingScenarioIdx']] > 0.0
+      unless (scenarioIdx = @resource.project['trackingScenarioIdx'])
+        error('ts_no_tracking_scenario',
+              'No trackingscenario has been defined.')
+      end
+
+      if @resource['efficiency', scenarioIdx] > 0.0
         targetSlots = totalNetWorkingSlots
         # This is acceptable rounding error when checking the total reported
         # work.

data/lib/taskjuggler/Tj3AppBase.rb

@@ -20,6 +20,9 @@ require 'taskjuggler/TextFormatter'
 
 class TaskJuggler
 
+  class TjRuntimeError < RuntimeError
+  end
+
   class Tj3AppBase
 
     def initialize
@@ -31,6 +34,7 @@ class TaskJuggler
       @silent = false
       @configFile = nil
       @mandatoryArgs = ''
+      @mininumRubyVersion = '1.9.2'
     end
 
     def processArguments(argv)
@@ -83,28 +87,47 @@ class TaskJuggler
     end
 
     def main(argv = ARGV)
+      if Gem::Version.new(RUBY_VERSION.dup) <
+         Gem::Version.new(@mininumRubyVersion)
+        error('This program requires at least Ruby version ' +
+              "#{@mininumRubyVersion}!")
+      end
+
       # Install signal handler to exit gracefully on CTRL-C.
       intHandler = Kernel.trap('INT') do
-        error("\nAborting on user request!")
+        error("Aborting on user request!")
       end
 
-      args = processArguments(argv)
-
-      # If DEBUG mode has been enabled, we restore the INT trap handler again
-      # to get Ruby backtrackes.
-      Kernel.trap('INT', intHandler) if $DEBUG
-
-      unless @silent
-        puts "#{AppConfig.softwareName} v#{AppConfig.version} - " +
-             "#{AppConfig.packageInfo}\n\n" +
-             "Copyright (c) #{AppConfig.copyright.join(', ')}\n" +
-             "              by #{AppConfig.authors.join(', ')}\n\n" +
-             "#{AppConfig.license}\n"
+      begin
+        args = processArguments(argv)
+
+        # If DEBUG mode has been enabled, we restore the INT trap handler again
+        # to get Ruby backtrackes.
+        Kernel.trap('INT', intHandler) if $DEBUG
+
+        unless @silent
+          puts "#{AppConfig.softwareName} v#{AppConfig.version} - " +
+               "#{AppConfig.packageInfo}\n\n" +
+               "Copyright (c) #{AppConfig.copyright.join(', ')}\n" +
+               "              by #{AppConfig.authors.join(', ')}\n\n" +
+               "#{AppConfig.license}\n"
+        end
+
+        @rc = RuntimeConfig.new(AppConfig.packageName, @configFile)
+
+        appMain(args)
+      rescue Exception => e
+        if e.is_a?(SystemExit) || e.is_a?(Interrupt)
+          # Don't show backtrace on user interrupt unless we are in debug mode.
+          $stderr.puts e.backtrace.join("\n") if $DEBUG
+          1
+        else
+          error("Ups, you have triggered a bug in #{AppConfig.softwareName}!\n" +
+                "#{e}\n" +
+                e.backtrace.join("\n") +
+                "Please see the user manual on how to get this bug fixed!")
+        end
       end
-
-      @rc = RuntimeConfig.new(AppConfig.packageName, @configFile)
-
-      args
     end
 
     private
@@ -114,7 +137,7 @@ class TaskJuggler
     end
 
     def error(message, exitVal = 1)
-      $stderr.puts "ERROR: #{message}"
+      $stderr.puts "\nERROR: #{message}"
       exit exitVal
     end