taskjuggler 0.0.10 → 0.0.11

data/lib/{SourceFileInfo.rb → taskjuggler/TextParser/SourceFileInfo.rb}

@@ -11,7 +11,7 @@
 # published by the Free Software Foundation.
 #
 
-class TaskJuggler
+class TaskJuggler::TextParser
 
   # Simple class that holds the info about a source file reference.
   class SourceFileInfo

data/lib/{TextParser → taskjuggler/TextParser}/StackElement.rb

@@ -11,8 +11,6 @@
 # published by the Free Software Foundation.
 #
 
-require 'SourceFileInfo'
-
 class TaskJuggler::TextParser
 
   # This class models the elements of the stack that the TextParser uses to keep

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

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

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

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

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

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

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

@@ -215,7 +215,7 @@ class TaskJuggler
       resource = @timeSheet.resource
       project = resource.project
       scenarioIdx = @timeSheet.scenarioIdx
-      startIdx = project.dateToIdx(project['now'], true)
+      startIdx = project.dateToIdx(project['now'])
       endIdx = project.dateToIdx(@task['end', scenarioIdx])
       @task.getEffectiveWork(scenarioIdx, startIdx, endIdx, resource)
     end
@@ -284,21 +284,28 @@ class TaskJuggler
         totalSlots += record.work
       end
 
-      targetSlots = totalNetWorkingSlots
-      # This is acceptable rounding error when checking the total reported
-      # work.
-      delta = 1
-      if totalSlots < (targetSlots - delta)
-        error('ts_work_too_low',
-              "The total work to be reported for this time sheet " +
-              "is #{workWithUnit(targetSlots)} but only " +
-              "#{workWithUnit(totalSlots)} were reported.")
-      end
-      if totalSlots > (targetSlots + delta)
-        error('ts_work_too_high',
-              "The total work to be reported for this time sheet " +
-              "is #{workWithUnit(targetSlots)} but " +
-              "#{workWithUnit(totalSlots)} were reported.")
+      if @resource['efficiency', @resource.project['trackingScenarioIdx']] > 0.0
+        targetSlots = totalNetWorkingSlots
+        # This is acceptable rounding error when checking the total reported
+        # work.
+        delta = 1
+        if totalSlots < (targetSlots - delta)
+          error('ts_work_too_low',
+                "The total work to be reported for this time sheet " +
+                "is #{workWithUnit(targetSlots)} but only " +
+                "#{workWithUnit(totalSlots)} were reported.")
+        end
+        if totalSlots > (targetSlots + delta)
+          error('ts_work_too_high',
+                "The total work to be reported for this time sheet " +
+                "is #{workWithUnit(targetSlots)} but " +
+                "#{workWithUnit(totalSlots)} were reported.")
+        end
+      else
+        if totalSlots > 0
+          error('ts_work_not_null',
+                "The reported work for non-working resources must be 0.")
+        end
       end
     end
 

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

@@ -13,10 +13,10 @@
 
 require 'rubygems'
 require 'optparse'
-require 'Tj3Config'
-require 'RuntimeConfig'
-require 'TjTime'
-require 'TextFormatter'
+require 'taskjuggler/Tj3Config'
+require 'taskjuggler/RuntimeConfig'
+require 'taskjuggler/TjTime'
+require 'taskjuggler/TextFormatter'
 
 class TaskJuggler
 
@@ -64,33 +64,31 @@ class TaskJuggler
 
       @opts.on_tail('-h', '--help', format('Show this message')) do
         puts @opts.to_s
-        exit 0
+        quit
       end
       @opts.on_tail('--version', format('Show version info')) do
         puts "#{AppConfig.softwareName} v#{AppConfig.version} - " +
           "#{AppConfig.packageInfo}"
-        exit 0
+        quit
       end
 
       begin
         files = @opts.parse(argv)
       rescue OptionParser::ParseError => msg
         puts @opts.to_s + "\n"
-        $stderr.puts msg
-        exit 2
+        error(msg, 2)
       end
 
       files
     end
 
-    def main
+    def main(argv = ARGV)
       # Install signal handler to exit gracefully on CTRL-C.
       intHandler = Kernel.trap('INT') do
-        puts "\nAborting on user request!"
-        exit 1
+        error("\nAborting on user request!")
       end
 
-      args = processArguments(ARGV)
+      args = processArguments(argv)
 
       # If DEBUG mode has been enabled, we restore the INT trap handler again
       # to get Ruby backtrackes.
@@ -111,6 +109,15 @@ class TaskJuggler
 
     private
 
+    def quit
+      exit 0
+    end
+
+    def error(message, exitVal = 1)
+      $stderr.puts "ERROR: #{message}"
+      exit exitVal
+    end
+
     def format(str, indent = nil)
       indent = @optsSummaryWidth + @optsSummaryIndent + 1 unless indent
       TextFormatter.new(79, indent).format(str)[indent..-1]

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

@@ -11,10 +11,10 @@
 # published by the Free Software Foundation.
 #
 
-require 'UTF8String'
-require 'AppConfig'
+require 'taskjuggler/UTF8String'
+require 'taskjuggler/AppConfig'
 
-AppConfig.version = '0.0.10'
+AppConfig.version = '0.0.11'
 AppConfig.packageName = 'taskjuggler'
 AppConfig.softwareName = 'TaskJuggler III'
 AppConfig.packageInfo = 'A Project Management Software'

data/lib/taskjuggler/Tj3Man.rb

@@ -0,0 +1,78 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = Tj3Man.rb -- The TaskJuggler III Project Management Software
+#
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+
+require 'taskjuggler/Tj3AppBase'
+require 'taskjuggler/TernarySearchTree'
+require 'taskjuggler/SyntaxReference'
+require 'taskjuggler/UserManual'
+
+AppConfig.appName = 'tj3man'
+
+class TaskJuggler
+
+  class Tj3Man < Tj3AppBase
+
+    def initialize
+      super
+
+      @man = SyntaxReference.new
+      @keywords = TernarySearchTree.new(@man.all)
+      @manual = false
+      @directory = nil
+    end
+
+    def processArguments(argv)
+      super do
+        @opts.banner += <<'EOT'
+This program can be used to generate the user manual in HTML format or to get
+a textual help for individual keywords.
+EOT
+        @opts.on('-d', '--dir <directory>', String,
+                format('directory to put the manual')) do |dir|
+          @directory = dir
+        end
+        @opts.on('-m', '--manual',
+                format('Generate the user manual into the current directory ' +
+                       'or the directory specified with the -d option.')) do
+          @manual = true
+        end
+      end
+    end
+
+    def main(argv = ARGV)
+      requestedKeywords = super
+      if @manual
+        UserManual.new.generate(@directory)
+      elsif requestedKeywords.empty?
+        puts @man.all.join("\n")
+      else
+        requestedKeywords.each do |keyword|
+          if (kws = @keywords[keyword, true]).nil?
+            $stderr.puts "No matches found for '#{keyword}'"
+            exit 1
+          elsif kws.length == 1 || kws.include?(keyword)
+            puts @man.to_s(keyword)
+          else
+            $stderr.puts "Multiple matches found for '#{keyword}':\n" +
+                         "#{kws.join(', ')}"
+            return 1
+          end
+        end
+      end
+      0
+    end
+
+  end
+
+end
+

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

@@ -11,7 +11,7 @@
 # published by the Free Software Foundation.
 #
 
-require 'Tj3AppBase'
+require 'taskjuggler/Tj3AppBase'
 
 class TaskJuggler
 
@@ -48,7 +48,7 @@ class TaskJuggler
         if ymdFilter.match(arg)
           @date = Time.mktime(*(ymdFilter.match(arg)[1..3]))
         else
-          @date = TjTime.now.nextDayOfWeek(arg.to_i % 7)
+          @date = TjTime.new.nextDayOfWeek(arg.to_i % 7)
         end
         @date = @date.strftime('%Y-%m-%d')
       end

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

@@ -16,155 +16,51 @@ require 'date'
 
 class TaskJuggler
 
-  # The TjTime class is based on the original Ruby class Time but provides lots
-  # of additional functionality.
+  # The TjTime class extends the original Ruby class Time with lots of
+  # TaskJuggler specific additional functionality. This is mostly for handling
+  # time zones.
   class TjTime
 
-    attr_reader :time
+    attr_reader :time, :timeZone
 
     # The number of days per month. Leap years are taken care of separately.
     MON_MAX = [ 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ]
 
+    # The current time zone name.
+    @@tz = 'UTC'
+    ENV['TZ'] = @@tz
+
     # call-seq:
-    #   TjTime(time) -> Scenario
-    #   TjTime(s) -> Scenario
-    #   TjTime(secs) -> Scenario
+    #   TjTime() -> TjTime (now)
+    #   TjTime(tjtime) -> TjTime
+    #   TjTime(time, timezone) -> TjTime
+    #   TjTime(str) -> TjTime
+    #   TjTime(secs) -> TjTime
     #
-    # The constructor is overloaded and accepts 3 kinds of arguments. If _t_ is
-    # a Time object this is just copied to the @time variable. If it's a string,
-    # it is parsed as a date. Or else it is interpreted as seconds after Epoch.
-    def initialize(t)
-      if t.is_a?(Time)
+    # The constructor is overloaded and accepts 4 kinds of arguments. If _t_
+    # is a Time object it's assumed to be in local time. If it's a string, it
+    # is parsed as a date. Or else it is interpreted as seconds after Epoch.
+    def initialize(t = nil)
+      @timeZone = @@tz
+
+      case t
+      when nil
+        @time = Time.now
+      when Time
         @time = t
-      elsif t.is_a?(String)
-        @time = TjTime.parse(t).time
+        @timeZone = nil
+      when TjTime
+        @time = t.time
+        @timeZone = nil
+      when String
+        parse(t)
+      when Array
+        @time = Time.mktime(*t)
       else
         @time = Time.at(t)
       end
     end
 
-    # Returns the current UTC time as Time object.
-    def TjTime.now
-      TjTime.new(Time.now.gmtime)
-    end
-
-    # Creates a time based on given values, interpreted as UTC. See Time.gm()
-    # for details.
-    def TjTime.gm(*args)
-      TjTime.new(Time.gm(*args))
-    end
-
-    # Creates a time based on given values, interpreted as local time. The
-    # result is stored as UTC time, though. See Time.local() for details.
-    def TjTime.local(*args)
-      TjTime.new(Time.local(*args).gmtime)
-    end
-
-    def TjTime.parse(t)
-      year, month, day, time, zone = t.split('-', 5)
-
-      # Check the year
-      if year
-        year = year.to_i
-        if year < 1970 || year > 2035
-          raise TjException.new, "Year #{year} out of range (1970 - 2035)"
-        end
-      else
-        raise TjException.new, "Year not specified"
-      end
-
-      # Check the month
-      if month
-        month = month.to_i
-        if month < 1 || month > 12
-          raise TjException.new, "Month #{month} out of range (1 - 12)"
-        end
-      else
-        raise TjException.new, "Month not specified"
-      end
-
-      # Check the day
-      if day
-        day = day.to_i
-        maxDay = [ 0, 31, Date.gregorian_leap?(year) ? 29 : 28, 31, 30, 31,
-                   30, 31, 31, 30, 31, 30, 31 ]
-        if month < 1 || month > maxDay[month]
-          raise TjException.new, "Day #{day} out of range (1 - #{maxDay[month]})"
-        end
-      else
-        raise TjException.new, "Day not specified"
-      end
-
-      # The time is optional. Will be expanded to 00:00:00.
-      if time
-        hour, minute, second = time.split(':')
-
-        # Check hour
-        if hour
-          hour = hour.to_i
-          if hour < 0 || hour > 23
-            raise TjException.new, "Hour #{hour} out of range (0 - 23)"
-          end
-        else
-          raise TjException.new, "Hour not specified"
-        end
-
-        if minute
-          minute = minute.to_i
-          if minute < 0 || minute > 59
-            raise TjException.new, "Minute #{minute} out of range (0 - 59)"
-          end
-        else
-          raise TjException.new, "Minute not specified"
-        end
-
-        # Check sencond. This value is optional and defaults to 0.
-        if second
-          second = second.to_i
-          if second < 0 || second > 59
-            raise TjException.new, "Second #{second} out of range (0 - 59)"
-          end
-        else
-          second = 0
-        end
-      else
-        hour = minute = second = 0
-      end
-
-      # The zone is optional and defaults to the current time zone.
-      if zone
-        if zone[0] != ?- && zone[0] != ?+
-          raise TjException.new, "Time zone adjustment must be prefixed by " +
-                                 "+ or -, not #{zone[0]}"
-        end
-        if zone.length != 5
-          raise TjException.new, "Time zone adjustment must use (+/-)HHMM format"
-        end
-
-        date = Time.utc(year, month, day, hour, minute, second)
-        sign = zone[0] == ?- ? 1 : -1
-        tzHour = zone[1..2].to_i
-        if tzHour < 0 || tzHour > 12
-          raise TjException.new, "Time zone adjustment hour out of range " +
-                                 "(0 - 12) but is #{tzHour}"
-        end
-        tzMinute = zone[3..4].to_i
-        if tzMinute < 0 || tzMinute > 59
-          raise TjException.new, "Time zone adjustment minute out of range " +
-                                 "(0 - 59) but is #{tzMinute}"
-        end
-        date += sign * (tzHour * 3600 + tzMinute * 60)
-      else
-        date = Time.mktime(year, month, day, hour, minute, second)
-      end
-
-      #puts "--> #{t}"
-      #puts(">>> #{year}-#{month}-#{day}-#{hour}:#{minute}:#{second}" +
-      #     "#{zone ? "-#{tzHour}:#{tzMinute}" : ""}")
-      #puts "=== #{date}"
-      TjTime.new(date)
-    end
-
     # Check if +zone+ is a valid time zone.
     def TjTime.checkTimeZone(zone)
       return true if zone == 'UTC'
@@ -193,21 +89,41 @@ class TaskJuggler
       res
     end
 
+    # Set a new active time zone. _zone_ must be a valid String known to the
+    # underlying operating system.
+    def TjTime.setTimeZone(zone)
+      unless zone && TjTime.checkTimeZone(zone)
+        raise "Illegal time zone #{zone}"
+      end
+
+      oldTimeZone = @@tz
+
+      @@tz = zone
+      ENV['TZ'] = zone
+
+      oldTimeZone
+    end
+
+    # Return the name of the currently active time zone.
+    def TjTime.timeZone
+      @@tz
+    end
+
     # Align the date to a time grid. The grid distance is determined by _clock_.
     def align(clock)
-      TjTime.new((@time.to_i / clock) * clock)
+      TjTime.new((localtime.to_i / clock) * clock)
     end
 
     # Returns the total number of seconds of the day. The time is assumed to be
     # in the time zone specified by _tz_.
     def secondsOfDay(tz = nil)
-      # TODO: Add timezone support
-      (@time.to_i + @time.gmt_offset) % (60 * 60 * 24)
+      lt = localtime
+      (lt.to_i + lt.gmt_offset) % (60 * 60 * 24)
     end
 
     # Add _secs_ number of seconds to the time.
     def +(secs)
-      TjTime.new(@time + secs)
+      TjTime.new(@time.to_i + secs)
     end
 
     # Substract _arg_ number of seconds or return the number of seconds between
@@ -216,7 +132,7 @@ class TaskJuggler
       if arg.is_a?(TjTime)
         @time - arg.time
       else
-        TjTime.new(@time - arg)
+        TjTime.new(@time.to_i - arg)
       end
     end
 
@@ -268,26 +184,22 @@ class TaskJuggler
 
     # Normalize time to the beginning of the current hour.
     def beginOfHour
-      t = @time.localtime.to_a
-      t[0, 2] = Array.new(2, 0)
-      t.slice!(6, 4)
-      t.reverse!
-      TjTime.new(Time.local(*t))
+      sec, min, hour, day, month, year = localtime.to_a
+      sec = min = 0
+      TjTime.new([ year, month, day, hour, min, sec, 0 ])
     end
 
     # Normalize time to the beginning of the current day.
     def midnight
-      t = @time.localtime.to_a
-      t[0, 3] = Array.new(3, 0)
-      t.slice!(6, 4)
-      t.reverse!
-      TjTime.new(Time.local(*t))
+      sec, min, hour, day, month, year = localtime.to_a
+      sec = min = hour = 0
+      TjTime.new([ year, month, day, hour, min, sec, 0 ])
     end
 
     # Normalize time to the beginning of the current week. _startMonday_
     # determines whether the week should start on Monday or Sunday.
     def beginOfWeek(startMonday)
-      t = @time.to_a
+      t = localtime.to_a
       # Set time to noon, 12:00:00
       t[0, 3] = [ 0, 0, 12 ]
       weekday = t[6]
@@ -301,33 +213,27 @@ class TaskJuggler
 
     # Normalize time to the beginning of the current month.
     def beginOfMonth
-      t = @time.localtime.to_a
-      t[0, 3] = Array.new(3, 0)
-      t[3] = 1
-      t.slice!(6, 4)
-      t.reverse!
-      TjTime.new(Time.local(*t))
+      sec, min, hour, day, month, year = localtime.to_a
+      sec = min = hour = 0
+      day = 1
+      TjTime.new([ year, month, day, hour, min, sec, 0 ])
     end
 
     # Normalize time to the beginning of the current quarter.
     def beginOfQuarter
-      t = @time.localtime.to_a
-      t[0, 3] = Array.new(3, 0)
-      t[3] = 1
-      t[4] = ((t[4] - 1) % 3) + 1
-      t.slice!(6, 4)
-      t.reverse!
-      TjTime.new(Time.local(*t))
+      sec, min, hour, day, month, year = localtime.to_a
+      sec = min = hour = 0
+      day = 1
+      month = ((month - 1) % 3 ) + 1
+      TjTime.new([ year, month, day, hour, min, sec, 0 ])
     end
 
     # Normalize time to the beginning of the current year.
     def beginOfYear
-      t = @time.localtime.to_a
-      t[0, 3] = Array.new(3, 0)
-      t[3, 2] = Array.new(2, 1)
-      t.slice!(6, 4)
-      t.reverse!
-      TjTime.new(Time.local(*t))
+      sec, min, hour, day, month, year = localtime.to_a
+      sec = min = hour = 0
+      day = month = 1
+      TjTime.new([ year, month, day, hour, min, sec, 0 ])
     end
 
     # Return a new time that is _hours_ later than time.
@@ -343,64 +249,74 @@ class TaskJuggler
     # Return a new time that is 1 day later than time but at the same time of
     # day.
     def sameTimeNextDay
-      delta = [ 0, -1, 1 ]
-      localT1 = @time.localtime.to_a
-      delta.each do |d|
-        t = @time + (24 + d) * 60 * 60
-        localT2 = t.localtime.to_a
-        return TjTime.new(t) if localT1[0, 3] == localT2[0, 3]
+      sec, min, hour, day, month, year = localtime.to_a
+      if (day += 1) > lastDayOfMonth(month, year)
+        day = 1
+        if (month += 1) > 12
+          month = 1
+          year += 1
+        end
       end
-      raise "Algorithm is broken for #{@time}"
+      TjTime.new([ year, month, day, hour, min, sec, 0 ])
     end
 
     # Return a new time that is 1 week later than time but at the same time of
     # day.
     def sameTimeNextWeek
-      delta = [ 0, -1, 1 ]
-      localT1 = @time.localtime.to_a
-      delta.each do |d|
-        t = @time + (7 * 24 + d) * 60 * 60
-        localT2 = t.localtime.to_a
-        return TjTime.new(t) if localT1[0, 3] == localT2[0, 3]
+      sec, min, hour, day, month, year = localtime.to_a
+      if (day += 7) > lastDayOfMonth(month, year)
+        day -= lastDayOfMonth(month, year)
+        if (month += 1) > 12
+          month = 1
+          year += 1
+        end
       end
-      raise "Algorithm is broken for #{@time}"
+      TjTime.new([ year, month, day, hour, min, sec, 0 ])
     end
 
     # Return a new time that is 1 month later than time but at the same time of
     # day.
     def sameTimeNextMonth
-      sec, min, hour, day, month, year = @time.localtime.to_a
+      sec, min, hour, day, month, year = localtime.to_a
       monMax = month == 2 && leapYear?(year) ? 29 : MON_MAX[month]
-      month += 1
-      if month > 12
+      if (month += 1) > 12
         month = 1
         year += 1
       end
-      day = monMax if day >= monMax
-      TjTime.new(Time.mktime(year, month, day, hour, min, sec, 0))
+      day = monMax if day >= lastDayOfMonth(month, year)
+      TjTime.new([ year, month, day, hour, min, sec, 0 ])
     end
 
     # Return a new time that is 1 quarter later than time but at the same time of
     # day.
     def sameTimeNextQuarter
-      t = @time.localtime.to_a
-      if (t[4] += 3) > 12
-        t[4] -= 12
-        t[5] += 1
+      sec, min, hour, day, month, year = localtime.to_a
+      if (month += 3) > 12
+        month -= 12
+        year += 1
       end
-      t.slice!(6, 4)
-      t.reverse!
-      TjTime.new(Time.local(*t))
+      TjTime.new([ year, month, day, hour, min, sec, 0 ])
     end
 
     # Return a new time that is 1 year later than time but at the same time of
     # day.
     def sameTimeNextYear
-      t = @time.localtime.to_a
-      t[5] += 1
-      t.slice!(6, 4)
-      t.reverse!
-      TjTime.new(Time.local(*t))
+      sec, min, hour, day, month, year = localtime.to_a
+      year += 1
+      TjTime.new([ year, month, day, hour, min, sec, 0])
+    end
+
+    # Return the start of the next _dow_ day of week after _date_. _dow_ must
+    # be 0 for Sundays, 1 for Mondays and 6 for Saturdays. If _date_ is a
+    # Tuesday and _dow_ is 5 (Friday) the date of next Friday 0:00 will be
+    # returned. If _date_ is a Tuesday and _dow_ is 2 (Tuesday) the date of
+    # the next Tuesday will be returned.
+    def nextDayOfWeek(dow)
+      raise "Day of week must be 0 - 6." unless dow >= 0 && dow <= 6
+      d = midnight.sameTimeNextDay
+      currentDoW = d.strftime('%w').to_i
+      1.upto((dow + 7 - currentDoW) % 7) { |i| d = d.sameTimeNextDay }
+      d
     end
 
     # Return the number of hours between this time and _date_. The result is
@@ -448,74 +364,179 @@ class TaskJuggler
         format = '%Y-%m-%d-%H:%M' + (@time.sec == 0 ? '' : ':%S') + '-%z'
       end
       # Always report values in local timezone
-      @time.dup.localtime.strftime(format)
+      localtime.strftime(format)
     end
 
     # Return the seconds since Epoch.
     def to_i
-      @time.to_i
+      localtime.to_i
+    end
+
+    def to_a
+      localtime.to_a
     end
 
-    def to_ary
-      to_s
+    def strftime(format)
+      localtime.strftime(format)
     end
 
+    # Return the day of the week. 0 for Sunday, 1 for Monday and so on.
+    def wday
+      localtime.wday
+    end
+
+    # Return the hours of the day (0..23)
+    def hour
+      localtime.hour
+    end
+
+    # Return the day of the month (1..n).
+    def day
+      localtime.day
+    end
+
+    # Return the month of the year (1..12)
+    def month
+      localtime.month
+    end
+
+    alias mon month
+
+    # Return the year.
+    def year
+      localtime.year
+    end
 
     # Return the abbreviated month name.
     def shortMonthName
-      @time.strftime('%b')
+      localtime.strftime('%b')
     end
 
     # Return the number of the quarter prefixed by a 'Q'.
     def quarterName
-      "Q#{(@time.mon / 3) + 1}"
+      "Q#{(localtime.mon / 3) + 1}"
     end
 
     # Return the week number. _weekStartsMonday_ specifies wheter the counting
     # should be for weeks starting Mondays or Sundays.
     def week(weekStartsMonday)
-      @time.strftime(weekStartsMonday ? '%W' : '%U')
+      localtime.strftime(weekStartsMonday ? '%W' : '%U')
     end
 
     # Return the abbreviated month name and the full year. E. g. 'Feb 1972'.
     def monthAndYear
-      @time.strftime('%b %Y')
+      localtime.strftime('%b %Y')
     end
 
     # Return the abbreviated weekday and the full date. E. g. 'Sat 2007-11-03'.
     def weekdayAndDate
-      @time.strftime('%A %Y-%m-%d')
+      localtime.strftime('%A %Y-%m-%d')
     end
 
-    # Return the start of the next _dow_ day of week after _date_. _dow_ must
-    # be 0 for Sundays, 1 for Mondays and 6 for Saturdays. If _date_ is a
-    # Tuesday and _dow_ is 5 (Friday) the date of next Friday 0:00 will be
-    # returned. If _date_ is a Tuesday and _dow_ is 2 (Tuesday) the date of
-    # the next Tuesday will be returned.
-    def nextDayOfWeek(dow)
-      raise "Day of week must be 0 - 6." unless dow >= 0 && dow <= 6
-      d = midnight.sameTimeNextDay
-      currentDoW = d.strftime('%w').to_i
-      1.upto((dow + 7 - currentDoW) % 7) { |i| d = d.sameTimeNextDay }
-      d
-    end
+  private
 
-    # Pass any unknown function directoy to the @time variable.
-    def method_missing(func, *args)
-      @time.method(func).call(*args)
-    end
+    def parse(t)
+      year, month, day, time, zone = t.split('-', 5)
 
-  private
+      # Check the year
+      if year
+        year = year.to_i
+        if year < 1970 || year > 2035
+          raise TjException.new, "Year #{year} out of range (1970 - 2035)"
+        end
+      else
+        raise TjException.new, "Year not specified"
+      end
 
-    def order(date)
-      if date.time < @time
-        t1 = date
-        t2 = self
+      # Check the month
+      if month
+        month = month.to_i
+        if month < 1 || month > 12
+          raise TjException.new, "Month #{month} out of range (1 - 12)"
+        end
+      else
+        raise TjException.new, "Month not specified"
+      end
+
+      # Check the day
+      if day
+        day = day.to_i
+        maxDay = [ 0, 31, Date.gregorian_leap?(year) ? 29 : 28, 31, 30, 31,
+                   30, 31, 31, 30, 31, 30, 31 ]
+        if month < 1 || month > maxDay[month]
+          raise TjException.new, "Day #{day} out of range (1 - #{maxDay[month]})"
+        end
       else
-        t1 = self
-        t2 = date
+        raise TjException.new, "Day not specified"
+      end
+
+      # The time is optional. Will be expanded to 00:00:00.
+      if time
+        hour, minute, second = time.split(':')
+
+        # Check hour
+        if hour
+          hour = hour.to_i
+          if hour < 0 || hour > 23
+            raise TjException.new, "Hour #{hour} out of range (0 - 23)"
+          end
+        else
+          raise TjException.new, "Hour not specified"
+        end
+
+        if minute
+          minute = minute.to_i
+          if minute < 0 || minute > 59
+            raise TjException.new, "Minute #{minute} out of range (0 - 59)"
+          end
+        else
+          raise TjException.new, "Minute not specified"
+        end
+
+        # Check sencond. This value is optional and defaults to 0.
+        if second
+          second = second.to_i
+          if second < 0 || second > 59
+            raise TjException.new, "Second #{second} out of range (0 - 59)"
+          end
+        else
+          second = 0
+        end
+      else
+        hour = minute = second = 0
+      end
+
+      # The zone is optional and defaults to the current time zone.
+      if zone
+        if zone[0] != ?- && zone[0] != ?+
+          raise TjException.new, "Time zone adjustment must be prefixed by " +
+                                 "+ or -, not #{zone[0]}"
+        end
+        if zone.length != 5
+          raise TjException.new, "Time zone adjustment must use (+/-)HHMM format"
+        end
+
+        @time = Time.utc(year, month, day, hour, minute, second)
+        sign = zone[0] == ?- ? 1 : -1
+        tzHour = zone[1..2].to_i
+        if tzHour < 0 || tzHour > 12
+          raise TjException.new, "Time zone adjustment hour out of range " +
+                                 "(0 - 12) but is #{tzHour}"
+        end
+        tzMinute = zone[3..4].to_i
+        if tzMinute < 0 || tzMinute > 59
+          raise TjException.new, "Time zone adjustment minute out of range " +
+                                 "(0 - 59) but is #{tzMinute}"
+        end
+        @time += sign * (tzHour * 3600 + tzMinute * 60)
+        @timeZone = 'UTC'
+      else
+        @time = Time.mktime(year, month, day, hour, minute, second)
       end
-      [ t1, t2 ]
+    end
+
+    def order(date)
+      self < date ? [ self, date ] : [ date, self ]
     end
 
     def countIntervals(date, stepFunc)
@@ -528,6 +549,10 @@ class TaskJuggler
       i
     end
 
+    def lastDayOfMonth(month, year)
+      month == 2 && leapYear?(year) ? 29 : MON_MAX[month]
+    end
+
     def leapYear?(year)
       case
       when year % 400 == 0
@@ -539,6 +564,26 @@ class TaskJuggler
       end
     end
 
+    def localtime
+      return @time if @timeZone == @@tz
+
+      if @time.utc?
+        if @@tz == 'UTC'
+          # @time is already in the right zone (UTC)
+          @time
+        else
+          @time.dup.localtime
+        end
+      elsif @@tz == 'UTC'
+        # @time is not in UTC, so convert it to local time.
+        @time.dup.gmtime
+      else
+        # To convert a Time object from one local time to another, we need to
+        # conver to UTC first and then to the new local time.
+        @time.dup.gmtime.localtime
+      end
+    end
+
   end
 
 end