taskjuggler 0.0.10 → 0.0.11

data/lib/{reports → taskjuggler/reports}/ReportTable.rb

@@ -11,8 +11,8 @@
 # published by the Free Software Foundation.
 #
 
-require 'reports/ReportTableColumn'
-require 'reports/ReportTableLine'
+require 'taskjuggler/reports/ReportTableColumn'
+require 'taskjuggler/reports/ReportTableLine'
 
 class TaskJuggler
 

data/lib/{reports → taskjuggler/reports}/ReportTableLine.rb

@@ -11,7 +11,7 @@
 # published by the Free Software Foundation.
 #
 
-require 'reports/ReportTableCell'
+require 'taskjuggler/reports/ReportTableCell'
 
 class TaskJuggler
 

data/lib/{reports → taskjuggler/reports}/ResourceListRE.rb

@@ -11,10 +11,10 @@
 # published by the Free Software Foundation.
 #
 
-require 'reports/TableReport'
-require 'reports/ReportTable'
-require 'TableColumnDefinition'
-require 'LogicalExpression'
+require 'taskjuggler/reports/TableReport'
+require 'taskjuggler/reports/ReportTable'
+require 'taskjuggler/TableColumnDefinition'
+require 'taskjuggler/LogicalExpression'
 
 class TaskJuggler
 

data/lib/{reports → taskjuggler/reports}/StatusSheetReport.rb

@@ -11,7 +11,7 @@
 # published by the Free Software Foundation.
 #
 
-require 'reports/ReportBase'
+require 'taskjuggler/reports/ReportBase'
 
 class TaskJuggler
 

data/lib/{reports → taskjuggler/reports}/TableReport.rb

@@ -11,11 +11,11 @@
 # published by the Free Software Foundation.
 #
 
-require 'reports/ReportBase'
-require 'reports/GanttChart'
-require 'reports/ReportTableLegend'
-require 'reports/ColumnTable'
-require 'Query'
+require 'taskjuggler/reports/ReportBase'
+require 'taskjuggler/reports/GanttChart'
+require 'taskjuggler/reports/ReportTableLegend'
+require 'taskjuggler/reports/ColumnTable'
+require 'taskjuggler/Query'
 
 class TaskJuggler
 
@@ -42,6 +42,7 @@ class TaskJuggler
       'freework'         => [ 'Free Work',         true,   :right, true ],
       'followers'        => [ 'Followers',         false,  :left,  true ],
       'id'               => [ 'Id',                false,  :left,  false ],
+      'inputs'           => [ 'Inputs',            false,  :left,  true ],
       'journal'          => [ 'Journal',           false,  :left,  false ],
       'journal_sub'      => [ 'Journal',           false,  :left,  false ],
       'journalmessages'  => [ 'Journal Messages',  false,  :left,  false ],
@@ -833,8 +834,8 @@ class TaskJuggler
         # Get work load for all tasks.
         query.scopeProperty = nil
         query.attributeId = 'effort'
-        query.startIdx = @project.dateToIdx(t, true)
-        query.endIdx = @project.dateToIdx(nextT, true) - 1
+        query.startIdx = @project.dateToIdx(t)
+        query.endIdx = @project.dateToIdx(nextT) - 1
         query.process
         workLoad = query.to_num
         scaledWorkLoad = query.to_s

data/lib/{reports → taskjuggler/reports}/TaskListRE.rb

@@ -11,10 +11,10 @@
 # published by the Free Software Foundation.
 #
 
-require 'reports/TableReport'
-require 'reports/ReportTable'
-require 'TableColumnDefinition'
-require 'LogicalExpression'
+require 'taskjuggler/reports/TableReport'
+require 'taskjuggler/reports/ReportTable'
+require 'taskjuggler/TableColumnDefinition'
+require 'taskjuggler/LogicalExpression'
 
 class TaskJuggler
 

data/lib/{reports → taskjuggler/reports}/TextReport.rb

@@ -11,7 +11,7 @@
 # published by the Free Software Foundation.
 #
 
-require 'reports/ReportBase'
+require 'taskjuggler/reports/ReportBase'
 
 class TaskJuggler
 

data/lib/{reports → taskjuggler/reports}/TimeSheetReport.rb

@@ -11,7 +11,7 @@
 # published by the Free Software Foundation.
 #
 
-require 'reports/ReportBase'
+require 'taskjuggler/reports/ReportBase'
 
 class TaskJuggler
 

data/lib/{reports → taskjuggler/reports}/TjpExportRE.rb

@@ -11,7 +11,7 @@
 # published by the Free Software Foundation.
 #
 
-require 'reports/ReportBase'
+require 'taskjuggler/reports/ReportBase'
 
 class TaskJuggler
 
@@ -25,17 +25,8 @@ class TaskJuggler
 
       @supportedTaskAttrs = %w( booking complete depends flags maxend
                                 maxstart minend minstart note priority
-                                responsible )
-      @supportedResourceAttrs = %w( vacation workinghours )
-      @report.set('scenarios', [ 0 ])
-
-      # Show all tasks, sorted by seqno-up.
-      @report.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
-      @report.set('sortTasks', [ [ 'seqno', true, -1 ] ])
-      # Show all resources, sorted by seqno-up.
-      @report.set('hideResource',
-                  LogicalExpression.new(LogicalOperation.new(0)))
-      @report.set('sortResources', [ [ 'seqno', true, -1 ] ])
+                                projectid responsible )
+      @supportedResourceAttrs = %w( flags vacation workinghours )
     end
 
     def generateIntermediateFormat
@@ -81,13 +72,26 @@ class TaskJuggler
       @file << "project #{@project['projectid']} \"#{@project['name']}\" " +
                "\"#{@project['version']}\" #{@project['start']} - " +
                "#{@project['end']} {\n"
+      generateAttributeText("timezone \"#{@project['timezone']}\"", 2)
       generateCustomAttributeDeclarations('resource', @project.resources,
                                           a('resourceAttributes'))
       generateCustomAttributeDeclarations('task', @project.tasks,
                                           a('taskAttributes'))
+      generateScenarioDefinition(@project.scenario(0), 2)
       @file << "}\n\n"
     end
 
+    def generateScenarioDefinition(scenario, indent)
+      @file << "#{' ' * indent}scenario #{scenario.id} " +
+               "#{quotedString(scenario.name)} {\n"
+      scenario.children.each do |sc|
+        generateScenarioDefinition(sc, indent + 2)
+      end
+      @file << "#{' ' * (indent + 2)}disabled\n" unless scenario.get('enabled')
+      @file << "#{' ' * indent}}\n"
+    end
+
+
     def generateCustomAttributeDeclarations(tag, propertySet, attributes)
       # First we search the attribute definitions for any user defined
       # attributes and count them.
@@ -104,7 +108,8 @@ class TaskJuggler
         propertySet.eachAttributeDefinition do |ad|
           next unless ad.userDefined && attributes.include?(ad.id)
 
-          @file << "    #{ad.objClass.tjpId} #{ad.id} \"#{ad.name}\"\n"
+          @file << "    #{ad.objClass.tjpId} #{ad.id} " +
+                   "#{quotedString(ad.name)}\n"
         end
       @file << "  }\n"
     end
@@ -154,7 +159,8 @@ class TaskJuggler
     def generateResource(resource, indent)
       Log.activity if resource.sequenceNo % 100 == 0
 
-      @file << ' ' * indent + "resource #{resource.id} \"#{resource.name}\""
+      @file << ' ' * indent + "resource #{resource.id} " +
+               "#{quotedString(resource.name)}"
       @file << ' {' unless resource.children.empty?
       @file << "\n"
 
@@ -186,7 +192,8 @@ class TaskJuggler
     def generateTask(task, indent)
       Log.activity if task.sequenceNo % 100 == 0
 
-      @file << ' ' * indent + "task #{task.id} \"#{task.name}\" {\n"
+      @file << ' ' * indent + "task #{task.id} " +
+               "#{quotedString(task.name)} {\n"
 
       if a('taskAttributes').include?('depends')
         a('scenarios').each do |scenarioIdx|
@@ -218,7 +225,9 @@ class TaskJuggler
         a('scenarios').each do |scenarioIdx|
           generateAttribute(task, 'start', indent + 2, scenarioIdx)
           if task['milestone', scenarioIdx]
-            generateAttributeText('milestone', indent + 2, scenarioIdx)
+            if task['scheduled', scenarioIdx]
+              generateAttributeText('milestone', indent + 2, scenarioIdx)
+            end
           else
             generateAttribute(task, 'end', indent + 2, scenarioIdx)
             generateAttributeText('scheduling ' +
@@ -226,7 +235,8 @@ class TaskJuggler
                                    'asap' : 'alap'),
                                   indent + 2, scenarioIdx)
           end
-          if task['scheduled', scenarioIdx]
+          if task['scheduled', scenarioIdx] &&
+             !inheritable?(task, 'scheduled', scenarioIdx)
             generateAttributeText('scheduled', indent + 2, scenarioIdx)
           end
         end
@@ -241,17 +251,20 @@ class TaskJuggler
 
       taskDeps = task[tag, scenarioIdx]
       unless taskDeps.empty?
-        @file << ' ' * indent + tag + ' '
+        str = "#{tag} "
         first = true
         taskDeps.each do |dep|
+          next if inheritable?(task, tag, scenarioIdx, dep) ||
+                  (task.parent && task.parent[tag, scenarioIdx].include?(dep))
+
           if first
             first = false
           else
-            @file << ', '
+            str << ', '
           end
-          @file << dep.task.fullId
+          str << dep.task.fullId
         end
-        @file << "\n"
+        generateAttributeText(str, indent, scenarioIdx) unless first
       end
     end
 
@@ -265,11 +278,12 @@ class TaskJuggler
         @project.resources.eachAttributeDefinition do |attrDef|
           id = attrDef.id
           next if (!@supportedResourceAttrs.include?(id) &&
-                   ! attrDef.userDefined) ||
-                   !a('resourceAttributes').include?(id)
+                   !attrDef.userDefined) ||
+                  !a('resourceAttributes').include?(id)
 
           if attrDef.scenarioSpecific
             a('scenarios').each do |scenarioIdx|
+              next if inheritable?(resource, id, scenarioIdx)
               generateAttribute(resource, id, 2, scenarioIdx)
             end
           else
@@ -288,8 +302,19 @@ class TaskJuggler
         Log.activity if task.sequenceNo % 100 == 0
 
         @file << "supplement task #{task.fullId} {\n"
+        # Declare adopted tasks.
+        adoptees = ""
+        task.adoptees.each do |adoptee|
+          next unless @taskList.include?(adoptee)
+
+          adoptees += ', ' unless adoptees.empty?
+          adoptees += adoptee.fullId
+        end
+        generateAttributeText("adopt #{adoptees}", 2) unless adoptees.empty?
+
         @project.tasks.eachAttributeDefinition do |attrDef|
           id = attrDef.id
+
           next if (!@supportedTaskAttrs.include?(id) && !attrDef.userDefined) ||
                   !a('taskAttributes').include?(id)
 
@@ -317,18 +342,19 @@ class TaskJuggler
     def generateAttribute(property, attrId, indent, scenarioIdx = nil)
       val = scenarioIdx.nil? ? property.getAttr(attrId) :
                                property[attrId, scenarioIdx]
-      return if val.nil? || (val.is_a?(Array) && val.empty?)
+      return if val.nil? || (val.is_a?(Array) && val.empty?) ||
+                (scenarioIdx && inheritable?(property, attrId, scenarioIdx))
 
       generateAttributeText(property.getAttr(attrId, scenarioIdx).to_tjp,
                             indent, scenarioIdx)
     end
 
-    def generateAttributeText(text, indent, scenarioIdx)
+    def generateAttributeText(text, indent, scenarioIdx = nil)
       @file << ' ' * indent
       tag = ''
       if !scenarioIdx.nil? && scenarioIdx != 0
-        tag = @project.scenario(scenarioIdx).id
-        @file << "#{tag}:"
+        tag = "#{@project.scenario(scenarioIdx).id}:"
+        @file << tag
       end
       @file << "#{indentBlock(text, indent + tag.length + 2)}\n"
     end
@@ -349,6 +375,8 @@ class TaskJuggler
             # Now convert/add them to a tripple-stage hash by scenarioIdx, task
             # and then resource.
             bookings.each do |task, booking|
+              next unless @taskList.include?(task)
+
               if !@bookings[scenarioIdx].include?(task)
                 @bookings[scenarioIdx][task] = {}
               end
@@ -362,7 +390,13 @@ class TaskJuggler
     def generateBooking(task, indent, scenarioIdx)
       return unless @bookings[scenarioIdx].include?(task)
 
-      @bookings[scenarioIdx][task].each_value do |booking|
+      # Convert Hash into an [ Resource, Booking ] Array sorted by Resource
+      # ID. This guarantees a reproducible order.
+      resourceBookings = @bookings[scenarioIdx][task].sort do |a, b|
+        a[0].fullId <=> b[0].fullId
+      end
+
+      resourceBookings.each do |resourceId, booking|
         generateAttributeText('booking ' + booking.to_tjp, indent, scenarioIdx)
       end
     end
@@ -382,12 +416,36 @@ class TaskJuggler
         end
         out << text[i]
         if text[i] == ?\n
-          out += ' ' * (indent + firstSpace)
+          out += ' ' * (indent + firstSpace - 1)
         end
       end
       out
     end
 
+    def quotedString(str)
+      if str[-1] == ?\n
+        "-8<-\n#{str}\n->8-"
+      else
+        escaped = str.gsub("\"", '\"')
+        "\"#{escaped}\""
+      end
+    end
+
+    # Return true if the attribute value for _attrId_ can be inherited from
+    # the parent scenario.
+    def inheritable?(property, attrId, scenarioIdx, listItem = nil)
+      parentScenario = @project.scenario(scenarioIdx).parent
+      return false unless parentScenario
+
+      parentScenarioIdx = @project.scenarioIdx(parentScenario)
+      parentAttr = property[attrId, parentScenarioIdx]
+      if parentAttr.is_a?(Array) && listItem
+        return parentAttr.include?(listItem)
+      else
+        return property[attrId, scenarioIdx] == parentAttr
+      end
+    end
+
   end
 
 end

data/lib/tj3.rb

@@ -11,149 +11,7 @@
 # published by the Free Software Foundation.
 #
 
-require 'rubygems'
-require 'optparse'
-require 'Tj3Config'
-require 'TaskJuggler'
+require 'taskjuggler/apps/Tj3'
 
-# Name of the application suite
-AppConfig.appName = 'tj3'
-
-def processArguments(argv)
-  opts = OptionParser.new
-
-  opts.banner = "#{AppConfig.softwareName} v#{AppConfig.version} - " +
-                "#{AppConfig.packageInfo}\n\n" +
-                "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] file.tjp " +
-                "[ file1.tji ... ]"
-  opts.separator ""
-  opts.on('--debuglevel N', Integer, "Verbosity of debug output") do |arg|
-    TaskJuggler::Log.level = arg
-  end
-  opts.on('--debugmodules x,y,z', Array,
-          'Restrict debug output to a list of modules') do |arg|
-    TaskJuggler::Log.segments = arg.split(',')
-  end
-  opts.on('--silent', "Don't show program and progress information") do
-    TaskJuggler::Log.silent = true
-  end
-  opts.on('-f', '--force-reports',
-          'Generate reports despite scheduling errors') do
-    @forceReports = true
-  end
-  opts.on('--check-time-sheet <tji-file>', String,
-          "Check the given time sheet") do |arg|
-    @timeSheets << arg
-  end
-  opts.on('--check-status-sheet <tji-file>', String,
-          "Check the given status sheet") do |arg|
-    @statusSheets << arg
-  end
-  opts.on('--warn-ts-deltas',
-          'Turn on warnings for requested changes in time sheets') do
-   @warnTsDeltas = true
-  end
-  opts.on('--check-syntax',
-          'Only parse the input files and check the syntax.') do
-   @checkSyntax = true
-  end
-  opts.on('--no-reports',
-          'Just schedule the project, but don\'t generate any reports.') do
-   @noReports = true
-  end
-  opts.on('-o', '--output-dir <directory>', String,
-          'Directory the reports should go into') do |arg|
-    @outputDir = arg + '/'
-  end
-  opts.on('-c N', Integer, 'Maximum number of CPU cores to use') do |arg|
-    @maxCpuCores = arg
-  end
-  opts.on_tail('-h', '--help', 'Show this message') do
-    puts opts.to_s
-    exit 0
-  end
-
-  opts.on_tail('--version', 'Show version info') do
-    puts "#{AppConfig.softwareName} v#{AppConfig.version} - " +
-      "#{AppConfig.packageInfo}"
-    exit 0
-  end
-
-  # Show some progress information by default
-  TaskJuggler::Log.silent = false
-  begin
-    files = opts.parse(argv)
-  rescue OptionParser::ParseError => msg
-    puts opts.to_s + "\n"
-    $stderr.puts msg
-    exit 0
-  end
-
-  if files.empty?
-    puts opts.to_s
-    $stderr.puts "\nNo project file name specified!"
-    exit 1
-  end
-
-  unless TaskJuggler::Log.silent
-    puts "#{AppConfig.softwareName} v#{AppConfig.version} - " +
-      "#{AppConfig.packageInfo}\n\n" +
-      "Copyright (c) #{AppConfig.copyright.join(', ')}" +
-      " by #{AppConfig.authors.join(', ')}\n\n" +
-      "#{AppConfig.license}\n"
-  end
-
-  files
-end
-
-def main
-  @maxCpuCores = 1
-  @forceReports = false
-  @warnTsDeltas = false
-  @checkSyntax = false
-  @noReports = false
-  @outputDir = ''
-  @timeSheets = []
-  @statusSheets = []
-
-  # Install signal handler to exit gracefully on CTRL-C.
-  Kernel.trap('INT') do
-    puts "\nAborting on user request!"
-    exit 1
-  end
-
-  files = processArguments(ARGV)
-  tj = TaskJuggler.new(true)
-  tj.maxCpuCores = @maxCpuCores
-  tj.warnTsDeltas = @warnTsDeltas
-  keepParser = !@timeSheets.empty? || !@statusSheets.empty?
-  exit 1 unless tj.parse(files, keepParser)
-
-  exit 0 if @checkSyntax
-
-  if !tj.schedule
-    exit 1 unless @forceReports
-  end
-
-  # The checks of time and status sheets is probably only used for debugging.
-  # Normally, this function is provided by tj3client.
-  @timeSheets.each do |ts|
-    exit 1 if !tj.checkTimeSheet(ts, File.read(ts)) || tj.errors > 0
-  end
-  @statusSheets.each do |ss|
-    exit 1 if !tj.checkStatusSheet(ss, File.read(ss)) || tj.errors > 0
-  end
-
-  exit 0 if @noReports
-
-  exit 1 if !tj.generateReports(@outputDir) || tj.errors > 0
-end
-
-main()
-exit 0
+exit TaskJuggler::Tj3.new.main()