- Now uses "defaultwidth" configuration variable for when ncurses support is not available

- Added the new movie to the task.html page

AUTHORS

@@ -1,7 +1,14 @@
-Principal Author
+Principal Author:
   Paul Beckingham, paul@beckingham.net
 
-Contributing Authors
+Contributing Authors:
+  Damian Glenny
 
-Testers
+With thanks to:
+  Eugene Kramer
+  Srijith K
+  Richard Querin
+  Bruce Israel
+  Thomas Engel
+  Nishiishii
 

COPYING

@@ -278,63 +278,4 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
 
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

ChangeLog

@@ -1,20 +1,75 @@
-1.1.0 (?)
+Version numbers are of the form:
-  - Command line specification of .taskrc file
 
-1.0.0 (?)
+    x.y.z
-  - New movie made, uploaded
+
-  - Bug: assertion fails on mobile for t v
+where the x represents a major version number, or architecture.  The y
-  - Bug: configure.ac does not properly determine ncurses availability
+represents a feature release, and the z represents a patch.
-  - Bug: when run without arguments, task dumps core on Solaris 10
+
-  - Bug: Cannot seem to use the percent character in a task description
+------ plans -------------------------------------
-  - Bug: New installation "task stats" reports newest task 12/31/1969
+
-  - Bug: New installation task projects displays header but no data - should short-circuit
+- Configurable columns in reports
-  + Bug: incorrect color specification in sample .taskrc file
+- Dependencies
+
+1.4.0 (?)
+  + Bug: "showage" configuration variable should apply to all reprts, not
+    just the ones based on "list"
+  + New configuration variable, "defaultwidth" that determines the width
+    of tables when ncurses support is not available
 
 ------ reality -----------------------------------
 
+1.3.0 (6/18/2008)
+  + "task calendar" now displays multiple months per line, adjustable by the
+    "monthsperline" configuration variable.  Feature added by Damian Glenny
+  + "task export" can now filter tasks like the reports
+  + Factored out code to filter tasks
+  + Displays shorter message when a command is entered incorrectly, and the
+    full usage for "task help"
+  + "task oldest" shows the oldest tasks
+  + "task newest" shows the newest tasks
+  + Bug: Segmentation fault when no "dateformat" configuration variable
+    specified
+  + Bug: Fixed bug whereby if you have more than one task with a due date, 7
+    days gets added to the entry date of task 2..n
+  + Bug: Fixed bug whereby "1 wks" was being improperly pluralized
+
+1.2.0 (6/13/2008)
+  + Bug: "dateformat" configuration variable used to display dates, but
+    not parse them
+  + "task list x" now performs a caseless comparison between "x" and the
+    description
+  + Task sub projects supported
+  + "showage" confguration determines whether "Age" column appears on the
+    "list" and "next" reports
+  + Improved TUTORIAL
+
+1.1.0 (6/7/2008)
+  + "blanklines" configuration to stop displaying unnecessary white
+     space and thus work better on small-screen devices
+  + "dateformat" configuration now determines how dates are formatted
+  + Better formatting of "task tags" output
+  + http://www.beckingham.net/task.html home page set up
+  + Added tags to the "task long" report
+
+1.0.1 (6/4/2008)
+  + Bug: UUID generator not properly terminating string.
+  + Bug: srandom/srand not called prior to UUID generation.
+
+1.0.0 (6/3/2008)
+  + New movie made, uploaded
+  + Bug: assertion fails on mobile for t v
+  + Bug: configure.ac does not properly determine ncurses availability
+  + Bug: Cannot seem to use the percent character in a task description
+  + Bug: New installation "task stats" reports newest task 12/31/1969
+  + Bug: New installation task projects displays header but no data - should short-circuit
+  + Bug: incorrect color specification in sample .taskrc file
+  + Bug: when run without arguments, task dumps core on Solaris 10
+  + "task calendar" now reports all months with due pending tasks
+  + Added rules for colorization by tag, project and keyword
+  + Added legend to "task calendar"
+
 0.9.9 (5/27/2008)
-  + Autoconf/autmake behaving properly.
+  + Autoconf/automake behaving properly.
   + Clean build on OS X 10.5.
   + Clean build on Ubuntu 8.0.
   + Clean build on Fedora Core 8.
@@ -105,6 +160,7 @@
   + File locking
   + retain deleted tasks
   + "task info ID" report showing all metadata
+  + File format v2
 
 [Development hiatus while planning for T, TDB API, new features and the future
 of the project.  Seeded to two testers for feedback, suggestions.]

DEVELOPERS

@@ -16,5 +16,5 @@ included.
   color.cpp       Color support functions.
   rules.cpp       Auto-colorization rules.
 
-Don't forget, please send patches to task@beckingham.net
+Don't forget, please send bugs, patches to task@beckingham.net
 

NEWS

@@ -1,23 +1,22 @@
-Welcome to Task 1.0.0.
+Welcome to Task 1.4.0.
 
 Task has been built and tested on the following configurations:
 
+  - OS X 10.4 Tiger
   - OS X 10.5 Leopard
   - Fedora Core 8
   - Fedora Core 9
-  - Ubuntu 8
+  - Ubuntu 8 Hardy Heron
-
+  - Solaris 10
-Known Issues:
+  - Cygwin 1.5.25-14
-
-  - problems running on Solaris 10
 
 While Task has undergone testing, bugs are sure to remain.  If you encounter a
-bug, please contact me at bugs@beckingham.net.  Here is what you could do, in
+bug, please contact me at task@beckingham.net.  Here is what you could do, in
 order of increasing effort (to you) and usefulness (to me):
 
   - Do nothing.  Bug probably won't get fixed.
 
-  - Send an email to bugs@beckingham.net, explaining what you saw.  The bug
+  - Send an email to task@beckingham.net, explaining what you saw.  The bug
     will be addressed, and a new release will be made.  You will be a hero.
 
   - Send an email, and a reproducible test case in the form of the few commands

README

@@ -4,6 +4,7 @@ Thank you for taking a look at task.  Task is a GTD utility featuring:
   - Tags
   - Colorful, tabular output
   - Reports
+  - Lots of commands
   - Low-level API
   - Abbreviations for all commands, options
   - Multi-user file locking
@@ -21,7 +22,7 @@ task movie on YouTube:
 
 or the new improved one:
 
-  http:/www.youtube.com/watch?v=????????????
+  http://www.youtube.com/watch?v=D2Kn4DMOVSw
 
 Either will give you a fairly good idea of what task is capable of, and whether
 it fits in to your way of working.  As a command line application, task is not
@@ -42,3 +43,6 @@ All feedback is welcome, in addition to any bug reports or patches to:
 
 Got an idea for an enhancement?  Send a message!
 
+I have found that task makes me more productive and organized.  I hope task can
+do the same for you.  
+

TUTORIAL

@@ -1,4 +1,4 @@
-Task program tutorial, for version 1.0.0
+Task program tutorial, for version 1.4.0
 ----------------------------------------
 
 This guide shows how to quickly set up the task program, and become proficient
@@ -21,15 +21,15 @@ Build the task program according to the directions in the INSTALL file.  This
 transcript illustrates a typical installation:
 
   % ls
-  task-1.0.0.tar.gz
+  task-1.4.0.tar.gz
-  % gunzip task-1.0.0.tar.gz
+  % gunzip task-1.4.0.tar.gz
-  % tar xf task-1.0.0.tar
+  % tar xf task-1.4.0.tar
-  % cd task-1.0.0
+  % cd task-1.4.0
   % ./configure
   ...
   % make
   ...
-  % make install
+  % make install     # (may require sudo, depending on --prefix)
 
 You need to make sure that the installed task program is in your PATH
 environment variable.
@@ -67,7 +67,7 @@ interface.  Let us take a look at those tasks:
 
   % task ls
 
-  ID Project Pri Description           
+  ID Project Pri Description
    1             Book plane ticket
    2             Rent a tux
    3             Reserve a rental car
@@ -97,7 +97,7 @@ a project to these tasks:
   % task 4 project:Family
   % task ls
 
-  ID Project Pri Description               
+  ID Project Pri Description
    3 Family      Send John a birthday card
    2 Wedding     Reserve a rental car
    1 Wedding     Book plane ticket
@@ -107,12 +107,46 @@ attributes changed (project, for example), the ids are prone to change.  But the
 id numbers will remain valid until the next 'ls' command is run.  You should
 only use the ids from the most recent 'ls' command.  The ids change, because
 task is always trying to use small numbers so that it is easy for you to enter
-them correctly.  Now that projects are assigned, we can look at just the Wedding
+them correctly.
-project tasks:
+
+Subprojects are supported.  If you have a project "Wedding", you can specify
+that a task is a subproject "Transport" of "Wedding" by assigning the project
+"Wedding.Transport".  Let's do this:
+
+  % task 2 project:Wedding.Transport
+  % task ls
+
+  ID Project           Pri Description
+   3 Family                Send John a birthday card
+   2 Wedding.Transport     Reserve a rental car
+   1 Wedding               Book plane ticket
+
+Task matches the leftmost part of the project when searching, so projects
+may be abbreviated:
+
+  % task ls project:Wedding.Tra
+
+  ID Project           Pri Description
+   2 Wedding.Transport     Reserve a rental car
+
+This way of matching projects can be used to see all tasks under the
+"Wedding" project and all subprojects:
 
   % task ls project:Wedding
 
-  ID Project Pri Description          
+  ID Project           Pri Description
+   2 Wedding.Transport     Reserve a rental car
+   1 Wedding               Book plane ticket
+
+Let's reassign 2 back to the "Wedding" project:
+
+  % task 2 project:Wedding
+
+Now that projects are assigned, we can look at just the Wedding project tasks:
+
+  % task ls project:Wedding
+
+  ID Project Pri Description
    1 Wedding     Book plane ticket
    2 Wedding     Reserve a rental car
 
@@ -121,14 +155,14 @@ could also have requested:
 
   % task ls ticket plane
 
-  ID Project Pri Description       
+  ID Project Pri Description
    1 Wedding     Book plane ticket
 
 Now let's prioritize.  Priorities can be H, M or L (High, Medium, Low).
 
   % task ls
 
-  ID Project Pri Description               
+  ID Project Pri Description
    3 Family      Send John a birthday card
    2 Wedding     Reserve a rental car
    1 Wedding     Book plane ticket
@@ -140,7 +174,7 @@ Now let's prioritize.  Priorities can be H, M or L (High, Medium, Low).
   % task 3 pri:H
   % task ls
 
-  ID Project Pri Description               
+  ID Project Pri Description
    3 Family  H   Send John a birthday card
    1 Wedding H   Book plane ticket
    2 Wedding M   Reserve a rental car
@@ -161,7 +195,7 @@ command provides more:
 
   % task list
 
-  ID Project Pri Due Active Age    Description               
+  ID Project Pri Due Active Age    Description
    3 Family  H              4 mins Send John a birthday card
    1 Wedding H              5 mins Book plane ticket
    2 Wedding M              5 mins Reserve a rental car
@@ -173,7 +207,7 @@ sorted by due date, then priority.  Let's add due dates:
   % task 1 due:7/31/2008
   % task list
 
-  ID Project Pri Due       Active Age    Description               
+  ID Project Pri Due       Active Age    Description
    3 Family  H   6/25/2008        6 mins Send John a birthday card
    1 Wedding H   7/31/2008        7 mins Book plane ticket
    2 Wedding M                    7 mins Reserve a rental car
@@ -212,7 +246,7 @@ labels.
 
   % task list
 
-  ID Project Pri Due       Active Age    Description               
+  ID Project Pri Due       Active Age    Description
    3 Family  H   6/25/2008        8 mins Send John a birthday card
    1 Wedding H   7/31/2008        9 mins Book plane ticket
    2 Wedding M                    9 mins Reserve a rental car
@@ -224,7 +258,7 @@ labels.
 
   % task list +phone
 
-  ID Project Pri Due       Active Age    Description               
+  ID Project Pri Due       Active Age    Description
    1 Wedding H   7/31/2008        9 mins Book plane ticket
    2 Wedding M                    9 mins Reserve a rental car
 
@@ -266,7 +300,7 @@ with no arguments will generate a help message that lists all these commands.
 
     % task summary
 
-    Project  Remaining Avg age Complete 0%                        100%              
+    Project  Remaining Avg age Complete 0%                        100%
     Errands          1  3 days      50% XXXXXXXXXXXXXXXX
     Birthdays        3  7 mths       0%
     Car              2   2 wks      25% XXXXXXXXX
@@ -316,14 +350,14 @@ with no arguments will generate a help message that lists all these commands.
 
     % task list
 
-    ID Project Pri Due Active Age     Description                                                      
+    ID Project Pri Due Active Age     Description
     12 Errand  L                      Remember to deposit check
     ...
 
     % task start 12
     % task list
 
-    ID Project Pri Due Active Age     Description                                                      
+    ID Project Pri Due Active Age     Description
     12 Errand  L       *      3 days  Remember to deposit check
     ...
 
@@ -345,13 +379,29 @@ with no arguments will generate a help message that lists all these commands.
 
 
 
+% task oldest
+-------------
+
+  Lists the oldest tasks.  Shows 10 tasks by default, but can be set via the
+  "oldest" configuration variable.
+
+
+
+% task newest
+-------------
+
+  Lists the newest tasks.  Shows 10 tasks by default, but can be set via the
+  "newest" configuration variable.
+
+
+
 % task history
 --------------
 
   This report shows you an overview of how many tasks were added, completed and
   deleted, by month.  It looks like this:
 
-    % task history 
+    % task history
 
     Year Month     Added Completed Deleted Net
     2008 March        21        16       0   5
@@ -409,14 +459,14 @@ with no arguments will generate a help message that lists all these commands.
 
   % task ls
 
-  ID Project Pri Description               
+  ID Project Pri Description
   12 Errand  L   Remember to deposit chekc
   ...
 
   % task 12 Remember to deposit bonus check
   % task ls
 
-  ID Project Pri Description               
+  ID Project Pri Description
   12 Errand  L   Remember to deposit bonus check
   ...
 
@@ -430,14 +480,14 @@ with no arguments will generate a help message that lists all these commands.
 
     % task ls
 
-    ID Project Pri Description               
+    ID Project Pri Description
     12 Errand  L   Remember to deposit chekc
     ...
 
     % task 12 /chekc/check/
     % task ls
 
-    ID Project Pri Description               
+    ID Project Pri Description
     12 Errand  L   Remember to deposit check
     ...
 
@@ -554,8 +604,27 @@ Interacting with the Shell
   background) attributes determines the colors used to represent the task.
   Valid foreground colors are:
 
+             bold          underline          bold_underline
+    black    bold_black    underline_black    bold_underline_black
+    red      bold_red      underline_red      bold_underline_red
+    green    bold_green    underline_green    bold_underline_green
+    yellow   bold_yellow   underline_yellow   bold_underline_yellow
+    blue     bold_blue     underline_blue     bold_underline_blue
+    magenta  bold_magenta  underline_magenta  bold_underline_magenta
+    cyan     bold_cyan     underline_cyan     bold_underline_cyan
+    white    bold_white    underline_white    bold_underline_white
+
   Valid background colors are:
 
+    on_black    on_bright_black
+    on_red      on_bright_red
+    on_green    on_bright_green
+    on_yellow   on_bright_yellow
+    on_blue     on_bright_blue
+    on_magenta  on_bright_magenta
+    on_cyan     on_bright_cyan
+    on_white    on_bright_white
+
   Note that these are not just colors, but combinations of colors and
   attributes.
 
@@ -602,6 +671,51 @@ Configuring Task
     curses              Determines whether task uses ncurses to establish the
                         size of the window you are using, for text wrapping.
 
+    blanklines          May be "on" or "off".  Prevents the display of
+                        unnecessary blank lines so that task makes better use
+                        screen real estate on small-screened devices.
+
+    dateformat          This is a string of characters that define how task
+                        formats dates.  The default value is:
+
+                          m/d/Y
+
+                        which means dates look like:
+
+                          6/7/2008
+
+                        The string should contain the characters:
+
+                          m   minimal-digit month   1, 12
+                          d   minimal-digit day     1, 30
+                          y   two-digit year        08
+                          M   two-digit month       01, 12
+                          D   two-digit day         01, 30
+                          Y   four-digit year       2008
+
+                        The string may also contain other characters to act as
+                        spacers, or formatting.  Other values could include
+                        (but are not limited to):
+
+                          d/m/Y            7/6/2008
+                          YMD              20080607
+                          m-d-y            6-7-08
+
+    showage             May be "yes" or "no".  Determines whether the "Age"
+                        column appears on the "list" and "next" reports.
+
+    monthsperline       Determines how many months the "task calendar" command
+                        renders across the screen.  Defaults to 1.
+
+    oldest              Determines how many tasks are shown on the "oldest"
+                        report.  Defaults to 10.
+
+    newest              Determines how many tasks are shown on the "newest"
+                        report.  Defaults to 10.
+
+    defaultwidth        The width of tables used when ncurses support is not
+                        available.  Defaults to 80.
+
     color               May be "on" or "off".  Determines whether task uses
                         color.
 
@@ -614,9 +728,14 @@ Configuring Task
     color.active        below) and one optional background color.
     color.tagged
                         For example, the value may be:
- 
+
                           bold_red on_bright_yellow
 
+    color.tag.X         Colors any task that has the tag X.
+
+    color.project.X     Colors any task assigned to project X.
+
+    color.keyword.X     Colors any task where the description contains X.
 
 
 Colors

announcement.txt

@@ -0,0 +1,36 @@
+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
+

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(task, 0.9.9, bugs@beckingham.net)
+AC_INIT(task, 1.4.0, bugs@beckingham.net)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/task.cpp])
 AC_CONFIG_HEADER([auto.h])
@@ -35,6 +35,8 @@ AC_FUNC_SELECT_ARGTYPES
 AC_CHECK_FUNCS([select])
 AC_CHECK_FUNC(flock, [AC_DEFINE([HAVE_FLOCK], [1], [Found flock])])
 AC_CHECK_FUNC(uuid_unparse_lower, [AC_DEFINE([HAVE_UUID], [1], [Found uuid_unparse_lower])])
+AC_CHECK_FUNC(random, [AC_DEFINE([HAVE_RANDOM], [1], [Found random])])
+AC_CHECK_FUNC(srandom, [AC_DEFINE([HAVE_SRANDOM], [1], [Found srandom])])
 
 AC_CONFIG_FILES([Makefile src/Makefile])
 AC_OUTPUT

grammar.txt

@@ -0,0 +1,68 @@
+
+This is a full BNF grammar for the task command line.  It is intended that a
+future release of task will incorporate a complete lexer/parser implementing
+this grammar.
+
+
+command:
+    VERSION
+  | HELP
+  | PROJECTS
+  | TAGS
+  | SUMMARY
+  | HISTORY
+  | NEXT
+  | CALENDAR
+  | ACTIVE
+  | OVERDUE
+  | STATS
+  | USAGE
+  | OLDEST
+  | NEWEST
+  | EXPORT <file>
+  | COLOR
+  | DELETE <id>
+  | INFO <id>
+  | START <id>
+  | DONE <id>
+  | ADD [<tags>] [<attrs>] [<desc>]
+  | LIST [<tags>] [<attrs>] [<desc>]
+  | LONG [<tags>] [<attrs>] [<desc>]
+  | LS [<tags>] [<attrs>] [<desc>]
+  | COMPLETED [<tags>] [<attrs>] [<desc>]
+  | <id> [<tags>] [<attrs>] [<desc>]
+  | <id> <substitution>
+
+id:
+    \d+
+  | \d{8}-\d{4}-\d{4}-\d{12}
+
+tags:
+    +<tag>
+  | -<tag>
+
+tag:
+    \w+
+
+attrs:
+    <attr>
+  | <attr> <attrs>
+
+attr:
+    <name>:<value>
+
+name:
+    \w+
+
+value:
+    .+
+
+substitution:
+    / <pattern> / <pattern> /
+
+pattern:
+    .+
+
+file:
+    ?
+

ideas.txt

@@ -0,0 +1,17 @@
+Real Parsing
+  define grammar for command line
+  implement flex/bison parser
+
+User-Defined Reports
+  report.xxx=id,project(2+),priority(1-),description
+  change all list-based reports to user-defined
+
+Generalized Report Writer
+  provide column list, sort order, filter
+
+Test Suite
+  allow .taskrc override
+  debug=on to cause all cout to be csv
+  regression tests for every bug, command, feature
+
+

script.txt

@@ -1,68 +1,105 @@
-task add do laundry
+                                            Hello, and welcome to this quick demo of the task program.
-task add project:garage order dumpster
-task add +phone tell mom i loveher
-task add +phone pro:garage schedule goodwill pickup
-task add +email pro:garage ask Tom if he wants that old bike
-task ls
 
-task 1 pro:home
+task add do laundry                         Let's add some tasks
+                                            I need to do laundry
+
+task add project:garage order dumpster      Oh yeah, the dumpster
+
+task add +phone tell mom i loveher          Must call Mom  (that "phone" there is a tag - they are
+                                              useful for searching, categorizing)
+task add +phone pro:garage schedule
+  goodwill pickup
+
+task ad +email pro:garage ask Tom if        Notice I can abbreviating commands
+  he wants that old bkie
+
+task ls                                     Let's see what we've got
+                                            I spelled bike wrong
+
+task 5 /bkie/bike/
+task ls                                     That's better
+
+task 1 pro:home                             Let's assign projects
 task 3 pro:home tell mom I love her
 task ls pro:garage
-task long pro:garage
-task list pro:garage
-task lis +phone
-task li pro:garage +phone
-task l mom
 
-task 1 priority:H
+task long pro:garage                        Let's see all the columns
+
+task list pro:garage                        There are different ways to list
+
+task lis +phone                             By tag
+task li pro:garage +phone                   By project and tag
+task l mom                                  By word
+
+task 1 priority:H                           Priorities can be High, Medium or Low
 task pri:H 3
 task 1 pri:M
-task li
+task li                                     The list is sorted by priority.
+
 task 2 pri:L
 task li
-task do 3
-task li
 
-# There may be an arbitrary number of tags.
+task done 3                                 Suppose task 3 is done
-task 2 +phone +mistake
+task li                                     ...and it's gone
+
+task 2 +phone +mistake                      Lets add tags
+
 # Oops!
-task 2 -mistake
+task 2 -mistake                             or remove tags
-task tags
-task info 2
 
-task projects
+task tags                                   or look at all the tags
 
-task 3 fg:bold
+task info 2                                 or all the details
-task li
+
-task 3 fg:white
+task projects                               or all the projects
+
+task 3 fg:bold                              Let's make it colorful
+task 4 fg:bold_green
 task li
 task 3 fg:bold_underline_white
 task li
+
 task 4 bg:on_bright_red fg:bold_yellow
-task li
+task li                                     Oh that's just nasty - let's get rid of that.
 task 4 bg:
 task li
 task 4 fg:
-task colors
+task 3 fg:
+
+task colors                                 There are many combinations to choose from
+
+(Slashes!!!)
+task 1 due:6/8/2008                         Let's add a due date
+date
 
-task 1 due:6/8/2008
-task li
-task calendar
-task 1 due:6/1/2008
 task li
+task calendar                               Notice the due task is in yellow, today is marked cyan
+
+task 1 due:5/20/2008                        This is now an overdue task
+task li                                     and it shows up red
 task overdue
 task cal
 
-task export file.csv
+task export file.csv                        You can export the tasks to a spreadsheet
 cat file.csv
 
-task start 1
+task start 1                                Started tasks can be used as reminders
-task active
+                                              of what you are supposed to be doing
-task do 1
+
-task li
+task active                                 They show up as active
-task do 3
+task done 1                                 Let's clear out a couple
-task do 1
+task li
-task active
+task done 3
-task summary
+task active
-task history
+
+task summary                                Summary shows progress on all projects
+
+task history                                History shows general activity - how many added,
+                                              completed etc, by month
+
+                                            And that's it.  There are more commands than this
+                                            covered in the TUTORIAL file, but this should give
+                                            the basic idea.
+
+                                            Thank you for watching.
 

src/.deps/Config.Po

@@ -98,7 +98,7 @@ Config.o Config.o: Config.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/bits/stl_tree.h \
   /usr/include/c++/4.0.0/bits/stl_map.h \
   /usr/include/c++/4.0.0/bits/stl_multimap.h /usr/include/sys/types.h \
-  Config.h Table.h color.h Grid.h color.h TDB.h T.h stlmacros.h ../auto.h
+  Config.h Table.h color.h Grid.h color.h TDB.h T.h ../auto.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -402,6 +402,4 @@ TDB.h:
 
 T.h:
 
-stlmacros.h:
-
 ../auto.h:

src/.deps/Date.Po

@@ -95,8 +95,7 @@ Date.o Date.o: Date.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/bits/stl_tree.h \
   /usr/include/c++/4.0.0/bits/stl_map.h \
   /usr/include/c++/4.0.0/bits/stl_multimap.h /usr/include/sys/types.h \
-  Config.h Table.h color.h Grid.h color.h TDB.h T.h stlmacros.h ../auto.h \
+  Config.h Table.h color.h Grid.h color.h TDB.h T.h ../auto.h Date.h
-  Date.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -388,8 +387,6 @@ TDB.h:
 
 T.h:
 
-stlmacros.h:
-
 ../auto.h:
 
 Date.h:

src/.deps/T.Po

@@ -95,7 +95,7 @@ T.o T.o: T.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/bits/stl_tree.h \
   /usr/include/c++/4.0.0/bits/stl_map.h \
   /usr/include/c++/4.0.0/bits/stl_multimap.h /usr/include/sys/types.h \
-  Config.h Table.h color.h Grid.h color.h TDB.h T.h stlmacros.h ../auto.h
+  Config.h Table.h color.h Grid.h color.h TDB.h T.h ../auto.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -387,6 +387,4 @@ TDB.h:
 
 T.h:
 
-stlmacros.h:
-
 ../auto.h:

src/.deps/TDB.Po

@@ -99,7 +99,7 @@ TDB.o TDB.o: TDB.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/bits/stl_tree.h \
   /usr/include/c++/4.0.0/bits/stl_map.h \
   /usr/include/c++/4.0.0/bits/stl_multimap.h Config.h Table.h color.h \
-  Grid.h color.h TDB.h T.h stlmacros.h ../auto.h
+  Grid.h color.h TDB.h T.h ../auto.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -403,6 +403,4 @@ TDB.h:
 
 T.h:
 
-stlmacros.h:
-
 ../auto.h:

src/.deps/Table.Po

@@ -96,7 +96,7 @@ Table.o Table.o: Table.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/bits/stl_bvector.h \
   /usr/include/c++/4.0.0/bits/vector.tcc color.h Grid.h Date.h task.h \
   /usr/include/sys/types.h Config.h Table.h color.h TDB.h T.h T.h \
-  stlmacros.h ../auto.h
+  ../auto.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -394,6 +394,4 @@ T.h:
 
 T.h:
 
-stlmacros.h:
-
 ../auto.h:

src/.deps/parse.Po

@@ -96,7 +96,7 @@ parse.o parse.o: parse.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/bits/stl_map.h \
   /usr/include/c++/4.0.0/bits/stl_multimap.h Date.h task.h \
   /usr/include/sys/types.h Config.h Table.h color.h Grid.h color.h TDB.h \
-  T.h stlmacros.h ../auto.h
+  T.h ../auto.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -390,6 +390,4 @@ TDB.h:
 
 T.h:
 
-stlmacros.h:
-
 ../auto.h:

src/.deps/rules.Po

@@ -95,7 +95,7 @@ rules.o rules.o: rules.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/vector /usr/include/c++/4.0.0/bits/stl_vector.h \
   /usr/include/c++/4.0.0/bits/stl_bvector.h \
   /usr/include/c++/4.0.0/bits/vector.tcc Table.h color.h Grid.h Date.h \
-  T.h task.h /usr/include/sys/types.h color.h TDB.h stlmacros.h ../auto.h
+  T.h task.h /usr/include/sys/types.h color.h TDB.h ../auto.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -389,6 +389,4 @@ color.h:
 
 TDB.h:
 
-stlmacros.h:
-
 ../auto.h:

src/.deps/task.Po

@@ -99,7 +99,7 @@ task.o task.o: task.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/vector /usr/include/c++/4.0.0/bits/stl_vector.h \
   /usr/include/c++/4.0.0/bits/stl_bvector.h \
   /usr/include/c++/4.0.0/bits/vector.tcc Date.h Table.h color.h Grid.h \
-  stlmacros.h TDB.h T.h task.h color.h ../auto.h /usr/include/ncurses.h \
+  TDB.h T.h task.h color.h ../auto.h /usr/include/ncurses.h \
   /usr/include/ncurses_dll.h /usr/include/unctrl.h /usr/include/curses.h
 
 /usr/include/c++/4.0.0/iostream:
@@ -398,8 +398,6 @@ color.h:
 
 Grid.h:
 
-stlmacros.h:
-
 TDB.h:
 
 T.h:

src/.deps/text.Po

@@ -95,7 +95,7 @@ text.o text.o: text.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/map /usr/include/c++/4.0.0/bits/stl_tree.h \
   /usr/include/c++/4.0.0/bits/stl_map.h \
   /usr/include/c++/4.0.0/bits/stl_multimap.h /usr/include/sys/types.h \
-  Config.h Table.h color.h Grid.h color.h TDB.h T.h stlmacros.h ../auto.h
+  Config.h Table.h color.h Grid.h color.h TDB.h T.h ../auto.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -387,6 +387,4 @@ TDB.h:
 
 T.h:
 
-stlmacros.h:
-
 ../auto.h:

src/.deps/util.Po

@@ -96,8 +96,7 @@ util.o util.o: util.cpp /usr/include/c++/4.0.0/iostream \
   /usr/include/c++/4.0.0/bits/stl_tree.h \
   /usr/include/c++/4.0.0/bits/stl_map.h \
   /usr/include/c++/4.0.0/bits/stl_multimap.h color.h Grid.h task.h \
-  Config.h color.h TDB.h T.h stlmacros.h ../auto.h \
+  Config.h color.h TDB.h T.h ../auto.h /usr/include/uuid/uuid.h
-  /usr/include/uuid/uuid.h
 
 /usr/include/c++/4.0.0/iostream:
 
@@ -391,8 +390,6 @@ TDB.h:
 
 T.h:
 
-stlmacros.h:
-
 ../auto.h:
 
 /usr/include/uuid/uuid.h:

src/.gitignore

@@ -1,2 +1,2 @@
-Makefile
+./Makefile
 *.o

src/Config.cpp

@@ -1,6 +1,27 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Copyright 2005 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
@@ -86,6 +107,7 @@ void Config::createDefault (const std::string& file)
 
     if (taskDir != "")
     {
+      // Create a sample .taskrc file.
       FILE* out;
       if ((out = fopen (file.c_str (), "w")))
       {
@@ -94,6 +116,9 @@ void Config::createDefault (const std::string& file)
         fprintf (out, "confirmation=yes\n");
         fprintf (out, "#nag=Note: try to stick to high priority tasks.  See \"task next\".\n");
         fprintf (out, "next=2\n");
+        fprintf (out, "dateformat=m/d/Y\n");
+        fprintf (out, "showage=yes\n");
+        fprintf (out, "monthsperline=1\n");
         fprintf (out, "curses=on\n");
         fprintf (out, "color=on\n");
 
@@ -104,13 +129,20 @@ void Config::createDefault (const std::string& file)
         fprintf (out, "#color.pri.L=on_green\n");
         fprintf (out, "color.active=bold_cyan\n");
         fprintf (out, "color.tagged=yellow\n");
+        fprintf (out, "#color.tag.bug=yellow\n");
+        fprintf (out, "#color.project.home=on_green\n");
+        fprintf (out, "#color.keyword.car=on_blue\n");
 
         fclose (out);
 
+        // Now set the live values.
         set ("data.location", taskDir);
         set ("command.logging", "off");
         set ("confirmation", "yes");
-        set ("next", 2);
+        set ("next", 1);
+        set ("dateformat", "m/d/Y");
+        set ("showage", "yes");
+        set ("monthsperline", 3);
         set ("curses", "on");
         set ("color", "on");
         set ("color.overdue", "red");
@@ -220,29 +252,6 @@ void Config::set (const std::string& key, const std::string& value)
   (*this)[key] = value;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// The vector form of Config::get assumes the single value is comma-separated,
-// and splits accordingly.
-void Config::get (
-  const std::string& key,
-  std::vector <std::string>& values)
-{
-  values.clear ();
-  split (values, (*this)[key], ',');
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// The vector form of Config::set joins the values together with commas, and
-// stores the single value.
-void Config::set (
-  const std::string& key,
-  const std::vector <std::string>& values)
-{
-  std::string conjoined;
-  join (conjoined, ",", values);
-  (*this)[key] = conjoined;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // Provide a vector of all configuration keys.
 void Config::all (std::vector<std::string>& items)

src/Config.h

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2005 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_CONFIG
@@ -26,11 +47,9 @@ public:
   bool get (const std::string&, bool);
   int get (const std::string&, const int);
   double get (const std::string&, const double);
-  void get (const std::string&, std::vector <std::string>&);
   void set (const std::string&, const int);
   void set (const std::string&, const double);
   void set (const std::string&, const std::string&);
-  void set (const std::string&, const std::vector <std::string>&);
   void all (std::vector <std::string>&);
 };
 

src/Date.cpp

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2005 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
@@ -36,29 +57,134 @@ Date::Date (const int m, const int d, const int y)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-Date::Date (const std::string& mdy)
+Date::Date (const std::string& mdy, const std::string& format /* = "m/d/Y" */)
 {
-  size_t firstSlash  = mdy.find ("/");
+  int month = 0;
-  size_t secondSlash = mdy.find ("/", firstSlash + 1);
+  int day   = 0;
-  if (firstSlash != std::string::npos &&
+  int year  = 0;
-      secondSlash != std::string::npos)
-  {
-    int m = ::atoi (mdy.substr (0,               firstSlash              ).c_str ());
-    int d = ::atoi (mdy.substr (firstSlash  + 1, secondSlash - firstSlash).c_str ());
-    int y = ::atoi (mdy.substr (secondSlash + 1, std::string::npos       ).c_str ());
-    if (!valid (m, d, y))
-      throw std::string ("\"") + mdy + "\" is not a valid date.";
 
-    // Duplicate Date::Date (const int, const int, const int);
+  unsigned int i = 0; // Index into mdy.
-    struct tm t = {0};
+
-    t.tm_mday = d;
+  for (unsigned int f = 0; f < format.length (); ++f)
-    t.tm_mon = m - 1;
+  {
-    t.tm_year = y - 1900;
+    switch (format[f])
+    {
+    // Single or double digit.
+    case 'm':
+      if (i >= mdy.length () ||
+          ! ::isdigit (mdy[i]))
+      {
+        throw std::string ("\"") + mdy + "\" is not a valid date.";
+      }
+
+      if (i + 1 < mdy.length ()                                         &&
+          mdy[i + 0] == '1'                                             &&
+          (mdy[i + 1] == '0' || mdy[i + 1] == '1' || mdy[i + 1] == '2'))
+      {
+        month = ::atoi (mdy.substr (i, 2).c_str ());
+        i += 2;
+      }
+      else
+      {
+        month = ::atoi (mdy.substr (i, 1).c_str ());
+        ++i;
+      }
+      break;
+
+    case 'd':
+      if (i >= mdy.length () ||
+          ! ::isdigit (mdy[i]))
+      {
+        throw std::string ("\"") + mdy + "\" is not a valid date.";
+      }
+
+      if (i + 1 < mdy.length ()  &&
+          (mdy[i + 0] == '1' || mdy[i + 0] == '2' || mdy[i + 0] == '3') &&
+          ::isdigit (mdy[i + 1]))
+      {
+        day = ::atoi (mdy.substr (i, 2).c_str ());
+        i += 2;
+      }
+      else
+      {
+        day = ::atoi (mdy.substr (i, 1).c_str ());
+        ++i;
+      }
+      break;
+
+    // Double digit.
+    case 'y':
+      if (i + 1 >= mdy.length () ||
+          ! ::isdigit (mdy[i + 0]) ||
+          ! ::isdigit (mdy[i + 1]))
+      {
+        throw std::string ("\"") + mdy + "\" is not a valid date.";
+      }
+
+      year = ::atoi (mdy.substr (i, 2).c_str ()) + 2000;
+      i += 2;
+      break;
+
+    case 'M':
+      if (i + 1 >= mdy.length () ||
+          ! ::isdigit (mdy[i + 0]) ||
+          ! ::isdigit (mdy[i + 1]))
+      {
+        throw std::string ("\"") + mdy + "\" is not a valid date.";
+      }
+
+      month = ::atoi (mdy.substr (i, 2).c_str ());
+      i += 2;
+      break;
+
+    case 'D':
+      if (i + 1 >= mdy.length () ||
+          ! ::isdigit (mdy[i + 0]) ||
+          ! ::isdigit (mdy[i + 1]))
+      {
+        throw std::string ("\"") + mdy + "\" is not a valid date.";
+      }
+
+      day = ::atoi (mdy.substr (i, 2).c_str ());
+      i += 2;
+      break;
+
+    // Quadruple digit.
+    case 'Y':
+      if (i + 3 >= mdy.length () ||
+          ! ::isdigit (mdy[i + 0]) ||
+          ! ::isdigit (mdy[i + 1]) ||
+          ! ::isdigit (mdy[i + 2]) ||
+          ! ::isdigit (mdy[i + 3]))
+      {
+        throw std::string ("\"") + mdy + "\" is not a valid date.";
+      }
+
+      year = ::atoi (mdy.substr (i, 4).c_str ());
+      i += 4;
+      break;
+
+    default:
+      if (i >= mdy.length () ||
+          mdy[i] != format[f])
+      {
+        throw std::string ("\"") + mdy + "\" is not a valid date.";
+      }
+      ++i;
+      break;
+    }
+  }
+
+  if (!valid (month, day, year))
+    throw std::string ("\"") + mdy + "\" is not a valid date.";
+
+  // Duplicate Date::Date (const int, const int, const int);
+  struct tm t = {0};
+  t.tm_mday = day;
+  t.tm_mon = month - 1;
+  t.tm_year = year - 1900;
 
     mT = mktime (&t);
-  }
-  else
-    throw std::string ("\"") + mdy + "\" is not a valid date.";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -95,20 +221,32 @@ void Date::toMDY (int& m, int& d, int& y)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void Date::toString (std::string& output)
+const std::string Date::toString (const std::string& format /*= "m/d/Y" */) const
 {
-  output = toString ();
+  // Making this local copy seems to fix a bug.  Remove the local copy and you'll
-}
+  // see segmentation faults and all kinds of gibberish.
+  std::string localFormat = format;
 
-////////////////////////////////////////////////////////////////////////////////
+  char buffer[12];
-std::string Date::toString (void)
+  std::string formatted;
-{
+  for (unsigned int i = 0; i < localFormat.length (); ++i)
-  int m, d, y;
+  {
-  toMDY (m, d, y);
+    char c = localFormat[i];
+    switch (c)
+    {
+    case 'm': sprintf (buffer, "%d",   this->month ());      break;
+    case 'M': sprintf (buffer, "%02d", this->month ());      break;
+    case 'd': sprintf (buffer, "%d",   this->day ());        break;
+    case 'D': sprintf (buffer, "%02d", this->day ());        break;
+    case 'y': sprintf (buffer, "%02d", this->year () % 100); break;
+    case 'Y': sprintf (buffer, "%d",   this->year ());       break;
+    default:  sprintf (buffer, "%c",   c);                   break;
+    }
 
-  char formatted [11];
+    formatted += buffer;
-  sprintf (formatted, "%d/%d/%d", m, d, y);
+  }
-  return std::string (formatted);
+
+  return formatted;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -213,28 +351,28 @@ std::string Date::dayName (int dow)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int Date::dayOfWeek ()
+int Date::dayOfWeek () const
 {
   struct tm* t = localtime (&mT);
   return t->tm_wday;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int Date::month ()
+int Date::month () const
 {
   struct tm* t = localtime (&mT);
   return t->tm_mon + 1;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int Date::day ()
+int Date::day () const
 {
   struct tm* t = localtime (&mT);
   return t->tm_mday;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int Date::year ()
+int Date::year () const
 {
   struct tm* t = localtime (&mT);
   return t->tm_year + 1900;

src/Date.h

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2005 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_DATE
@@ -16,15 +37,14 @@ public:
            Date ();
            Date (time_t);
            Date (const int, const int, const int);
-           Date (const std::string&);
+           Date (const std::string&, const std::string& format = "m/d/Y");
            Date (const Date&);
   virtual ~Date ();
 
   void toEpoch (time_t&);
   time_t toEpoch ();
   void toMDY (int&, int&, int&);
-  void toString (std::string&);
+  const std::string toString (const std::string& format = "m/d/Y") const;
-  std::string toString (void);
   static bool valid (const int, const int, const int);
 
   static bool leapYear (int);
@@ -32,11 +52,11 @@ public:
   static std::string monthName (int);
   static void dayName (int, std::string&);
   static std::string dayName (int);
-  int dayOfWeek ();
+  int dayOfWeek () const;
 
-  int month ();
+  int month () const;
-  int day ();
+  int day () const;
-  int year ();
+  int year () const;
 
   bool operator== (const Date&);
   bool operator!= (const Date&);

src/Grid.cpp

@@ -1,5 +1,29 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2007 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
+//
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
+//
+//
 //
 // Grid implements a sparse 2D array of Cell objects.  Grid makes every effort
 // to perform well on cell insertion and retrieval.  A Cell is a variant type,
@@ -145,9 +169,9 @@ unsigned int Grid::height () const
 ////////////////////////////////////////////////////////////////////////////////
 Grid::Cell* Grid::byRow (const unsigned int row, const unsigned int col) const
 {
-  if (row <= mRows.size () &&
+  if (row < mRows.size () &&
       mRows[row] != NULL   &&
-      col <= mRows[row]->size ())
+      col < mRows[row]->size ())
     return (*mRows[row])[col];
 
   return NULL;
@@ -155,9 +179,9 @@ Grid::Cell* Grid::byRow (const unsigned int row, const unsigned int col) const
 
 Grid::Cell* Grid::byColumn (const unsigned int row, const unsigned int col) const
 {
-  if (col <= mColumns.size () &&
+  if (col < mColumns.size () &&
       mColumns[col] != NULL   &&
-      row <= mColumns[col]->size ())
+      row < mColumns[col]->size ())
     return (*mColumns[col])[row];
 
   return NULL;
@@ -166,36 +190,25 @@ Grid::Cell* Grid::byColumn (const unsigned int row, const unsigned int col) cons
 ////////////////////////////////////////////////////////////////////////////////
 void Grid::expandGrid (const unsigned int row, const unsigned int col)
 {
+
   // If the new row is outside the bounds of the current grid, add blank rows to
   // pad, then a new row vector.
   if (row >= mRows.size ())
   {
     for (unsigned int r = mRows.size (); r <= row; ++r)
       if (r < row)
-//      {
-//        std::cout << "additional mRows[" << r << "] = NULL" << std::endl;
         mRows.push_back (NULL);
-//      }
       else
-//      {
-//        std::cout << "additional mRows[" << r << "] = new std::vector <Cell*>" << std::endl;
         mRows.push_back (new std::vector <Cell*>);
-//      }
   }
   // If the new row is within the bounds of the current grid, ensure that the
   // row points to a vector of cells.
   else if (mRows[row] == NULL)
-//  {
-//    std::cout << "existing mRows[" << row << "] = new std::vector <Cell*>" << std::endl;
     mRows[row] = new std::vector <Cell*>;
-//  }
 
   if (col >= mRows[row]->size ())
     for (unsigned int c = mRows[row]->size (); c <= col; ++c)
-//    {
-//      std::cout << "additional mRows[" << row << "][" << c << "] = NULL" << std::endl;
       mRows[row]->push_back (NULL);
-//    }
 
   // If the new col is outside the bounds of the current grid, add blank cols to
   // pad, then a new col vector.
@@ -203,30 +216,18 @@ void Grid::expandGrid (const unsigned int row, const unsigned int col)
   {
     for (unsigned int c = mColumns.size (); c <= col; ++c)
       if (c < col)
-//      {
-//        std::cout << "additional mColumns[" << c << "] = NULL" << std::endl;
         mColumns.push_back (NULL);
-//      }
       else
-//      {
-//        std::cout << "additional mColumns[" << c << "] = new std::vector <Cell*>" << std::endl;
         mColumns.push_back (new std::vector <Cell*>);
-//      }
   }
   // If the new col is within the bounds of the current grid, ensure that the
   // col points to a vector of cells.
   else if (mColumns[col] == NULL)
-//  {
-//    std::cout << "existing mColumns[" << col << "] = new std::vector <Cell*>" << std::endl;
     mColumns[col] = new std::vector <Cell*>;
-//  }
 
   if (row >= mColumns[col]->size ())
     for (unsigned int r = mColumns[col]->size (); r <= row; ++r)
-//    {
-//      std::cout << "additional mColumns[" << col << "][" << r << "] = NULL" << std::endl;
       mColumns[col]->push_back (NULL);
-//    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -237,15 +238,10 @@ void Grid::insertCell (
 {
   // Delete any existing cell, because cells are owned by rows, not columns.
   if ((*mRows[row])[col] != NULL)
-//  {
-//    std::cout << "deleted old cell mRows[" << row << "][" << col << "]" << std::endl;
     delete (*mRows[row])[col];
-//  }
 
   (*mRows[row])[col]    = cell;
   (*mColumns[col])[row] = cell;
-//  std::cout << "assigned new cell mRows[" << row << "][" << col << "]" << std::endl;
-//  std::cout << "assigned new cell mColumns[" << col << "][" << row << "]" << std::endl;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

src/Grid.h

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2007 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_GRID

src/Makefile.am

@@ -1,3 +1,3 @@
 bin_PROGRAMS = task
-task_SOURCES = Config.cpp Date.cpp T.cpp TDB.cpp Table.cpp Grid.cpp color.cpp parse.cpp task.cpp util.cpp text.cpp rules.cpp Config.h Date.h T.h TDB.h Table.h Grid.h color.h stlmacros.h task.h
+task_SOURCES = Config.cpp Date.cpp T.cpp TDB.cpp Table.cpp Grid.cpp color.cpp parse.cpp task.cpp util.cpp text.cpp rules.cpp Config.h Date.h T.h TDB.h Table.h Grid.h color.h task.h
 AM_CPPFLAGS = -Wall -pedantic -ggdb3 -fno-rtti

src/Makefile.in

@@ -154,7 +154,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-task_SOURCES = Config.cpp Date.cpp T.cpp TDB.cpp Table.cpp Grid.cpp color.cpp parse.cpp task.cpp util.cpp text.cpp rules.cpp Config.h Date.h T.h TDB.h Table.h Grid.h color.h stlmacros.h task.h
+task_SOURCES = Config.cpp Date.cpp T.cpp TDB.cpp Table.cpp Grid.cpp color.cpp parse.cpp task.cpp util.cpp text.cpp rules.cpp Config.h Date.h T.h TDB.h Table.h Grid.h color.h task.h
 AM_CPPFLAGS = -Wall -pedantic -ggdb3 -fno-rtti
 all: all-am
 

src/T.cpp

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2006 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
@@ -254,20 +275,8 @@ const std::string T::compose () const
   int count = 0;
   foreach (i, mAttributes)
   {
-    std::string converted = i->second;
-
-    // Date attributes may need conversion to epoch.
-    if (i->first == "due"   ||
-        i->first == "start" ||
-        i->first == "entry" ||
-        i->first == "end")
-    {
-      if (i->second.find ("/") != std::string::npos)
-        validDate (converted);
-    }
-
     line += (count > 0 ? " " : "");
-    line += i->first + ":" + converted;
+    line += i->first + ":" + i->second;
 
     ++count;
   }

src/T.h

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2006 - 2007, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_T

src/TDB.cpp

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2007, 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
@@ -222,7 +243,6 @@ bool TDB::addT (const T& t) const
   std::vector <std::string> tags;
   task.getTags (tags);
 
-  // TODO This logic smells funny.
   // +tag or -tag are both considered valid tags to add to a new pending task.
   // Generating an error here would not be friendly.
   for (unsigned int i = 0; i < tags.size (); ++i)
@@ -307,7 +327,7 @@ bool TDB::logCommand (int argc, char** argv) const
         delay (0.25);
 #endif
 
-      fprintf (out, command.c_str ());
+      fputs (command.c_str (), out);
 
       fclose (out);
       return true;
@@ -342,7 +362,7 @@ bool TDB::overwritePending (std::vector <T>& all) const
 
     std::vector <T>::iterator it;
     for (it = all.begin (); it != all.end (); ++it)
-      fprintf (out, it->compose ().c_str ());
+      fputs (it->compose ().c_str (), out);
 
     fclose (out);
     return true;
@@ -364,7 +384,7 @@ bool TDB::writePending (const T& t) const
       delay (0.25);
 #endif
 
-    fprintf (out, t.compose ().c_str ());
+    fputs (t.compose ().c_str (), out);
 
     fclose (out);
     return true;
@@ -386,7 +406,7 @@ bool TDB::writeCompleted (const T& t) const
       delay (0.25);
 #endif
 
-    fprintf (out, t.compose ().c_str ());
+    fputs (t.compose ().c_str (), out);
 
     fclose (out);
     return true;

src/TDB.h

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2007, 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_TDB

src/Table.cpp

@@ -1,7 +1,29 @@
 ////////////////////////////////////////////////////////////////////////////////
+// task - a command line task list manager.
+//
 // Copyright 2006 - 2008, Paul Beckingham.
 // All rights reserved.
 //
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
+//
+//
 //
 // Attributes                Table    Row Column   Cell
 // ----------------------------------------------------
@@ -27,7 +49,6 @@
 #include <Table.h>
 #include <Date.h>
 #include <task.h>
-#include <stlmacros.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 Table::Table ()
@@ -632,63 +653,18 @@ void Table::formatCell (
   blank = Text::colorize (fg, bg, pad + intraPad);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-const std::string Table::formatCell (
-  const int row,
-  const int col,
-  const int width,
-  const int padding)
-{
-  assert (width > 0);
-
-  Text::color fg     = getFg (row, col);
-  Text::color bg     = getBg (row, col);
-  just justification = getJustification (row, col);
-  std::string data   = getCell (row, col);
-
-  std::string pad      = "";
-  std::string intraPad = "";
-  std::string preJust  = "";
-  std::string postJust = "";
-
-  for (int i = 0; i < padding; ++i)
-    pad += " ";
-
-  // Place the data within the available space - justify.
-  int gap = width - data.length ();
-
-  if (justification == left)
-  {
-    for (int i = 0; i < gap; ++i)
-      postJust += " ";
-  }
-  else if (justification == right)
-  {
-    for (int i = 0; i < gap; ++i)
-      preJust += " ";
-  }
-  else if (justification == center)
-  {
-    for (int i = 0; i < gap / 2; ++i)
-      preJust += " ";
-
-    for (size_t i = 0; i < gap - preJust.length (); ++i)
-      postJust += " ";
-  }
-
-  if (col < (signed) mColumns.size () - 1)
-    for (int i = 0; i < getIntraPadding (); ++i)
-      intraPad += " ";
-
-  return Text::colorize (fg, bg, pad + preJust + data + postJust + pad + intraPad);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 void Table::suppressWS ()
 {
   mSuppressWS = true;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+void Table::setDateFormat (const std::string& dateFormat)
+{
+  mDateFormat = dateFormat;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 int Table::rowCount ()
 {
@@ -708,10 +684,10 @@ int Table::columnCount ()
 //   - removal of redundant color codes:
 //       ^[[31mName^[[0m ^[[31mValue^[[0m -> ^[[31mName Value^[[0m
 //
+// This method is a work in progress.
 void Table::optimize (std::string& output)
 {
 /*
-  TODO Unoptimized length.
   int start = output.length ();
 */
 
@@ -724,7 +700,6 @@ void Table::optimize (std::string& output)
   }
 
 /*
-  TODO This code displays the % reduction of the optimize function.
   std::cout << int ((100 * (start - output.length ()) / start))
             << "%" << std::endl;
 */
@@ -802,8 +777,8 @@ void Table::sort (std::vector <int>& order)
 
               else
               {
-                Date dl ((std::string)*left);
+                Date dl ((std::string)*left, mDateFormat);
-                Date dr ((std::string)*right);
+                Date dr ((std::string)*right, mDateFormat);
                 if (dl > dr)
                   SWAP
               }
@@ -820,8 +795,8 @@ void Table::sort (std::vector <int>& order)
 
               else
               {
-                Date dl ((std::string)*left);
+                Date dl ((std::string)*left, mDateFormat);
-                Date dr ((std::string)*right);
+                Date dr ((std::string)*right, mDateFormat);
                 if (dl < dr)
                   SWAP
               }

src/Table.h

@@ -1,8 +1,28 @@
 ////////////////////////////////////////////////////////////////////////////////
+// task - a command line task list manager.
+//
 // Copyright 2006 - 2008, Paul Beckingham.
 // All rights reserved.
 //
-// TODO Implement height
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
+//
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_TABLE
 #define INCLUDED_TABLE
@@ -59,6 +79,7 @@ public:
            void setCellBg (int, int, Text::color);
 
            void suppressWS ();
+           void setDateFormat (const std::string&);
 
            int rowCount ();
            int columnCount ();
@@ -77,7 +98,6 @@ private:
            just getJustification (const int, const int);
            just getHeaderJustification (const int);
            const std::string formatHeader (const int, const int, const int);
-           const std::string formatCell (const int, const int, const int, const int);
            void formatCell (const int, const int, const int, const int, std::vector <std::string>&, std::string&);
            void optimize (std::string&);
            void sort (std::vector <int>&);
@@ -109,6 +129,7 @@ private:
 
   // Misc...
   bool mSuppressWS;
+  std::string mDateFormat;
 };
 
 #endif

src/color.cpp

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <string>

src/color.h

@@ -1,7 +1,28 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2008, Paul Beckingham.
+// task - a command line task list manager.
+//
+// Copyright 2006 - 2008, Paul Beckingham.
 // All rights reserved.
 //
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
+//
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_COLOR
 #define INCLUDED_COLOR

src/parse.cpp

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2006 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
@@ -99,12 +120,15 @@ static const char* commands[] =
   "delete",
   "done",
   "export",
+  "help",
   "history",
   "info",
   "list",
   "long",
   "ls",
+  "newest",
   "next",
+  "oldest",
   "overdue",
   "projects",
   "start",
@@ -164,29 +188,13 @@ static bool isCommand (const std::string& candidate)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool validDate (std::string& date)
+bool validDate (std::string& date, Config& conf)
 {
-  size_t firstSlash  = date.find ("/");
+  Date test (date, conf.get ("dateformat", "m/d/Y"));
-  size_t secondSlash = date.find ("/", firstSlash + 1);
-  if (firstSlash != std::string::npos &&
-      secondSlash != std::string::npos)
-  {
-    int m = ::atoi (date.substr (0,               firstSlash              ).c_str ());
-    int d = ::atoi (date.substr (firstSlash  + 1, secondSlash - firstSlash).c_str ());
-    int y = ::atoi (date.substr (secondSlash + 1, std::string::npos       ).c_str ());
-    if (!Date::valid (m, d, y))
-      throw std::string ("\"") + date + "\" is not a valid date.";
 
-    // Convert to epoch form.
+  char epoch[12];
-    Date dt (m, d, y);
+  sprintf (epoch, "%d", (int) test.toEpoch ());
-    time_t t;
+  date = epoch;
-    dt.toEpoch (t);
-    char converted[12];
-    sprintf (converted, "%u", (unsigned int) t);
-    date = converted;
-  }
-  else
-    throw std::string ("Badly formed date - use the MM/DD/YYYY format");
 
   return true;
 }
@@ -206,7 +214,7 @@ static bool validPriority (std::string& input)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-static bool validAttribute (std::string& name, std::string& value)
+static bool validAttribute (std::string& name, std::string& value, Config& conf)
 {
   guess ("attribute", attributes, name);
 
@@ -214,7 +222,7 @@ static bool validAttribute (std::string& name, std::string& value)
     guess ("color", colors, value);
 
   else if (name == "due" && value != "")
-    validDate (value);
+    validDate (value, conf);
 
   else if (name == "priority")
   {
@@ -314,7 +322,8 @@ static bool validSubstitution (
 void parse (
   std::vector <std::string>& args,
   std::string& command,
-  T& task)
+  T& task,
+  Config& conf)
 {
   command = "";
 
@@ -348,7 +357,7 @@ void parse (
       std::string name  = arg.substr (0, colon);
       std::string value = arg.substr (colon + 1, std::string::npos);
 
-      if (validAttribute (name, value))
+      if (validAttribute (name, value, conf))
         task.setAttribute (name, value);
     }
 

src/rules.cpp

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2006 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
@@ -62,6 +83,7 @@ void initializeColorRules (Config& conf)
 void autoColorize (T& task, Text::color& fg, Text::color& bg)
 {
   // Note: fg, bg already contain colors specifically assigned via command.
+  // TODO These rules form a hierarchy - the last rule is king.
 
   // Colorization of the tagged.
   if (gsFg["color.tagged"] != Text::nocolor ||
@@ -153,6 +175,50 @@ void autoColorize (T& task, Text::color& fg, Text::color& bg)
       bg = gsBg["color.due"];
     }
   }
+
+  // Colorization by tag value.
+  std::map <std::string, Text::color>::iterator it;
+  for (it = gsFg.begin (); it != gsFg.end (); ++it)
+  {
+    if (it->first.substr (0, 10) == "color.tag.")
+    {
+      std::string value = it->first.substr (10, std::string::npos);
+      if (task.hasTag (value))
+      {
+        fg = gsFg[it->first];
+        bg = gsBg[it->first];
+      }
+    }
+  }
+
+  // Colorization by project name.
+  for (it = gsFg.begin (); it != gsFg.end (); ++it)
+  {
+    if (it->first.substr (0, 14) == "color.project.")
+    {
+      std::string value = it->first.substr (14, std::string::npos);
+      if (task.getAttribute ("project") == value)
+      {
+        fg = gsFg[it->first];
+        bg = gsBg[it->first];
+      }
+    }
+  }
+
+  // Colorization by keyword.
+  for (it = gsFg.begin (); it != gsFg.end (); ++it)
+  {
+    if (it->first.substr (0, 14) == "color.keyword.")
+    {
+      std::string value = lowerCase (it->first.substr (14, std::string::npos));
+      std::string desc  = lowerCase (task.getDescription ());
+      if (desc.find (value) != std::string::npos)
+      {
+        fg = gsFg[it->first];
+        bg = gsBg[it->first];
+      }
+    }
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////

src/stlmacros.h

@@ -1,18 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// Copyright 2006 - 2008, Paul Beckingham.  All rights reserved.
-//
-//
-////////////////////////////////////////////////////////////////////////////////
-#ifndef INCLUDED_STLMACROS
-#define INCLUDED_STLMACROS
-
-#define foreach(i, c)                                              \
-for (typeof (c) *foreach_p = & (c);                                \
-     foreach_p;                                                    \
-     foreach_p = 0)                                                \
-  for (typeof (foreach_p->begin()) i = foreach_p->begin();         \
-       i != foreach_p->end();                                      \
-       ++i)
-
-#endif
-////////////////////////////////////////////////////////////////////////////////

src/task.h

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2006 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -13,16 +34,27 @@
 #include "color.h"
 #include "TDB.h"
 #include "T.h"
-#include "stlmacros.h"
 #include "../auto.h"
 
+#ifndef min
+#define min(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
 #ifndef max
 #define max(a,b) ((a) > (b) ? (a) : (b))
 #endif
 
+#define foreach(i, c)                                              \
+for (typeof (c) *foreach_p = & (c);                                \
+     foreach_p;                                                    \
+     foreach_p = 0)                                                \
+  for (typeof (foreach_p->begin()) i = foreach_p->begin();         \
+       i != foreach_p->end();                                      \
+       ++i)
+
 // parse.cpp
-void parse (std::vector <std::string>&, std::string&, T&);
+void parse (std::vector <std::string>&, std::string&, T&, Config&);
-bool validDate (std::string&);
+bool validDate (std::string&, Config&);
 
 // task.cpp
 void handleAdd (const TDB&, T&, Config&);
@@ -41,6 +73,8 @@ void handleReportCalendar (const TDB&, T&, Config&);
 void handleReportActive (const TDB&, T&, Config&);
 void handleReportOverdue (const TDB&, T&, Config&);
 void handleReportStats (const TDB&, T&, Config&);
+void handleReportOldest (const TDB&, T&, Config&);
+void handleReportNewest (const TDB&, T&, Config&);
 void handleVersion (Config&);
 void handleExport (const TDB&, T&, Config&);
 void handleDelete (const TDB&, T&, Config&);
@@ -69,6 +103,7 @@ int autoComplete (const std::string&, const std::vector<std::string>&, std::vect
 void formatTimeDeltaDays (std::string&, time_t);
 std::string formatSeconds (time_t);
 const std::string uuid ();
+const char* optionalBlankLine (Config&);
 
 // rules.cpp
 void initializeColorRules (Config&);

src/tests/.gitignore

@@ -1,5 +1,6 @@
 t.t
 tdb.t
+date.t
 pending.data
 completed.data
 

src/tests/Makefile

@@ -0,0 +1,28 @@
+PROJECT = t.t tdb.t date.t
+CFLAGS  = -I. -I.. -Wall -pedantic -ggdb3 -fno-rtti
+LFLAGS  = -L/usr/local/lib
+OBJECTS = ../TDB.o ../T.o ../parse.o ../text.o ../Date.o ../util.o ../Config.o
+
+all: $(PROJECT)
+
+install: $(PROJECT)
+	@echo unimplemented
+
+test: $(PROJECT)
+	@echo unimplemented
+
+clean:
+	-rm *.o $(PROJECT)
+
+.cpp.o:
+	g++ -c $(CFLAGS) $<
+
+t.t: t.t.o $(OBJECTS) test.o
+	g++ t.t.o $(OBJECTS) test.o $(LFLAGS) -o t.t
+
+tdb.t: tdb.t.o $(OBJECTS) test.o
+	g++ tdb.t.o $(OBJECTS) test.o $(LFLAGS) -o tdb.t
+
+date.t: date.t.o $(OBJECTS) test.o
+	g++ date.t.o $(OBJECTS) test.o $(LFLAGS) -o date.t
+

src/tests/date.t.cpp

@@ -0,0 +1,113 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright 2005 - 2008, Paul Beckingham.  All rights reserved.
+//
+////////////////////////////////////////////////////////////////////////////////
+#include <iostream>
+#include <Date.h>
+#include <test.h>
+
+////////////////////////////////////////////////////////////////////////////////
+int main (int argc, char** argv)
+{
+  plan (63);
+
+  Date now;
+  Date yesterday;
+  yesterday -= 1;
+
+  ok    (yesterday <= now,       "yesterday <= now");
+  ok    (yesterday <  now,       "yesterday < now");
+  notok (yesterday == now,       "!(yesterday == now)");
+  ok    (yesterday != now,       "yesterday != now");
+  ok    (now       >= yesterday, "now >= yesterday");
+  ok    (now       >  yesterday, "now > yesterday");
+
+  ok    (Date::valid (2, 29, 2008), "valid: 2/29/2008");
+  notok (Date::valid (2, 29, 2007), "invalid: 2/29/2007");
+
+  ok    (Date::leapYear (2008), "2008 is a leap year");
+  notok (Date::leapYear (2007), "2007 is not a leap year");
+  ok    (Date::leapYear (2000), "2000 is a leap year");
+  ok    (Date::leapYear (1900), "1900 is a leap year");
+
+  is (Date::daysInMonth (2, 2008), 29, "29 days in February 2008");
+  is (Date::daysInMonth (2, 2007), 28, "28 days in February 2007");
+
+  is (Date::monthName (1), "January",   "1 = January");
+  is (Date::monthName (2), "February",  "2 = February");
+  is (Date::monthName (3), "March",     "3 = March");
+  is (Date::monthName (4), "April",     "4 = April");
+  is (Date::monthName (5), "May",       "5 = May");
+  is (Date::monthName (6), "June",      "6 = June");
+  is (Date::monthName (7), "July",      "7 = July");
+  is (Date::monthName (8), "August",    "8 = August");
+  is (Date::monthName (9), "September", "9 = September");
+  is (Date::monthName (10), "October",  "10 = October");
+  is (Date::monthName (11), "November", "11 = November");
+  is (Date::monthName (12), "December", "12 = December");
+
+  is (Date::dayName (0), "Sunday",    "0 == Sunday");
+  is (Date::dayName (1), "Monday",    "1 == Monday");
+  is (Date::dayName (2), "Tuesday",   "2 == Tuesday");
+  is (Date::dayName (3), "Wednesday", "3 == Wednesday");
+  is (Date::dayName (4), "Thursday",  "4 == Thursday");
+  is (Date::dayName (5), "Friday",    "5 == Friday");
+  is (Date::dayName (6), "Saturday",  "6 == Saturday");
+
+  Date happyNewYear (1, 1, 2008);
+  is (happyNewYear.dayOfWeek (), 2, "1/1/2008 == Tuesday");
+  is (happyNewYear.month (),     1, "1/1/2008 == January");
+  is (happyNewYear.day (),       1, "1/1/2008 == 1");
+  is (happyNewYear.year (),   2008, "1/1/2008 == 2008");
+
+  is (now - yesterday, 1, "today - yesterday == 1");
+
+  is (happyNewYear.toString (), "1/1/2008", "toString 1/1/2008");
+
+  int m, d, y;
+  happyNewYear.toMDY (m, d, y);
+  is (m, 1, "1/1/2008 == January");
+  is (d, 1, "1/1/2008 == 1");
+  is (y, 2008, "1/1/2008 == 2008");
+
+  Date epoch (9, 8, 2001);
+  ok ((int)epoch.toEpoch () < 1000000000, "9/8/2001 < 1,000,000,000");
+  epoch += 86400;
+  ok ((int)epoch.toEpoch () > 1000000000, "9/9/2001 > 1,000,000,000");
+
+  Date fromEpoch (epoch.toEpoch ());
+  is (fromEpoch.toString (), epoch.toString (), "ctor (time_t)");
+
+  Date fromString1 ("1/1/2008");
+  is (fromString1.month (),   1, "ctor (std::string) -> m");
+  is (fromString1.day (),     1, "ctor (std::string) -> d");
+  is (fromString1.year (), 2008, "ctor (std::string) -> y");
+
+  Date fromString2 ("1/1/2008", "m/d/Y");
+  is (fromString2.month (),   1, "ctor (std::string) -> m");
+  is (fromString2.day (),     1, "ctor (std::string) -> d");
+  is (fromString2.year (), 2008, "ctor (std::string) -> y");
+
+  Date fromString3 ("20080101", "YMD");
+  is (fromString3.month (),   1, "ctor (std::string) -> m");
+  is (fromString3.day (),     1, "ctor (std::string) -> d");
+  is (fromString3.year (), 2008, "ctor (std::string) -> y");
+
+  Date fromString4 ("12/31/2007");
+  is (fromString4.month (),  12, "ctor (std::string) -> m");
+  is (fromString4.day (),    31, "ctor (std::string) -> d");
+  is (fromString4.year (), 2007, "ctor (std::string) -> y");
+
+  Date fromString5 ("12/31/2007", "m/d/Y");
+  is (fromString5.month (),  12, "ctor (std::string) -> m");
+  is (fromString5.day (),    31, "ctor (std::string) -> d");
+  is (fromString5.year (), 2007, "ctor (std::string) -> y");
+
+  Date fromString6 ("20071231", "YMD");
+  is (fromString6.month (),  12, "ctor (std::string) -> m");
+  is (fromString6.day (),    31, "ctor (std::string) -> d");
+  is (fromString6.year (), 2007, "ctor (std::string) -> y");
+  return 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////

src/tests/t.t.cpp

@@ -1,4 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
+// task - a command line task list manager.
+//
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include "../T.h"

src/tests/tdb.t.cpp

@@ -1,4 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
+// task - a command line task list manager.
+//
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>

src/tests/test.cpp

@@ -1,11 +1,32 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2007, 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
 #include <string>
-#include <library.h>
+#include <task.h>
 
 static int total = 0;
 static int counter = 0;

src/tests/test.h

@@ -1,5 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2007, 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
+//
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef INCLUDED_TEST

src/text.cpp

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2004 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
@@ -8,6 +29,9 @@
 #include <string>
 #include "task.h"
 
+static const char* newline = "\n";
+static const char* noline  = "";
+
 ///////////////////////////////////////////////////////////////////////////////
 void wrapText (
   std::vector <std::string>& lines,
@@ -262,3 +286,12 @@ std::string lowerCase (const std::string& input)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+const char* optionalBlankLine (Config& conf)
+{
+  if (conf.get ("blanklines", true) == true)
+    return newline;
+
+  return noline;
+}
+
+////////////////////////////////////////////////////////////////////////////////

src/util.cpp

@@ -1,6 +1,27 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2006 - 2008, Paul Beckingham.  All rights reserved.
+// task - a command line task list manager.
 //
+// Copyright 2006 - 2008, Paul Beckingham.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
@@ -59,19 +80,19 @@ void formatTimeDeltaDays (std::string& output, time_t delta)
   if (days > 365)
     sprintf (formatted, "%.1f yrs", (days / 365.2422));
   else if (days > 84)
-    sprintf (formatted, "%1d mths", (int) (days / 30.6));
+    sprintf (formatted, "%1d mth%s", (int) (days / 30.6), ((int) (days / 30.6) == 1 ? "" : "s"));
   else if (days > 13)
-    sprintf (formatted, "%d wks", (int) (days / 7.0));
+    sprintf (formatted, "%d wk%s", (int) (days / 7.0), ((int) (days / 7.0) == 1 ? "" : "s"));
   else if (days > 5.0)
-    sprintf (formatted, "%d days", (int) days);
+    sprintf (formatted, "%d day%s", (int) days, ((int) days == 1 ? "" : "s"));
   else if (days > 1.0)
     sprintf (formatted, "%.1f days", days);
   else if (days * 24 > 1.0)
-    sprintf (formatted, "%d hrs", (int) (days * 24.0));
+    sprintf (formatted, "%d hr%s", (int) (days * 24.0), ((int) (days * 24.0) == 1 ? "" : "s"));
   else if (days * 24 * 60 > 1)
-    sprintf (formatted, "%d mins", (int) (days * 24 * 60));
+    sprintf (formatted, "%d min%s", (int) (days * 24 * 60), ((int) (days * 24 * 60) == 1 ? "" : "s"));
   else if (days * 24 * 60 * 60 > 1)
-    sprintf (formatted, "%d secs", (int) (days * 24 * 60 * 60));
+    sprintf (formatted, "%d sec%s", (int) (days * 24 * 60 * 60), ((int) (days * 24 * 60 * 60) == 1 ? "" : "s"));
   else
     strcpy (formatted, "-");
 
@@ -87,19 +108,19 @@ std::string formatSeconds (time_t delta)
   if (days > 365)
     sprintf (formatted, "%.1f yrs", (days / 365.2422));
   else if (days > 84)
-    sprintf (formatted, "%1d mths", (int) (days / 30.6));
+    sprintf (formatted, "%1d mth%s", (int) (days / 30.6), ((int) (days / 30.6) == 1 ? "" : "s"));
   else if (days > 13)
-    sprintf (formatted, "%d wks", (int) (days / 7.0));
+    sprintf (formatted, "%d wk%s", (int) (days / 7.0), ((int) (days / 7.0) == 1 ? "" : "s"));
   else if (days > 5.0)
-    sprintf (formatted, "%d days", (int) days);
+    sprintf (formatted, "%d day%s", (int) days, ((int) days == 1 ? "" : "s"));
   else if (days > 1.0)
     sprintf (formatted, "%.1f days", days);
   else if (days * 24 > 1.0)
-    sprintf (formatted, "%d hrs", (int) (days * 24.0));
+    sprintf (formatted, "%d hr%s", (int) (days * 24.0), ((int) (days * 24) == 1 ? "" : "s"));
   else if (days * 24 * 60 > 1)
-    sprintf (formatted, "%d mins", (int) (days * 24 * 60));
+    sprintf (formatted, "%d min%s", (int) (days * 24 * 60), ((int) (days * 24 * 60) == 1 ? "" : "s"));
   else if (days * 24 * 60 * 60 > 1)
-    sprintf (formatted, "%d secs", (int) (days * 24 * 60 * 60));
+    sprintf (formatted, "%d sec%s", (int) (days * 24 * 60 * 60), ((int) (days * 24 * 60 * 60) == 1 ? "" : "s"));
   else
     strcpy (formatted, "-");
 
@@ -161,14 +182,18 @@ const std::string uuid ()
 static char randomHexDigit ()
 {
   static char digits[] = "0123456789abcdef";
+#ifdef HAVE_RANDOM
   return digits[random () % 16];
+#else
+  return digits[rand () % 16];
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 const std::string uuid ()
 {
   // xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  char id [37];
+  char id [48] = {0};
   id[0]  = randomHexDigit ();
   id[1]  = randomHexDigit ();
   id[2]  = randomHexDigit ();