taskjuggler 0.0.6 → 0.0.7

data/lib/deep_copy.rb

@@ -37,7 +37,7 @@ class Object
     # Built-in classed can't be cloned either. The check below is probably
     # cheaper than the frequent (hiddent) exceptions from those objects.
     return self if frozen? || nil? || is_a?(Fixnum) || is_a?(Float) ||
-                   is_a?(TrueClass) || is_a?(FalseClass)
+                   is_a?(TrueClass) || is_a?(FalseClass) || is_a?(Symbol)
 
     # In case we have loops in our graph, we return references, not
     # deep-copied objects.

data/lib/reports/GanttContainer.rb

@@ -58,10 +58,10 @@ class TaskJuggler
     end
 
     def addBlockedZones(router)
-      height = (@lineHeight / 2) - @@size
       # Horizontal block
       router.addZone(@start - @@size, @y + (@lineHeight / 2) - @@size - 2,
-                     @end - @start + 1 + 2 * @@size, 2 * @@size + 5, true, false)
+                     @end - @start + 1 + 2 * @@size, 2 * @@size + 5, true,
+                     false)
       # Block for arrowhead.
       router.addZone(@start - @@size - 9, @y + (@lineHeight / 2) - 7, 10, 15,
                      true, true)

data/lib/reports/GanttLine.rb

@@ -338,9 +338,8 @@ class TaskJuggler
       tooltip = tooltip.getPattern(query)
       return unless tooltip && !tooltip.empty?
 
-      if tooltip.respond_to?('functionHandler') &&
-         tooltip.functionHandler('query')
-        tooltip.functionHandler('query').setQuery(query)
+      if tooltip.respond_to?('functionHandler')
+        tooltip.setQuery(query)
       end
       if query
         query.attributeId = 'name'

data/lib/reports/GanttTaskBar.rb

@@ -81,14 +81,18 @@ class TaskJuggler
       html << rectToHTML(xStart, 0, width, @lineHeight, 'tj_gantt_frame')
 
       # First we draw the task frame.
-      html << (frame = rectToHTML(xStart, yCenter - @@size, width, 2 * @@size,
-                                  'taskbarframe'))
+      html << rectToHTML(xStart, yCenter - @@size, width, 2 * @@size,
+                         'taskbarframe')
 
       # The we draw the filling.
       html << rectToHTML(xStart + 1, yCenter - @@size + 1, width - 2,
                          2 * @@size - 2, 'taskbar')
       # And then the progress bar. If task is null we assume 50% completion.
-      completion = @task ? @task['complete', @scenarioIdx] / 100.0 : 0.5
+      if @task && @task['complete', @scenarioIdx]
+        completion = @task['complete', @scenarioIdx] / 100.0
+      else
+        completion = 0.5
+      end
       html << rectToHTML(xStart + 1, yCenter - @@size / 2,
                          (width - 2) * completion, @@size, 'progressbar')
     end

data/lib/reports/Report.rb

@@ -47,61 +47,53 @@ class TaskJuggler
     # report defined by all the class attributes and report elements is
     # generated according the the requested output format(s).
     def generate
-      begin
-        generateIntermediateFormat
-
-        # Then generate the actual output format.
-        get('formats').each do |format|
-          case format
-          when :html
-            generateHTML
-            copyAuxiliaryFiles
-          when :csv
-            generateCSV
-          when :niku
-            generateNiku
-          when :tjp
-            generateTJP
-          else
-            raise 'Unknown report output format #{format}.'
-          end
+      generateIntermediateFormat
+
+      # Then generate the actual output format.
+      get('formats').each do |format|
+        case format
+        when :html
+          generateHTML
+          copyAuxiliaryFiles
+        when :csv
+          generateCSV
+        when :niku
+          generateNiku
+        when :tjp
+          generateTJP
+        else
+          raise 'Unknown report output format #{format}.'
         end
-      rescue TjException
-        error('reporting_failed', $!.message)
       end
-      0
+      true
     end
 
     # Generate an output format agnostic version that can later be turned into
     # the respective output formats.
     def generateIntermediateFormat
-      begin
-        @content = nil
-        case @typeSpec
-        when :export
-          @content = TjpExportRE.new(self)
-        when :niku
-          @content = NikuReport.new(self)
-        when :resourcereport
-          @content = ResourceListRE.new(self)
-        when :textreport
-          @content = TextReport.new(self)
-        when :taskreport
-          @content = TaskListRE.new(self)
-        when :statusSheet
-          @content = StatusSheetReport.new(self)
-        when :timeSheet
-          @content = TimeSheetReport.new(self)
-        else
-          raise "Unknown report type"
-        end
-
-        # Most output format can be generated from a common intermediate
-        # representation of the elements. We generate that IR first.
-        @content.generateIntermediateFormat if @content
-      rescue TjException
-        error('report_IR_generattion_failed', $!.message)
+      @content = nil
+      case @typeSpec
+      when :export
+        @content = TjpExportRE.new(self)
+      when :niku
+        @content = NikuReport.new(self)
+      when :resourcereport
+        @content = ResourceListRE.new(self)
+      when :textreport
+        @content = TextReport.new(self)
+      when :taskreport
+        @content = TaskListRE.new(self)
+      when :statusSheet
+        @content = StatusSheetReport.new(self)
+      when :timeSheet
+        @content = TimeSheetReport.new(self)
+      else
+        raise "Unknown report type"
       end
+
+      # Most output format can be generated from a common intermediate
+      # representation of the elements. We generate that IR first.
+      @content.generateIntermediateFormat if @content
     end
 
     # Render the content of the report as HTML (without the framing).
@@ -116,6 +108,22 @@ class TaskJuggler
       @project.reportContexts.first.report.get('interactive')
     end
 
+    def error(id, message)
+      if message && !message.empty?
+        @project.messageHandler.error(id, message, @sourceFileInfo)
+      else
+        # We have no message, so the error has already been reported to the
+        # MessageHandler. Just trigger another exception to signal the error.
+        raise TjException
+      end
+    end
+
+    def warning(id, message)
+      if message && !message.empty?
+        @project.messageHandler.warning(id, message, @sourceFileInfo)
+      end
+    end
+
   private
     # Convenience function to access a report attribute
     def a(attribute)
@@ -204,7 +212,8 @@ EOT
       return nil unless @content
 
       # CSV format can only handle the first element.
-      csv = @content.to_csv
+      return nil unless (csv = @content.to_csv)
+
       # Expand nested tables into the outer table.
       columnIdx = 0
       while columnIdx < csv[0].length do
@@ -286,10 +295,10 @@ EOT
 
     def copyDirectory(dirName)
       # The directory needs to be in the same directory as the HTML report.
-      auxDstDir = File.dirname((@name[0] == '/' ? '' : @project.outputDir) +
-                               @name) + '/'
+      auxDstDir = (File.dirname((@name[0] == '/' ? '' : @project.outputDir) +
+                                @name) + '/').untaint
       # Find the data directory that came with the TaskJuggler installation.
-      auxSrcDir = AppConfig.dataDirs("data/#{dirName}")[0]
+      auxSrcDir = AppConfig.dataDirs("data/#{dirName}")[0].untaint
       # Raise an error if we haven't found the data directory
       dataDirError(dirName) if auxSrcDir.nil? || !File.exists?(auxSrcDir)
       # Don't copy directory if all files are up-to-date.
@@ -314,18 +323,14 @@ EOT
     end
 
     def dataDirError(dirName)
-      raise TjException.new, <<"EOT"
+      error('data_dir_error', <<"EOT"
 Cannot find the #{dirName} directory. This is usually the result of an
 improper TaskJuggler installation. If you know the directory, you can use the
 TASKJUGGLER_DATA_PATH environment variable to specify the location.  The
 variable should be set to the path without the /data at the end. Multiple
 directories must be separated by colons.
 EOT
-    end
-
-    def error(id, message)
-        @project.messageHandler.send(Message.new(id, 'error', message, nil, nil,
-                                                 @sourceFileInfo))
+           )
     end
 
   end

data/lib/reports/ReportBase.rb

@@ -31,9 +31,9 @@ class TaskJuggler
       query = @report.project.reportContexts.last.query
       %w( header left center right footer
           prolog headline caption epilog ).each do |name|
-        next unless text = a(name)
+        next unless (text = a(name))
 
-        text.functionHandler('query').setQuery(query)
+        text.setQuery(query)
       end
     end
 
@@ -73,7 +73,8 @@ class TaskJuggler
         end
       end
 
-      standardFilterOps(list, hideExpr, rollupExpr, openNodes, resource, taskRoot)
+      standardFilterOps(list, hideExpr, rollupExpr, openNodes, resource,
+                        taskRoot)
     end
 
     # Take the complete resource list and remove all resources that are matching
@@ -104,7 +105,8 @@ class TaskJuggler
         end
       end
 
-      standardFilterOps(list, hideExpr, rollupExpr, openNodes, task, resourceRoot)
+      standardFilterOps(list, hideExpr, rollupExpr, openNodes, task,
+                        resourceRoot)
     end
 
     private

data/lib/reports/ReportTableCell.rb

@@ -108,7 +108,8 @@ class TaskJuggler
 
       # Insert a padding cell for the left side indentation.
       if @leftIndent
-        row << XMLElement.new('td', 'style' => "width:#{@leftIndent}px; ")
+        row << XMLElement.new('td', 'style' => "min-width:#{@leftIndent}px; " +
+                                               "width:#{@leftIndent}px; ")
       end
       row << cellIcon(cell)
 
@@ -120,8 +121,8 @@ class TaskJuggler
       if tooltip && !tooltip.empty? && !@selfcontained
         if @showTooltipHint
           row << (td = XMLElement.new('td'))
-          td << (tIcon = XMLElement.new('img', 'src' => 'icons/details.png',
-                                        'class' => 'tj_table_cell_tooltip'))
+          td << XMLElement.new('img', 'src' => 'icons/details.png',
+                               'class' => 'tj_table_cell_tooltip')
           addHtmlTooltip(tooltip, td, cell)
         else
           addHtmlTooltip(tooltip, cell)
@@ -130,7 +131,8 @@ class TaskJuggler
 
       # Insert a padding cell for the right side indentation.
       if @rightIndent
-        row << XMLElement.new('td', 'style' => "width:#{@rightIndent}px; ")
+        row << XMLElement.new('td', 'style' => "min-width:#{@rightIndent}px; " +
+                                               "width:#{@rightIndent}px; ")
       end
 
       cell
@@ -148,9 +150,8 @@ class TaskJuggler
         elsif @data && @data.is_a?(String)
           @data
         elsif @text
-          if @text.respond_to?('functionHandler') &&
-             @text.functionHandler('query')
-            @text.functionHandler('query').setQuery(@query)
+          if @text.respond_to?('functionHandler')
+            @text.setQuery(@query)
           end
           str = @text.to_s
           # Remove any trailing line breaks. These don't really make much
@@ -247,9 +248,8 @@ class TaskJuggler
       textAsString =
         if @text.is_a?(RichTextIntermediate)
           # @text is a RichText.
-          if @text.respond_to?('functionHandler') &&
-             @text.functionHandler('query')
-            @text.functionHandler('query').setQuery(@query)
+          if @text.respond_to?('functionHandler')
+            @text.setQuery(@query)
           end
           @text.to_s
         else
@@ -288,7 +288,7 @@ class TaskJuggler
       # Assuming an average character width of 8 pixels
       if @width && (text.length > (@width / 8))
         text = text[0, @width / 8]
-        modified = shortened = true
+        modified = true
       end
       # Add three dots to show that there is more info available.
       text += "..." if modified
@@ -299,9 +299,8 @@ class TaskJuggler
       return unless tooltip && !tooltip.empty? && !@selfcontained
 
       hook = trigger if hook.nil?
-      if tooltip.respond_to?('functionHandler') &&
-         tooltip.functionHandler('query')
-        tooltip.functionHandler('query').setQuery(@query)
+      if tooltip.respond_to?('functionHandler')
+        tooltip.setQuery(@query)
       end
       if @query
         @query.attributeId = 'name'

data/lib/reports/TableReport.rb

@@ -38,9 +38,11 @@ class TaskJuggler
       'effortdone'       => [ 'Effort Done',       true,   :right, true ],
       'effortleft'       => [ 'Effort Left',       true,   :right, true ],
       'freetime'         => [ 'Free Time',         true,   :right, true ],
+      'freework'         => [ 'Free Work',         true,   :right, true ],
       'followers'        => [ 'Followers',         false,  :left,  true ],
       'id'               => [ 'Id',                false,  :left,  false ],
       'journal'          => [ 'Journal',           false,  :left,  false ],
+      'journal_sub'      => [ 'Journal',           false,  :left,  false ],
       'journalmessages'  => [ 'Journal Messages',  false,  :left,  false ],
       'journalsummaries' => [ 'Journal Summaries', false,  :left,  false ],
       'line'             => [ 'Line No.',          false,  :right, false ],
@@ -822,7 +824,6 @@ class TaskJuggler
     # date to the next cell.
     def genCalChartResourceCell(origQuery, line, columnDef, t,
                                 sameTimeNextFunc)
-      resource = line.property
       # Find out if we have an enclosing task scope.
       if line.scopeLine && line.scopeLine.property.is_a?(Task)
         task = line.scopeLine.property

data/lib/reports/TextReport.rb

@@ -87,6 +87,9 @@ class TaskJuggler
     end
 
     def to_csv
+      @report.warning('text_report_no_csv',
+                      "textreport '#{@report.fullId}' cannot be converted " +
+                      "into CSV format")
       nil
     end
 

data/lib/reports/TimeSheetReport.rb

@@ -131,7 +131,7 @@ EOT
   #   status green "Your headline here!" {
   #     summary -8<-
   #     A summary text
-  #     -8<-
+  #     ->8-
   #     details -8<-
   #     Some more details
   #     ->8-
@@ -254,6 +254,7 @@ EOT
           workPercent = (workDays / (weeksToReport * weeklyWorkingDays)) *
                         100.0
 
+          remaining = endDate = nil
           if task['effort', scenarioIdx] > 0
             # The task is an effort based task.
             # Get the remaining effort for this task.
@@ -262,11 +263,9 @@ EOT
             query.loadUnit = :days
             query.process
             remaining = query.to_s
-            endDate = nil
           else
             # The task is a duration task.
             # Get the planned task end date.
-            remaining = nil
             endDate = task['end', scenarioIdx]
           end
 

data/lib/reports/TjpExportRE.rb

@@ -263,7 +263,6 @@ class TaskJuggler
         @file << "supplement resource #{resource.fullId} {\n"
         @project.resources.eachAttributeDefinition do |attrDef|
           id = attrDef.id
-          attr = resource.getAttr(id)
           next if (!@supportedResourceAttrs.include?(id) &&
                    ! attrDef.userDefined) ||
                    !a('resourceAttributes').include?(id)
@@ -290,7 +289,6 @@ class TaskJuggler
         @file << "supplement task #{task.fullId} {\n"
         @project.tasks.eachAttributeDefinition do |attrDef|
           id = attrDef.id
-          attr = task.getAttr(id)
           next if (!@supportedTaskAttrs.include?(id) && !attrDef.userDefined) ||
                   !a('taskAttributes').include?(id)
 

data/lib/tj3client.rb

@@ -36,6 +36,8 @@ class TaskJuggler
       @host = '127.0.0.1'
       # The default port. 'T' and 'J' in ASCII decimal
       @port = 8474
+      # The file with the server URI in case port is 0.
+      @uriFile = File.join(Dir.getwd, '.tj3d.uri')
       # This must must be changed for the communication to work.
       @authKey = nil
       # Determines whether report IDs are fix IDs or regular expressions that
@@ -62,9 +64,14 @@ class TaskJuggler
         { :label => 'add',
           :args  => [ 'tjp file', '*tji file'],
           :descr => 'Add a new project or update and existing one' },
+        { :label => 'update',
+          :args => [],
+          :descr => 'Reload all projects that have modified files and '+
+                    'are not being reloaded already' },
         { :label => 'remove',
           :args  => [ '+project ID' ],
-          :descr => 'Remove the project with the specified ID from the daemon' },
+          :descr => 'Remove the project with the specified ID from the ' +
+                    'daemon' },
         { :label => 'report',
           :args  => [ 'project ID', '+report ID', '!=', '*tji file'],
           :descr => 'Generate the report with the provided ID for ' +
@@ -75,7 +82,7 @@ class TaskJuggler
                     'that match the provided report ID' },
         { :label => 'check-ts',
           :args  => [ 'project ID', 'time sheet' ],
-          :descr => 'Check the provided time sheet for correctness' +
+          :descr => 'Check the provided time sheet for correctness ' +
                     'against the project with the given ID'},
         { :label => 'check-ss',
           :args  => [ 'project ID', 'status sheet' ],
@@ -118,6 +125,11 @@ EOT
                  format('Use the specified TCP/IP port')) do |arg|
            @port = arg
         end
+        @opts.on('--urifile', String,
+                 format('If the port is 0, use this file to get the URI ' +
+                        'of the server.')) do |arg|
+          @uriFile = arg
+        end
         @opts.on('-r', '--regexp',
                 format('The report IDs are not fixed but regular expressions ' +
                        'that match a set of reports')) do |arg|
@@ -184,6 +196,19 @@ _global:
 EOT
       end
 
+      uri = "druby://#{@host}:#{@port}"
+      if @port == 0
+        # If the @port is configured to 0, we need to read the URI to connect
+        # to the server from the .tj3d.uri file that has been generated by the
+        # server.
+        begin
+          uri = File.read(@uriFile).chomp
+        rescue
+          error('The server port is configured to be 0, but no ' +
+                ".tj3d.uri file can be found: #{$!}")
+        end
+      end
+
       # We try to play it safe here. The client also starts a DRb server, so
       # we need to make sure it's constricted to localhost only. We require
       # the DRb server for the standard IO redirection to work.
@@ -194,7 +219,7 @@ EOT
 
       begin
         # Get the ProjectBroker object from the tj3d.
-        @broker = DRbObject.new(nil, "druby://#{@host}:#{@port}")
+        @broker = DRbObject.new(nil, uri)
         # Client and server should always come from the same Gem. Since we
         # restict communication to localhost, that's probably not a problem.
         if (check = @broker.apiVersion(@authKey, 1)) < 0
@@ -242,6 +267,9 @@ EOT
           end
         end
         info('Project removed')
+      when 'update'
+        callDaemon(:update, [])
+        info('Reload requested')
       when 'report'
         # The first value of args is the project ID. The following values
         # could be either report IDs or TJI file # names ('.' or '*.tji').