taskjuggler 3.5.0 → 3.6.0

data/lib/taskjuggler/URLParameter.rb

@@ -3,8 +3,8 @@
 #
 # = URLParameter.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/UTF8String.rb

@@ -3,8 +3,8 @@
 #
 # = UTF8String.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/UserManual.rb

@@ -3,8 +3,8 @@
 #
 # = UserManual.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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
@@ -55,6 +55,7 @@ class TaskJuggler
         Tutorial
         The_TaskJuggler_Syntax
         Rich_Text_Attributes
+        List_Attributes
         Software
         Day_To_Day_Juggling
         TaskJuggler_Internals

data/lib/taskjuggler/VimSyntax.rb

@@ -3,8 +3,8 @@
 #
 # = VimSyntax.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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
@@ -215,11 +215,11 @@ let b:current_syntax = "tjp"
 
 " Support running tj3 from within vim. Just type ':make your_project.tjp' to
 " activate it.
-set makeprg=tj3\ --silent
+setlocal makeprg=tj3\ --silent
 
 " Support browsing the man page by typing Shift-k while having the cursor over
 " any syntax keyword
-set keywordprg=tj3man
+setlocal keywordprg=tj3man
 
 " Remap Ctrl-] to show full ID of property defined in the current
 " line. This requires a current ctags file (generated by 'tagfile'

data/lib/taskjuggler/WorkingHours.rb

@@ -3,8 +3,8 @@
 #
 # = WorkingHours.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/XMLDocument.rb

@@ -3,8 +3,8 @@
 #
 # = XMLDocument.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/XMLElement.rb

@@ -3,8 +3,8 @@
 #
 # = XMLElement.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/apps/Tj3.rb

@@ -3,8 +3,8 @@
 #
 # = Tj3.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/apps/Tj3Client.rb

@@ -3,8 +3,8 @@
 #
 # = Tj3Client.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/apps/Tj3Daemon.rb

@@ -3,8 +3,8 @@
 #
 # = Tj3Daemon.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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
@@ -57,7 +57,11 @@ EOT
                         'requests (Default: 8474).')) do |arg|
           @port = arg
         end
-        @opts.on('--urifile', String,
+        @opts.on('--logfile <FILE NAME>', String,
+                          format('Log daemon messages to the specified file.')) do |arg|
+              @mhi.logFile = arg
+              end
+        @opts.on('--urifile <FILE NAME>', String,
                  format('If the port is 0, use this file to store the URI ' +
                         'of the server.')) do |arg|
           @uriFile = arg

data/lib/taskjuggler/apps/Tj3Man.rb

@@ -3,8 +3,8 @@
 #
 # = Tj3Man.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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
@@ -110,7 +110,7 @@ EOT
                             'manual', 'html')
       file = "#{manualDir}/#{keyword || 'index'}.html"
       # Make sure the file exists.
-      unless File.exists?(file)
+      unless File.exist?(file)
         $stderr.puts "Cannot open manual file #{file}"
         exit 1
       end

data/lib/taskjuggler/apps/Tj3SsReceiver.rb

@@ -3,8 +3,8 @@
 #
 # = Tj3SsReceiver.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/apps/Tj3SsSender.rb

@@ -3,8 +3,8 @@
 #
 # = Tj3SsSender.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/apps/Tj3TsReceiver.rb

@@ -3,8 +3,8 @@
 #
 # = Tj3TsReceiver.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/apps/Tj3TsSender.rb

@@ -3,8 +3,8 @@
 #
 # = Tj3TsSender.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/apps/Tj3TsSummary.rb

@@ -3,8 +3,8 @@
 #
 # = Tj3TsSummary.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/apps/Tj3WebD.rb

@@ -3,8 +3,8 @@
 #
 # = Tj3WebD.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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
@@ -60,7 +60,11 @@ EOT
                         'specified file.')) do |arg|
           @pidFile = arg
         end
-        @opts.on('--urifile', String,
+        @opts.on('--logfile <FILE NAME>', String,
+                 format('Log daemon messages to the specified file.')) do |arg|
+          @mhi.logFile = arg
+        end
+        @opts.on('--urifile <FILE NAME>', String,
                  format('If the port is 0, use this file to read the URI ' +
                         'of the TaskJuggler daemon.')) do |arg|
           @uriFile = arg

data/lib/taskjuggler/daemon/Daemon.rb

@@ -3,8 +3,8 @@
 #
 # = Daemon.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/daemon/DaemonConnector.rb

@@ -3,8 +3,8 @@
 #
 # = DaemonConnector.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/daemon/ProcessIntercom.rb

@@ -3,8 +3,8 @@
 #
 # = ProcessIntercom.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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
@@ -103,8 +103,9 @@ class TaskJuggler
       $stdout = stdout if stdout
       $stderr = stderr if stdout
       $stdin = stdin if stdin
-      debug('', 'IO is now routed to the client')
       Log.silent = silent
+      Term::ANSIColor.coloring = !silent
+      debug('', 'IO is now routed to the client')
       true
     end
 

data/lib/taskjuggler/daemon/ProjectBroker.rb

@@ -3,8 +3,8 @@
 #
 # = ProjectBroker.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/daemon/ProjectServer.rb

@@ -3,8 +3,8 @@
 #
 # = ProjectServer.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/daemon/ReportServer.rb

@@ -3,8 +3,8 @@
 #
 # = ReportServer.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/daemon/ReportServlet.rb

@@ -3,8 +3,8 @@
 #
 # = ReportServlet.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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
@@ -15,6 +15,7 @@ require 'webrick'
 require 'taskjuggler/MessageHandler'
 require 'taskjuggler/RichText'
 require 'taskjuggler/HTMLDocument'
+require 'taskjuggler/URLParameter'
 require 'taskjuggler/daemon/DaemonConnector'
 
 class TaskJuggler
@@ -50,10 +51,14 @@ class TaskJuggler
         else
           debug('', "Report #{reportId} of project #{projectId} requested")
           attributes = req.query['attributes'] || ''
-          attributes = URLParameter.decode(attributes) unless attributes.empty?
+          unless attributes.empty?
+            attributes = URLParameter.decode(attributes)
+          end
+          debug('', "Attributes: #{attributes}")
           generateReport(projectId, reportId, attributes)
         end
       rescue
+        error('get_req_failed', "Cannot serve GET request: #{req}\n#{$!}")
       end
     end
 
@@ -116,9 +121,10 @@ class TaskJuggler
       end
 
       # Ask the ReportServer to generate the reports with the provided ID.
+      retVal = true
       begin
-        @reportServer.generateReport(@rs_authKey, reportId, false, nil,
-                                     attributes)
+        retVal = @reportServer.generateReport(@rs_authKey, reportId, false, nil,
+                                              attributes)
       rescue
         stdOut.rewind
         stdErr.rewind
@@ -142,12 +148,17 @@ class TaskJuggler
       broker.disconnect
 
       @res['content-type'] = 'text/html'
-      stdErr.rewind
-      $stderr.puts stdErr.read
-      # To read the $stdout of the ReportServer we need to rewind the buffer
-      # and then read the full text.
-      stdOut.rewind
-      @res.body = stdOut.read
+      if retVal
+        # To read the $stdout of the ReportServer we need to rewind the buffer
+        # and then read the full text.
+        stdOut.rewind
+        @res.body = stdOut.read
+      else
+        stdErr.rewind
+        error('get_req_stderr',
+              "Error while parsing attribute definition:\n-8<-\n" +
+              "#{attributes}\n->8-\n#{stdErr.read}")
+      end
     end
 
     def generateWelcomePage(projectId)

data/lib/taskjuggler/daemon/WebServer.rb

@@ -3,8 +3,8 @@
 #
 # = WebServer.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/daemon/WelcomePage.rb

@@ -3,8 +3,8 @@
 #
 # = WelcomePage.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/deep_copy.rb

@@ -3,8 +3,8 @@
 #
 # = deep_copy.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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

data/lib/taskjuggler/reports/AccountListRE.rb

@@ -3,8 +3,8 @@
 #
 # = AccountListRE.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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