taskjuggler 3.4.0 → 3.5.0

data/lib/taskjuggler/Interval.rb

@@ -3,7 +3,7 @@
 #
 # = Interval.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/IntervalList.rb

@@ -3,7 +3,7 @@
 #
 # = IntervalList.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/Journal.rb

@@ -3,7 +3,7 @@
 #
 # = Journal.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/KateSyntax.rb

@@ -3,7 +3,7 @@
 #
 # = KateSyntax.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/KeywordArray.rb

@@ -3,7 +3,7 @@
 #
 # = KeywordArray.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/KeywordDocumentation.rb

@@ -3,7 +3,7 @@
 #
 # = KeywordDocumentation.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
@@ -688,7 +688,8 @@ class TaskJuggler
       return nil if @pattern.supportLevel == :removed
 
       if @pattern.exampleFile
-        exampleDir = AppConfig.dataDirs('test')[0] + "TestSuite/Syntax/Correct/"
+        exampleDir = File.join(AppConfig.dataDirs('test')[0], 'TestSuite',
+                               'Syntax', 'Correct')
         example = TjpExample.new
         fileName = "#{exampleDir}/#{@pattern.exampleFile}.tjp"
         example.open(fileName)

data/lib/taskjuggler/LeaveList.rb

@@ -3,7 +3,7 @@
 #
 # = LeaveList.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/Limits.rb

@@ -3,7 +3,7 @@
 #
 # = Limits.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/Log.rb

@@ -3,7 +3,7 @@
 #
 # = Log.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/LogicalExpression.rb

@@ -3,7 +3,7 @@
 #
 # = LogicalExpression.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/LogicalFunction.rb

@@ -3,7 +3,7 @@
 #
 # = LogicalFunction.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
@@ -36,6 +36,7 @@ class TaskJuggler
         'isresource' => 0,
         'isresponsibilityof' => 2,
         'istask' => 0,
+        'isvalid' => 1,
         'treelevel' => 0
     }
 
@@ -231,6 +232,27 @@ class TaskJuggler
       property.is_a?(Task)
     end
 
+    def isvalid(expr, args)
+      property = properties(expr)[0]
+      project = property.project
+      attr = args[0]
+      scenario, attr = args[0].split('.')
+      if attr.nil?
+        attr = scenario
+        scenario = nil
+      end
+      expr.error("Argument must not be empty") unless attr
+      if scenario && (scenarioIdx = project.scenarioIdx(scenario)).nil?
+        expr.error("Unknown scenario '#{scenario}' used for function " +
+                   "isvalid()")
+      end
+      unless property.propertySet.knownAttribute?(attr)
+        expr.error("Unknown attribute '#{attr}' used for function " +
+                   "isvalid()")
+      end
+      !property[attr, scenarioIdx].nil?
+    end
+
     def treelevel(expr, args)
       property = properties(expr)[0]
       return 0 unless property

data/lib/taskjuggler/LogicalOperation.rb

@@ -3,7 +3,7 @@
 #
 # = LogicalOperation.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
@@ -191,7 +191,7 @@ class TaskJuggler
     # To evaluate a property attribute we use the Query mechanism to retrieve
     # the value.
     def eval(expr)
-      query = expr.query
+      query = expr.query.dup
       query.scenarioIdx = @scenario.sequenceNo - 1
       query.attributeId = @operand1
       query.process
@@ -207,6 +207,9 @@ class TaskJuggler
     # names are shown, otherwise their values.
     def to_s(query)
       if query
+        query = query.dup
+        query.scenarioIdx = @scenario.sequenceNo - 1
+        query.attributeId = @operand1
         query.process
         query.to_s
       else

data/lib/taskjuggler/MessageHandler.rb

@@ -3,7 +3,7 @@
 #
 # = MessageHandler.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
@@ -136,6 +136,8 @@ class TaskJuggler
       @logLevel = 3
       # The full file name of the log file.
       @logFile = nil
+      # Toggle if scenario ids are included in the messages or not.
+      @hideScenario = true
       # The name of the current application
       @appName = 'unknown'
       # Set to true if program should be exited on warnings.
@@ -168,7 +170,6 @@ class TaskJuggler
       @messages = []
     end
 
-
     # Set the console output level.
     def outputLevel=(level)
       @outputLevel = checkLevel(level)
@@ -179,6 +180,10 @@ class TaskJuggler
       @logLevel = checkLevel(level)
     end
 
+    def hideScenario=(yesNo)
+      @hideScenario = yesNo
+    end
+
     # Generate a fatal message that will abort the application.
     def fatal(id, message, sourceFileInfo = nil, line = nil, data = nil,
               scenario = nil)
@@ -268,7 +273,8 @@ class TaskJuggler
       # Treat criticals like errors but without generating another
       # exception.
       msg = Message.new(type == :critical ? :error : type, id, message,
-                        sourceFileInfo, line, data, scenario)
+                        sourceFileInfo, line, data,
+                        @hideScenario ? nil : scenario)
       @messages << msg
 
       # Append the message to the log file if requested by the user.

data/lib/taskjuggler/PTNProxy.rb

@@ -3,7 +3,7 @@
 #
 # = PTNProxy.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/Painter.rb

@@ -3,7 +3,7 @@
 #
 # = Painter.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/Project.rb

@@ -3,7 +3,7 @@
 #
 # = Project.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
@@ -71,6 +71,7 @@ class TaskJuggler
         # members: the tjp syntax token, the user visible name and the
         # associated color as RGB byte array.
         'alertLevels' => AlertLevelDefinitions.new,
+        'auxdir' => '',
         'copyright' => nil,
         'costaccount' => nil,
         'currency' => "EUR",
@@ -337,7 +338,7 @@ class TaskJuggler
         [ 'accountroot',  'Account Root',    PropertyAttribute,
               true,  false,   false, nil ],
         [ 'auxdir', 'Auxiliary files directory', StringAttribute,
-              true,  false,   false, '' ],
+              true,  true,    false, '' ],
         [ 'bsi',       'BSI',          StringAttribute,
               false, false,   false, '' ],
         [ 'caption',   'Caption',      RichTextAttribute,
@@ -477,7 +478,7 @@ class TaskJuggler
       # context of enclosing reports needs to be preserved. Therefor we use a
       # stack to implement this.
       @reportContexts = []
-      @outputDir = ''
+      @outputDir = './'
       @warnTsDeltas = false
     end
 

data/lib/taskjuggler/ProjectFileParser.rb

@@ -3,7 +3,7 @@
 #
 # = ProjectFileParser.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
@@ -193,14 +193,17 @@ class TaskJuggler
       # Register the new Attribute type with the Property set it should belong
       # to.
       @propertySet.addAttributeType(AttributeDefinition.new(
-        @val[1], @val[2], type, inherit, false, scenarioSpecific, default, true))
+        @val[1], @val[2], type, inherit, false, scenarioSpecific, default,
+        true))
 
       # Add the new user-defined attribute as reportable attribute to the parser
       # rule.
       oldCurrentRule = @cr
       @cr = @rules[:reportableAttributes]
-      singlePattern('_' + @val[1])
-      descr(@val[2])
+      unless @cr.include?(@val[1])
+        singlePattern('_' + @val[1])
+        descr(@val[2])
+      end
       @cr = oldCurrentRule
 
       scenarioSpecific
@@ -265,6 +268,14 @@ class TaskJuggler
       @property.typeSpec = type
       @property.sourceFileInfo = sourceFileInfo
       @property.inheritAttributes
+
+      if block_given?
+        # The default attribute values for this report type have to be set in
+        # 'inherited' mode since they are not user provided.
+        AttributeBase.setMode(1)
+        yield
+        AttributeBase.setMode(0)
+      end
     end
 
     # If the @limitResources list is not empty, we have to create a Limits

data/lib/taskjuggler/ProjectFileScanner.rb

@@ -3,7 +3,7 @@
 #
 # = ProjectFileScanner.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/PropertyList.rb

@@ -3,7 +3,7 @@
 #
 # = PropertyList.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
@@ -191,7 +191,7 @@ class TaskJuggler
     def index
       i = 0
       @items.each do |p|
-        p.set('index', i += 1)
+        p.force('index', i += 1)
       end
     end
 

data/lib/taskjuggler/PropertySet.rb

@@ -3,7 +3,7 @@
 #
 # = PropertySet.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
@@ -242,7 +242,7 @@ class TaskJuggler
           end
           bsi += idx.to_s
         end
-        p.set('bsi', bsi)
+        p.force('bsi', bsi)
       end
     end
 

data/lib/taskjuggler/PropertyTreeNode.rb

@@ -3,7 +3,7 @@
 #
 # = PropertyTreeNode.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
@@ -423,10 +423,28 @@ class TaskJuggler
       end
     end
 
+    # Set the non-scenario-specific attribute with ID _attributeId_ to
+    # _value_. No further checks are done.
+    def force(attributeId, value)
+      @attributes[attributeId].set(value)
+    end
+
     # Set the non-scenario-specific attribute with ID _attributeId_ to _value_.
-    # In case the attribute does not exist, an exception is raised.
+    # In case an already provided value is overwritten again, an exeception is
+    # raised.
     def set(attributeId, value)
-      @attributes[attributeId].set(value)
+      attr = @attributes[attributeId]
+      # Assignments to list attributes always append. We don't
+      # consider this an overwrite.
+      overwrite = attr.provided && !attr.isList?
+      attr.set(value)
+
+      # We only raise the overwrite error after the value has been set.
+      if overwrite
+        raise AttributeOverwrite,
+          "Overwriting a previously provided value for attribute " +
+          "#{attributeId}"
+      end
     end
 
     # Set the scenario specific attribute with ID _attributeId_ for the
@@ -434,36 +452,46 @@ class TaskJuggler
     # attribute must not be scenario specific. In case the attribute does not
     # exist, an exception is raised.
     def []=(attributeId, scenario, value)
+      overwrite = false
+
       if scenario
         if AttributeBase.mode == 0
           # If we get values in 'provided' mode, we copy them immedidately to
           # all derived scenarios.
-          overwrite = false
           @project.scenario(scenario).all.each do |sc|
             scenarioIdx = @project.scenarioIdx(sc)
+            attr = @scenarioAttributes[scenarioIdx][attributeId]
 
-            if @scenarioAttributes[scenarioIdx][attributeId].provided
+            if attr.provided && !attr.isList?
+              # Assignments to list attributes always append. We don't
+              # consider this an overwrite.
               overwrite = true
             end
 
             if scenarioIdx == scenario
-              @scenarioAttributes[scenarioIdx][attributeId].set(value)
+              attr.set(value)
             else
-              @scenarioAttributes[scenarioIdx][attributeId].inherit(value)
+              attr.inherit(value)
             end
           end
-          # We only raise the overwrite error after all scenarios have been
-          # set. For some attributes the overwrite is actually allowed.
-          if overwrite
-            raise AttributeOverwrite,
-              "Overwriting a previously provided value for attribute " +
-              "#{attributeId}"
-          end
         else
-          @scenarioAttributes[scenario][attributeId].set(value)
+          attr = @scenarioAttributes[scenario][attributeId]
+          overwrite = attr.provided && !attr.isList?
+
+          attr.set(value)
         end
       else
-        @attributes[attributeId].set(value)
+        attr = @attributes[attributeId]
+        overwrite = attr.provided && !attr.isList?
+        attr.set(value)
+      end
+
+      # We only raise the overwrite error after all scenarios have been
+      # set. For some attributes the overwrite is actually allowed.
+      if overwrite
+        raise AttributeOverwrite,
+          "Overwriting a previously provided value for attribute " +
+          "#{attributeId}"
       end
     end