taskjuggler 3.4.0 → 3.5.0

data/lib/taskjuggler/reports/GanttHeaderScaleItem.rb

@@ -3,7 +3,7 @@
 #
 # = GanttHeaderScaleItem.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/GanttLine.rb

@@ -3,7 +3,7 @@
 #
 # = GanttLine.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/GanttLoadStack.rb

@@ -3,7 +3,7 @@
 #
 # = GanttLoadStack.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/GanttMilestone.rb

@@ -3,7 +3,7 @@
 #
 # = GanttMilestone.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/GanttRouter.rb

@@ -3,7 +3,7 @@
 #
 # = GanttRouter.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/GanttTaskBar.rb

@@ -3,7 +3,7 @@
 #
 # = GanttTaskBar.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/HTMLGraphics.rb

@@ -3,7 +3,7 @@
 #
 # = HTMLGraphics.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/ICalReport.rb

@@ -3,7 +3,7 @@
 #
 # = ICalReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/MspXmlRE.rb

@@ -3,7 +3,7 @@
 #
 # = MspXmlRE.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/Navigator.rb

@@ -3,7 +3,7 @@
 #
 # = Navigator.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/NikuReport.rb

@@ -3,7 +3,7 @@
 #
 # = NikuReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/Report.rb

@@ -3,7 +3,7 @@
 #
 # = Report.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -248,8 +248,7 @@ EOT
         else
           # Prepend the specified output directory unless the provided file
           # name is an absolute file name.
-          ((@name[0] == '/' ? '' : @project.outputDir) +
-           @name + '.html').untaint
+          absoluteFileName(@name) + '.html'
         end
       begin
         html.write(fileName)
@@ -276,9 +275,7 @@ EOT
       # Use the CSVFile class to write the Array of Arrays to a colon
       # separated file. Write to $stdout if the filename was set to '.'.
       begin
-        fileName = (@name == '.' ? @name :
-                                  (@name[0] == '/' ? '' : @project.outputDir) +
-                                  @name + '.csv').untaint
+        fileName = (@name == '.' ? '.' : absoluteFileName(@name) + '.csv')
         CSVFile.new(csv, ';').write(fileName)
       rescue IOError, SystemCallError
         error('write_csv', "Cannot write to file #{fileName}.\n#{$!}",
@@ -300,9 +297,8 @@ EOT
         if @name == '.'
           $stdout.write(@content.to_tjp)
         else
-          fileName = (@name[0] == '/' ? '' : @project.outputDir) + @name
+          fileName = absoluteFileName(@name)
           fileName += a('definitions').include?('project') ? '.tjp' : '.tji'
-          fileName.untaint
           File.open(fileName, 'w') { |f| f.write(@content.to_tjp) }
         end
       rescue IOError, SystemCallError
@@ -325,8 +321,7 @@ EOT
         if @name == '.'
           $stdout.write(@content.to_mspxml)
         else
-          fileName = (@name[0] == '/' ? '' : @project.outputDir) + @name + '.xml'
-          fileName.untaint
+          fileName = absoluteFileName(@name) + '.xml'
           File.open(fileName, 'w') { |f| f.write(@content.to_mspxml) }
         end
       rescue IOError, SystemCallError
@@ -346,8 +341,7 @@ EOT
 
       begin
         f = @name == '.' ? $stdout :
-          File.new(((@name[0] == '/' ? '' : @project.outputDir) +
-                    @name + '.xml').untaint, 'w')
+          File.new(absoluteFileName(@name) + '.xml', 'w')
         f.puts "#{@content.to_niku}"
       rescue IOError, SystemCallError
         error('write_niku', "Cannot write to file #{@name}.\n#{$!}",
@@ -366,8 +360,7 @@ EOT
 
       begin
         f = @name == '.' ? $stdout :
-          File.new(((@name[0] == '/' ? '' : @project.outputDir) +
-                    @name + '.ics').untaint, 'w')
+          File.new(absoluteFileName(@name) + '.ics', 'w')
         f.puts "#{@content.to_iCal}"
       rescue IOError, SystemCallError
         error('write_ical', "Cannot write to file #{@name}.\n#{$!}",
@@ -386,8 +379,7 @@ EOT
 
       begin
         f = @name == '.' ? $stdout :
-          File.new(((@name[0] == '/' ? '' : @project.outputDir) +
-                    @name).untaint, 'w')
+          File.new(absoluteFileName(@name), 'w')
         f.puts "#{@content.to_ctags}"
       rescue IOError, SystemCallError
         error('write_ctags', "Cannot write to file #{@name}.\n#{$!}",
@@ -407,8 +399,7 @@ 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) + '/').untaint
+      auxDstDir = File.dirname(absoluteFileName(@name)) + '/'
       # Find the data directory that came with the TaskJuggler installation.
       auxSrcDir = AppConfig.dataDirs("data/#{dirName}")[0].untaint
       # Raise an error if we haven't found the data directory
@@ -456,14 +447,35 @@ EOT
            )
     end
 
+    def windowsOS?
+      (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+    end
+
     def checkFileName(name)
-      if name =~ /[\\?%*:|"<>]/
+      if windowsOS?
+        illegalChars = /[\x00\\\*\?\"<>\|]/
+      else
+        illegalChars = /[\\?%*:|"<>]/
+      end
+      if name =~ illegalChars
         error('invalid_file_name',
               'File names may not contain any of the following characters: ' +
               '\?%*:|\"<>', sourceFileInfo)
       end
     end
 
+    def absoluteFileName?(name)
+      if windowsOS?
+        name[0] =~ /a-zA-Z/ && name[1] == ?:
+      else
+        name[0] == ?/
+      end
+    end
+
+    def absoluteFileName(name)
+      ((absoluteFileName?(name) ? '' : @project.outputDir) + name).untaint
+    end
+
   end
 
 end

data/lib/taskjuggler/reports/ReportBase.rb

@@ -3,7 +3,7 @@
 #
 # = ReportBase.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/ReportContext.rb

@@ -3,7 +3,7 @@
 #
 # = ReportContext.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/ReportTable.rb

@@ -3,7 +3,7 @@
 #
 # = ReportTable.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/ReportTableCell.rb

@@ -3,7 +3,7 @@
 #
 # = ReportTableCell.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/ReportTableColumn.rb

@@ -3,7 +3,7 @@
 #
 # = ReportTableColumn.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/ReportTableLegend.rb

@@ -3,7 +3,7 @@
 #
 # = ReportTableLegend.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/ReportTableLine.rb

@@ -3,7 +3,7 @@
 #
 # = ReportTableLine.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/ResourceListRE.rb

@@ -3,7 +3,7 @@
 #
 # = ResourceListRE.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/StatusSheetReport.rb

@@ -3,7 +3,7 @@
 #
 # = StatusSheetReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/TableReport.rb

@@ -3,7 +3,7 @@
 #
 # = TableReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -416,7 +416,6 @@ class TaskJuggler
 
           # Generate a cell for each column in this line.
           a('columns').each do |columnDef|
-            query.attributeId = columnDef.id
             next unless generateTableCell(line, columnDef, query)
           end
         end
@@ -463,7 +462,6 @@ class TaskJuggler
 
           # Generate a cell for each column in this line.
           a('columns').each do |columnDef|
-            query.attributeId = columnDef.id
             next unless generateTableCell(line, columnDef, query)
           end
         end
@@ -520,7 +518,6 @@ class TaskJuggler
 
           # Generate a cell for each column in this line.
           a('columns').each do |column|
-            query.attributeId = column.id
             next unless generateTableCell(line, column, query)
           end
         end
@@ -636,6 +633,7 @@ class TaskJuggler
       # the Query to avoid spoiling the original query with column specific
       # settings.
       query = query.dup
+      query.attributeId = columnDef.id
       query.start = @columns[columnDef].start
       query.end = @columns[columnDef].end
       query.listType = columnDef.listType
@@ -696,7 +694,8 @@ class TaskJuggler
         genCalChartResourceCell(query, tcLine, columnDef, start,
                                 sameTimeNextFunc)
       elsif query.property.is_a?(Account)
-        genCalChartAccountCell(query, tcLine, columnDef, start, sameTimeNextFunc)
+        genCalChartAccountCell(query, tcLine, columnDef, start,
+                               sameTimeNextFunc)
       else
         raise "Unknown property type #{query.property.class}"
       end

data/lib/taskjuggler/reports/TableReportColumn.rb

@@ -3,7 +3,7 @@
 #
 # = TableReportColumn.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/TagFile.rb

@@ -3,7 +3,7 @@
 #
 # = TagFile.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/TaskListRE.rb

@@ -3,7 +3,7 @@
 #
 # = TaskListRE.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/TextReport.rb

@@ -3,7 +3,7 @@
 #
 # = TextReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/TimeSheetReport.rb

@@ -3,7 +3,7 @@
 #
 # = TimeSheetReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/reports/TjpExportRE.rb

@@ -3,7 +3,7 @@
 #
 # = TjpExportRE.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -121,7 +121,14 @@ class TaskJuggler
           next unless ad.userDefined && attributes.include?(ad.id)
 
           @file << "    #{ad.objClass.tjpId} #{ad.id} " +
-                   "#{quotedString(ad.name)}\n"
+                   "#{quotedString(ad.name)}"
+          if ad.scenarioSpecific || ad.inheritedFromParent
+            @file << " { "
+            @file << "scenariospecific " if ad.scenarioSpecific
+            @file << "inherit " if ad.inheritedFromParent
+            @file << "}"
+          end
+          @file << "\n"
         end
       @file << "  }\n"
     end

data/lib/taskjuggler/reports/TraceReport.rb

@@ -3,7 +3,7 @@
 #
 # = TraceReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify