From 2cae1df42f7bc72fa1150baabd1152faf2ee4d42 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 1 Nov 2008 16:31:30 -0400 Subject: [PATCH] - Merged 1.4.3 to master --- AUTHORS | 1 + ChangeLog | 9 + NEWS | 2 +- TUTORIAL | 6 + announcement.txt | 36 ---- configure.ac | 4 +- html/30second.html | 2 +- html/advanced.html | 20 ++- html/color.html | 2 +- html/config.html | 38 +++- html/date.html | 2 +- html/filter.html | 92 ++++++++++ html/recur.html | 2 +- html/setup.html | 2 +- html/shadow.html | 98 ++++++++++ html/shell.html | 2 +- html/simple.html | 2 +- html/task.html | 22 +-- html/usage.html | 2 +- html/versions.html | 6 + src/.gitignore | 1 - src/TDB.cpp | 27 ++- src/TDB.h | 10 +- src/command.cpp | 277 ++++++++++++++++------------- src/report.cpp | 433 +++++++++++++++++++++++++++++---------------- src/task.cpp | 231 +++++++++++++++++------- src/task.h | 52 +++--- 27 files changed, 950 insertions(+), 431 deletions(-) create mode 100644 TUTORIAL delete mode 100644 announcement.txt create mode 100644 html/filter.html create mode 100644 html/shadow.html diff --git a/AUTHORS b/AUTHORS index d045cad9b..027de8b31 100644 --- a/AUTHORS +++ b/AUTHORS @@ -17,4 +17,5 @@ With thanks to: Stas Antons Vincent Fleuranceau T. Charles Yun + ArchiMark diff --git a/ChangeLog b/ChangeLog index c9f0cdaab..c2b641218 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,15 @@ ------ old releases ------------------------------ +1.4.3 (10/9/2008) + + Fixed misleading task count at bottom on "info" report. + + Added support for a shadow file that contains a plain text task report, + with the "shadow.file" and "shadow.command" configuration variables. + The shadow file is automatically updated whenever the task database + changes. Useful for integrating with "Samurize". + +------ old releases ------------------------------ + 1.4.2 (9/18/2008) + "task undo" can now retract a "task done" command, provided no reports have been run (and therefore TDB::gc run) diff --git a/NEWS b/NEWS index 7698ef623..e936a4cb7 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -Welcome to Task 1.5.0. +Welcome to Task 1.4.3. Task has been built and tested on the following configurations: diff --git a/TUTORIAL b/TUTORIAL new file mode 100644 index 000000000..e389b623a --- /dev/null +++ b/TUTORIAL @@ -0,0 +1,6 @@ + +This TUTORIAL file has been deprecated. It is superseded by a richer and more +extensive online version that can be found at: + + http://www.beckingham.net/task.html + diff --git a/announcement.txt b/announcement.txt deleted file mode 100644 index 037106408..000000000 --- a/announcement.txt +++ /dev/null @@ -1,36 +0,0 @@ -Some considerable time ago - longer than I had hoped - I demonstrated an -alternate implementation of the todo script, called task, in the form of a -YouTube movie: - - http://www.youtube.com/watch?v=l68LCl6BYvs - -A lot has happened since then, and the task program has been slowly improving -thanks to feedback from some early testers, and continuous use by me. Today, -I have uploaded a new movie: - - http://www.youtube.com/watch?v=D2Kn4DMOVSw - -This movie includes most of the changes and improvements to task, but behind -the scenes are the biggest changes. There was a rewrite of the underlying -storage mechanism yielding a clean API for the front end, and the code was -reviewed for portability and converted to use GNU autoconf/automake. - -Task has been released under GPL, and so far has been tested on: - - Max OS X 10.4 (Tiger) - Max OS X 10.5 (Leopard) - Fedora 8 - Fedora 9 - Ubuntu 8 (Hardy Heron) - Solaris 10 - -Task has been making me more organized and productive for some time now. -Perhaps some of you might find it useful, and I welcome feedback of all kinds. - -You can find the task source code at: - - http://www.beckingham.net/task-1.0.0.tar.gz - -Thank you. -Paul Beckingham - diff --git a/configure.ac b/configure.ac index e89a1aa53..0c1c977b3 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(task, 1.5.0, bugs@beckingham.net) +AC_INIT(task, 1.4.3, bugs@beckingham.net) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src/task.cpp]) AC_CONFIG_HEADER([auto.h]) @@ -19,7 +19,7 @@ AC_CHECK_LIB(ncurses,endwin) # Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS([stdlib.h sys/file.h sys/stat.h sys/time.h unistd.h]) -AC_CHECK_HEADERS([string vector map]) +AC_CHECK_HEADERS([sstream string vector map]) # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL diff --git a/html/30second.html b/html/30second.html index f1450c650..227b0bbf2 100644 --- a/html/30second.html +++ b/html/30second.html @@ -1,7 +1,7 @@ - Task 1.4.1 + 30-Second Tutorial diff --git a/html/advanced.html b/html/advanced.html index 07f293754..97a344cdb 100644 --- a/html/advanced.html +++ b/html/advanced.html @@ -1,7 +1,7 @@ - Task 1.4.1 + Advanced Usage @@ -313,6 +313,24 @@ ID Project Pri Description This command displays all the colors that task supports.

+ % task usage +

+ If logging has been enabled by the "command.logging=on" directive + in the .taskrc file, then task will record every command that is + run. When this command is run, task will display a count of how + many times each command was used. + +

+ +

+ This command is for the purpose of seeing whether command are + actually used. +

+ +

+ This command is deprecated, and will be removed in task 1.5.0 +

+ % task version

This can be used to show the version number of task, and to display diff --git a/html/color.html b/html/color.html index 72c70772b..f88357e0c 100644 --- a/html/color.html +++ b/html/color.html @@ -1,7 +1,7 @@ - Task 1.4.1 + Color Usage diff --git a/html/config.html b/html/config.html index 37cd127b8..144df2498 100644 --- a/html/config.html +++ b/html/config.html @@ -1,7 +1,7 @@ - Task 1.4.1 + Task Configuration @@ -279,6 +279,42 @@ ID Project Pri Description preceding "task" program name.

+ +
shadow.file
+
+

+ If specified, designates a file path that will be autoamtically + written to by task, whenever the task database changes. In other + words, it is automatically kept up to date. +

+ +

+ The shadow.command configuration variable is used to determine + which report is written to the shadow file. There is no color + used in the shadow file. +

+ +

+ This feature can be useful in maintaining a current file for + use by the "Samurize" program. +

+
+ +
shadow.command
+
+

+ This is the command that is run to maintain the shadow file, + determined by the shadow.file configuration variable. The + format is identical to that of default.command - please see + the documentation for default.command. +

+ +

+ If this command is not specified, task will use the default.command + value instead. If that is not specified, the command "list" is used. +

+
+
diff --git a/html/date.html b/html/date.html index 0d4c8b711..f5dcee84a 100644 --- a/html/date.html +++ b/html/date.html @@ -1,7 +1,7 @@ - Task 1.4.1 + Date Handling diff --git a/html/filter.html b/html/filter.html new file mode 100644 index 000000000..af801375b --- /dev/null +++ b/html/filter.html @@ -0,0 +1,92 @@ + + + + Task Filters + + + + + +
+ + + + + + +
+ + +
+
+
+
+

Task Filters

+
+

+

+
+ +
+
+
+

+ Copyright 2006-2008, P. Beckingham. All rights reserved. +

+
+ +
+ 		+
+
+
+
+
+
+
+
+
+
+ + + +
+ +
+ + + + + + + diff --git a/html/recur.html b/html/recur.html index ca7e9d626..2a72f76b6 100644 --- a/html/recur.html +++ b/html/recur.html @@ -1,7 +1,7 @@ - Task 1.4.1 + Recurring Tasks diff --git a/html/setup.html b/html/setup.html index 209260e28..68ecbf8b6 100644 --- a/html/setup.html +++ b/html/setup.html @@ -1,7 +1,7 @@ - Task 1.4.1 + Task Setup diff --git a/html/shadow.html b/html/shadow.html new file mode 100644 index 000000000..c1d0f5926 --- /dev/null +++ b/html/shadow.html @@ -0,0 +1,98 @@ + + + + Task Shadow Files + + + + + +
+ + + + + + +
+ + +
+
+
+
+

Task Shadow Files

+
+

+ + + + + + +

+
+ +
+
+
+

+ Copyright 2006-2008, P. Beckingham. All rights reserved. +

+
+ +
+ 		+
+
+
+
+
+
+
+
+
+
+ + + +
+ +
+ + + + + + + diff --git a/html/shell.html b/html/shell.html index 147ea2aa4..6bade3cc6 100644 --- a/html/shell.html +++ b/html/shell.html @@ -1,7 +1,7 @@ - Task 1.4.1 + Interacting with the Shell diff --git a/html/simple.html b/html/simple.html index cfa72564f..85ca5782b 100644 --- a/html/simple.html +++ b/html/simple.html @@ -1,7 +1,7 @@ - Task 1.4.1 + Simple Usage diff --git a/html/task.html b/html/task.html index aeafd3ecf..0c0236789 100644 --- a/html/task.html +++ b/html/task.html @@ -1,7 +1,7 @@ - Task 1.5.0 + Latest Release @@ -54,8 +54,8 @@
  • Date Handling
  • Troubleshooting
  • Old Versions - -
  • Filters (coming soon) +
  • Filters (coming soon) +
  • Shadow Files (coming soon)

    @@ -75,26 +75,28 @@ - + - + - +
    Source:task-1.5.0.tar.gztask-1.4.3.tar.gz
    Mac OS X 10.5 (Leopard) Intel-only:task-1.5.0.pkgtask-1.4.3.pkg
    Debian package: (Thanks to Richard Querin): task_1.5.0-1_i386.debtask_1.4.3-1_i386.deb
    -

    New in version 1.5.0 (?)

    +

    New in version 1.4.3 (9/18/2008)

    diff --git a/html/usage.html b/html/usage.html index 97b98f5df..92b7b1d88 100644 --- a/html/usage.html +++ b/html/usage.html @@ -1,7 +1,7 @@ - Task 1.4.1 + Task Usage diff --git a/html/versions.html b/html/versions.html index 190a7251a..409c74fa4 100644 --- a/html/versions.html +++ b/html/versions.html @@ -38,6 +38,12 @@

    New in version 1.4.2 (9/18/2008)

    task-1.4.2.tar.gz +
    + Mac OS X 10.5 (Leopard) Intel-only: + task-1.4.2.pkg +
    + Debian package: task_1.4.2-1_i386.deb + (Thanks to Richard Querin)