taskjuggler 3.7.1 → 3.8.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (349) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +26 -0
  3. data/Rakefile +4 -1
  4. data/data/tjp.vim +296 -296
  5. data/examples/ProjectTemplate/template.tjp +3 -3
  6. data/examples/Tutorial/tutorial.tjp +3 -3
  7. data/lib/taskjuggler/AppConfig.rb +1 -1
  8. data/lib/taskjuggler/BatchProcessor.rb +68 -57
  9. data/lib/taskjuggler/FileList.rb +1 -1
  10. data/lib/taskjuggler/MessageHandler.rb +0 -1
  11. data/lib/taskjuggler/ResourceScenario.rb +29 -1
  12. data/lib/taskjuggler/RuntimeConfig.rb +1 -1
  13. data/lib/taskjuggler/SheetHandlerBase.rb +5 -4
  14. data/lib/taskjuggler/StatusSheetReceiver.rb +2 -2
  15. data/lib/taskjuggler/StatusSheetSender.rb +1 -1
  16. data/lib/taskjuggler/TaskScenario.rb +7 -2
  17. data/lib/taskjuggler/TextParser/Scanner.rb +1 -1
  18. data/lib/taskjuggler/TimeSheetReceiver.rb +2 -2
  19. data/lib/taskjuggler/TimeSheetSender.rb +1 -1
  20. data/lib/taskjuggler/TimeSheets.rb +3 -2
  21. data/lib/taskjuggler/TjTime.rb +13 -6
  22. data/lib/taskjuggler/TjpSyntaxRules.rb +9 -3
  23. data/lib/taskjuggler/XMLDocument.rb +1 -1
  24. data/lib/taskjuggler/apps/Tj3Daemon.rb +2 -2
  25. data/lib/taskjuggler/apps/Tj3WebD.rb +1 -1
  26. data/lib/taskjuggler/daemon/ProjectServer.rb +2 -2
  27. data/lib/taskjuggler/reports/CSVFile.rb +1 -1
  28. data/lib/taskjuggler/reports/MspXmlRE.rb +5 -3
  29. data/lib/taskjuggler/reports/Report.rb +5 -5
  30. data/lib/taskjuggler/reports/ReportTableCell.rb +7 -5
  31. data/lib/taskjuggler/reports/TableReport.rb +2 -1
  32. data/lib/taskjuggler/reports/TraceReport.rb +2 -2
  33. data/lib/taskjuggler/version.rb +1 -1
  34. data/manual/html/Day_To_Day_Juggling.html +1 -1
  35. data/manual/html/Getting_Started.html +1 -1
  36. data/manual/html/How_To_Contribute.html +1 -1
  37. data/manual/html/Installation.html +1 -1
  38. data/manual/html/Intro.html +1 -1
  39. data/manual/html/List_Attributes.html +1 -1
  40. data/manual/html/Reporting_Bugs.html +1 -1
  41. data/manual/html/Rich_Text_Attributes.html +1 -1
  42. data/manual/html/Software.html +1 -1
  43. data/manual/html/TaskJuggler_2x_Migration.html +1 -1
  44. data/manual/html/TaskJuggler_Internals.html +1 -1
  45. data/manual/html/The_TaskJuggler_Syntax.html +1 -1
  46. data/manual/html/Tutorial.html +1 -1
  47. data/manual/html/account.html +1 -1
  48. data/manual/html/account.task.html +1 -1
  49. data/manual/html/accountprefix.html +1 -1
  50. data/manual/html/accountreport.html +2 -2
  51. data/manual/html/accountroot.html +1 -1
  52. data/manual/html/active.html +1 -1
  53. data/manual/html/adopt.task.html +1 -1
  54. data/manual/html/aggregate.html +1 -1
  55. data/manual/html/alert.html +1 -1
  56. data/manual/html/alertlevels.html +1 -1
  57. data/manual/html/allocate.html +1 -1
  58. data/manual/html/alphabet.html +1 -1
  59. data/manual/html/alternative.html +1 -1
  60. data/manual/html/author.html +1 -1
  61. data/manual/html/auxdir.html +1 -1
  62. data/manual/html/auxdir.report.html +1 -1
  63. data/manual/html/balance.html +1 -1
  64. data/manual/html/booking.resource.html +1 -1
  65. data/manual/html/booking.task.html +1 -1
  66. data/manual/html/caption.html +1 -1
  67. data/manual/html/cellcolor.column.html +1 -1
  68. data/manual/html/celltext.column.html +1 -1
  69. data/manual/html/center.html +1 -1
  70. data/manual/html/charge.html +1 -1
  71. data/manual/html/chargeset.html +1 -1
  72. data/manual/html/columnid.html +5 -2
  73. data/manual/html/columns.html +1 -1
  74. data/manual/html/complete.html +1 -1
  75. data/manual/html/copyright.html +1 -1
  76. data/manual/html/credits.html +1 -1
  77. data/manual/html/currency.html +1 -1
  78. data/manual/html/currencyformat.html +1 -1
  79. data/manual/html/dailymax.html +1 -1
  80. data/manual/html/dailymin.html +1 -1
  81. data/manual/html/dailyworkinghours.html +1 -1
  82. data/manual/html/date.extend.html +1 -1
  83. data/manual/html/date.html +1 -1
  84. data/manual/html/definitions.html +1 -1
  85. data/manual/html/depends.html +1 -1
  86. data/manual/html/details.html +1 -1
  87. data/manual/html/disabled.html +1 -1
  88. data/manual/html/duration.html +1 -1
  89. data/manual/html/efficiency.html +1 -1
  90. data/manual/html/effort.html +1 -1
  91. data/manual/html/effortdone.html +1 -1
  92. data/manual/html/effortleft.html +1 -1
  93. data/manual/html/email.html +1 -1
  94. data/manual/html/enabled.html +1 -1
  95. data/manual/html/end.column.html +1 -1
  96. data/manual/html/end.html +1 -1
  97. data/manual/html/end.limit.html +1 -1
  98. data/manual/html/end.report.html +2 -2
  99. data/manual/html/end.timesheet.html +1 -1
  100. data/manual/html/endcredit.html +1 -1
  101. data/manual/html/epilog.html +1 -1
  102. data/manual/html/export.html +2 -2
  103. data/manual/html/extend.html +1 -1
  104. data/manual/html/fail.html +1 -1
  105. data/manual/html/fdl.html +1 -1
  106. data/manual/html/flags.account.html +1 -1
  107. data/manual/html/flags.html +1 -1
  108. data/manual/html/flags.journalentry.html +1 -1
  109. data/manual/html/flags.report.html +1 -1
  110. data/manual/html/flags.resource.html +1 -1
  111. data/manual/html/flags.statussheet.html +1 -1
  112. data/manual/html/flags.task.html +1 -1
  113. data/manual/html/flags.timesheet.html +1 -1
  114. data/manual/html/fontcolor.column.html +1 -1
  115. data/manual/html/footer.html +1 -1
  116. data/manual/html/formats.export.html +1 -1
  117. data/manual/html/formats.html +1 -1
  118. data/manual/html/functions.html +1 -1
  119. data/manual/html/gapduration.html +1 -1
  120. data/manual/html/gaplength.html +1 -1
  121. data/manual/html/halign.center.html +1 -1
  122. data/manual/html/halign.column.html +1 -1
  123. data/manual/html/halign.left.html +1 -1
  124. data/manual/html/halign.right.html +1 -1
  125. data/manual/html/hasalert.html +1 -1
  126. data/manual/html/header.html +1 -1
  127. data/manual/html/headline.html +1 -1
  128. data/manual/html/height.html +1 -1
  129. data/manual/html/hideaccount.html +1 -1
  130. data/manual/html/hidejournalentry.html +1 -1
  131. data/manual/html/hidereport.html +1 -1
  132. data/manual/html/hideresource.html +2 -2
  133. data/manual/html/hidetask.html +2 -2
  134. data/manual/html/icalreport.html +1 -1
  135. data/manual/html/include.macro.html +1 -1
  136. data/manual/html/include.project.html +1 -1
  137. data/manual/html/include.properties.html +1 -1
  138. data/manual/html/index.html +1 -1
  139. data/manual/html/inherit.extend.html +1 -1
  140. data/manual/html/interval1.html +1 -1
  141. data/manual/html/interval2.html +1 -1
  142. data/manual/html/interval3.html +1 -1
  143. data/manual/html/interval4.html +1 -1
  144. data/manual/html/isactive.html +1 -1
  145. data/manual/html/ischildof.html +1 -1
  146. data/manual/html/isdependencyof.html +1 -1
  147. data/manual/html/isdutyof.html +1 -1
  148. data/manual/html/isfeatureof.html +1 -1
  149. data/manual/html/isleaf.html +1 -1
  150. data/manual/html/ismilestone.html +1 -1
  151. data/manual/html/isongoing.html +1 -1
  152. data/manual/html/isresource.html +1 -1
  153. data/manual/html/isresponsibilityof.html +1 -1
  154. data/manual/html/istask.html +1 -1
  155. data/manual/html/isvalid.html +1 -1
  156. data/manual/html/journalattributes.html +1 -1
  157. data/manual/html/journalentry.html +1 -1
  158. data/manual/html/journalmode.html +1 -1
  159. data/manual/html/leaveallowance.html +1 -1
  160. data/manual/html/leaves.html +1 -1
  161. data/manual/html/left.html +1 -1
  162. data/manual/html/length.html +1 -1
  163. data/manual/html/limits.allocate.html +1 -1
  164. data/manual/html/limits.html +1 -1
  165. data/manual/html/limits.resource.html +1 -1
  166. data/manual/html/limits.task.html +1 -1
  167. data/manual/html/listitem.column.html +1 -1
  168. data/manual/html/listtype.column.html +1 -1
  169. data/manual/html/loadunit.html +2 -2
  170. data/manual/html/logicalexpression.html +1 -1
  171. data/manual/html/logicalflagexpression.html +1 -1
  172. data/manual/html/macro.html +1 -1
  173. data/manual/html/managers.html +1 -1
  174. data/manual/html/mandatory.html +1 -1
  175. data/manual/html/markdate.html +1 -1
  176. data/manual/html/maxend.html +1 -1
  177. data/manual/html/maximum.html +1 -1
  178. data/manual/html/maxstart.html +1 -1
  179. data/manual/html/milestone.html +1 -1
  180. data/manual/html/minend.html +1 -1
  181. data/manual/html/minimum.html +1 -1
  182. data/manual/html/minstart.html +1 -1
  183. data/manual/html/monthlymax.html +1 -1
  184. data/manual/html/monthlymin.html +1 -1
  185. data/manual/html/navbar.html +1 -1
  186. data/manual/html/navigator.html +1 -1
  187. data/manual/html/newtask.html +1 -1
  188. data/manual/html/nikureport.html +1 -1
  189. data/manual/html/note.task.html +1 -1
  190. data/manual/html/novevents.html +1 -1
  191. data/manual/html/now.html +1 -1
  192. data/manual/html/number.extend.html +1 -1
  193. data/manual/html/numberformat.html +1 -1
  194. data/manual/html/onend.html +1 -1
  195. data/manual/html/onstart.html +1 -1
  196. data/manual/html/opennodes.html +1 -1
  197. data/manual/html/outputdir.html +1 -1
  198. data/manual/html/overtime.booking.html +1 -1
  199. data/manual/html/period.column.html +1 -1
  200. data/manual/html/period.limit.html +1 -1
  201. data/manual/html/period.report.html +2 -2
  202. data/manual/html/period.task.html +1 -1
  203. data/manual/html/persistent.html +1 -1
  204. data/manual/html/precedes.html +1 -1
  205. data/manual/html/priority.html +1 -1
  206. data/manual/html/priority.timesheet.html +1 -1
  207. data/manual/html/project.html +1 -1
  208. data/manual/html/projectid.html +1 -1
  209. data/manual/html/projectid.task.html +1 -1
  210. data/manual/html/projectids.html +1 -1
  211. data/manual/html/projection.html +1 -1
  212. data/manual/html/prolog.html +1 -1
  213. data/manual/html/properties.html +1 -1
  214. data/manual/html/purge.html +2 -2
  215. data/manual/html/rate.html +1 -1
  216. data/manual/html/rate.resource.html +1 -1
  217. data/manual/html/rawhtmlhead.html +1 -1
  218. data/manual/html/reference.extend.html +1 -1
  219. data/manual/html/remaining.html +1 -1
  220. data/manual/html/replace.html +1 -1
  221. data/manual/html/reportprefix.html +1 -1
  222. data/manual/html/resource.html +1 -1
  223. data/manual/html/resourceattributes.html +1 -1
  224. data/manual/html/resourceprefix.html +1 -1
  225. data/manual/html/resourcereport.html +2 -2
  226. data/manual/html/resourceroot.html +1 -1
  227. data/manual/html/resources.limit.html +1 -1
  228. data/manual/html/responsible.html +1 -1
  229. data/manual/html/richtext.extend.html +1 -1
  230. data/manual/html/right.html +1 -1
  231. data/manual/html/rollupaccount.html +1 -1
  232. data/manual/html/rollupresource.html +2 -2
  233. data/manual/html/rolluptask.html +2 -2
  234. data/manual/html/scale.column.html +1 -1
  235. data/manual/html/scenario.html +1 -1
  236. data/manual/html/scenario.ical.html +1 -1
  237. data/manual/html/scenarios.export.html +1 -1
  238. data/manual/html/scenarios.html +1 -1
  239. data/manual/html/scenariospecific.extend.html +1 -1
  240. data/manual/html/scheduled.html +1 -1
  241. data/manual/html/scheduling.html +1 -1
  242. data/manual/html/schedulingmode.html +1 -1
  243. data/manual/html/select.html +1 -1
  244. data/manual/html/selfcontained.html +1 -1
  245. data/manual/html/shift.allocate.html +1 -1
  246. data/manual/html/shift.html +1 -1
  247. data/manual/html/shift.resource.html +1 -1
  248. data/manual/html/shift.task.html +1 -1
  249. data/manual/html/shift.timesheet.html +1 -1
  250. data/manual/html/shifts.allocate.html +1 -1
  251. data/manual/html/shifts.resource.html +1 -1
  252. data/manual/html/shifts.task.html +1 -1
  253. data/manual/html/shorttimeformat.html +1 -1
  254. data/manual/html/sloppy.booking.html +1 -1
  255. data/manual/html/sloppy.projection.html +1 -1
  256. data/manual/html/sortaccounts.html +1 -1
  257. data/manual/html/sortjournalentries.html +1 -1
  258. data/manual/html/sortresources.html +1 -1
  259. data/manual/html/sorttasks.html +1 -1
  260. data/manual/html/start.column.html +1 -1
  261. data/manual/html/start.html +1 -1
  262. data/manual/html/start.limit.html +1 -1
  263. data/manual/html/start.report.html +2 -2
  264. data/manual/html/startcredit.html +1 -1
  265. data/manual/html/status.statussheet.html +1 -1
  266. data/manual/html/status.timesheet.html +1 -1
  267. data/manual/html/statussheet.html +1 -1
  268. data/manual/html/statussheetreport.html +1 -1
  269. data/manual/html/strict.projection.html +1 -1
  270. data/manual/html/summary.html +1 -1
  271. data/manual/html/supplement.html +1 -1
  272. data/manual/html/supplement.resource.html +1 -1
  273. data/manual/html/supplement.task.html +1 -1
  274. data/manual/html/tagfile.html +1 -1
  275. data/manual/html/task.html +1 -1
  276. data/manual/html/task.statussheet.html +1 -1
  277. data/manual/html/task.timesheet.html +1 -1
  278. data/manual/html/taskattributes.html +1 -1
  279. data/manual/html/taskprefix.html +1 -1
  280. data/manual/html/taskreport.html +2 -2
  281. data/manual/html/taskroot.export.html +1 -1
  282. data/manual/html/taskroot.html +1 -1
  283. data/manual/html/text.extend.html +1 -1
  284. data/manual/html/textreport.html +2 -2
  285. data/manual/html/timeformat.html +1 -1
  286. data/manual/html/timeformat1.html +1 -1
  287. data/manual/html/timeformat2.html +1 -1
  288. data/manual/html/timeoff.nikureport.html +1 -1
  289. data/manual/html/timesheet.html +1 -1
  290. data/manual/html/timesheetreport.html +1 -1
  291. data/manual/html/timezone.export.html +1 -1
  292. data/manual/html/timezone.html +1 -1
  293. data/manual/html/timezone.report.html +1 -1
  294. data/manual/html/timezone.shift.html +1 -1
  295. data/manual/html/timingresolution.html +1 -1
  296. data/manual/html/title.column.html +1 -1
  297. data/manual/html/title.html +1 -1
  298. data/manual/html/toc.html +3 -3
  299. data/manual/html/tooltip.column.html +1 -1
  300. data/manual/html/tracereport.html +2 -2
  301. data/manual/html/trackingscenario.html +1 -1
  302. data/manual/html/treelevel.html +1 -1
  303. data/manual/html/vacation.html +1 -1
  304. data/manual/html/vacation.resource.html +1 -1
  305. data/manual/html/vacation.shift.html +1 -1
  306. data/manual/html/warn.html +1 -1
  307. data/manual/html/weeklymax.html +1 -1
  308. data/manual/html/weeklymin.html +1 -1
  309. data/manual/html/weekstartsmonday.html +1 -1
  310. data/manual/html/weekstartssunday.html +1 -1
  311. data/manual/html/width.column.html +1 -1
  312. data/manual/html/width.html +1 -1
  313. data/manual/html/work.html +1 -1
  314. data/manual/html/workinghours.project.html +1 -1
  315. data/manual/html/workinghours.resource.html +1 -1
  316. data/manual/html/workinghours.shift.html +1 -1
  317. data/manual/html/yearlyworkingdays.html +1 -1
  318. data/spec/TraceReport_spec.rb +1 -1
  319. data/spec/support/DaemonControl.rb +2 -3
  320. data/taskjuggler.gemspec +0 -3
  321. data/tasks/gem.rake +0 -1
  322. data/tasks/help2man.rake +1 -1
  323. data/tasks/manual.rake +1 -1
  324. data/test/TestSuite/CSV-Reports/quotes.tjp +20 -0
  325. data/test/TestSuite/CSV-Reports/refs/celltext.csv +11 -11
  326. data/test/TestSuite/CSV-Reports/refs/quotes.csv +5 -0
  327. data/test/TestSuite/CSV-Reports/refs/resourcereport.csv +3 -3
  328. data/test/TestSuite/CSV-Reports/refs/resourcereport_with_tasks.csv +21 -21
  329. data/test/TestSuite/CSV-Reports/refs/sortByTree.csv +11 -11
  330. data/test/TestSuite/CSV-Reports/refs/sortBy_effort.up.csv +11 -11
  331. data/test/TestSuite/CSV-Reports/refs/sortBy_plan.start.down.csv +11 -11
  332. data/test/TestSuite/CSV-Reports/refs/taskreport.csv +11 -11
  333. data/test/TestSuite/CSV-Reports/refs/taskreport_with_resources.csv +29 -29
  334. data/test/TestSuite/Syntax/Correct/Timezone2.tjp +8 -0
  335. data/test/TestSuite/Syntax/Correct/template.tjp +3 -3
  336. data/test/TestSuite/Syntax/Correct/tutorial.tjp +3 -3
  337. data/test/TestSuite/Syntax/Errors/time_error.tjp +9 -0
  338. data/test/test_BatchProcessor.rb +6 -3
  339. metadata +14 -17
  340. data/man/tj3.1 +0 -130
  341. data/man/tj3client.1 +0 -145
  342. data/man/tj3d.1 +0 -93
  343. data/man/tj3man.1 +0 -76
  344. data/man/tj3ss_receiver.1 +0 -86
  345. data/man/tj3ss_sender.1 +0 -100
  346. data/man/tj3ts_receiver.1 +0 -86
  347. data/man/tj3ts_sender.1 +0 -92
  348. data/man/tj3ts_summary.1 +0 -104
  349. data/man/tj3webd.1 +0 -86
@@ -1,5 +1,5 @@
1
1
  <!DOCTYPE html>
2
- <!-- This file has been generated by tj3man v3.7.1 -->
2
+ <!-- This file has been generated by tj3man v3.8.0 -->
3
3
  <html lang="en" xml:lang="en">
4
4
  <head>
5
5
  <title>weeklymax</title>
@@ -1,5 +1,5 @@
1
1
  <!DOCTYPE html>
2
- <!-- This file has been generated by tj3man v3.7.1 -->
2
+ <!-- This file has been generated by tj3man v3.8.0 -->
3
3
  <html lang="en" xml:lang="en">
4
4
  <head>
5
5
  <title>weeklymin</title>
@@ -1,5 +1,5 @@
1
1
  <!DOCTYPE html>
2
- <!-- This file has been generated by tj3man v3.7.1 -->
2
+ <!-- This file has been generated by tj3man v3.8.0 -->
3
3
  <html lang="en" xml:lang="en">
4
4
  <head>
5
5
  <title>weekstartsmonday</title>
@@ -1,5 +1,5 @@
1
1
  <!DOCTYPE html>
2
- <!-- This file has been generated by tj3man v3.7.1 -->
2
+ <!-- This file has been generated by tj3man v3.8.0 -->
3
3
  <html lang="en" xml:lang="en">
4
4
  <head>
5
5
  <title>weekstartssunday</title>
@@ -1,5 +1,5 @@
1
1
  <!DOCTYPE html>
2
- <!-- This file has been generated by tj3man v3.7.1 -->
2
+ <!-- This file has been generated by tj3man v3.8.0 -->
3
3
  <html lang="en" xml:lang="en">
4
4
  <head>
5
5
  <title>width.column</title>
@@ -1,5 +1,5 @@
1
1
  <!DOCTYPE html>
2
- <!-- This file has been generated by tj3man v3.7.1 -->
2
+ <!-- This file has been generated by tj3man v3.8.0 -->
3
3
  <html lang="en" xml:lang="en">
4
4
  <head>
5
5
  <title>width</title>
@@ -1,5 +1,5 @@
1
1
  <!DOCTYPE html>
2
- <!-- This file has been generated by tj3man v3.7.1 -->
2
+ <!-- This file has been generated by tj3man v3.8.0 -->
3
3
  <html lang="en" xml:lang="en">
4
4
  <head>
5
5
  <title>work</title>
@@ -1,5 +1,5 @@
1
1
  <!DOCTYPE html>
2
- <!-- This file has been generated by tj3man v3.7.1 -->
2
+ <!-- This file has been generated by tj3man v3.8.0 -->
3
3
  <html lang="en" xml:lang="en">
4
4
  <head>
5
5
  <title>workinghours.project</title>
@@ -1,5 +1,5 @@
1
1
  <!DOCTYPE html>
2
- <!-- This file has been generated by tj3man v3.7.1 -->
2
+ <!-- This file has been generated by tj3man v3.8.0 -->
3
3
  <html lang="en" xml:lang="en">
4
4
  <head>
5
5
  <title>workinghours.resource</title>
@@ -1,5 +1,5 @@
1
1
  <!DOCTYPE html>
2
- <!-- This file has been generated by tj3man v3.7.1 -->
2
+ <!-- This file has been generated by tj3man v3.8.0 -->
3
3
  <html lang="en" xml:lang="en">
4
4
  <head>
5
5
  <title>workinghours.shift</title>
@@ -1,5 +1,5 @@
1
1
  <!DOCTYPE html>
2
- <!-- This file has been generated by tj3man v3.7.1 -->
2
+ <!-- This file has been generated by tj3man v3.8.0 -->
3
3
  <html lang="en" xml:lang="en">
4
4
  <head>
5
5
  <title>yearlyworkingdays</title>
@@ -55,7 +55,7 @@ EOT
55
55
  end
56
56
 
57
57
  it 'should generate a trace report' do
58
- File.delete(@tf) if File.exists?(@tf)
58
+ File.delete(@tf) if File.exist?(@tf)
59
59
  tj3(@prj)
60
60
  ref = <<'EOT'
61
61
  "Date";"t1:plan.complete";"t2:plan.complete";"t3:plan.complete"
@@ -48,7 +48,7 @@ EOT
48
48
  else
49
49
  # Wait for the daemon to get online.
50
50
  i = 0
51
- while !File.exists?('.tj3d.uri') && i < 10
51
+ while !File.exist?('.tj3d.uri') && i < 10
52
52
  sleep 0.5
53
53
  i += 1
54
54
  end
@@ -63,7 +63,7 @@ EOT
63
63
  end
64
64
  raise "tj3d termination failed: #{res.stdErr}" if res.returnValue != 0
65
65
  i = 0
66
- while File.exists?('.tj3d.uri') && i < 10
66
+ while File.exist?('.tj3d.uri') && i < 10
67
67
  sleep 0.5
68
68
  i += 1
69
69
  end
@@ -85,4 +85,3 @@ EOT
85
85
  end
86
86
 
87
87
  end
88
-
data/taskjuggler.gemspec CHANGED
@@ -31,7 +31,6 @@ GEM_SPEC = Gem::Specification.new { |s|
31
31
  s.homepage = 'http://www.taskjuggler.org'
32
32
  s.author = 'Chris Schlaeger'
33
33
  s.email = 'chris@linux.com'
34
- s.rubyforge_project = 'taskjuggler'
35
34
  s.summary = 'A Project Management Software'
36
35
  s.description = <<'EOT'
37
36
  TaskJuggler is a modern and powerful, Free and Open Source Software project
@@ -60,7 +59,6 @@ EOT
60
59
  s.test_files = (`git ls-files -- test`).split("\n") +
61
60
  (`git ls-files -- spec`).split("\n")
62
61
 
63
- s.has_rdoc = true
64
62
  s.extra_rdoc_files = %w( README.rdoc COPYING CHANGELOG )
65
63
 
66
64
  s.add_dependency('mail', '~> 2.7', '>= 2.7.1')
@@ -69,4 +67,3 @@ EOT
69
67
  s.platform = Gem::Platform::RUBY
70
68
  s.required_ruby_version = '>= 2.0.0'
71
69
  }
72
-
data/tasks/gem.rake CHANGED
@@ -61,4 +61,3 @@ task :release do
61
61
  Rake::Task[:rdoc].invoke
62
62
  Rake::Task[:gem].invoke
63
63
  end
64
-
data/tasks/help2man.rake CHANGED
@@ -10,7 +10,7 @@ task :help2man => 'man' do
10
10
  help2man.chomp!
11
11
  Dir.foreach('bin') do |prog|
12
12
  next if prog == '.' or prog == '..'
13
- system help2man,"--output=man/#{prog}.1","--no-info","--manual=TaskJuggler",*("--include=h2m/#{prog}.h2m" unless !File.exists?("h2m/#{prog}.h2m")),"bin/#{prog}"
13
+ system help2man,"--output=man/#{prog}.1","--no-info","--manual=TaskJuggler",*("--include=h2m/#{prog}.h2m" unless !File.exist?("h2m/#{prog}.h2m")),"bin/#{prog}"
14
14
  FileUtils.chmod(0644, "man/#{prog}.1")
15
15
  end
16
16
  FileUtils.chmod(0755, 'man')
data/tasks/manual.rake CHANGED
@@ -7,7 +7,7 @@ CLOBBER.include "manual/html/"
7
7
  desc 'Generate User Manual'
8
8
  task :manual do
9
9
  htmldir = 'manual/html'
10
- rm_rf htmldir if File.exists? htmldir
10
+ rm_rf htmldir if File.exist? htmldir
11
11
  mkdir_p htmldir
12
12
  # Make sure we can run 'rake manual' from all subdirs.
13
13
  ENV['TASKJUGGLER_DATA_PATH'] =
@@ -0,0 +1,20 @@
1
+ project "targets" "1.0" 2007-12-16 +3m {
2
+ timezone 'UTC'
3
+ }
4
+
5
+ task t1 "T1"
6
+ task t2 "T2" {
7
+ depends !t1
8
+ }
9
+ task t3 "T3" {
10
+ depends !t1
11
+ }
12
+ task t4 "T4 with \"quotes\"" {
13
+ depends !t3
14
+ }
15
+
16
+ taskreport '.' {
17
+ formats csv
18
+ columns name, targets
19
+ }
20
+
@@ -1,14 +1,14 @@
1
1
  "BSI";"Name"
2
- 1;"Plan Work (plan)"
3
- 1.1;" Plan A (plan.plan_a)"
4
- 1.2;" Plan B (plan.plan_b)"
5
- 1.3;" Plan C (plan.plan_c)"
6
- 2;"Execute Work (execute)"
7
- 2.1;" Step 1 (execute.ex1)"
8
- 2.2;" Step 2 (execute.ex2)"
2
+ "1";"Plan Work (plan)"
3
+ "1.1";" Plan A (plan.plan_a)"
4
+ "1.2";" Plan B (plan.plan_b)"
5
+ "1.3";" Plan C (plan.plan_c)"
6
+ "2";"Execute Work (execute)"
7
+ "2.1";" Step 1 (execute.ex1)"
8
+ "2.2";" Step 2 (execute.ex2)"
9
9
  "2.2.1";" Step 2.1 (execute.ex2.ex2_1)"
10
10
  "2.2.2";" Step 2.2 (execute.ex2.ex2_2)"
11
- 2.4;" Step 3 (execute.ex3)"
12
- 2.5;" Step 4 (execute.ex4)"
13
- 2.3;" Milestone 1 (execute.ms1)"
14
- 3;"Check Work (check)"
11
+ "2.4";" Step 3 (execute.ex3)"
12
+ "2.5";" Step 4 (execute.ex4)"
13
+ "2.3";" Milestone 1 (execute.ms1)"
14
+ "3";"Check Work (check)"
@@ -0,0 +1,5 @@
1
+ "Name";"Targets"
2
+ "T1";"T2 (t2) 2007-12-16, T4 with ""quotes"" (t4) 2007-12-16"
3
+ "T2";""
4
+ "T3";"T4 with ""quotes"" (t4) 2007-12-16"
5
+ "T4 with ""quotes""";""
@@ -1,4 +1,4 @@
1
1
  "BSI";"Name";"Effort";"2007-12-17-00:00:00";"2007-12-24-00:00:00";"2007-12-31-00:00:00";"2008-01-07-00:00:00";"2008-01-14-00:00:00";"2008-01-21-00:00:00";"2008-01-28-00:00:00";"2008-02-04-00:00:00";"2008-02-11-00:00:00";"2008-02-18-00:00:00";"2008-02-25-00:00:00";"2008-03-03-00:00:00";"2008-03-10-00:00:00"
2
- 3;"Jack";17.0;"";"";"";3.0;5.0;4.0;"";5.0;"";"";"";"";""
3
- 1;"Jill";42.5;5.0;2.5;5.0;5.0;5.0;5.0;5.0;5.0;5.0;"";"";"";""
4
- 2;"Joe";14.0;5.0;5.0;"";2.0;"";"";"";2.0;"";"";"";"";""
2
+ "3";"Jack";17.0;"";"";"";3.0;5.0;4.0;"";5.0;"";"";"";"";""
3
+ "1";"Jill";42.5;5.0;2.5;5.0;5.0;5.0;5.0;5.0;5.0;5.0;"";"";"";""
4
+ "2";"Joe";14.0;5.0;5.0;"";2.0;"";"";"";2.0;"";"";"";"";""
@@ -1,22 +1,22 @@
1
1
  "BSI";"Name";"Effort";"2007-12-10-00:00:00";"2007-12-17-00:00:00";"2007-12-24-00:00:00";"2007-12-31-00:00:00";"2008-01-07-00:00:00";"2008-01-14-00:00:00";"2008-01-21-00:00:00";"2008-01-28-00:00:00";"2008-02-04-00:00:00";"2008-02-11-00:00:00";"2008-02-18-00:00:00"
2
- 3;"Jack";17.0;"";"";"";"";3.0;5.0;4.0;"";5.0;"";""
3
- 2;" Execute Work";17.0;"";"";"";"";3.0;5.0;4.0;"";5.0;"";""
4
- 2.2;" Step 2";5.0;"";"";"";"";"";"";"";"";5.0;"";""
5
- " 2.2.2";" Step 2.2";5.0;"";"";"";"";"";"";"";"";5.0;"";""
6
- 2.4;" Step 3";12.0;"";"";"";"";3.0;5.0;4.0;"";"";"";""
7
- 1;"Jill";42.5;"";5.0;2.5;5.0;5.0;5.0;5.0;5.0;5.0;5.0;""
8
- 1;" Plan Work";12.5;"";5.0;2.5;5.0;"";"";"";"";"";"";""
9
- 1.2;" Plan B";7.5;"";5.0;2.5;"";"";"";"";"";"";"";""
10
- 1.3;" Plan C";5.0;"";"";"";5.0;"";"";"";"";"";"";""
11
- 2;" Execute Work";25.0;"";"";"";"";5.0;5.0;5.0;5.0;5.0;"";""
12
- 2.1;" Step 1";20.0;"";"";"";"";5.0;5.0;5.0;5.0;"";"";""
13
- 2.2;" Step 2";5.0;"";"";"";"";"";"";"";"";5.0;"";""
14
- " 2.2.2";" Step 2.2";5.0;"";"";"";"";"";"";"";"";5.0;"";""
15
- 3;" Check Work";5.0;"";"";"";"";"";"";"";"";"";5.0;""
16
- 2;"Joe";14.0;"";5.0;5.0;"";2.0;"";"";"";2.0;"";""
17
- 1;" Plan Work";10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
18
- 1.1;" Plan A";10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
19
- 2;" Execute Work";4.0;"";"";"";"";2.0;"";"";"";2.0;"";""
20
- 2.2;" Step 2";2.0;"";"";"";"";2.0;"";"";"";"";"";""
21
- " 2.2.1";" Step 2.1";2.0;"";"";"";"";2.0;"";"";"";"";"";""
22
- 2.5;" Step 4";2.0;"";"";"";"";"";"";"";"";2.0;"";""
2
+ "3";"Jack";17.0;"";"";"";"";3.0;5.0;4.0;"";5.0;"";""
3
+ "2";" Execute Work";17.0;"";"";"";"";3.0;5.0;4.0;"";5.0;"";""
4
+ "2.2";" Step 2";5.0;"";"";"";"";"";"";"";"";5.0;"";""
5
+ "2.2.2";" Step 2.2";5.0;"";"";"";"";"";"";"";"";5.0;"";""
6
+ "2.4";" Step 3";12.0;"";"";"";"";3.0;5.0;4.0;"";"";"";""
7
+ "1";"Jill";42.5;"";5.0;2.5;5.0;5.0;5.0;5.0;5.0;5.0;5.0;""
8
+ "1";" Plan Work";12.5;"";5.0;2.5;5.0;"";"";"";"";"";"";""
9
+ "1.2";" Plan B";7.5;"";5.0;2.5;"";"";"";"";"";"";"";""
10
+ "1.3";" Plan C";5.0;"";"";"";5.0;"";"";"";"";"";"";""
11
+ "2";" Execute Work";25.0;"";"";"";"";5.0;5.0;5.0;5.0;5.0;"";""
12
+ "2.1";" Step 1";20.0;"";"";"";"";5.0;5.0;5.0;5.0;"";"";""
13
+ "2.2";" Step 2";5.0;"";"";"";"";"";"";"";"";5.0;"";""
14
+ "2.2.2";" Step 2.2";5.0;"";"";"";"";"";"";"";"";5.0;"";""
15
+ "3";" Check Work";5.0;"";"";"";"";"";"";"";"";"";5.0;""
16
+ "2";"Joe";14.0;"";5.0;5.0;"";2.0;"";"";"";2.0;"";""
17
+ "1";" Plan Work";10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
18
+ "1.1";" Plan A";10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
19
+ "2";" Execute Work";4.0;"";"";"";"";2.0;"";"";"";2.0;"";""
20
+ "2.2";" Step 2";2.0;"";"";"";"";2.0;"";"";"";"";"";""
21
+ "2.2.1";" Step 2.1";2.0;"";"";"";"";2.0;"";"";"";"";"";""
22
+ "2.5";" Step 4";2.0;"";"";"";"";"";"";"";"";2.0;"";""
@@ -1,14 +1,14 @@
1
1
  "BSI";"Name";"Id";"Duration"
2
- 1;"Plan Work";"plan";19.8
3
- 1.1;" Plan A";"plan.plan_a";11.4
4
- 1.2;" Plan B";"plan.plan_b";9.2
5
- 1.3;" Plan C";"plan.plan_c";4.4
6
- 2;"Execute Work";"execute";32.4
7
- 2.1;" Step 1";"execute.ex1";25.4
8
- 2.2;" Step 2";"execute.ex2";32.4
2
+ "1";"Plan Work";"plan";19.8
3
+ "1.1";" Plan A";"plan.plan_a";11.4
4
+ "1.2";" Plan B";"plan.plan_b";9.2
5
+ "1.3";" Plan C";"plan.plan_c";4.4
6
+ "2";"Execute Work";"execute";32.4
7
+ "2.1";" Step 1";"execute.ex1";25.4
8
+ "2.2";" Step 2";"execute.ex2";32.4
9
9
  "2.2.1";" Step 2.1";"execute.ex2.ex2_1";1.4
10
10
  "2.2.2";" Step 2.2";"execute.ex2.ex2_2";4.4
11
- 2.3;" Milestone 1";"execute.ms1";0.0
12
- 2.4;" Step 3";"execute.ex3";15.4
13
- 2.5;" Step 4";"execute.ex4";1.4
14
- 3;"Check Work";"check";4.4
11
+ "2.3";" Milestone 1";"execute.ms1";0.0
12
+ "2.4";" Step 3";"execute.ex3";15.4
13
+ "2.5";" Step 4";"execute.ex4";1.4
14
+ "3";"Check Work";"check";4.4
@@ -1,14 +1,14 @@
1
1
  "Effort";"BSI";"Id"
2
- 0.0;2.3;"execute.ms1"
2
+ 0.0;"2.3";"execute.ms1"
3
3
  2.0;"2.2.1";"execute.ex2.ex2_1"
4
- 2.0;2.5;"execute.ex4"
5
- 5.0;3;"check"
6
- 5.0;1.3;"plan.plan_c"
7
- 7.5;1.2;"plan.plan_b"
4
+ 2.0;"2.5";"execute.ex4"
5
+ 5.0;"3";"check"
6
+ 5.0;"1.3";"plan.plan_c"
7
+ 7.5;"1.2";"plan.plan_b"
8
8
  10.0;"2.2.2";"execute.ex2.ex2_2"
9
- 10.0;1.1;"plan.plan_a"
10
- 12.0;2.2;"execute.ex2"
11
- 12.0;2.4;"execute.ex3"
12
- 20.0;2.1;"execute.ex1"
13
- 22.5;1;"plan"
14
- 46.0;2;"execute"
9
+ 10.0;"1.1";"plan.plan_a"
10
+ 12.0;"2.2";"execute.ex2"
11
+ 12.0;"2.4";"execute.ex3"
12
+ 20.0;"2.1";"execute.ex1"
13
+ 22.5;"1";"plan"
14
+ 46.0;"2";"execute"
@@ -1,14 +1,14 @@
1
1
  "Start";"BSI";"Id"
2
- "2008-02-11-10:00:00-+0100";3;"check"
3
- "2008-02-08-19:00:00-+0100";2.3;"execute.ms1"
2
+ "2008-02-11-10:00:00-+0100";"3";"check"
3
+ "2008-02-08-19:00:00-+0100";"2.3";"execute.ms1"
4
4
  "2008-02-04-10:00:00-+0100";"2.2.2";"execute.ex2.ex2_2"
5
- "2008-02-04-10:00:00-+0100";2.5;"execute.ex4"
6
- "2008-01-09-10:00:00-+0100";2.4;"execute.ex3"
7
- "2008-01-07-10:00:00-+0100";2;"execute"
8
- "2008-01-07-10:00:00-+0100";2.1;"execute.ex1"
9
- "2008-01-07-10:00:00-+0100";2.2;"execute.ex2"
5
+ "2008-02-04-10:00:00-+0100";"2.5";"execute.ex4"
6
+ "2008-01-09-10:00:00-+0100";"2.4";"execute.ex3"
7
+ "2008-01-07-10:00:00-+0100";"2";"execute"
8
+ "2008-01-07-10:00:00-+0100";"2.1";"execute.ex1"
9
+ "2008-01-07-10:00:00-+0100";"2.2";"execute.ex2"
10
10
  "2008-01-07-10:00:00-+0100";"2.2.1";"execute.ex2.ex2_1"
11
- "2007-12-31-10:00:00-+0100";1.3;"plan.plan_c"
12
- "2007-12-17-10:00:00-+0100";1.1;"plan.plan_a"
13
- "2007-12-17-10:00:00-+0100";1.2;"plan.plan_b"
14
- "2007-12-16-01:00:00-+0100";1;"plan"
11
+ "2007-12-31-10:00:00-+0100";"1.3";"plan.plan_c"
12
+ "2007-12-17-10:00:00-+0100";"1.1";"plan.plan_a"
13
+ "2007-12-17-10:00:00-+0100";"1.2";"plan.plan_b"
14
+ "2007-12-16-01:00:00-+0100";"1";"plan"
@@ -1,14 +1,14 @@
1
1
  "BSI";"Name";"Start";"End";"Duration";"Effort";"2007-12-10-00:00:00-+0100";"2007-12-17-00:00:00-+0100";"2007-12-24-00:00:00-+0100";"2007-12-31-00:00:00-+0100";"2008-01-07-00:00:00-+0100";"2008-01-14-00:00:00-+0100";"2008-01-21-00:00:00-+0100";"2008-01-28-00:00:00-+0100";"2008-02-04-00:00:00-+0100";"2008-02-11-00:00:00-+0100";"2008-02-18-00:00:00-+0100"
2
- 1;"Plan Work";"2007-12-16-01:00:00-+0100";"2008-01-04-19:00:00-+0100";19.8;22.5;"";10.0;7.5;5.0;"";"";"";"";"";"";""
3
- 1.1;" Plan A";"2007-12-17-10:00:00-+0100";"2007-12-28-19:00:00-+0100";11.4;10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
4
- 1.2;" Plan B";"2007-12-17-10:00:00-+0100";"2007-12-26-15:00:00-+0100";9.2;7.5;"";5.0;2.5;"";"";"";"";"";"";"";""
5
- 1.3;" Plan C";"2007-12-31-10:00:00-+0100";"2008-01-04-19:00:00-+0100";4.4;5.0;"";"";"";5.0;"";"";"";"";"";"";""
6
- 2;"Execute Work";"2008-01-07-10:00:00-+0100";"2008-02-08-19:00:00-+0100";32.4;46.0;"";"";"";"";10.0;10.0;9.0;5.0;12.0;"";""
7
- 2.1;" Step 1";"2008-01-07-10:00:00-+0100";"2008-02-01-19:00:00-+0100";25.4;20.0;"";"";"";"";5.0;5.0;5.0;5.0;"";"";""
8
- 2.2;" Step 2";"2008-01-07-10:00:00-+0100";"2008-02-08-19:00:00-+0100";32.4;12.0;"";"";"";"";2.0;"";"";"";10.0;"";""
2
+ "1";"Plan Work";"2007-12-16-01:00:00-+0100";"2008-01-04-19:00:00-+0100";19.8;22.5;"";10.0;7.5;5.0;"";"";"";"";"";"";""
3
+ "1.1";" Plan A";"2007-12-17-10:00:00-+0100";"2007-12-28-19:00:00-+0100";11.4;10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
4
+ "1.2";" Plan B";"2007-12-17-10:00:00-+0100";"2007-12-26-15:00:00-+0100";9.2;7.5;"";5.0;2.5;"";"";"";"";"";"";"";""
5
+ "1.3";" Plan C";"2007-12-31-10:00:00-+0100";"2008-01-04-19:00:00-+0100";4.4;5.0;"";"";"";5.0;"";"";"";"";"";"";""
6
+ "2";"Execute Work";"2008-01-07-10:00:00-+0100";"2008-02-08-19:00:00-+0100";32.4;46.0;"";"";"";"";10.0;10.0;9.0;5.0;12.0;"";""
7
+ "2.1";" Step 1";"2008-01-07-10:00:00-+0100";"2008-02-01-19:00:00-+0100";25.4;20.0;"";"";"";"";5.0;5.0;5.0;5.0;"";"";""
8
+ "2.2";" Step 2";"2008-01-07-10:00:00-+0100";"2008-02-08-19:00:00-+0100";32.4;12.0;"";"";"";"";2.0;"";"";"";10.0;"";""
9
9
  "2.2.1";" Step 2.1";"2008-01-07-10:00:00-+0100";"2008-01-08-19:00:00-+0100";1.4;2.0;"";"";"";"";2.0;"";"";"";"";"";""
10
10
  "2.2.2";" Step 2.2";"2008-02-04-10:00:00-+0100";"2008-02-08-19:00:00-+0100";4.4;10.0;"";"";"";"";"";"";"";"";10.0;"";""
11
- 2.4;" Step 3";"2008-01-09-10:00:00-+0100";"2008-01-24-19:00:00-+0100";15.4;12.0;"";"";"";"";3.0;5.0;4.0;"";"";"";""
12
- 2.5;" Step 4";"2008-02-04-10:00:00-+0100";"2008-02-05-19:00:00-+0100";1.4;2.0;"";"";"";"";"";"";"";"";2.0;"";""
13
- 2.3;" Milestone 1";"2008-02-08-19:00:00-+0100";"2008-02-08-19:00:00-+0100";0.0;0.0;"";"";"";"";"";"";"";"";"";"";""
14
- 3;"Check Work";"2008-02-11-10:00:00-+0100";"2008-02-15-19:00:00-+0100";4.4;5.0;"";"";"";"";"";"";"";"";"";5.0;""
11
+ "2.4";" Step 3";"2008-01-09-10:00:00-+0100";"2008-01-24-19:00:00-+0100";15.4;12.0;"";"";"";"";3.0;5.0;4.0;"";"";"";""
12
+ "2.5";" Step 4";"2008-02-04-10:00:00-+0100";"2008-02-05-19:00:00-+0100";1.4;2.0;"";"";"";"";"";"";"";"";2.0;"";""
13
+ "2.3";" Milestone 1";"2008-02-08-19:00:00-+0100";"2008-02-08-19:00:00-+0100";0.0;0.0;"";"";"";"";"";"";"";"";"";"";""
14
+ "3";"Check Work";"2008-02-11-10:00:00-+0100";"2008-02-15-19:00:00-+0100";4.4;5.0;"";"";"";"";"";"";"";"";"";5.0;""
@@ -1,32 +1,32 @@
1
1
  "BSI";"Name";"Start";"End";"Duration";"Effort";"2007-12-10-00:00:00-+0100";"2007-12-17-00:00:00-+0100";"2007-12-24-00:00:00-+0100";"2007-12-31-00:00:00-+0100";"2008-01-07-00:00:00-+0100";"2008-01-14-00:00:00-+0100";"2008-01-21-00:00:00-+0100";"2008-01-28-00:00:00-+0100";"2008-02-04-00:00:00-+0100";"2008-02-11-00:00:00-+0100";"2008-02-18-00:00:00-+0100"
2
- 1;"Plan Work";"2007-12-16-01:00:00-+0100";"2008-01-04-19:00:00-+0100";19.8;22.5;"";10.0;7.5;5.0;"";"";"";"";"";"";""
3
- 1;" Jill";"";"";"";12.5;"";5.0;2.5;5.0;"";"";"";"";"";"";""
4
- 2;" Joe";"";"";"";10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
5
- 1.1;" Plan A";"2007-12-17-10:00:00-+0100";"2007-12-28-19:00:00-+0100";11.4;10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
6
- 2;" Joe";"";"";"";10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
7
- 1.2;" Plan B";"2007-12-17-10:00:00-+0100";"2007-12-26-15:00:00-+0100";9.2;7.5;"";5.0;2.5;"";"";"";"";"";"";"";""
8
- 1;" Jill";"";"";"";7.5;"";5.0;2.5;"";"";"";"";"";"";"";""
9
- 1.3;" Plan C";"2007-12-31-10:00:00-+0100";"2008-01-04-19:00:00-+0100";4.4;5.0;"";"";"";5.0;"";"";"";"";"";"";""
10
- 1;" Jill";"";"";"";5.0;"";"";"";5.0;"";"";"";"";"";"";""
11
- 2;"Execute Work";"2008-01-07-10:00:00-+0100";"2008-02-08-19:00:00-+0100";32.4;46.0;"";"";"";"";10.0;10.0;9.0;5.0;12.0;"";""
12
- 3;" Jack";"";"";"";17.0;"";"";"";"";3.0;5.0;4.0;"";5.0;"";""
13
- 1;" Jill";"";"";"";25.0;"";"";"";"";5.0;5.0;5.0;5.0;5.0;"";""
14
- 2;" Joe";"";"";"";4.0;"";"";"";"";2.0;"";"";"";2.0;"";""
15
- 2.1;" Step 1";"2008-01-07-10:00:00-+0100";"2008-02-01-19:00:00-+0100";25.4;20.0;"";"";"";"";5.0;5.0;5.0;5.0;"";"";""
16
- 1;" Jill";"";"";"";20.0;"";"";"";"";5.0;5.0;5.0;5.0;"";"";""
17
- 2.2;" Step 2";"2008-01-07-10:00:00-+0100";"2008-02-08-19:00:00-+0100";32.4;12.0;"";"";"";"";2.0;"";"";"";10.0;"";""
18
- 3;" Jack";"";"";"";5.0;"";"";"";"";"";"";"";"";5.0;"";""
19
- 1;" Jill";"";"";"";5.0;"";"";"";"";"";"";"";"";5.0;"";""
20
- 2;" Joe";"";"";"";2.0;"";"";"";"";2.0;"";"";"";"";"";""
2
+ "1";"Plan Work";"2007-12-16-01:00:00-+0100";"2008-01-04-19:00:00-+0100";19.8;22.5;"";10.0;7.5;5.0;"";"";"";"";"";"";""
3
+ "1";" Jill";"";"";"";12.5;"";5.0;2.5;5.0;"";"";"";"";"";"";""
4
+ "2";" Joe";"";"";"";10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
5
+ "1.1";" Plan A";"2007-12-17-10:00:00-+0100";"2007-12-28-19:00:00-+0100";11.4;10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
6
+ "2";" Joe";"";"";"";10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
7
+ "1.2";" Plan B";"2007-12-17-10:00:00-+0100";"2007-12-26-15:00:00-+0100";9.2;7.5;"";5.0;2.5;"";"";"";"";"";"";"";""
8
+ "1";" Jill";"";"";"";7.5;"";5.0;2.5;"";"";"";"";"";"";"";""
9
+ "1.3";" Plan C";"2007-12-31-10:00:00-+0100";"2008-01-04-19:00:00-+0100";4.4;5.0;"";"";"";5.0;"";"";"";"";"";"";""
10
+ "1";" Jill";"";"";"";5.0;"";"";"";5.0;"";"";"";"";"";"";""
11
+ "2";"Execute Work";"2008-01-07-10:00:00-+0100";"2008-02-08-19:00:00-+0100";32.4;46.0;"";"";"";"";10.0;10.0;9.0;5.0;12.0;"";""
12
+ "3";" Jack";"";"";"";17.0;"";"";"";"";3.0;5.0;4.0;"";5.0;"";""
13
+ "1";" Jill";"";"";"";25.0;"";"";"";"";5.0;5.0;5.0;5.0;5.0;"";""
14
+ "2";" Joe";"";"";"";4.0;"";"";"";"";2.0;"";"";"";2.0;"";""
15
+ "2.1";" Step 1";"2008-01-07-10:00:00-+0100";"2008-02-01-19:00:00-+0100";25.4;20.0;"";"";"";"";5.0;5.0;5.0;5.0;"";"";""
16
+ "1";" Jill";"";"";"";20.0;"";"";"";"";5.0;5.0;5.0;5.0;"";"";""
17
+ "2.2";" Step 2";"2008-01-07-10:00:00-+0100";"2008-02-08-19:00:00-+0100";32.4;12.0;"";"";"";"";2.0;"";"";"";10.0;"";""
18
+ "3";" Jack";"";"";"";5.0;"";"";"";"";"";"";"";"";5.0;"";""
19
+ "1";" Jill";"";"";"";5.0;"";"";"";"";"";"";"";"";5.0;"";""
20
+ "2";" Joe";"";"";"";2.0;"";"";"";"";2.0;"";"";"";"";"";""
21
21
  "2.2.1";" Step 2.1";"2008-01-07-10:00:00-+0100";"2008-01-08-19:00:00-+0100";1.4;2.0;"";"";"";"";2.0;"";"";"";"";"";""
22
- 2;" Joe";"";"";"";2.0;"";"";"";"";2.0;"";"";"";"";"";""
22
+ "2";" Joe";"";"";"";2.0;"";"";"";"";2.0;"";"";"";"";"";""
23
23
  "2.2.2";" Step 2.2";"2008-02-04-10:00:00-+0100";"2008-02-08-19:00:00-+0100";4.4;10.0;"";"";"";"";"";"";"";"";10.0;"";""
24
- 3;" Jack";"";"";"";5.0;"";"";"";"";"";"";"";"";5.0;"";""
25
- 1;" Jill";"";"";"";5.0;"";"";"";"";"";"";"";"";5.0;"";""
26
- 2.4;" Step 3";"2008-01-09-10:00:00-+0100";"2008-01-24-19:00:00-+0100";15.4;12.0;"";"";"";"";3.0;5.0;4.0;"";"";"";""
27
- 3;" Jack";"";"";"";12.0;"";"";"";"";3.0;5.0;4.0;"";"";"";""
28
- 2.5;" Step 4";"2008-02-04-10:00:00-+0100";"2008-02-05-19:00:00-+0100";1.4;2.0;"";"";"";"";"";"";"";"";2.0;"";""
29
- 2;" Joe";"";"";"";2.0;"";"";"";"";"";"";"";"";2.0;"";""
30
- 2.3;" Milestone 1";"2008-02-08-19:00:00-+0100";"2008-02-08-19:00:00-+0100";0.0;0.0;"";"";"";"";"";"";"";"";"";"";""
31
- 3;"Check Work";"2008-02-11-10:00:00-+0100";"2008-02-15-19:00:00-+0100";4.4;5.0;"";"";"";"";"";"";"";"";"";5.0;""
32
- 1;" Jill";"";"";"";5.0;"";"";"";"";"";"";"";"";"";5.0;""
24
+ "3";" Jack";"";"";"";5.0;"";"";"";"";"";"";"";"";5.0;"";""
25
+ "1";" Jill";"";"";"";5.0;"";"";"";"";"";"";"";"";5.0;"";""
26
+ "2.4";" Step 3";"2008-01-09-10:00:00-+0100";"2008-01-24-19:00:00-+0100";15.4;12.0;"";"";"";"";3.0;5.0;4.0;"";"";"";""
27
+ "3";" Jack";"";"";"";12.0;"";"";"";"";3.0;5.0;4.0;"";"";"";""
28
+ "2.5";" Step 4";"2008-02-04-10:00:00-+0100";"2008-02-05-19:00:00-+0100";1.4;2.0;"";"";"";"";"";"";"";"";2.0;"";""
29
+ "2";" Joe";"";"";"";2.0;"";"";"";"";"";"";"";"";2.0;"";""
30
+ "2.3";" Milestone 1";"2008-02-08-19:00:00-+0100";"2008-02-08-19:00:00-+0100";0.0;0.0;"";"";"";"";"";"";"";"";"";"";""
31
+ "3";"Check Work";"2008-02-11-10:00:00-+0100";"2008-02-15-19:00:00-+0100";4.4;5.0;"";"";"";"";"";"";"";"";"";5.0;""
32
+ "1";" Jill";"";"";"";5.0;"";"";"";"";"";"";"";"";"";5.0;""
@@ -0,0 +1,8 @@
1
+ project tz "Timezone" "1.0" 2005-06-06-00:00-+1300 - 2005-06-07-0:00-+1300 {
2
+ timezone "Pacific/Auckland"
3
+ }
4
+
5
+ task item "Project" {
6
+ start 2005-06-06-12:00
7
+ }
8
+
@@ -242,9 +242,9 @@ taskreport overview "" {
242
242
  # Macro to set the background color of a cell according to the alert
243
243
  # level of the task.
244
244
  macro AlertColor [
245
- cellcolor plan.alert = 0 "#00D000" # green
246
- cellcolor plan.alert = 1 "#D0D000" # yellow
247
- cellcolor plan.alert = 2 "#D00000" # red
245
+ cellcolor plan.alert = 0 "#90FF90" # green
246
+ cellcolor plan.alert = 1 "#FFFF90" # yellow
247
+ cellcolor plan.alert = 2 "#FF9090" # red
248
248
  ]
249
249
 
250
250
  taskreport status "" {
@@ -564,9 +564,9 @@ taskreport overview "" {
564
564
  # Macro to set the background color of a cell according to the alert
565
565
  # level of the task.
566
566
  macro AlertColor [
567
- cellcolor plan.alert = 0 "#00D000" # green
568
- cellcolor plan.alert = 1 "#D0D000" # yellow
569
- cellcolor plan.alert = 2 "#D00000" # red
567
+ cellcolor plan.alert = 0 "#90FF90" # green
568
+ cellcolor plan.alert = 1 "#FFFF90" # yellow
569
+ cellcolor plan.alert = 2 "#FF9090" # red
570
570
  ]
571
571
 
572
572
  taskreport status "" {
@@ -0,0 +1,9 @@
1
+ # MARK: error 2 time_error
2
+ project tz "Timezone" "1.0" 2005-06-06-00:00-+0000 - 2005-06-07-0:00-+1401 {
3
+ timezone "Europe/Athens"
4
+ }
5
+
6
+ task item "Project" {
7
+ start 2005-06-06-12:00
8
+ }
9
+
@@ -32,6 +32,10 @@ class TestProject < Test::Unit::TestCase
32
32
  @t.kill
33
33
  end
34
34
 
35
+ def test_basic
36
+ doRun(1, 1) { sleep 0.1 }
37
+ end
38
+
35
39
  def test_simple
36
40
  doRun(1, 1) { sleep 0.1 }
37
41
  doRun(1, 2) { sleep 0.1 }
@@ -63,7 +67,6 @@ class TestProject < Test::Unit::TestCase
63
67
  @cnt = 0
64
68
  lock = Monitor.new
65
69
  bp.wait do |j|
66
- puts "Signal error" if j.retVal.signaled?
67
70
  postprocess(j)
68
71
  lock.synchronize { @cnt += 1 }
69
72
  end
@@ -75,12 +78,12 @@ class TestProject < Test::Unit::TestCase
75
78
  yield
76
79
  $stderr.puts "Error #{n}" if n % 2 == 0
77
80
  puts "Job #{n} finished"
81
+ # Return the job ID as return value
78
82
  n
79
83
  end
80
84
 
81
85
  def postprocess(job)
82
- assert_equal(job.retVal.exitstatus, job.jobId, 'JobID mismatch')
83
- assert_equal(job.retVal.pid, job.pid, 'PID mismatch')
86
+ assert_equal(job.retVal, job.jobId, 'PID mismatch')
84
87
  assert_equal("job #{job.jobId}", job.tag)
85
88
  text = <<"EOT"
86
89
  Job #{job.jobId} started