taskjuggler 3.6.0 → 3.7.1

data/spec/TimeSheets_spec.rb

@@ -216,7 +216,7 @@ EOT
       it 'should have matching timesheets in body and attachment' do
         @tss_mails.each do |mail|
           bodySheet = extractTimeSheet(mail.parts[0].decoded)
-          attachedSheet = extractTimeSheet(mail.part[1].decoded)
+          attachedSheet = extractTimeSheet(mail.part[1].decoded).tr("\r", '')
           bodySheet.should == attachedSheet
         end
       end

data/taskjuggler.gemspec

@@ -35,16 +35,16 @@ GEM_SPEC = Gem::Specification.new { |s|
   s.summary = 'A Project Management Software'
   s.description = <<'EOT'
 TaskJuggler is a modern and powerful, Free and Open Source Software project
-management tool. Its new approach to project planing and tracking is more
+management tool. It's new approach to project planning and tracking is more
 flexible and superior to the commonly used Gantt chart editing tools.
 
 TaskJuggler is project management software for serious project managers. It
 covers the complete spectrum of project management tasks from the first idea
 to the completion of the project. It assists you during project scoping,
-resource assignment, cost and revenue planing, risk and communication
+resource assignment, cost and revenue planning, risk and communication
 management.
 EOT
-
+  s.license = 'GPL-2.0'
   s.require_path = 'lib'
   s.files = (`git ls-files -- lib`).split("\n") +
             (`git ls-files -- data`).split("\n") +
@@ -53,7 +53,7 @@ EOT
             (`git ls-files -- tasks`).split("\n") +
             %w( .gemtest taskjuggler.gemspec Rakefile ) +
             # Generated files, not contained in Git repository.
-            %w( data/tjp.vim ) + Dir.glob('manual/html/**/*')
+            %w( data/tjp.vim ) + Dir.glob('manual/html/**/*') + Dir.glob('man/*.1')
   s.bindir = 'bin'
   s.executables = (`git ls-files -- bin`).split("\n").
                   map { |fn| File.basename(fn) }
@@ -63,9 +63,9 @@ EOT
   s.has_rdoc = true
   s.extra_rdoc_files = %w( README.rdoc COPYING CHANGELOG )
 
-  s.add_dependency('mail', '>= 2.4.3')
-  s.add_dependency('term-ansicolor', '>= 1.0.7')
-  s.add_development_dependency('rspec', '>= 2.5.0')
+  s.add_dependency('mail', '~> 2.7', '>= 2.7.1')
+  s.add_runtime_dependency('term-ansicolor', '~> 1.7', '>= 1.7.1')
+  s.add_development_dependency('rspec', '~> 2.5', '>= 2.5.0')
   s.platform = Gem::Platform::RUBY
   s.required_ruby_version  = '>= 2.0.0'
 }

data/tasks/changelog.rake

@@ -1,5 +1,7 @@
 require 'time'
 
+CLOBBER.include "CHANGELOG"
+
 desc 'Generate the CHANGELOG file'
 task :changelog do
 

data/tasks/gem.rake

@@ -3,6 +3,8 @@ require 'find'
 require 'rubygems'
 require 'rubygems/package'
 
+CLOBBER.include "pkg/"
+
 # Unfortunately Rake::GemPackageTest cannot deal with files that are generated
 # by Rake targets. So we have to write our own packaging task.
 desc 'Build the gem package'
@@ -11,6 +13,7 @@ task :gem => [:clobber] do
   Rake::Task[:manual].invoke
   Rake::Task[:changelog].invoke
   Rake::Task[:permissions].invoke
+  Rake::Task[:help2man].invoke
 
   load 'taskjuggler.gemspec';
 

data/tasks/help2man.rake

@@ -0,0 +1,18 @@
+# TASK MAN GENERATE
+
+CLOBBER.include "man"
+
+directory "man"
+
+desc 'Generate man pages from help'
+task :help2man => 'man' do
+	help2man = %x{which help2man}
+	help2man.chomp!
+	Dir.foreach('bin') do |prog|
+		next if prog == '.' or prog == '..'
+		system help2man,"--output=man/#{prog}.1","--no-info","--manual=TaskJuggler",*("--include=h2m/#{prog}.h2m" unless !File.exists?("h2m/#{prog}.h2m")),"bin/#{prog}"
+    FileUtils.chmod(0644, "man/#{prog}.1")
+	end
+  FileUtils.chmod(0755, 'man')
+end
+

data/tasks/kate.rake

@@ -2,6 +2,8 @@
 
 require 'taskjuggler/KateSyntax'
 
+CLOBBER.include "data/kate-tjp.xml"
+
 desc 'Generate kate-tjp.xml Kate syntax file'
 task :kate do
   TaskJuggler::KateSyntax.new.generate('data/kate-tjp.xml')

data/tasks/manual.rake

@@ -2,6 +2,8 @@
 
 require 'taskjuggler/apps/Tj3Man'
 
+CLOBBER.include "manual/html/"
+
 desc 'Generate User Manual'
 task :manual do
   htmldir = 'manual/html'

data/tasks/test.rake

@@ -2,6 +2,11 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'test')
 
 require 'rake/testtask'
 
+CLEAN.include "test/TestSuite/Export-Reports/refs/Leave.tjp"
+CLEAN.include "test/TestSuite/Export-Reports/refs/ListAttributes.tjp"
+CLEAN.include "test/TestSuite/Export-Reports/refs/Macro-4.tjp"
+CLEAN.include "test/TestSuite/Export-Reports/refs/TraceReport.tjp"
+
 # TEST TASK
 desc 'Run all unit tests in the test directory'
 Rake::TestTask.new(:unittest) do |t|

data/tasks/vim.rake

@@ -2,6 +2,8 @@
 
 require 'taskjuggler/VimSyntax'
 
+CLOBBER.include "data/tjp.vim"
+
 desc 'Generate vim.tjp Vim syntax file'
 task :vim do
   TaskJuggler::VimSyntax.new.generate('data/tjp.vim')

data/test/TestSuite/Export-Reports/refs/AccountReport.tjp

@@ -45,7 +45,6 @@ task _Task_1 "Products" {
   task _Task_6 "Final Payment" {
     depends _Task_1.mf
     start 2012-10-22-17:00-+0000
-    milestone
     scheduled
   }
 }

data/test/TestSuite/Export-Reports/refs/AdoptedTasks.tjp

@@ -10,12 +10,10 @@ projectids prj
 
 task t1 "T1" {
   start 2011-03-05-00:00-+0000
-  milestone
   scheduled
 }
 task t2 "T2" {
   start 2011-03-05-00:00-+0000
-  milestone
   scheduled
 }
 task t3 "T3" {

data/test/TestSuite/Export-Reports/refs/AlertLevels.tjp

@@ -15,7 +15,6 @@ projectids prj
 
 task _Task_1 "Holiday Season" {
   start 2011-11-24-00:00-+0000
-  milestone
   scheduled
 }
 supplement task _Task_1 {

data/test/TestSuite/Export-Reports/refs/Allocate-1.tjp

@@ -25,7 +25,6 @@ task t1 "Task 1" {
   }
   task m1 "Milestone 1" {
     start 2003-06-05-06:00-+0000
-    milestone
     scheduled
   }
 }

data/test/TestSuite/Export-Reports/refs/AutoID.tjp

@@ -32,7 +32,6 @@ resource _Resource_1 "Foo" {
 task _Task_1 "Foo" {
   task _Task_2 "Bar" {
     start 2009-10-04-00:00-+0000
-    milestone
     scheduled
   }
 }

data/test/TestSuite/Export-Reports/refs/AutoMacros.tjp

@@ -10,7 +10,6 @@ projectids prj
 
 task items "Project breakdown" {
   start 2006-09-22-00:00-+0000
-  milestone
   scheduled
 }
 supplement task items {

data/test/TestSuite/Export-Reports/refs/Currencyformat.tjp

@@ -10,7 +10,6 @@ projectids prj
 
 task t "Task" {
   start 2007-01-01-00:00-+0000
-  milestone
   scheduled
 }
 supplement task t {

data/test/TestSuite/Export-Reports/refs/CustomAttributes.tjp

@@ -38,9 +38,7 @@ resource _Resource_1 "R"
 
 task _Task_1 "T" {
   start 2013-04-24-00:00-+0000
-  milestone
   scheduled
-  two:milestone
 }
 supplement task _Task_1 {
   Claim "A '''big''' statement."

data/test/TestSuite/Export-Reports/refs/Depends1.tjp

@@ -11,7 +11,6 @@ projectids prj
 task foo1 "foo1" {
   task foo2 "foo2" {
     start 2007-12-04-07:00-+0000
-    milestone
     scheduled
   }
   task foo3 "foo3" {

data/test/TestSuite/Export-Reports/refs/Durations.tjp

@@ -18,7 +18,6 @@ task t "Enclosing" {
   }
   task intervalTask "Interval Task" {
     start 2007-06-17-06:00-+0000
-    milestone
     scheduled
   }
   task lengthTask "Length Task" {

data/test/TestSuite/Export-Reports/refs/Efficiency.tjp

@@ -14,7 +14,6 @@ resource confRoom "Conference Room"
 
 task t "An important date" {
   start 2007-07-21-06:00-+0000
-  milestone
   scheduled
 }
 supplement task t {

data/test/TestSuite/Export-Reports/refs/Gap.tjp

@@ -10,19 +10,16 @@ projectids prj
 
 task t1 "Task 1" {
   start 2005-05-29-06:00-+0000
-  milestone
   scheduled
 }
 task t2 "Task 2" {
   depends t1
   start 2005-06-03-06:00-+0000
-  milestone
   scheduled
 }
 task t3 "Task 3" {
   depends t1
   start 2005-06-03-23:00-+0000
-  milestone
   scheduled
 }
 supplement task t1 {

data/test/TestSuite/Export-Reports/refs/Include.tjp

@@ -14,7 +14,6 @@ resource _Resource_4 "R2"
 
 task _Task_1 "Foo" {
   start 2010-02-26-00:00-+0000
-  milestone
   scheduled
 }
 supplement task _Task_1 {

data/test/TestSuite/Export-Reports/refs/Journal.tjp

@@ -11,7 +11,6 @@ resource tux "Tux"
 
 task t1 "Task1" {
   start 2009-05-05-06:00-+0000
-  milestone
   scheduled
 }
 supplement task t1 {

data/test/TestSuite/Export-Reports/refs/Macro-1.tjp

@@ -12,7 +12,6 @@ resource tux2 "Tux2"
 
 task t1 "Task1" {
   start 2008-01-18-00:00-+0000
-  milestone
   scheduled
 }
 task t2 "Task2" {

data/test/TestSuite/Export-Reports/refs/Macro-2.tjp

@@ -10,12 +10,10 @@ projectids prj
 
 task _Task_1 " Crème brûlée   Prepare " {
   start 2010-04-28-00:00-+0000
-  milestone
   scheduled
 }
 task _Task_2 "task" {
   start 2010-04-28-00:00-+0000
-  milestone
   scheduled
 }
 supplement task _Task_1 {

data/test/TestSuite/Export-Reports/refs/Macro-3.tjp

@@ -10,7 +10,6 @@ projectids foo600
 
 task _Task_1 "foo" {
   start 2009-12-01-00:00-+0000
-  milestone
   scheduled
 }
 supplement task _Task_1 {

data/test/TestSuite/Export-Reports/refs/Manager.tjp

@@ -23,7 +23,6 @@ resource _Resource_1 "The Company" {
 
 task _Task_1 "T" {
   start 2010-04-03-00:00-+0000
-  milestone
   scheduled
 }
 supplement task _Task_1 {

data/test/TestSuite/Export-Reports/refs/Milestone.tjp

@@ -10,12 +10,10 @@ projectids prj
 
 task project_start "Project Start" {
   start 2005-07-15-06:00-+0000
-  milestone
   scheduled
 }
 task deadline "Important Deadline" {
   start 2005-07-20-06:00-+0000
-  milestone
   scheduled
 }
 supplement task project_start {

data/test/TestSuite/Export-Reports/refs/Numberformat.tjp

@@ -10,7 +10,6 @@ projectids prj
 
 task t "Task" {
   start 2000-01-01-00:00-+0000
-  milestone
   scheduled
 }
 supplement task t {

data/test/TestSuite/Export-Reports/refs/Precedes1.tjp

@@ -11,7 +11,6 @@ projectids prj
 task foo1 "foo1" {
   task foo2 "foo2" {
     start 2003-12-04-07:00-+0000
-    milestone
     scheduled
   }
   task foo3 "foo3" {

data/test/TestSuite/Export-Reports/refs/Project.tjp

@@ -10,7 +10,6 @@ projectids prj
 
 task t "Task" {
   start 2007-01-01-07:00-+0000
-  milestone
   scheduled
 }
 supplement task t {

data/test/TestSuite/Export-Reports/refs/ProjectIDs.tjp

@@ -10,17 +10,14 @@ projectids prj, prj1, prj2
 
 task t1 "Task 1" {
   start 2006-08-22-06:00-+0000
-  milestone
   scheduled
 }
 task t2 "Task 2" {
   start 2006-08-22-06:00-+0000
-  milestone
   scheduled
 }
 task t3 "Task 3" {
   start 2006-08-22-06:00-+0000
-  milestone
   scheduled
 }
 supplement task t1 {

data/test/TestSuite/Export-Reports/refs/Reports.tjp

@@ -30,7 +30,6 @@ task t2 "FooTask2" {
 }
 task t3 "FooTask3" {
   start 2000-01-01-07:00-+0000
-  milestone
   scheduled
 }
 supplement task t1 {

data/test/TestSuite/Export-Reports/refs/Resource.tjp

@@ -15,7 +15,6 @@ resource team "A team" {
 
 task t "An important date" {
   start 2005-06-10-06:00-+0000
-  milestone
   scheduled
 }
 supplement task t {

data/test/TestSuite/Export-Reports/refs/ResourceRoot.tjp

@@ -19,7 +19,6 @@ resource r5 "R5"
 
 task _Task_1 "T" {
   start 2010-11-10-00:00-+0000
-  milestone
   scheduled
 }
 supplement task _Task_1 {

data/test/TestSuite/Export-Reports/refs/RollupResource.tjp

@@ -19,7 +19,6 @@ resource r5 "R5"
 
 task _Task_1 "T" {
   start 2010-11-10-00:00-+0000
-  milestone
   scheduled
 }
 supplement task _Task_1 {

data/test/TestSuite/Export-Reports/refs/Scenario.tjp

@@ -16,10 +16,8 @@ projectids prj
 
 task t "Task" {
   start 2007-05-29-06:00-+0000
-  milestone
   scheduled
   actual:start 2007-06-03-06:00-+0000
-  actual:milestone
 }
 supplement task t {
   priority 500

data/test/TestSuite/Export-Reports/refs/Timezone.tjp

@@ -10,7 +10,6 @@ projectids tz
 
 task item "Project" {
   start 2005-06-06-09:00-+0000
-  milestone
   scheduled
 }
 supplement task item {

data/test/TestSuite/Export-Reports/refs/Vacation.tjp

@@ -16,7 +16,6 @@ resource tuxus "Tuxus"
 
 task t "An important date" {
   start 2005-07-22-06:00-+0000
-  milestone
   scheduled
 }
 supplement task t {