taskjuggler 0.0.11 → 0.1.0

data/lib/taskjuggler/apps/Tj3Client.rb

@@ -159,19 +159,22 @@ EOT
       end
     end
 
-    def main(argv = ARGV)
-      args = super
-      # Run a first check of the non-optional command line arguments.
-      checkCommand(args)
-      # Read some configuration variables. Except for the authKey, they are
-      # all optional.
-      @rc.configure(self, 'global')
-
-      connectDaemon
-      retVal = executeCommand(args[0], args[1..-1])
-      disconnectDaemon
-
-      retVal
+    def appMain(args)
+      begin
+        # Run a first check of the non-optional command line arguments.
+        checkCommand(args)
+        # Read some configuration variables. Except for the authKey, they are
+        # all optional.
+        @rc.configure(self, 'global')
+
+        connectDaemon
+        retVal = executeCommand(args[0], args[1..-1])
+        disconnectDaemon
+
+        return retVal
+      rescue TjRuntimeError
+        return 1
+      end
     end
 
     private
@@ -453,11 +456,10 @@ EOT
       $stdout.puts "#{message}"
     end
 
-    def error(message)
+    def error(message, exitVal = 1)
       $stderr.puts "ERROR: #{message}"
-      # Don't call exit in unsafe mode. We are probably running as a RSpec
-      # test.
-      exit 1 unless @unsafeMode
+      # Don't call exit in unsafe mode. Raise a StandardError instead.
+      raise TjRuntimeError
     end
 
   end

data/lib/taskjuggler/apps/Tj3Daemon.rb

@@ -72,27 +72,30 @@ EOT
       end
     end
 
-    def main(argv = ARGV)
-      files = super
-      broker = ProjectBroker.new
-      @rc.configure(self, 'global')
-      @rc.configure(@log, 'global.log')
-      @rc.configure(broker, 'global')
-      @rc.configure(broker, 'daemon')
-
-      # Set some config variables if corresponding data was provided via the
-      # command line.
-      broker.port = @port if @port
-      broker.uriFile = @uriFile.untaint
-      broker.enableWebServer = @webServer
-      broker.webServerPort = @webServerPort if @webServerPort
-      broker.projectFiles = sortInputFiles(files) unless files.empty?
-      broker.daemonize = @daemonize
-      # Create log files for standard IO for each child process if the daemon
-      # is not disconnected from the terminal.
-      broker.logStdIO = !@daemonize
-
-      broker.start
+    def appMain(files)
+      begin
+        broker = ProjectBroker.new
+        @rc.configure(self, 'global')
+        @rc.configure(@log, 'global.log')
+        @rc.configure(broker, 'global')
+        @rc.configure(broker, 'daemon')
+
+        # Set some config variables if corresponding data was provided via the
+        # command line.
+        broker.port = @port if @port
+        broker.uriFile = @uriFile.untaint
+        broker.enableWebServer = @webServer
+        broker.webServerPort = @webServerPort if @webServerPort
+        broker.projectFiles = sortInputFiles(files) unless files.empty?
+        broker.daemonize = @daemonize
+        # Create log files for standard IO for each child process if the daemon
+        # is not disconnected from the terminal.
+        broker.logStdIO = !@daemonize
+
+        return broker.start
+      rescue TjRuntimeError
+        return 1
+      end
     end
 
     private

data/lib/taskjuggler/{Tj3Man.rb → apps/Tj3Man.rb}

@@ -29,6 +29,7 @@ class TaskJuggler
       @keywords = TernarySearchTree.new(@man.all)
       @manual = false
       @directory = nil
+      @mininumRubyVersion = '1.8.7'
     end
 
     def processArguments(argv)
@@ -49,8 +50,7 @@ EOT
       end
     end
 
-    def main(argv = ARGV)
-      requestedKeywords = super
+    def appMain(requestedKeywords)
       if @manual
         UserManual.new.generate(@directory)
       elsif requestedKeywords.empty?

data/lib/taskjuggler/apps/Tj3SsReceiver.rb

@@ -37,17 +37,20 @@ EOT
       end
     end
 
-    def main(argv = ARGV)
-      super
-      ts = TaskJuggler::StatusSheetReceiver.new('tj3ss_receiver')
-      @rc.configure(ts, 'global')
-      @rc.configure(ts, 'statussheets')
-      @rc.configure(ts, 'statussheets.receiver')
-      ts.workingDir = @workingDir if @workingDir
-      ts.dryRun = @dryRun
-
-      ts.processEmail
-      0
+    def appMain(argv)
+      begin
+        ts = TaskJuggler::StatusSheetReceiver.new('tj3ss_receiver')
+        @rc.configure(ts, 'global')
+        @rc.configure(ts, 'statussheets')
+        @rc.configure(ts, 'statussheets.receiver')
+        ts.workingDir = @workingDir if @workingDir
+        ts.dryRun = @dryRun
+
+        ts.processEmail
+        return 0
+      rescue TjRuntimeError
+        return 1
+      end
     end
 
   end

data/lib/taskjuggler/apps/Tj3SsSender.rb

@@ -67,21 +67,24 @@ EOT
       end
     end
 
-    def main(argv = ARGV)
-      super
-      ts = StatusSheetSender.new('tj3ss_sender')
-      @rc.configure(ts, 'global')
-      @rc.configure(ts, 'statussheets')
-      @rc.configure(ts, 'statussheets.sender')
-      ts.workingDir = @workingDir if @workingDir
-      ts.dryRun = @dryRun
-      ts.force = @force
-      ts.intervalDuration = @intervalDuration if @intervalDuration
-      ts.date = @date if @date
-      ts.hideResource = @hideResource if @hideResource
+    def appMain(argv)
+      begin
+        ts = StatusSheetSender.new('tj3ss_sender')
+        @rc.configure(ts, 'global')
+        @rc.configure(ts, 'statussheets')
+        @rc.configure(ts, 'statussheets.sender')
+        ts.workingDir = @workingDir if @workingDir
+        ts.dryRun = @dryRun
+        ts.force = @force
+        ts.intervalDuration = @intervalDuration if @intervalDuration
+        ts.date = @date if @date
+        ts.hideResource = @hideResource if @hideResource
 
-      ts.sendTemplates(@resourceList)
-      0
+        ts.sendTemplates(@resourceList)
+        return 0
+      rescue TjRuntimeError
+        return 1
+      end
     end
 
   end

data/lib/taskjuggler/apps/Tj3TsReceiver.rb

@@ -40,17 +40,20 @@ EOT
       end
     end
 
-    def main(argv = ARGV)
-      super
-      ts = TimeSheetReceiver.new('tj3ts_receiver')
-      @rc.configure(ts, 'global')
-      @rc.configure(ts, 'timesheets')
-      @rc.configure(ts, 'timesheets.receiver')
-      ts.workingDir = @workingDir if @workingDir
-      ts.dryRun = @dryRun
-
-      ts.processEmail
-      0
+    def appMain(argv)
+      begin
+        ts = TimeSheetReceiver.new('tj3ts_receiver')
+        @rc.configure(ts, 'global')
+        @rc.configure(ts, 'timesheets')
+        @rc.configure(ts, 'timesheets.receiver')
+        ts.workingDir = @workingDir if @workingDir
+        ts.dryRun = @dryRun
+
+        ts.processEmail
+        return 0
+      rescue TjRuntimeError
+        return 1
+      end
     end
 
   end

data/lib/taskjuggler/apps/Tj3TsSender.rb

@@ -55,20 +55,23 @@ EOT
       end
     end
 
-    def main(argv = ARGV)
-      super
-      ts = TimeSheetSender.new('tj3ts_sender')
-      @rc.configure(ts, 'global')
-      @rc.configure(ts, 'timesheets')
-      @rc.configure(ts, 'timesheets.sender')
-      ts.workingDir = @workingDir if @workingDir
-      ts.dryRun = @dryRun
-      ts.force = @force
-      ts.intervalDuration = @intervalDuration if @intervalDuration
-      ts.date = @date if @date
+    def appMain(argv)
+      begin
+        ts = TimeSheetSender.new('tj3ts_sender')
+        @rc.configure(ts, 'global')
+        @rc.configure(ts, 'timesheets')
+        @rc.configure(ts, 'timesheets.sender')
+        ts.workingDir = @workingDir if @workingDir
+        ts.dryRun = @dryRun
+        ts.force = @force
+        ts.intervalDuration = @intervalDuration if @intervalDuration
+        ts.date = @date if @date
 
-      ts.sendTemplates(@resourceList)
-      0
+        ts.sendTemplates(@resourceList)
+        return 0
+      rescue
+        return 1
+      end
     end
 
   end

data/lib/taskjuggler/apps/Tj3TsSummary.rb

@@ -64,20 +64,23 @@ EOT
       end
     end
 
-    def main(argv = ARGV)
-      super
-      ts = TimeSheetSummary.new
-      @rc.configure(ts, 'global')
-      @rc.configure(ts, 'timesheets')
-      @rc.configure(ts, 'timesheets.summary')
-      ts.workingDir = @workingDir if @workingDir
-      ts.dryRun = @dryRun
-      ts.date = @date if @date
-      ts.sheetRecipients += @sheetRecipients
-      ts.digestRecipients += @digestRecipients
+    def appMain(argv)
+      begin
+        ts = TimeSheetSummary.new
+        @rc.configure(ts, 'global')
+        @rc.configure(ts, 'timesheets')
+        @rc.configure(ts, 'timesheets.summary')
+        ts.workingDir = @workingDir if @workingDir
+        ts.dryRun = @dryRun
+        ts.date = @date if @date
+        ts.sheetRecipients += @sheetRecipients
+        ts.digestRecipients += @digestRecipients
 
-      ts.sendSummary(@resourceList)
-      0
+        ts.sendSummary(@resourceList)
+        return 0
+      rescue TjRuntimeError
+        return 1
+      end
     end
 
   end

data/lib/taskjuggler/reports/GanttChart.rb

@@ -207,7 +207,7 @@ class TaskJuggler
     # Utility function that convers a date to the corresponding X-position in
     # the Gantt chart.
     def dateToX(date)
-      (@width / (@end - @start)) * (date - @start)
+      ((@width / (@end - @start)) * (date - @start)).to_i
     end
 
     # This is not a user callable function. It's only meant for use within the

data/lib/taskjuggler/reports/GanttRouter.rb

@@ -48,8 +48,6 @@ class TaskJuggler
       # Hash objects.
       routes = []
       fromToPoints.each do |touple|
-        # Ignore lines where start is after end.
-        next if touple[0] > touple[2]
         routes << {
           :startX => touple[0],
           :startY => touple[1],

data/lib/taskjuggler/reports/GanttTaskBar.rb

@@ -91,7 +91,8 @@ class TaskJuggler
       if @query
         @query.attributeId = 'complete'
         @query.process
-        completion = @query.result / 100.0
+        res = @query.result
+        completion = res ? res / 100.0 : 0.0
       else
         completion = 0.5
       end

data/lib/taskjuggler/reports/Navigator.rb

@@ -68,7 +68,7 @@ class TaskJuggler
       end
       @elements.each do |element|
         if element.current && !element.elements.empty?
-          html << XMLElement.new('hr') unless first
+          html << XMLElement.new('hr', {}, true) unless first
           html << element.to_html
         end
       end
@@ -188,6 +188,7 @@ class TaskJuggler
       # Remove all reports that the user doesn't want to have include.
       query = @project.reportContexts.last.query.dup
       query.scopeProperty = nil
+      query.scenarioIdx = query.scenario = nil
       list.delete_if do |property|
         query.property = property
         @hideReport.eval(query)

data/lib/taskjuggler/reports/NikuReport.rb

@@ -118,6 +118,7 @@ class TaskJuggler
 
       # The actual content. One line per resource.
       table << (tbody = XMLElement.new('tbody'))
+      numberFormat = a('numberFormat')
       @resourcesTotalEffort.keys.sort.each do |resourceId|
         tbody << (tr = XMLElement.new('tr', 'class' => 'tabline'))
         tr << htmlTabCell("#{@resources[resourceId].name} (#{resourceId})",
@@ -126,21 +127,22 @@ class TaskJuggler
         @projects.keys.sort.each do |projectId|
           next if projectTotal(projectId) <= 0.0
           value = sum(projectId, resourceId)
-          tr << htmlTabCell(value >= 0.01 ? format("%.2f", value) : '')
+          valStr = numberFormat.format(value)
+          valStr = '' if valStr.to_f == 0.0
+          tr << htmlTabCell(valStr)
         end
 
-        tr << htmlTabCell(format("%.2f", resourceTotal(resourceId)), true)
+        tr << htmlTabCell(numberFormat.format(resourceTotal(resourceId)), true)
       end
 
       # Project totals
       tbody << (tr = XMLElement.new('tr', 'class' => 'tabline'))
       tr << htmlTabCell('Total', 'true', 'left')
       @projects.keys.sort.each do |projectId|
-        next if projectTotal(projectId) <= 0.0
-        tr << htmlTabCell(format("%.2f", projectTotal(projectId)), true,
-                          'right')
+        next if (pTotal = projectTotal(projectId)) <= 0.0
+        tr << htmlTabCell(numberFormat.format(pTotal), true, 'right')
       end
-      tr << htmlTabCell(format("%.2f", total()), true, 'right')
+      tr << htmlTabCell(numberFormat.format(total()), true, 'right')
       tableFrame
     end
 
@@ -166,6 +168,7 @@ EOT
       nikuDataBus << (projects = XMLElement.new('Projects'))
 
       timeFormat = '%Y-%m-%dT%H:%M:%S'
+      numberFormat = a('numberFormat')
       @projects.keys.sort.each do |projectId|
         prj = @projects[projectId]
         projects << (project =
@@ -185,7 +188,8 @@ EOT
                                         a('start').to_s(timeFormat),
                                         'finish' =>
                                         (a('end') - 1).to_s(timeFormat),
-                                        'sum' => sum(prj.id, res.id).to_s))
+                                        'sum' => numberFormat.format(
+                                          sum(prj.id, res.id)).to_s))
         end
 
         # The custom information section usually contains Clarity installation

data/lib/taskjuggler/reports/ReportContext.rb

@@ -35,6 +35,7 @@ class TaskJuggler
         'currencyFormat' => @report.get('currencyFormat'),
         'start' => @report.get('start'),
         'end' => @report.get('end'),
+        'hideJournalEntry' => @report.get('hideJournalEntry'),
         'costAccount' => @report.get('costAccount'),
         'revenueAccount' => @report.get('revenueAccount')
       }

data/lib/taskjuggler/reports/StatusSheetReport.rb

@@ -87,6 +87,7 @@ class TaskJuggler
                      'timeFormat' => a('timeFormat'),
                      'currencyFormat' => a('currencyFormat'),
                      'start' => a('start'), 'end' => a('end'),
+                     'hideJournalEntry' => a('hideJournalEntry'),
                      'costAccount' => a('costAccount'),
                      'revenueAccount' => a('revenueAccount') }
       resourceList.query = Query.new(queryAttrs)
@@ -123,8 +124,9 @@ class TaskJuggler
         topLevelTasks.each do |task|
           # Get a list of all the current Journal entries for this task and
           # all it's sub tasks.
-          entries = @project['journal'].currentEntriesR(a('end'), task,
-                                                        0, a('start') + 1)
+          entries = @project['journal'].
+            currentEntriesR(a('end'), task, 0, a('start') + 1,
+                            resourceList.query.hideJournalEntry)
           next if entries.empty?
 
           manager.responsibilities << ManagerResponsibilities.new(task, entries)
@@ -183,6 +185,9 @@ class TaskJuggler
                 @file << "\n"
               end
               @file << "    #   author #{entry.author.fullId}\n" if entry.author
+              unless entry.flags.empty?
+                @file << "    #   flags #{entry.flags.join(', ')}\n"
+              end
               if entry.summary
                 @file << "    #   summary -8<-\n" +
                          indentBlock(4, entry.summary.richText.inputText) +

data/lib/taskjuggler/reports/TableReport.rb

@@ -58,7 +58,7 @@ class TaskJuggler
       'scenario'         => [ 'Scenario',          false,  :left,  true ],
       'status'           => [ 'Status',            false,  :left,  true ],
       'targets'          => [ 'Targets',           false,  :left,  true ],
-      'wbs'              => [ 'WBS',               false,  :left,  false ]
+      'bsi'              => [ 'BSI',               false,  :left,  false ]
     }
     @@propertiesByType = {
       # Type                     Indent  Align
@@ -330,6 +330,7 @@ class TaskJuggler
                      'timeFormat' => a('timeFormat'),
                      'currencyFormat' => a('currencyFormat'),
                      'start' => @start, 'end' => @end,
+                     'hideJournalEntry' => a('hideJournalEntry'),
                      'costAccount' => a('costAccount'),
                      'revenueAccount' => a('revenueAccount') }
       taskList.query = Query.new(queryAttrs)
@@ -394,6 +395,7 @@ class TaskJuggler
                      'timeFormat' => a('timeFormat'),
                      'currencyFormat' => a('currencyFormat'),
                      'start' => @start, 'end' => @end,
+                     'hideJournalEntry' => a('hideJournalEntry'),
                      'costAccount' => a('costAccount'),
                      'revenueAccount' => a('revenueAccount') }
       resourceList.query = Query.new(queryAttrs)
@@ -604,7 +606,7 @@ class TaskJuggler
     def genStandardCell(query, line, columnDef)
       query = query.dup
       query.listType = columnDef.listType
-      query.listMode = columnDef.listMode
+      query.listItem = columnDef.listItem
 
       # Find out, what type of PropertyTreeNode we are dealing with.
       property = line.property
@@ -650,7 +652,7 @@ class TaskJuggler
     def genCalculatedCell(query, line, columnDef, property)
       query = query.dup
       query.listType = columnDef.listType
-      query.listMode = columnDef.listMode
+      query.listItem = columnDef.listItem
 
       # Create a new cell
       cell = newCell(query, line)
@@ -698,7 +700,7 @@ class TaskJuggler
           generateIntermediateFormat
       when 'no'
         cell.text = line.no.to_s
-      when 'wbs'
+      when 'bsi'
         cell.indent = 2 if line.scopeLine
       when 'scenario'
         cell.text = @project.scenario(query.scenarioIdx).name