taskjuggler 0.0.5 → 0.0.6

data/lib/tj3d.rb

@@ -31,6 +31,8 @@ class TaskJuggler
       @log.appName = AppConfig.appName
       @daemonize = true
       @port = nil
+      @webServer = false
+      @webServerPort = nil
     end
 
     def processArguments(argv)
@@ -46,8 +48,19 @@ EOT
           @daemonize = false
         end
         @opts.on('-p', '--port <NUMBER>', Integer,
-                 format('Use the specified TCP/IP port')) do |arg|
-           @port = arg
+                 format('Use the specified TCP/IP port to serve tj3client ' +
+                        'requests (Default: 8474).')) do |arg|
+          @port = arg
+        end
+        @opts.on('-w', '--webserver',
+                 format('Start a web server that serves the reports of ' +
+                        'the loaded projects.')) do
+          @webServer = true
+        end
+        @opts.on('--webserver-port <NUMBER>', Integer,
+                 format('Use the specified TCP/IP port to serve web browser ' +
+                        'requests (Default: 8080).')) do |arg|
+          @webServerPort = arg
         end
       end
     end
@@ -59,8 +72,30 @@ EOT
       @rc.configure(@log, 'global.log')
       @rc.configure(broker, 'global')
       @rc.configure(broker, 'daemon')
+
+      # Set some config variables if corresponding data was provided via the
+      # command line.
       broker.port = @port if @port
+      broker.enableWebServer = @webServer
+      broker.webServerPort = @webServerPort if @webServerPort
+      broker.projectFiles = sortInputFiles(files) unless files.empty?
+      broker.daemonize = @daemonize
+
+      broker.start
+    end
 
+    def error(message)
+      $stderr.puts "ERROR: #{message}"
+      exit 1
+    end
+
+    private
+
+    # Sort the provided input files into groups of projects. Each *.tjp file
+    # starts a new project. A *.tjp file may be followed by any number of
+    # *.tji files. The result is an Array of projects. Each consists of an
+    # Array like this: [ <working directory>, <tjp file> (, <tji file> ...) ].
+    def sortInputFiles(files)
       projects = []
       project = nil
       files.each do |file|
@@ -92,14 +127,7 @@ EOT
         end
       end
 
-      broker.daemonize = @daemonize
-
-      broker.start(projects)
-    end
-
-    def error(message)
-      $stderr.puts "ERROR: #{message}"
-      exit 1
+      projects
     end
 
   end

data/lib/tj3ss_sender.rb

@@ -55,6 +55,13 @@ EOT
                  format('Filter expression to limit the resource list')) do |arg|
           @hideResource = arg
         end
+        @opts.on('-i', '--interval <DURATION>', String,
+                 format('The duration of the interval. This is a number ' +
+                        'directly followed by a unit. 1w means one week ' +
+                        '(the default), 5d means 5 days and 72h means 72 ' +
+                        'hours.')) do |arg|
+          @intervalDuration = arg
+        end
         optsEndDate
       end
     end

data/lib/tj3ts_receiver.rb

@@ -49,6 +49,7 @@ EOT
       ts.dryRun = @dryRun
 
       ts.processEmail
+      0
     end
 
   end

data/manual/Day_To_Day_Juggling

@@ -753,7 +753,7 @@ Each time you review your project status you should generate such an include
 file for the period that you are reviewing. Then you sync the content with the
 feedback that you get from your resources and add the file to the project plan.
 
-==== Status Sheets =====
+==== Status Sheets ====
 
 For larger projects with many contributors the flood of time sheets
 can become hard to manage. Higher level managers are usually not

data/manual/Rich_Text_Attributes

@@ -141,6 +141,14 @@ The report generator inserts the referenced report as a new block
 of this text. The referenced report inherits some context such as the
 report period and the property set from the referencing report.
 ----
+'''Inline Generator''' ''''reportlink''''
+
+Paramters:
+
+* ''''id'''' : ID of a defined [[report]]
+
+The report link generator inserts a link to the referenced report.
+----
 '''Inline Generator''' ''''query''''
 
 Paramters:

data/manual/TaskJuggler_2x_Migration

@@ -64,6 +64,13 @@ format.
 optional. If you don't need to reference a property, you can omit the
 ID. TaskJuggler will automatically assign an ID then.
 
+* The syntax for macros has changed slightly. The terminating
+''''<nowiki>]</nowiki>'''' must be the last character before the
+line break. No spaces or comments are allowed here. Parameters of
+macro calls must always be enclosed by double quotes. In contrast to
+regular strings, single quotes are not allowed here. The parameter
+may not span multiple lines.
+
 === Using TaskJuggler 2.x and TaskJuggler 3.x in parallel ===
 
 While TaskJuggler 3.x has many new features over TaskJuggler 2.x like

data/manual/The_TaskJuggler_Syntax

@@ -70,14 +70,28 @@ double quotes.
  "This is a double quoted string."
 
 Single quoted strings may contain double quotes and vice versa.
+Alternatively, you can prefix the quote mark with a backslash to use
+it within a string.
 
-For multi-line strings cut mark strings are recommended. A
-cut-mark-string starts with ''''<nowiki>-8<-</nowiki>'''' (scissor on
-a dotted line) and ends with ''''->8-''''. The start mark must be
+ 'It\'s a string with a quote included.'
+
+If you want to use a backslash right before the included quote you
+need to escape the backslash with another backslash. Backslashes that
+aren't followed by a quote mark don't need to be escaped.
+
+ 'A backslash \\\' followed by a quote.'
+
+For multi-line strings or strings with many included quotes cut mark
+strings are recommended. A cut-mark-string starts with
+''''<nowiki>-8<-</nowiki>'''' (scissor on a dotted line) and ends with
+''''->8-''''(scissors looking the other way). The start mark must be
 immediately followed by a line break. The indentation of the first
-line must be repeated for all following lines of the string and is not
-included in the resulting strings. The terminating cut mark must only
-be preceded by white spaces in that line.
+line after the opening scissors must be repeated for all following
+lines of the string and is not included in the resulting strings. The
+terminating cut mark must only be preceded by white spaces in that
+line. When considering the indentation, tabs are not identical with
+some number of spaces. Each indented line must be prefixed by the
+exact same combination of tabs and spaces.
 
  -8<-
    This is a

data/prj_cfg.rb

@@ -35,7 +35,7 @@ MANUAL_DIR      = 'manual'
 
 # FILES
 README          = FileList['README']
-CHANGES         = ''#'CHANGES'
+CHANGELOG       = 'CHANGELOG'
 LICENSE         = 'COPYING'
 DESCRIPTION     = <<'EOT'
 TaskJuggler is a project management software that goes far beyond the commonly
@@ -46,4 +46,5 @@ SETUP_FILE      = 'setup.rb'
 PRJ_FILE        = 'prj_cfg.rb'
 GEM_SPEC_FILE   = 'gem_spec.rb'
 DATA_FILES      = FileList["benchmarks/**/*", "examples/**/*", "manual/*", "test/all.rb", "test/MessageChecker.rb", "test/TestSuite/**/*", "data/**/*"]
-
+DEPENDENCIES    = { 'mail' => '= 2.1.3',
+                    'open4' => '1.0.1' }

data/tasks/changelog.rake

@@ -0,0 +1,36 @@
+require 'time'
+
+desc 'update changelog'
+task :CHANGELOG do
+  releases = `git tag`.split("\n").map { |r| r.chomp }
+
+  File.open('CHANGELOG', 'w+') do |changelog|
+    prevRelease = nil
+    releases.each do |release|
+      version = /\d\.\d\.\d/.match(release)
+      interval = prevRelease ? "#{prevRelease}..#{release}" : release
+      prevRelease = release
+
+      date = Time.parse(/Date: (.*)/.match(`git show #{release}`)[1]).utc
+      date = date.strftime("%Y-%m-%d")
+      # We use RDOC markup syntax to generate a title
+      changelog.puts "= Release #{version} (#{date})\n"
+
+      `git log -z #{interval}`.split("\0").each do |commit|
+        next if commit =~ /^Merge: \d*/
+        ref, author, time, _, message = commit.split("\n", 5)
+        ref = ref[/commit ([0-9a-f]+)/, 1]
+        author = author[/Author: (.*)/, 1].strip
+        time = Time.parse(time[/Date: (.*)/, 1]).utc
+        # Eleminate git-svn-id: lines
+        message.gsub!(/git-svn-id: .*\n/, '')
+        # Eliminate Signed-off-by: lines
+        message.gsub!(/Signed-off-by: .*\n/, '')
+        message.strip!
+
+        changelog.puts '', "  * #{message}"
+      end
+      changelog.puts
+    end
+  end
+end

data/tasks/csts.rake

@@ -19,7 +19,7 @@ RAKE_FILES      = FileList[RAKEFILE, PRJ_FILE, GEM_SPEC_FILE, SETUP_FILE, "#{RAK
 BIN_FILES       = FileList["#{BIN_DIR}/**/*"]
 LIB_FILES       = FileList["#{LIB_DIR}/**/*.rb"]
 TEST_FILES      = FileList["#{TEST_DIR}/**/test_*.rb"]
-RDOC_FILES      = FileList[README,LICENSE]#,CHANGES]
+RDOC_FILES      = FileList[README,LICENSE,CHANGELOG]
 
 # DIST FILES
 DIST_FILES       = FileList[]
@@ -34,9 +34,8 @@ DIST_FILES.include("#{RDOC_DIR}/**/*.{html,css}", 'man/*.[0-9]')
 DIST_FILES.exclude('**/tmp_*', '**/*.tmp')
 
 # 
-CLEAN.include( MANUAL_DIR + '/html' )
+CLEAN.include( MANUAL_DIR + '/html/*' )
 CLEAN.include( 'README' ) if File.exist? 'README.rb'
-CLEAN.include( 'CHANGES' ) if File.exist? 'CHANGES.rb'
 
 # LOADPATH
 REQUIRE_PATHS   = [LIB_DIR]

data/tasks/gem.rake

@@ -1,14 +1,24 @@
 # GEM TASK
+require 'find'
+
 Rake::GemPackageTask.new(GEM_SPEC) { |pkg|
     pkg.need_zip        = true
     pkg.need_tar        = true
     puts "Signed with #{CERT_PRIVATE}" if HAVE_CERT
 }
 
+execs = Dir.glob('./bin/*') + Dir.glob('./**/run') +
+        Dir.glob('./test/**/genrefs')
+
 task :release => [:clobber] do
     puts "Preparing release of #{PROJECT_NAME} version #{PROJECT_VERSION}"
     Rake::Task[:test].invoke
     Rake::Task[:rdoc].invoke
+    # Make sure all files and directories are readable.
+    Find.find('.') do |f|
+      FileUtils.chmod_R((FileTest.directory?(f) ||
+                         execs.include?(f)) ? 0755 : 0644, f)
+    end
     Rake::Task[:package].invoke
 end
 

data/tasks/missing.rake

@@ -1,20 +1,3 @@
-
-task :CHANGES do
-    if File.directory? '.git'
-        system('git log >CHANGES')
-    elsif not File.exist? CHANGES
-        open( CHANGES, 'a' ) { |fn| fn <<"
-= #{PROJECT_NAME} Changelog
-
-== Version #{PROJECT_VERSION}
-
-* Added XXX
-* Added YYY
-* Added ZZZ
-" }
-    end
-end
-
 task :README do
     load 'README.rb' if File.exist? 'README.rb'
 end

data/test/TestSuite/ReportGenerator/Correct/Journal.html

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!-- This file has been generated by taskjuggler3 v0.0.5 -->
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>TaskJuggler Report - Journal</title>
+  <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
+  <meta content="TaskJuggler Report" name="description"/>
+  <meta content="taskjuggler, project, management" name="keywords"/>
+  <link href="css/tjreport.css" rel="stylesheet" type="text/css"></link>
+ </head>
+ <!-- Dynamic Report ID: 0 -->
+ <body>
+  <script src="scripts/wz_tooltip.js" type="text/javascript"></script>
+  <noscript><div style="text-align:center; color:#FF0000">This page requires Javascript for full functionality. Please enable it
+in your browser settings!
+</div></noscript>
+  <div class="tj_page">
+   <!-- Dynamic Report ID: 0 -->
+   <table cellspacing="1" class="tj_table_frame">
+    <tr><td><table cellspacing="1" class="tj_table"><tbody>
+        <tr class="tabhead" style="height:39px; font-size:15px;">
+         <td class="tabcell"><table cellspacing="0" class="tj_table_header_cell" style="text-align:center; "><tr>
+            <td style="width:0px; "></td>
+            <td class="tj_table_cell_label" style="white-space:nowrap; font-weight:bold; ">Name</td>
+            <td style="width:0px; "></td>
+           </tr></table></td>
+         <td class="tabcell"><table cellspacing="0" class="tj_table_header_cell" style="text-align:center; "><tr>
+            <td style="width:0px; "></td>
+            <td class="tj_table_cell_label" style="white-space:nowrap; font-weight:bold; ">Journal</td>
+            <td style="width:0px; "></td>
+           </tr></table></td>
+        </tr>
+        <tr class="tabline" style="font-size:12px; ">
+         <td class="taskcell1">
+          <table cellspacing="0" class="tj_table_cell" style="text-align:left; "><tr>
+            <td style="width:0px; "></td>
+            <td class="tj_table_cell_icon" onclick="TagToTip('ID11037940', TITLE, 'T')" style="cursor:help; "><img alt="Icon" src="icons/task.png"></img></td>
+            <td class="tj_table_cell_label" style="white-space:nowrap; ">T</td>
+            <td style="width:0px; "></td>
+           </tr></table>
+          <div class="tj_tooltip_box" id="ID11037940" style="cursor:help"><div>
+            <b>ID:</b> _Task_1</div></div>
+         </td>
+         <td class="taskcell1"><table cellspacing="0" class="tj_table_cell" style="text-align:left; "><tr>
+            <td style="width:0px; "></td>
+            <td class="tj_table_cell_label" style="white-space:nowrap; "><div class="tj_journal">
+              <h1 class="tj_journal" id="GreenEntry_2">
+               <img alt="[Green]" src="icons/flag-green.png" style="vertical-align:text-bottom; "></img>Entry 2</h1>
+              <p class="tj_journal">
+               <i>Reported on 2010-06-14</i> </p>
+              <p class="tj_journal"><b>Entry 2</b></p>
+             </div></td>
+            <td style="width:0px; "></td>
+           </tr></table></td>
+        </tr>
+       </tbody></table></td></tr>
+    <tr><td></td></tr>
+   </table>
+   <div class="copyright">Project: Journal Version: 1.0 - Created on 2010-06-07 15:00:54 with <a href="http://www.taskjuggler.org">TaskJuggler III</a> v0.0.5</div>
+  </div>
+ </body>
+</html>

data/test/TestSuite/ReportGenerator/Correct/Journal.tjp

@@ -0,0 +1,14 @@
+project "Journal" 2010-06-07 +1m
+
+task "T" {
+  duration 3w
+  journalentry 2010-06-07-8:00 "Entry 1"
+  journalentry 2010-06-14-8:00 "Entry 2"
+  journalentry 2010-06-21-8:00 "Entry 3"
+}
+
+taskreport "Journal-1" {
+  formats csv
+  # Only "Entry 2" should be included
+  columns name, journal { period 2010-06-14 +1w }
+}

data/test/TestSuite/{HTML-Reports/LogicalFunctions.tjp → ReportGenerator/Correct/LogicalFunctions1.tjp}

@@ -7,8 +7,8 @@ task "Task 4"
 task "Task 5"
 task ""
 
-taskreport "LogicalFunctions" {
-  formats html
+taskreport "LogicalFunctions1-1" {
+  formats csv
   columns index, name,
           id { celltext plan.index < 3 "Index < 3"
                celltext 1 "Index >= 3" },

data/test/TestSuite/ReportGenerator/Correct/LogicalFunctions2.csv

@@ -0,0 +1,3 @@
+Name
+R1
+R2

data/test/TestSuite/ReportGenerator/Correct/LogicalFunctions2.tjp

@@ -0,0 +1,19 @@
+project "LogFunc2" 2010-06-07 +1m
+
+resource r1 "R1"
+resource r2 "R2" {
+  vacation 2010-06-14 +7d
+}
+
+task "Task" {
+  effort 25d
+  allocate r1, r2
+}
+
+resourcereport "LogicalFunctions2-1" {
+  formats csv
+  period 2010-06-14 +7d
+  hideresource ~isactive(plan)
+  columns name
+}
+

data/test/TestSuite/ReportGenerator/Correct/css/tjmanual.css

@@ -0,0 +1,66 @@
+pre {
+  font-size:16px;
+  font-family: Courier;
+  padding-left:8px;
+  padding-right:8px;
+  padding-top:0px;
+  padding-bottom:0px;
+}
+p {
+  margin-top:8px;
+  margin-bottom:8px;
+}
+code {
+  font-size:16px;
+  font-family: Courier;
+}
+.table {
+  background-color:#ABABAB;
+  width:100%;
+}
+.tag {
+  background-color:#E0E0F0;
+  font-size:16px;
+  font-weight:bold;
+  padding-left:8px;
+  padding-right:8px;
+  padding-top:5px;
+  padding-bottom:5px;
+}
+.descr {
+  background-color:#F0F0F0;
+  font-size:16px;
+  padding-left:8px;
+  padding-right:8px;
+  padding-top:5px;
+  padding-bottom:5px;
+}
+.codeframe{
+  border-width:2px;
+  border-color:#ABABAB;
+  border-style:solid;
+  background-color:#F0F0F0;
+  margin-top:8px;
+  margin-bottom:8px;
+}
+.code {
+  padding-left:15px;
+  padding-right:15px;
+  padding-top:0px;
+  padding-bottom:0px;
+}
+div[codesection] {
+  border-width:2px;
+  border-color:#ABABAB;
+  border-style:solid;
+  background-color:#F0F0F0;
+  margin-top:8px;
+  margin-bottom:8px;
+}
+pre[codesection] {
+  padding-left:15px;
+  padding-right:15px;
+  padding-top:0px;
+  padding-bottom:0px;
+}
+