taskjuggler 0.0.10 → 0.0.11

data/lib/{Allocation.rb → taskjuggler/Allocation.rb}

@@ -11,8 +11,8 @@
 # published by the Free Software Foundation.
 #
 
-require 'Resource'
-require 'Shift'
+require 'taskjuggler/Resource'
+require 'taskjuggler/Shift'
 
 class TaskJuggler
 
@@ -70,7 +70,7 @@ class TaskJuggler
 
     # Return the candidate list sorted according to the selectionMode.
     def candidates(scenarioIdx = -1)
-      if scenarioIdx < 0 || @selectionMode == 0 # oder
+      if scenarioIdx < 0 || @selectionMode == 0 # declaration order
         return @candidates
       end
       if @selectionMode == 4 # random

data/lib/{AppConfig.rb → taskjuggler/AppConfig.rb}

@@ -12,7 +12,6 @@
 #
 
 require 'rbconfig'
-require 'rbconfig/datadir'
 
 # This class provides central management of configuration data to an
 # application. It stores the version number, the name of the application and

data/lib/{AttributeBase.rb → taskjuggler/AttributeBase.rb}

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

data/lib/{Attributes.rb → taskjuggler/Attributes.rb}

@@ -11,14 +11,14 @@
 # published by the Free Software Foundation.
 #
 
-require 'Allocation'
-require 'AttributeBase'
-require 'Charge'
-require 'ChargeSet'
-require 'Limits'
-require 'LogicalOperation'
-require 'ShiftAssignments'
-require 'WorkingHours'
+require 'taskjuggler/Allocation'
+require 'taskjuggler/AttributeBase'
+require 'taskjuggler/Charge'
+require 'taskjuggler/ChargeSet'
+require 'taskjuggler/Limits'
+require 'taskjuggler/LogicalOperation'
+require 'taskjuggler/ShiftAssignments'
+require 'taskjuggler/WorkingHours'
 
 class TaskJuggler
 
@@ -415,6 +415,10 @@ class TaskJuggler
       rText.generateIntermediateFormat
     end
 
+    def to_tjp
+      "#{@type.id} \"#{url}\"#{label ? " { label \"#{label}\" }" : ''}"
+    end
+
     def url
       @value ? @value[0] : nil
     end
@@ -491,7 +495,13 @@ class TaskJuggler
     end
 
     def to_tjp
-      "#{@type.id} \"#{@value.to_s}\""
+      inputText = @value.richText.inputText
+      if inputText[-1] == ?\n
+        "#{@type.id} -8<-\n#{inputText}\n->8-"
+      else
+        escaped = inputText.gsub("\"", '\"')
+        "#{@type.id} \"#{escaped}\""
+      end
     end
 
   end

data/lib/{Charge.rb → taskjuggler/Charge.rb}

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

data/lib/{ChargeSet.rb → taskjuggler/ChargeSet.rb}

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

data/lib/{HTMLDocument.rb → taskjuggler/HTMLDocument.rb}

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

data/lib/{Interval.rb → taskjuggler/Interval.rb}

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

data/lib/{IntervalList.rb → taskjuggler/IntervalList.rb}

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

data/lib/{Journal.rb → taskjuggler/Journal.rb}

@@ -244,7 +244,7 @@ class TaskJuggler
                       resource = nil, alertLevel = nil)
       list = entriesByTask(task, startDate, endDate, resource, alertLevel)
 
-      task.children.each do |t|
+      task.kids.each do |t|
         list += entriesByTaskR(t, startDate, endDate, resource, alertLevel)
       end
 
@@ -359,7 +359,7 @@ class TaskJuggler
       maxAlertLevel = 0
       # Now gather all current entries of the child properties and find the
       # date that is closest to and right before the given _date_.
-      property.children.each do |p|
+      property.kids.each do |p|
         currentEntriesR(date, p, minLevel, minDate).each do |e|
           # Find the date of the most recent entry.
           latestDate = e.date if latestDate.nil? || e.date > latestDate

data/lib/{KeywordDocumentation.rb → taskjuggler/KeywordDocumentation.rb}

@@ -11,11 +11,11 @@
 # published by the Free Software Foundation.
 #
 
-require 'HTMLDocument'
-require 'RichText'
-require 'TjpExample'
-require 'TextFormatter'
-require 'Project'
+require 'taskjuggler/HTMLDocument'
+require 'taskjuggler/RichText'
+require 'taskjuggler/TjpExample'
+require 'taskjuggler/TextFormatter'
+require 'taskjuggler/Project'
 
 class TaskJuggler
 

data/lib/{Limits.rb → taskjuggler/Limits.rb}

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

data/lib/{LogicalExpression.rb → taskjuggler/LogicalExpression.rb}

@@ -11,9 +11,9 @@
 # published by the Free Software Foundation.
 #
 
-require 'LogicalOperation'
-require 'Attributes'
-require 'LogicalFunction'
+require 'taskjuggler/LogicalOperation'
+require 'taskjuggler/Attributes'
+require 'taskjuggler/LogicalFunction'
 
 class TaskJuggler
 

data/lib/{LogicalFunction.rb → taskjuggler/LogicalFunction.rb}

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

data/lib/{LogicalOperation.rb → taskjuggler/LogicalOperation.rb}

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

data/lib/{MessageHandler.rb → taskjuggler/MessageHandler.rb}

@@ -11,6 +11,8 @@
 # published by the Free Software Foundation.
 #
 
+require 'taskjuggler/TextParser/SourceFileInfo'
+
 class TaskJuggler
 
   # The Message object can store several classes of messages that the
@@ -41,7 +43,7 @@ class TaskJuggler
       end
       @message = message
 
-      if sourceFileInfo && !sourceFileInfo.is_a?(SourceFileInfo)
+      if sourceFileInfo && !sourceFileInfo.is_a?(TextParser::SourceFileInfo)
         raise "SourceFileInfo object expected but got #{sourceFileInfo.class}"
       end
       @sourceFileInfo = sourceFileInfo

data/lib/{Project.rb → taskjuggler/Project.rb}

@@ -11,29 +11,29 @@
 # published by the Free Software Foundation.
 #
 
-require 'TjException'
-require 'MessageHandler'
-require 'FileList'
-require 'TjTime'
-require 'Booking'
-require 'PropertySet'
-require 'Attributes'
-require 'RealFormat'
-require 'PropertyList'
-require 'TaskDependency'
-require 'Scenario'
-require 'Shift'
-require 'Account'
-require 'Task'
-require 'Resource'
-require 'reports/Report'
-require 'ShiftAssignments'
-require 'WorkingHours'
-require 'TimeSheets'
-require 'ProjectFileParser'
-require 'BatchProcessor'
-require 'Journal'
-require 'KeywordArray'
+require 'taskjuggler/TjException'
+require 'taskjuggler/MessageHandler'
+require 'taskjuggler/FileList'
+require 'taskjuggler/TjTime'
+require 'taskjuggler/Booking'
+require 'taskjuggler/PropertySet'
+require 'taskjuggler/Attributes'
+require 'taskjuggler/RealFormat'
+require 'taskjuggler/PropertyList'
+require 'taskjuggler/TaskDependency'
+require 'taskjuggler/Scenario'
+require 'taskjuggler/Shift'
+require 'taskjuggler/Account'
+require 'taskjuggler/Task'
+require 'taskjuggler/Resource'
+require 'taskjuggler/reports/Report'
+require 'taskjuggler/ShiftAssignments'
+require 'taskjuggler/WorkingHours'
+require 'taskjuggler/TimeSheets'
+require 'taskjuggler/ProjectFileParser'
+require 'taskjuggler/BatchProcessor'
+require 'taskjuggler/Journal'
+require 'taskjuggler/KeywordArray'
 
 class TaskJuggler
 
@@ -83,7 +83,7 @@ class TaskJuggler
         'loadUnit' => :days,
         'name' => name,
         'navigators' => {},
-        'now' => TjTime.now.align(3600),
+        'now' => TjTime.new.align(3600),
         'numberFormat' => RealFormat.new([ '-', '', '', '.', 1]),
         'priority' => 500,
         'projectid' => id || "prj",
@@ -94,7 +94,7 @@ class TaskJuggler
         'shortTimeFormat' => "%H:%M",
         'start' => nil,
         'timeFormat' => "%Y-%m-%d",
-        'timezone' => nil,
+        'timezone' => TjTime.timeZone,
         'trackingScenarioIdx' => 0,
         'vacations' => [],
         'version' => version || "1.0",
@@ -135,7 +135,7 @@ class TaskJuggler
         [ 'replace',   'Replace',      BooleanAttribute,
               true,  false,   true,  false ],
         [ 'timezone',  'Time Zone',    StringAttribute,
-              true,  true,    true,  nil ],
+              true,  true,    true,  TjTime.timeZone ],
         [ 'tree',      'Tree Index',   StringAttribute,
               false, false,   false, "" ],
         [ 'vacations', 'Vacations',    IntervalListAttribute,
@@ -179,9 +179,9 @@ class TaskJuggler
         [ 'effort', 'Total Effort',    FixnumAttribute,
               false, false,   true,  0 ],
         [ 'email',     'Email',        StringAttribute,
-              false,  false,   false, nil ],
+              false, false,   false, nil ],
         [ 'fail',      'Failure Conditions', LogicalExpressionListAttribute,
-              false, false,   true,  [] ],
+              false, false,   false,  [] ],
         [ 'flags',     'Flags',        FlagListAttribute,
               true,  false,   true,  [] ],
         [ 'fte',       'FTE',          FloatAttribute,
@@ -200,14 +200,12 @@ class TaskJuggler
               false, false,   true,  [] ],
         [ 'shifts',    'Shifts',       ShiftAssignmentsAttribute,
               true, false,    true,  nil ],
-        [ 'timezone',  'Time Zone',    StringAttribute,
-              true,  false,   true,  nil ],
         [ 'tree',      'Tree Index',   StringAttribute,
               false, false,   false, "" ],
         [ 'vacations',  'Vacations',   IntervalListAttribute,
               true,  true,    true,  [] ],
         [ 'warn',      'Warning Condition', LogicalExpressionListAttribute,
-              false, false,   true,  [] ],
+              false, false,   false, [] ],
         [ 'wbs',       'WBS',          StringAttribute,
               false, false,   false, "" ],
         [ 'workinghours', 'Working Hours', WorkingHoursAttribute,
@@ -240,13 +238,13 @@ class TaskJuggler
         [ 'effort',    'Effort',       DurationAttribute,
               false, false,   true,  0 ],
         [ 'end',       'End',          DateAttribute,
-              true,  false,   true,  nil ],
+              false, false,   true,  nil ],
         [ 'endpreds',  'End Preds.',   TaskListAttribute,
               false, false,   true,  [] ],
         [ 'endsuccs',  'End Succs.',   TaskListAttribute,
               false, false,   true,  [] ],
         [ 'fail',      'Failure Conditions', LogicalExpressionListAttribute,
-              false, false,   true,  [] ],
+              false, false,   false, [] ],
         [ 'flags',     'Flags',        FlagListAttribute,
               true,  false,   true,  [] ],
         [ 'forward',   'Scheduling',   BooleanAttribute,
@@ -284,7 +282,7 @@ class TaskJuggler
         [ 'shifts',     'Shifts',      ShiftAssignmentsAttribute,
               true,  false,   true, nil ],
         [ 'start',     'Start',        DateAttribute,
-              true,  false,   true,  nil ],
+              false, false,   true,  nil ],
         [ 'startpreds', 'Start Preds.', TaskListAttribute,
               false, false,   true,  [] ],
         [ 'startsuccs', 'Start Succs.', TaskListAttribute,
@@ -294,7 +292,7 @@ class TaskJuggler
         [ 'tree',      'Tree Index',   StringAttribute,
               false, false,   false, "" ],
         [ 'warn',      'Warning Condition', LogicalExpressionListAttribute,
-              false, false,   true,  [] ],
+              false, false,   false, [] ],
         [ 'wbs',       'WBS',          StringAttribute,
               false, false,   false, "" ]
       ]
@@ -387,7 +385,7 @@ class TaskJuggler
         [ 'timeOffName',  'Time Off Name', StringAttribute,
               false,  false,   false, nil ],
         [ 'timezone', 'Time Zone',     StringAttribute,
-              true,  true,    false, nil ],
+              true,  true,    false, TjTime.timeZone ],
         [ 'title',    'Title',         StringAttribute,
               true, false,   false, nil ],
         [ 'tree',      'Tree Index',   StringAttribute,
@@ -449,15 +447,17 @@ class TaskJuggler
         if @attributes['start'] && @attributes['end']
           @attributes['workinghours'] =
             WorkingHours.new(@attributes['scheduleGranularity'],
-                             @attributes['start'], @attributes['end'])
+                             @attributes['start'], @attributes['end'],
+                             @attributes['timezone'])
           # WorkingHours is using a copy-on-write scheme to prevent multiple
           # copies of the same Scoreboard. All other WorkingHours objects are
           # created as copies of this object. By calling
           # WorkingHours::onShift? we make sure this instance has got a
-          # Scoreboard than gets reused by the other instances.
+          # Scoreboard that gets reused by the other instances.
           @attributes['workinghours'].onShift?(@attributes['start'])
         end
       end
+      value
     end
 
     # Return the number of defined scenarios for the project.
@@ -627,6 +627,14 @@ class TaskJuggler
         finishScenario(scIdx)
       end
 
+      resources.each do |resource|
+        resource.checkFailsAndWarnings
+      end
+
+      tasks.each do |task|
+        task.checkFailsAndWarnings
+      end
+
       @timeSheets.warnOnDelta if @warnTsDeltas
       true
     end
@@ -840,7 +848,7 @@ class TaskJuggler
     # Convert a _date_ (TjTime) to the equivalent Scoreboard index. If
     # _forceIntoProject_ is true, the date will be pushed into the project time
     # frame.
-    def dateToIdx(date, forceIntoProject = false)
+    def dateToIdx(date, forceIntoProject = true)
       if (date < @attributes['start'] || date > @attributes['end'])
         # Date is out of range.
         if forceIntoProject
@@ -864,8 +872,8 @@ class TaskJuggler
     # Return the number of working days (ignoring global vacations) during the
     # given _interval_.
     def workingDays(interval)
-      startIdx = dateToIdx(interval.start, true)
-      endIdx = dateToIdx(interval.end, true)
+      startIdx = dateToIdx(interval.start)
+      endIdx = dateToIdx(interval.end)
       slots = 0
       startIdx.upto(endIdx) do |idx|
         slots += 1 unless @scoreboardNoVacations[idx]
@@ -1013,11 +1021,6 @@ class TaskJuggler
         Log.progress(i.to_f / total)
       end
 
-      # This should be really fast so we don't log progess.
-      @resources.each do |resource|
-        resource.postScheduleCheck(scIdx)
-      end
-
       Log.stopProgressMeter
     end
 
@@ -1127,8 +1130,8 @@ class TaskJuggler
 
       # Mark all global vacation slots as such
       @attributes['vacations'].each do |vacation|
-        startIdx = @scoreboard.dateToIdx(vacation.start, true)
-        endIdx = @scoreboard.dateToIdx(vacation.end, true)
+        startIdx = @scoreboard.dateToIdx(vacation.start)
+        endIdx = @scoreboard.dateToIdx(vacation.end)
         startIdx.upto(endIdx - 1) do |i|
           # If the slot is nil or set to 4 then don't set the time-off bit.
           sb = @scoreboard[i]