Improved color map instructions.

Clarified the use of ANSI escape codes.
Added motivation why to change, e.g. when using Conky.
Added requirement to uncomment color defaults when changing the color map, based on a support request on the mailing list.

tests/README

@@ -105,7 +105,7 @@ First digit tells the family:
 
 	0 - the absolute basics and global stuff
 	1 - basic every-day usage
-        2 - add ins
+	2 - add ins
 
 Second digit tells the particular command we are testing.
 

tests/t0000-config.sh

@@ -10,7 +10,7 @@ to find it somewhere else.
 
 # Remove the pre-created todo.cfg to test behavior in its absence
 rm -f todo.cfg
-echo "Fatal error: Cannot read configuration file $HOME/todo.cfg" > expect
+echo "Fatal Error: Cannot read configuration file $HOME/.todo/config" > expect
 test_expect_success 'no config file' '
     todo.sh > output 2>&1 || test_cmp expect output
 '
@@ -32,6 +32,15 @@ EOF
 
 rm -f used_config
 test_expect_success 'config file (default location 1)' '
+    mkdir .todo
+    cp test.cfg .todo/config
+    todo.sh > output;
+    test_cmp expect output && test -f used_config &&
+        rm -rf .todo
+'
+
+rm -f used_config
+test_expect_success 'config file (default location 2)' '
     cp test.cfg todo.cfg
     todo.sh > output;
     test_cmp expect output && test -f used_config &&
@@ -39,7 +48,7 @@ test_expect_success 'config file (default location 1)' '
 '
 
 rm -f used_config
-test_expect_success 'config file (default location 2)' '
+test_expect_success 'config file (default location 3)' '
     cp test.cfg .todo.cfg
     todo.sh > output;
     test_cmp expect output && test -f used_config &&

tests/t0001-null.sh

@@ -12,7 +12,7 @@ when there are no todos.
 #
 cat > expect <<EOF
 --
-TODO: 0 of 0 tasks shown from $HOME/todo.txt
+TODO: 0 of 0 tasks shown
 EOF
 
 test_expect_success 'null ls' '
@@ -44,7 +44,7 @@ test_expect_success 'null listpri a' '
 #
 cat > expect <<EOF
 --
-TODO: 0 of 0 tasks shown from $HOME/todo.tmp
+TODO: 0 of 0 tasks shown
 EOF
 
 test_expect_success 'null lsa' '

tests/t0002-actions.sh

@@ -0,0 +1,40 @@
+#!/bin/sh
+
+test_description='todo.sh actions.d
+
+This test just makes sure that todo.sh can locate custom actions.
+'
+. ./test-lib.sh
+
+# All the below tests will output the custom action message
+cat > expect << EOF
+TODO: foo
+EOF
+
+cat > foo << EOF
+echo "TODO: foo"
+EOF
+chmod +x foo
+
+test_expect_success 'custom action (default location 1)' '
+    mkdir .todo.actions.d
+    cp foo .todo.actions.d/
+    todo.sh foo > output;
+    test_cmp expect output && rm -rf .todo.actions.d
+'
+
+test_expect_success 'custom action (default location 2)' '
+    mkdir -p .todo/actions
+    cp foo .todo/actions/
+    todo.sh foo > output;
+    test_cmp expect output && rm -rf .todo/actions
+'
+
+test_expect_success 'custom action (env variable)' '
+    mkdir myactions
+    cp foo myactions/
+    TODO_ACTIONS_DIR=myactions todo.sh foo > output;
+    test_cmp expect output && rm -rf myactions
+'
+
+test_done

tests/t1000-addlist.sh

@@ -12,21 +12,23 @@ command work, including support for filtering.
 #
 test_todo_session 'basic add/list' <<EOF
 >>> todo.sh add notice the daisies
-TODO: 'notice the daisies' added on line 1.
+1 notice the daisies
+TODO: 1 added.
 
 >>> todo.sh list
 1 notice the daisies
 --
-TODO: 1 of 1 tasks shown from $HOME/todo.txt
+TODO: 1 of 1 tasks shown
 
 >>> todo.sh add smell the roses
-TODO: 'smell the roses' added on line 2.
+2 smell the roses
+TODO: 2 added.
 
 >>> todo.sh list
 1 notice the daisies
 2 smell the roses
 --
-TODO: 2 of 2 tasks shown from $HOME/todo.txt
+TODO: 2 of 2 tasks shown
 EOF
 
 #
@@ -36,23 +38,39 @@ test_todo_session 'basic list filtering' <<EOF
 >>> todo.sh list daisies
 1 notice the daisies
 --
-TODO: 1 of 2 tasks shown from $HOME/todo.txt
+TODO: 1 of 2 tasks shown
 
 >>> todo.sh list smell
 2 smell the roses
 --
-TODO: 1 of 2 tasks shown from $HOME/todo.txt
+TODO: 1 of 2 tasks shown
 EOF
 
 test_todo_session 'case-insensitive filtering' <<EOF
 >>> todo.sh add smell the uppercase Roses
-TODO: 'smell the uppercase Roses' added on line 3.
+3 smell the uppercase Roses
+TODO: 3 added.
 
 >>> todo.sh list roses
 2 smell the roses
 3 smell the uppercase Roses
 --
-TODO: 2 of 3 tasks shown from $HOME/todo.txt
+TODO: 2 of 3 tasks shown
+EOF
+
+test_todo_session 'add with &' <<EOF
+>>> todo.sh add "dig the garden & water the flowers"
+4 dig the garden & water the flowers
+TODO: 4 added.
+
+>>> todo.sh list
+4 dig the garden & water the flowers
+1 notice the daisies
+2 smell the roses
+3 smell the uppercase Roses
+--
+TODO: 4 of 4 tasks shown
+
 EOF
 
 test_done

tests/t1010-add-date.sh

@@ -12,39 +12,42 @@ a date to each item.
 #
 test_todo_session 'cmd line first day' <<EOF
 >>> todo.sh -t add notice the daisies
-TODO: '2009-02-13 notice the daisies' added on line 1.
+1 2009-02-13 notice the daisies
+TODO: 1 added.
 
 >>> todo.sh list
 1 2009-02-13 notice the daisies
 --
-TODO: 1 of 1 tasks shown from $HOME/todo.txt
+TODO: 1 of 1 tasks shown
 EOF
 
 test_tick
 
 test_todo_session 'cmd line second day' <<EOF
 >>> todo.sh -t add smell the roses
-TODO: '2009-02-14 smell the roses' added on line 2.
+2 2009-02-14 smell the roses
+TODO: 2 added.
 
 >>> todo.sh list
 1 2009-02-13 notice the daisies
 2 2009-02-14 smell the roses
 --
-TODO: 2 of 2 tasks shown from $HOME/todo.txt
+TODO: 2 of 2 tasks shown
 EOF
 
 test_tick
 
 test_todo_session 'cmd line third day' <<EOF
 >>> todo.sh -t add mow the lawn
-TODO: '2009-02-15 mow the lawn' added on line 3.
+3 2009-02-15 mow the lawn
+TODO: 3 added.
 
 >>> todo.sh list
 1 2009-02-13 notice the daisies
 2 2009-02-14 smell the roses
 3 2009-02-15 mow the lawn
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 EOF
 
 # Switch to config file
@@ -55,7 +58,8 @@ test_tick 3600
 
 test_todo_session 'config file third day' <<EOF
 >>> todo.sh add take out the trash
-TODO: '2009-02-15 take out the trash' added on line 4.
+4 2009-02-15 take out the trash
+TODO: 4 added.
 
 >>> todo.sh list
 1 2009-02-13 notice the daisies
@@ -63,7 +67,7 @@ TODO: '2009-02-15 take out the trash' added on line 4.
 3 2009-02-15 mow the lawn
 4 2009-02-15 take out the trash
 --
-TODO: 4 of 4 tasks shown from $HOME/todo.txt
+TODO: 4 of 4 tasks shown
 EOF
 
 test_done

tests/t1020-addtolistfile.sh

@@ -0,0 +1,83 @@
+#!/bin/sh
+
+test_description='basic addto and list functionality
+
+This test just makes sure the basic addto and listfile
+commands work, including support for filtering.
+'
+. ./test-lib.sh
+
+#
+# Addto and listfile
+#
+test_todo_session 'nonexistant file' <<EOF
+>>> todo.sh addto garden.txt notice the daisies
+TODO: Destination file $HOME/garden.txt does not exist.
+=== 1
+EOF
+
+touch "$HOME/garden.txt"
+
+test_todo_session 'basic addto/listfile' <<EOF
+>>> todo.sh addto garden.txt notice the daisies
+1 notice the daisies
+GARDEN: 1 added.
+
+>>> todo.sh listfile garden.txt
+1 notice the daisies
+--
+GARDEN: 1 of 1 tasks shown
+
+>>> todo.sh addto garden.txt smell the roses
+2 smell the roses
+GARDEN: 2 added.
+
+>>> todo.sh listfile garden.txt
+1 notice the daisies
+2 smell the roses
+--
+GARDEN: 2 of 2 tasks shown
+EOF
+
+#
+# Filter
+#
+test_todo_session 'basic listfile filtering' <<EOF
+>>> todo.sh listfile garden.txt daisies
+1 notice the daisies
+--
+GARDEN: 1 of 2 tasks shown
+
+>>> todo.sh listfile garden.txt smell  
+2 smell the roses
+--
+GARDEN: 1 of 2 tasks shown
+EOF
+
+test_todo_session 'case-insensitive filtering' <<EOF
+>>> todo.sh addto garden.txt smell the uppercase Roses
+3 smell the uppercase Roses
+GARDEN: 3 added.
+
+>>> todo.sh listfile garden.txt roses
+2 smell the roses
+3 smell the uppercase Roses
+--
+GARDEN: 2 of 3 tasks shown
+EOF
+
+test_todo_session 'addto with &' <<EOF
+>>> todo.sh addto garden.txt "dig the garden & water the flowers"
+4 dig the garden & water the flowers
+GARDEN: 4 added.
+
+>>> todo.sh listfile garden.txt 
+4 dig the garden & water the flowers
+1 notice the daisies
+2 smell the roses
+3 smell the uppercase Roses
+--
+GARDEN: 4 of 4 tasks shown
+EOF
+
+test_done

tests/t1030-addto-date.sh

@@ -0,0 +1,75 @@
+#!/bin/sh
+
+test_description='test the date on addto feature
+
+Tests paths by which we might automatically add
+a date to each item.
+'
+. ./test-lib.sh
+
+touch "$HOME/garden.txt"
+
+#
+# Add and list
+#
+test_todo_session 'cmd line first day' <<EOF
+>>> todo.sh -t addto garden.txt notice the daisies
+1 2009-02-13 notice the daisies
+GARDEN: 1 added.
+
+>>> todo.sh listfile garden.txt
+1 2009-02-13 notice the daisies
+--
+GARDEN: 1 of 1 tasks shown
+EOF
+
+test_tick
+
+test_todo_session 'cmd line second day' <<EOF
+>>> todo.sh -t addto garden.txt smell the roses
+2 2009-02-14 smell the roses
+GARDEN: 2 added.
+
+>>> todo.sh listfile garden.txt
+1 2009-02-13 notice the daisies
+2 2009-02-14 smell the roses
+--
+GARDEN: 2 of 2 tasks shown
+EOF
+
+test_tick
+
+test_todo_session 'cmd line third day' <<EOF
+>>> todo.sh -t addto garden.txt mow the lawn
+3 2009-02-15 mow the lawn
+GARDEN: 3 added.
+
+>>> todo.sh listfile garden.txt
+1 2009-02-13 notice the daisies
+2 2009-02-14 smell the roses
+3 2009-02-15 mow the lawn
+--
+GARDEN: 3 of 3 tasks shown
+EOF
+
+# Switch to config file
+echo "export TODOTXT_DATE_ON_ADD=1" >> todo.cfg
+
+# Bump the clock, for good measure.
+test_tick 3600
+
+test_todo_session 'config file third day' <<EOF
+>>> todo.sh addto garden.txt take out the trash
+4 2009-02-15 take out the trash
+GARDEN: 4 added.
+
+>>> todo.sh listfile garden.txt
+1 2009-02-13 notice the daisies
+2 2009-02-14 smell the roses
+3 2009-02-15 mow the lawn
+4 2009-02-15 take out the trash
+--
+GARDEN: 4 of 4 tasks shown
+EOF
+
+test_done

tests/t1100-replace.sh

@@ -19,24 +19,24 @@ EOF
 
 test_todo_session 'basic replace' <<EOF
 >>> todo.sh replace 1 "smell the cows"
-1: notice the daisies
-replaced with
-1: smell the cows
+1 notice the daisies
+TODO: Replaced task with:
+1 smell the cows
 
 >>> todo.sh list
 1 smell the cows
 --
-TODO: 1 of 1 tasks shown from $HOME/todo.txt
+TODO: 1 of 1 tasks shown
 
 >>> todo.sh replace 1 smell the roses
-1: smell the cows
-replaced with
-1: smell the roses
+1 smell the cows
+TODO: Replaced task with:
+1 smell the roses
 
 >>> todo.sh list
 1 smell the roses
 --
-TODO: 1 of 1 tasks shown from $HOME/todo.txt
+TODO: 1 of 1 tasks shown
 EOF
 
 cat > todo.txt <<EOF
@@ -47,25 +47,88 @@ chase the chickens
 EOF
 test_todo_session 'replace in multi-item file' <<EOF
 >>> todo.sh replace 1 smell the cheese
-1: smell the cows
-replaced with
-1: smell the cheese
+1 smell the cows
+TODO: Replaced task with:
+1 smell the cheese
 
 >>> todo.sh replace 3 jump on hay
-3: thrash some hay
-replaced with
-3: jump on hay
+3 thrash some hay
+TODO: Replaced task with:
+3 jump on hay
 
 >>> todo.sh replace 4 collect the eggs
-4: chase the chickens
-replaced with
-4: collect the eggs
+4 chase the chickens
+TODO: Replaced task with:
+4 collect the eggs
+EOF
+
+test_todo_session 'replace with priority' <<EOF
+>>> todo.sh pri 4 a
+4 (A) collect the eggs
+TODO: 4 prioritized (A).
+
+>>> todo.sh replace 4 "collect the bread"
+4 (A) collect the eggs
+TODO: Replaced task with:
+4 (A) collect the bread
+
+>>> todo.sh replace 4 collect the eggs
+4 (A) collect the bread
+TODO: Replaced task with:
+4 (A) collect the eggs
+EOF
+
+test_todo_session 'replace with &' << EOF
+>>> todo.sh replace 3 "thrash the hay & thresh the wheat"
+3 jump on hay
+TODO: Replaced task with:
+3 thrash the hay & thresh the wheat
 EOF
 
 test_todo_session 'replace error' << EOF
 >>> todo.sh replace 10 "hej!"
 === 1
-10: No such todo.
+TODO: No task 10.
+EOF
+
+cat /dev/null > todo.txt
+test_todo_session 'replace handling prepended date on add' <<EOF
+>>> todo.sh -t add "new task"
+1 2009-02-13 new task
+TODO: 1 added.
+
+>>> todo.sh replace 1 this is just a new one
+1 2009-02-13 new task
+TODO: Replaced task with:
+1 2009-02-13 this is just a new one
+
+>>> todo.sh replace 1 2010-07-04 this also has a new date
+1 2009-02-13 this is just a new one
+TODO: Replaced task with:
+1 2010-07-04 this also has a new date
+EOF
+
+cat /dev/null > todo.txt
+test_todo_session 'replace handling priority and prepended date on add' <<EOF
+>>> todo.sh -t add "new task"
+1 2009-02-13 new task
+TODO: 1 added.
+
+>>> todo.sh pri 1 A
+1 (A) 2009-02-13 new task
+TODO: 1 prioritized (A).
+
+>>> todo.sh replace 1 this is just a new one
+1 (A) 2009-02-13 new task
+TODO: Replaced task with:
+1 (A) 2009-02-13 this is just a new one
+EOF
+
+test_todo_session 'replace with prepended date replaces existing date' <<EOF
+>>> todo.sh replace 1 2010-07-04 this also has a new date
+1 (A) 2009-02-13 this is just a new one
+TODO: Replaced task with:
+1 (A) 2010-07-04 this also has a new date
 EOF
 
 test_done

tests/t1200-pri.sh

@@ -22,10 +22,10 @@ test_todo_session 'basic priority' <<EOF
 1 smell the uppercase Roses +flowers @outside
 3 stop
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 
 >>> todo.sh pri 1 B
-1: (B) smell the uppercase Roses +flowers @outside
+1 (B) smell the uppercase Roses +flowers @outside
 TODO: 1 prioritized (B).
 
 >>> todo.sh list
@@ -33,17 +33,17 @@ TODO: 1 prioritized (B).
 2 notice the sunflowers
 3 stop
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 
 >>> todo.sh -p list
 1 (B) smell the uppercase Roses +flowers @outside
 2 notice the sunflowers
 3 stop
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 
 >>> todo.sh pri 2 C
-2: (C) notice the sunflowers
+2 (C) notice the sunflowers
 TODO: 2 prioritized (C).
 
 >>> todo.sh -p list
@@ -51,10 +51,10 @@ TODO: 2 prioritized (C).
 2 (C) notice the sunflowers
 3 stop
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 
 >>> todo.sh pri 2 A
-2: (A) notice the sunflowers
+2 (A) notice the sunflowers
 TODO: 2 prioritized (A).
 
 >>> todo.sh -p list
@@ -62,20 +62,21 @@ TODO: 2 prioritized (A).
 1 (B) smell the uppercase Roses +flowers @outside
 3 stop
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 
 >>> todo.sh pri 2 a
-2: (A) notice the sunflowers
+2 (A) notice the sunflowers
 TODO: 2 prioritized (A).
 
 >>> todo.sh -p listpri
 2 (A) notice the sunflowers
 1 (B) smell the uppercase Roses +flowers @outside
 --
-TODO: 2 of 3 tasks shown from $HOME/todo.txt
+TODO: 2 of 3 tasks shown
 
 >>> todo.sh add "smell the coffee +wakeup"
-TODO: 'smell the coffee +wakeup' added on line 4.
+4 smell the coffee +wakeup
+TODO: 4 added.
 
 >>> todo.sh -p list
 2 (A) notice the sunflowers
@@ -83,7 +84,7 @@ TODO: 'smell the coffee +wakeup' added on line 4.
 4 smell the coffee +wakeup
 3 stop
 --
-TODO: 4 of 4 tasks shown from $HOME/todo.txt
+TODO: 4 of 4 tasks shown
 EOF
 
 test_done

tests/t1300-ls.sh

@@ -28,14 +28,14 @@ test_todo_session 'checking TODOTXT_SORT_COMMAND' <<EOF
 3 bbb yyy this line should be second.
 1 ccc xxx this line should be third.
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 
 >>> todo.sh -d "$TEST_TODO1_" ls
 1 ccc xxx this line should be third.
 3 bbb yyy this line should be second.
 2 aaa zzz this line should be first.
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 EOF
 
 #
@@ -50,11 +50,79 @@ test_todo_session 'checking TODOTXT_FINAL_FILTER' <<EOF
 3 bbb yyy this line s...
 1 ccc xxx this line s...
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 EOF
 
 #
-# check the  p command line option
+# check the filtering of TERM
+#
+test_todo_session 'checking filtering of TERM' <<EOF
+>>> todo.sh ls second
+3 bbb yyy this line should be second.
+--
+TODO: 1 of 3 tasks shown
+
+>>> todo.sh ls "should be f"
+2 aaa zzz this line should be first.
+--
+TODO: 1 of 3 tasks shown
+
+>>> todo.sh ls " zzz"
+2 aaa zzz this line should be first.
+--
+TODO: 1 of 3 tasks shown
+EOF
+
+#
+# check the filtering of TERM with regexp
+#
+test_todo_session 'checking filtering of TERM with regexp' <<EOF
+>>> todo.sh ls "ir[ds]"
+2 aaa zzz this line should be first.
+1 ccc xxx this line should be third.
+--
+TODO: 2 of 3 tasks shown
+
+>>> todo.sh ls "f.*t"
+2 aaa zzz this line should be first.
+--
+TODO: 1 of 3 tasks shown
+
+>>> todo.sh ls "ir[ds]" xxx
+1 ccc xxx this line should be third.
+--
+TODO: 1 of 3 tasks shown
+EOF
+
+#
+# check the x command line option
+#
+TEST_TODO3_=todo3.cfg
+sed -e "s%^.*export TODOTXT_FINAL_FILTER=.*$%export TODOTXT_FINAL_FILTER=\"grep -v xxx\"%" "${TEST_TODO_}" > "${TEST_TODO3_}"
+
+cat > todo.txt <<EOF
+foo
+bar xxx
+baz
+EOF
+
+test_todo_session 'final filter suppression' <<EOF
+>>> todo.sh -d "$TEST_TODO3_" ls
+3 baz
+1 foo
+--
+TODO: 2 of 3 tasks shown
+
+>>> todo.sh -d "$TEST_TODO3_" -x ls
+2 bar xxx
+3 baz
+1 foo
+--
+TODO: 3 of 3 tasks shown
+EOF
+
+#
+# check the p command line option
 #
 cat > todo.txt <<EOF
 (A) @con01 +prj01 -- Some project 01 task, pri A
@@ -101,7 +169,7 @@ test_todo_session 'plain mode option' <<EOF
 19 @con02 +prj03 -- Some project 03 task, no priorty
 20 @con02 +prj04 -- Some project 04 task, no priority
 --
-TODO: 20 of 20 tasks shown from $HOME/todo.txt
+TODO: 20 of 20 tasks shown
 
 >>> todo.sh -p ls
 01 (A) @con01 +prj01 -- Some project 01 task, pri A
@@ -125,7 +193,7 @@ TODO: 20 of 20 tasks shown from $HOME/todo.txt
 19 @con02 +prj03 -- Some project 03 task, no priorty
 20 @con02 +prj04 -- Some project 04 task, no priority
 --
-TODO: 20 of 20 tasks shown from $HOME/todo.txt
+TODO: 20 of 20 tasks shown
 EOF
 
 #
@@ -176,7 +244,7 @@ test_todo_session 'context, project, and priority suppression' <<EOF
 19 @con02 +prj03 -- Some project 03 task, no priorty
 20 @con02 +prj04 -- Some project 04 task, no priority
 --
-TODO: 20 of 20 tasks shown from $HOME/todo.txt
+TODO: 20 of 20 tasks shown
 
 >>> todo.sh ls @con01
 01 (A) @con01 +prj01 -- Some project 01 task, pri A
@@ -190,7 +258,7 @@ TODO: 20 of 20 tasks shown from $HOME/todo.txt
 17 @con01 +prj01 -- Some project 01 task, no priority
 18 @con01 +prj02 -- Some project 02 task, no priority
 --
-TODO: 10 of 20 tasks shown from $HOME/todo.txt
+TODO: 10 of 20 tasks shown
 
 >>> todo.sh -P ls @con01
 01 @con01 +prj01 -- Some project 01 task, pri A
@@ -204,7 +272,7 @@ TODO: 10 of 20 tasks shown from $HOME/todo.txt
 17 @con01 +prj01 -- Some project 01 task, no priority
 18 @con01 +prj02 -- Some project 02 task, no priority
 --
-TODO: 10 of 20 tasks shown from $HOME/todo.txt
+TODO: 10 of 20 tasks shown
 
 >>> todo.sh -+ ls @con01
 01 (A) @con01 -- Some project 01 task, pri A
@@ -218,7 +286,7 @@ TODO: 10 of 20 tasks shown from $HOME/todo.txt
 17 @con01 -- Some project 01 task, no priority
 18 @con01 -- Some project 02 task, no priority
 --
-TODO: 10 of 20 tasks shown from $HOME/todo.txt
+TODO: 10 of 20 tasks shown
 
 >>> todo.sh -@ ls @con01
 01 (A) +prj01 -- Some project 01 task, pri A
@@ -232,7 +300,7 @@ TODO: 10 of 20 tasks shown from $HOME/todo.txt
 17 +prj01 -- Some project 01 task, no priority
 18 +prj02 -- Some project 02 task, no priority
 --
-TODO: 10 of 20 tasks shown from $HOME/todo.txt
+TODO: 10 of 20 tasks shown
 
 >>> todo.sh -P -@ ls @con01
 01 +prj01 -- Some project 01 task, pri A
@@ -246,7 +314,7 @@ TODO: 10 of 20 tasks shown from $HOME/todo.txt
 17 +prj01 -- Some project 01 task, no priority
 18 +prj02 -- Some project 02 task, no priority
 --
-TODO: 10 of 20 tasks shown from $HOME/todo.txt
+TODO: 10 of 20 tasks shown
 
 >>> todo.sh -P -@ -+ -P -@ -+ ls @con01
 01 (A) @con01 +prj01 -- Some project 01 task, pri A
@@ -260,7 +328,7 @@ TODO: 10 of 20 tasks shown from $HOME/todo.txt
 17 @con01 +prj01 -- Some project 01 task, no priority
 18 @con01 +prj02 -- Some project 02 task, no priority
 --
-TODO: 10 of 20 tasks shown from $HOME/todo.txt
+TODO: 10 of 20 tasks shown
 
 >>> todo.sh -P -@ -+ -P -@ -+ -P -@ -+ ls @con01
 01 -- Some project 01 task, pri A
@@ -274,7 +342,7 @@ TODO: 10 of 20 tasks shown from $HOME/todo.txt
 17 -- Some project 01 task, no priority
 18 -- Some project 02 task, no priority
 --
-TODO: 10 of 20 tasks shown from $HOME/todo.txt
+TODO: 10 of 20 tasks shown
 EOF
 
 #
@@ -509,7 +577,88 @@ test_todo_session 'check line number padding, out to 3 digits' <<EOF
 111 hex6E this is another line
 112 hex6F this is another line
 --
-TODO: 112 of 112 tasks shown from $HOME/todo.txt
+TODO: 112 of 112 tasks shown
+EOF
+
+#
+# check that blank lines are ignored.
+#
+
+# Less than 10
+cat > todo.txt <<EOF
+hex00 this is one line
+
+hex02 this is another line
+hex03 this is another line
+hex04 this is another line
+hex05 this is another line
+hex06 this is another line
+hex07 this is another line
+EOF
+test_todo_session 'check that blank lines are ignored for less than 10 items' <<EOF
+>>> todo.sh ls
+1 hex00 this is one line
+3 hex02 this is another line
+4 hex03 this is another line
+5 hex04 this is another line
+6 hex05 this is another line
+7 hex06 this is another line
+8 hex07 this is another line
+--
+TODO: 7 of 7 tasks shown
+EOF
+
+# More than 10
+cat > todo.txt <<EOF
+hex00 this is one line
+
+hex02 this is another line
+hex03 this is another line
+hex04 this is another line
+hex05 this is another line
+hex06 this is another line
+hex07 this is another line
+hex08 this is another line
+hex09 this is another line
+EOF
+test_todo_session 'check that blank lines are ignored for blank lines whose ID begins with `0` (one blank)' <<EOF
+>>> todo.sh ls
+01 hex00 this is one line
+03 hex02 this is another line
+04 hex03 this is another line
+05 hex04 this is another line
+06 hex05 this is another line
+07 hex06 this is another line
+08 hex07 this is another line
+09 hex08 this is another line
+10 hex09 this is another line
+--
+TODO: 9 of 9 tasks shown
+EOF
+cat > todo.txt <<EOF
+hex00 this is one line
+
+hex02 this is another line
+hex03 this is another line
+hex04 this is another line
+hex05 this is another line
+
+hex07 this is another line
+hex08 this is another line
+hex09 this is another line
+EOF
+test_todo_session 'check that blank lines are ignored for blank lines whose ID begins with `0` (many blanks)' <<EOF
+>>> todo.sh ls
+01 hex00 this is one line
+03 hex02 this is another line
+04 hex03 this is another line
+05 hex04 this is another line
+06 hex05 this is another line
+08 hex07 this is another line
+09 hex08 this is another line
+10 hex09 this is another line
+--
+TODO: 8 of 8 tasks shown
 EOF
 
 test_done

tests/t1330-ls-highlighting.sh

@@ -0,0 +1,151 @@
+#!/bin/sh
+#
+
+test_description='list highlighting
+
+This test checks the highlighting (with colors) of prioritized tasks.
+'
+. ./test-lib.sh
+
+TEST_TODO_=todo.cfg
+
+#
+# check the highlighting of prioritized tasks
+#
+cat > todo.txt <<EOF
+(A) @con01 +prj01 -- Some project 01 task, pri A
+(B) @con02 +prj02 -- Some project 02 task, pri B
+(C) @con01 +prj01 -- Some project 01 task, pri C
+(D) @con02 +prj02 -- Some project 02 task, pri D
+(E) @con01 +prj01 -- Some project 01 task, pri E
+(Z) @con02 +prj02 -- Some project 02 task, pri Z
+@con01 +prj01 -- Some project 01 task, no priority
+@con02 +prj02 -- Some project 02 task, no priority
+EOF
+test_todo_session 'default highlighting' <<EOF
+>>> todo.sh ls
+1 (A) @con01 +prj01 -- Some project 01 task, pri A
+2 (B) @con02 +prj02 -- Some project 02 task, pri B
+3 (C) @con01 +prj01 -- Some project 01 task, pri C
+4 (D) @con02 +prj02 -- Some project 02 task, pri D
+5 (E) @con01 +prj01 -- Some project 01 task, pri E
+6 (Z) @con02 +prj02 -- Some project 02 task, pri Z
+7 @con01 +prj01 -- Some project 01 task, no priority
+8 @con02 +prj02 -- Some project 02 task, no priority
+--
+TODO: 8 of 8 tasks shown
+EOF
+
+#
+# check changing the color definitions into something other than ANSI color
+# escape sequences
+#
+TEST_TODO_CUSTOM=todo-custom.cfg
+cat todo.cfg > "$TEST_TODO_CUSTOM"
+cat >> "$TEST_TODO_CUSTOM" <<'EOF'
+export YELLOW='${color yellow}'
+export GREEN='${color green}'
+export LIGHT_BLUE='${color LightBlue}'
+export WHITE='${color white}'
+export DEFAULT='${color}'
+export PRI_A=$YELLOW
+export PRI_B=$GREEN
+export PRI_C=$LIGHT_BLUE
+export PRI_X=$WHITE
+EOF
+test_todo_session 'customized highlighting' <<'EOF'
+>>> todo.sh -d "$TEST_TODO_CUSTOM" ls
+${color yellow}1 (A) @con01 +prj01 -- Some project 01 task, pri A${color}
+${color green}2 (B) @con02 +prj02 -- Some project 02 task, pri B${color}
+${color LightBlue}3 (C) @con01 +prj01 -- Some project 01 task, pri C${color}
+${color white}4 (D) @con02 +prj02 -- Some project 02 task, pri D${color}
+${color white}5 (E) @con01 +prj01 -- Some project 01 task, pri E${color}
+${color white}6 (Z) @con02 +prj02 -- Some project 02 task, pri Z${color}
+7 @con01 +prj01 -- Some project 01 task, no priority
+8 @con02 +prj02 -- Some project 02 task, no priority
+--
+TODO: 8 of 8 tasks shown
+EOF
+
+#
+# check defining highlightings for more priorities than the default A, B, C
+#
+TEST_TODO_ADDITIONAL=todo-additional.cfg
+cat todo.cfg > "$TEST_TODO_ADDITIONAL"
+cat >> "$TEST_TODO_ADDITIONAL" <<'EOF'
+export PRI_E=$BROWN
+export PRI_Z=$LIGHT_PURPLE
+EOF
+test_todo_session 'additional highlighting pri E+Z' <<'EOF'
+>>> todo.sh -d "$TEST_TODO_ADDITIONAL" ls
+1 (A) @con01 +prj01 -- Some project 01 task, pri A
+2 (B) @con02 +prj02 -- Some project 02 task, pri B
+3 (C) @con01 +prj01 -- Some project 01 task, pri C
+4 (D) @con02 +prj02 -- Some project 02 task, pri D
+5 (E) @con01 +prj01 -- Some project 01 task, pri E
+6 (Z) @con02 +prj02 -- Some project 02 task, pri Z
+7 @con01 +prj01 -- Some project 01 task, no priority
+8 @con02 +prj02 -- Some project 02 task, no priority
+--
+TODO: 8 of 8 tasks shown
+EOF
+
+# check changing the fallback highlighting for undefined priorities
+#
+TEST_TODO_PRI_X=todo-pri-x.cfg
+cat todo.cfg > "$TEST_TODO_PRI_X"
+cat >> "$TEST_TODO_PRI_X" <<'EOF'
+export PRI_X=$BROWN
+EOF
+test_todo_session 'different highlighting for pri X' <<'EOF'
+>>> todo.sh -d "$TEST_TODO_PRI_X" ls
+1 (A) @con01 +prj01 -- Some project 01 task, pri A
+2 (B) @con02 +prj02 -- Some project 02 task, pri B
+3 (C) @con01 +prj01 -- Some project 01 task, pri C
+4 (D) @con02 +prj02 -- Some project 02 task, pri D
+5 (E) @con01 +prj01 -- Some project 01 task, pri E
+6 (Z) @con02 +prj02 -- Some project 02 task, pri Z
+7 @con01 +prj01 -- Some project 01 task, no priority
+8 @con02 +prj02 -- Some project 02 task, no priority
+--
+TODO: 8 of 8 tasks shown
+EOF
+
+# check highlighting of done (but not yet archived) tasks
+#
+cat > todo.txt <<EOF
+(A) smell the uppercase Roses +flowers @outside
+remove1
+notice the sunflowers
+remove2
+stop
+EOF
+test_todo_session 'highlighting of done tasks' <<EOF
+>>> todo.sh -a do 2
+2 x 2009-02-13 remove1
+TODO: 2 marked as done.
+
+>>> todo.sh list
+1 (A) smell the uppercase Roses +flowers @outside
+3 notice the sunflowers
+4 remove2
+5 stop
+2 x 2009-02-13 remove1
+--
+TODO: 5 of 5 tasks shown
+
+>>> todo.sh -a do 4
+4 x 2009-02-13 remove2
+TODO: 4 marked as done.
+
+>>> todo.sh list
+1 (A) smell the uppercase Roses +flowers @outside
+3 notice the sunflowers
+5 stop
+2 x 2009-02-13 remove1
+4 x 2009-02-13 remove2
+--
+TODO: 5 of 5 tasks shown
+EOF
+
+test_done

tests/t1400-prepend.sh

@@ -0,0 +1,94 @@
+#!/bin/sh
+
+test_description='basic prepend functionality
+'
+. ./test-lib.sh
+
+test_todo_session 'prepend usage' <<EOF
+>>> todo.sh prepend B B
+usage: todo.sh prepend ITEM# "TEXT TO PREPEND"
+=== 1
+EOF
+
+cat > todo.txt <<EOF
+(B) smell the uppercase Roses +flowers @outside
+notice the sunflowers
+stop
+EOF
+test_todo_session 'basic prepend' <<EOF
+>>> todo.sh list
+1 (B) smell the uppercase Roses +flowers @outside
+2 notice the sunflowers
+3 stop
+--
+TODO: 3 of 3 tasks shown
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+2 notice the sunflowers
+3 stop
+--
+TODO: 3 of 3 tasks shown
+
+>>> todo.sh prepend 2 test
+2 test notice the sunflowers
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+3 stop
+2 test notice the sunflowers
+--
+TODO: 3 of 3 tasks shown
+
+>>> todo.sh prepend 1 test
+1 (B) test smell the uppercase Roses +flowers @outside
+
+>>> todo.sh -p list
+1 (B) test smell the uppercase Roses +flowers @outside
+3 stop
+2 test notice the sunflowers
+--
+TODO: 3 of 3 tasks shown
+
+EOF
+
+test_todo_session 'prepend with &' <<EOF
+>>> todo.sh prepend 3 "no running & jumping now"
+3 no running & jumping now stop
+EOF
+
+cat /dev/null > todo.txt
+test_todo_session 'prepend handling prepended date on add' <<EOF
+>>> todo.sh -t add "new task"
+1 2009-02-13 new task
+TODO: 1 added.
+
+>>> todo.sh prepend 1 "this is just a"
+1 2009-02-13 this is just a new task
+EOF
+
+cat /dev/null > todo.txt
+test_todo_session 'prepend handling priority and prepended date on add' <<EOF
+>>> todo.sh -t add "new task"
+1 2009-02-13 new task
+TODO: 1 added.
+
+>>> todo.sh pri 1 A
+1 (A) 2009-02-13 new task
+TODO: 1 prioritized (A).
+
+>>> todo.sh prepend 1 "this is just a"
+1 (A) 2009-02-13 this is just a new task
+EOF
+
+cat /dev/null > todo.txt
+test_todo_session 'prepend with prepended date keeps both' <<EOF
+>>> todo.sh -t add "new task"
+1 2009-02-13 new task
+TODO: 1 added.
+
+>>> todo.sh prepend 1 "2010-07-04 this is just a"
+1 2009-02-13 2010-07-04 this is just a new task
+EOF
+
+test_done

tests/t1500-do.sh

@@ -0,0 +1,86 @@
+#!/bin/sh
+
+test_description='do functionality
+'
+. ./test-lib.sh
+
+#DATE=`date '+%Y-%m-%d'`
+
+test_todo_session 'do usage' <<EOF
+>>> todo.sh do B B
+usage: todo.sh do ITEM#[, ITEM#, ITEM#, ...]
+=== 1
+EOF
+
+test_todo_session 'do missing ITEM#' <<EOF
+>>> todo.sh do
+usage: todo.sh do ITEM#[, ITEM#, ITEM#, ...]
+=== 1
+EOF
+
+cat > todo.txt <<EOF
+smell the uppercase Roses +flowers @outside
+notice the sunflowers
+stop
+remove1
+remove2
+remove3
+remove4
+EOF
+
+test_todo_session 'basic do' <<EOF
+>>> todo.sh list
+2 notice the sunflowers
+4 remove1
+5 remove2
+6 remove3
+7 remove4
+1 smell the uppercase Roses +flowers @outside
+3 stop
+--
+TODO: 7 of 7 tasks shown
+
+>>> todo.sh do 7,6
+7 x 2009-02-13 remove4
+TODO: 7 marked as done.
+6 x 2009-02-13 remove3
+TODO: 6 marked as done.
+x 2009-02-13 remove3
+x 2009-02-13 remove4
+TODO: $HOME/todo.txt archived.
+
+>>> todo.sh -p list
+2 notice the sunflowers
+4 remove1
+5 remove2
+1 smell the uppercase Roses +flowers @outside
+3 stop
+--
+TODO: 5 of 5 tasks shown
+
+>>> todo.sh do 5 4
+5 x 2009-02-13 remove2
+TODO: 5 marked as done.
+4 x 2009-02-13 remove1
+TODO: 4 marked as done.
+x 2009-02-13 remove1
+x 2009-02-13 remove2
+TODO: $HOME/todo.txt archived.
+
+>>> todo.sh -p list
+2 notice the sunflowers
+1 smell the uppercase Roses +flowers @outside
+3 stop
+--
+TODO: 3 of 3 tasks shown
+EOF
+
+test_todo_session 'fail multiple do attempts' <<EOF
+>>> todo.sh -a do 3
+3 x 2009-02-13 stop
+TODO: 3 marked as done.
+
+>>> todo.sh -a do 3
+3 is already marked done
+EOF
+test_done

tests/t1600-append.sh

@@ -0,0 +1,76 @@
+#!/bin/sh
+
+test_description='basic append functionality
+
+Ensure we can append items successfully.
+'
+. ./test-lib.sh
+
+#
+# Set up the basic todo.txt
+#
+todo.sh add notice the daisies > /dev/null
+
+test_todo_session 'append usage' <<EOF
+>>> todo.sh append adf asdfa
+=== 1
+usage: todo.sh append ITEM# "TEXT TO APPEND"
+EOF
+
+test_todo_session 'basic append' <<EOF
+>>> todo.sh append 1 "smell the roses"
+1 notice the daisies smell the roses
+
+>>> todo.sh list
+1 notice the daisies smell the roses
+--
+TODO: 1 of 1 tasks shown
+EOF
+
+test_todo_session 'basic append with &' <<EOF
+>>> todo.sh append 1 "see the wasps & bees"
+1 notice the daisies smell the roses see the wasps & bees
+
+>>> todo.sh list
+1 notice the daisies smell the roses see the wasps & bees
+--
+TODO: 1 of 1 tasks shown
+EOF
+
+
+test_todo_session 'append error' << EOF
+>>> todo.sh append 10 "hej!"
+=== 1
+TODO: No task 10.
+EOF
+
+cat > todo.txt <<EOF
+notice the daisies
+EOF
+test_todo_session 'append of current sentence' <<EOF
+>>> todo.sh append 1 ", lilies and roses"
+1 notice the daisies, lilies and roses
+
+>>> todo.sh append 1 "; see the wasps"
+1 notice the daisies, lilies and roses; see the wasps
+
+>>> todo.sh append 1 "& bees"
+1 notice the daisies, lilies and roses; see the wasps & bees
+EOF
+
+cp todo.cfg special-delimiters.cfg
+cat >> special-delimiters.cfg <<EOF
+export SENTENCE_DELIMITERS='*,.:;&'
+EOF
+test_todo_session 'append of current sentence SENTENCE_DELIMITERS' <<EOF
+>>> todo.sh -d special-delimiters.cfg append 1 "&beans"
+1 notice the daisies, lilies and roses; see the wasps & bees&beans
+
+>>> todo.sh -d special-delimiters.cfg append 1 "%foo"
+1 notice the daisies, lilies and roses; see the wasps & bees&beans %foo
+
+>>> todo.sh -d special-delimiters.cfg append 1 "*2"
+1 notice the daisies, lilies and roses; see the wasps & bees&beans %foo*2
+EOF
+
+test_done

tests/t1700-depri.sh

@@ -0,0 +1,71 @@
+#!/bin/sh
+
+test_description='basic depriority functionality
+'
+. ./test-lib.sh
+
+test_todo_session 'depriority usage' <<EOF
+>>> todo.sh depri B B
+usage: todo.sh depri ITEM#[, ITEM#, ITEM#, ...]
+=== 1
+EOF
+
+test_todo_session 'depriority nonexistant item' <<EOF
+>>> todo.sh depri 42
+TODO: No task 42.
+=== 1
+EOF
+
+cat > todo.txt <<EOF
+(B) smell the uppercase Roses +flowers @outside
+(A) notice the sunflowers
+stop
+EOF
+test_todo_session 'basic depriority' <<EOF
+>>> todo.sh -p list
+2 (A) notice the sunflowers
+1 (B) smell the uppercase Roses +flowers @outside
+3 stop
+--
+TODO: 3 of 3 tasks shown
+
+>>> todo.sh depri 1
+1 smell the uppercase Roses +flowers @outside
+TODO: 1 deprioritized.
+
+>>> todo.sh -p list
+2 (A) notice the sunflowers
+1 smell the uppercase Roses +flowers @outside
+3 stop
+--
+TODO: 3 of 3 tasks shown
+EOF
+
+cat > todo.txt <<EOF
+(B) smell the uppercase Roses +flowers @outside
+(A) notice the sunflowers
+(C) stop
+EOF
+test_todo_session 'multiple depriority' <<EOF
+>>> todo.sh -p list
+2 (A) notice the sunflowers
+1 (B) smell the uppercase Roses +flowers @outside
+3 (C) stop
+--
+TODO: 3 of 3 tasks shown
+
+>>> todo.sh depri 3 2
+3 stop
+TODO: 3 deprioritized.
+2 notice the sunflowers
+TODO: 2 deprioritized.
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+2 notice the sunflowers
+3 stop
+--
+TODO: 3 of 3 tasks shown
+EOF
+
+test_done

tests/t1800-del.sh

@@ -0,0 +1,153 @@
+#!/bin/sh
+
+test_description='basic del functionality
+'
+. ./test-lib.sh
+
+test_todo_session 'del usage' <<EOF
+>>> todo.sh del B
+usage: todo.sh del ITEM# [TERM]
+=== 1
+EOF
+
+test_todo_session 'del nonexistant item' <<EOF
+>>> todo.sh -f del 42
+TODO: No task 42.
+=== 1
+
+>>> todo.sh -f del 42 Roses
+TODO: No task 42.
+=== 1
+EOF
+
+cat > todo.txt <<EOF
+(B) smell the uppercase Roses +flowers @outside
+(A) notice the sunflowers
+stop
+EOF
+test_todo_session 'basic del' <<EOF
+>>> todo.sh -p list
+2 (A) notice the sunflowers
+1 (B) smell the uppercase Roses +flowers @outside
+3 stop
+--
+TODO: 3 of 3 tasks shown
+
+>>> todo.sh -f del 1
+1 (B) smell the uppercase Roses +flowers @outside
+TODO: 1 deleted.
+
+>>> todo.sh -p list
+2 (A) notice the sunflowers
+3 stop
+--
+TODO: 2 of 2 tasks shown
+EOF
+
+cat > todo.txt <<EOF
+(B) smell the uppercase Roses +flowers @outside
+(A) notice the sunflowers
+stop
+EOF
+test_todo_session 'del preserving line numbers' <<EOF
+>>> todo.sh -f del 1
+1 (B) smell the uppercase Roses +flowers @outside
+TODO: 1 deleted.
+
+>>> todo.sh -f del 1
+TODO: No task 1.
+=== 1
+
+>>> todo.sh add A new task
+4 A new task
+TODO: 4 added.
+
+>>> todo.sh -p list
+2 (A) notice the sunflowers
+4 A new task
+3 stop
+--
+TODO: 3 of 3 tasks shown
+
+>>> todo.sh -f -n del 2
+2 (A) notice the sunflowers
+TODO: 2 deleted.
+
+>>> todo.sh add Another new task
+3 Another new task
+TODO: 3 added.
+
+>>> todo.sh -p list
+2 A new task
+3 Another new task
+1 stop
+--
+TODO: 3 of 3 tasks shown
+EOF
+
+cat > todo.txt <<EOF
+(B) smell the uppercase Roses +flowers @outside
+(A) notice the sunflowers
+(C) stop
+EOF
+test_todo_session 'basic del TERM' <<EOF
+>>> todo.sh -p list
+2 (A) notice the sunflowers
+1 (B) smell the uppercase Roses +flowers @outside
+3 (C) stop
+--
+TODO: 3 of 3 tasks shown
+
+>>> todo.sh del 1 uppercase
+1 (B) smell the uppercase Roses +flowers @outside
+TODO: Removed 'uppercase' from task.
+1 (B) smell the Roses +flowers @outside
+
+>>> todo.sh -p list
+2 (A) notice the sunflowers
+1 (B) smell the Roses +flowers @outside
+3 (C) stop
+--
+TODO: 3 of 3 tasks shown
+
+>>> todo.sh del 1 "the Roses"
+1 (B) smell the Roses +flowers @outside
+TODO: Removed 'the Roses' from task.
+1 (B) smell +flowers @outside
+
+>>> todo.sh del 1 m
+1 (B) smell +flowers @outside
+TODO: Removed 'm' from task.
+1 (B) sell +flowers @outside
+
+>>> todo.sh del 1 @outside
+1 (B) sell +flowers @outside
+TODO: Removed '@outside' from task.
+1 (B) sell +flowers
+
+>>> todo.sh del 1 sell
+1 (B) sell +flowers
+TODO: Removed 'sell' from task.
+1 (B) +flowers
+EOF
+
+cat > todo.txt <<EOF
+(B) smell the uppercase Roses +flowers @outside
+(A) notice the sunflowers
+(C) stop
+EOF
+test_todo_session 'del nonexistant TERM' <<EOF
+>>> todo.sh del 1 dung
+1 (B) smell the uppercase Roses +flowers @outside
+TODO: 'dung' not found; no removal done.
+=== 1
+
+>>> todo.sh -p list
+2 (A) notice the sunflowers
+1 (B) smell the uppercase Roses +flowers @outside
+3 (C) stop
+--
+TODO: 3 of 3 tasks shown
+EOF
+
+test_done

tests/t2000-multiline.sh

@@ -0,0 +1,136 @@
+#!/bin/sh
+
+test_description='Multi-line functionality'
+
+. ./test-lib.sh
+
+## Replace test
+# Create the expected file
+echo "1 smell the cheese
+TODO: Replaced task with:
+1 eat apples eat oranges drink milk">$HOME/expect.multi
+
+test_expect_success 'multiline squash item replace' '
+(
+# Prepare single line todo file
+cat /dev/null > $HOME/todo.txt
+"$HOME/bin/todo.sh" add smell the cheese
+
+# Run replace
+"$HOME/bin/todo.sh" replace 1 "eat apples
+eat oranges
+drink milk" > $HOME/output.multi
+
+# Test output against expected
+diff "$HOME/output.multi" "$HOME/expect.multi"
+if [ $? -ne 0 ]; then
+  exit 1
+else
+  exit 0
+fi
+)
+'
+
+## Add test
+# Create the expected file
+echo "2 eat apples eat oranges drink milk
+TODO: 2 added.">$HOME/expect.multi
+
+test_expect_success 'multiline squash item add' '
+(
+# Prepare single line todo file
+cat /dev/null > $HOME/todo.txt
+"$HOME/bin/todo.sh" add smell the cheese
+
+# Run add
+"$HOME/bin/todo.sh" add "eat apples
+eat oranges
+drink milk" > $HOME/output.multi
+
+# Test output against expected
+diff "$HOME/output.multi" "$HOME/expect.multi"
+if [ $? -ne 0 ]; then
+  exit 1
+else
+  exit 0
+fi
+)
+'
+
+## Append test
+# Create the expected file
+echo "1 smell the cheese eat apples eat oranges drink milk">$HOME/expect.multi
+
+test_expect_success 'multiline squash item append' '
+(
+# Prepare single line todo file
+cat /dev/null > $HOME/todo.txt
+"$HOME/bin/todo.sh" add smell the cheese
+
+# Run append
+"$HOME/bin/todo.sh" append 1 "eat apples
+eat oranges
+drink milk" > $HOME/output.multi
+
+# Test output against expected
+diff "$HOME/output.multi" "$HOME/expect.multi"
+if [ $? -ne 0 ]; then
+  exit 1
+else
+  exit 0
+fi
+)
+'
+
+## Prepend test
+# Create the expected file
+echo "1 eat apples eat oranges drink milk smell the cheese">$HOME/expect.multi
+
+test_expect_success 'multiline squash item prepend' '
+(
+# Prepare single line todo file
+cat /dev/null > $HOME/todo.txt
+"$HOME/bin/todo.sh" add smell the cheese
+
+# Run prepend
+"$HOME/bin/todo.sh" prepend 1 "eat apples
+eat oranges
+drink milk" > $HOME/output.multi
+
+# Test output against expected
+diff "$HOME/output.multi" "$HOME/expect.multi"
+if [ $? -ne 0 ]; then
+  exit 1
+else
+  exit 0
+fi
+)
+'
+
+## Multiple line addition
+# Create the expected file
+echo "2 eat apples
+TODO: 2 added." > $HOME/expect.multi
+echo "3 eat oranges
+TODO: 3 added." >>$HOME/expect.multi
+echo "4 drink milk
+TODO: 4 added." >> $HOME/expect.multi
+
+test_expect_success 'actual multiline add' '
+(
+# Run addm
+"$HOME/bin/todo.sh" addm "eat apples
+eat oranges
+drink milk" > $HOME/output.multi
+
+# Test output against expected
+diff "$HOME/output.multi" "$HOME/expect.multi"
+if [ $? -ne 0 ]; then
+  exit 1
+else
+  exit 0
+fi
+)
+'
+
+test_done

tests/t8000-actions.sh

@@ -0,0 +1,52 @@
+#!/bin/sh
+
+test_description='custom actions functionality
+
+This test covers the contract between todo.sh and custom actions.
+'
+. ./test-lib.sh
+
+unset TODO_ACTIONS_DIR
+mkdir .todo.actions.d
+cat > .todo.actions.d/foo << EOF
+echo "TODO: foo"
+EOF
+
+test_todo_session 'nonexecutable action' <<EOF
+>>> todo.sh foo
+Usage: todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]
+Try 'todo.sh -h' for more information.
+=== 1
+EOF
+
+chmod +x .todo.actions.d/foo
+test_todo_session 'executable action' <<EOF
+>>> todo.sh foo
+TODO: foo
+EOF
+
+cat > .todo.actions.d/ls << EOF
+echo "TODO: my ls"
+EOF
+chmod +x .todo.actions.d/ls
+test_todo_session 'overriding built-in action' <<EOF
+>>> todo.sh ls
+TODO: my ls
+
+>>> todo.sh command ls
+--
+TODO: 0 of 0 tasks shown
+EOF
+
+cat > .todo.actions.d/bad << EOF
+echo "TODO: bad"
+exit 42
+EOF
+chmod +x .todo.actions.d/bad
+test_todo_session 'failing action' <<EOF
+>>> todo.sh bad
+TODO: bad
+=== 42
+EOF
+
+test_done

tests/t9999-testsuite_example.sh

@@ -17,26 +17,26 @@ test_todo_session 'basic tests' <<EOF
 4 smell the coffee +wakeup
 3 stop
 --
-TODO: 4 of 4 tasks shown from $HOME/todo.txt
+TODO: 4 of 4 tasks shown
 
 >>> todo.sh -p list +flowers
 1 (B) smell the uppercase Roses +flowers @outside
 --
-TODO: 1 of 4 tasks shown from $HOME/todo.txt
+TODO: 1 of 4 tasks shown
 
 >>> todo.sh -p list flowers
 2 (A) notice the sunflowers
 1 (B) smell the uppercase Roses +flowers @outside
 --
-TODO: 2 of 4 tasks shown from $HOME/todo.txt
+TODO: 2 of 4 tasks shown
 
 >>> todo.sh -p list flowers out
 1 (B) smell the uppercase Roses +flowers @outside
 --
-TODO: 1 of 4 tasks shown from $HOME/todo.txt
+TODO: 1 of 4 tasks shown
 
 >>> todo.sh -a do 2
-2: x 2009-02-13 notice the sunflowers
+2 x 2009-02-13 notice the sunflowers
 TODO: 2 marked as done.
 
 >>> todo.sh -p list
@@ -45,19 +45,21 @@ TODO: 2 marked as done.
 3 stop
 2 x 2009-02-13 notice the sunflowers
 --
-TODO: 4 of 4 tasks shown from $HOME/todo.txt
+TODO: 4 of 4 tasks shown
 
 >>> todo.sh add "make the coffee +wakeup"
-TODO: 'make the coffee +wakeup' added on line 5.
+5 make the coffee +wakeup
+TODO: 5 added.
 
 >>> todo.sh -p list coffee
 5 make the coffee +wakeup
 4 smell the coffee +wakeup
 --
-TODO: 2 of 5 tasks shown from $HOME/todo.txt
+TODO: 2 of 5 tasks shown
 
 >>> todo.sh add "visit http://example.com"
-TODO: 'visit http://example.com' added on line 6.
+6 visit http://example.com
+TODO: 6 added.
 
 >>> todo.sh -p list
 1 (B) smell the uppercase Roses +flowers @outside
@@ -67,7 +69,7 @@ TODO: 'visit http://example.com' added on line 6.
 6 visit http://example.com
 2 x 2009-02-13 notice the sunflowers
 --
-TODO: 6 of 6 tasks shown from $HOME/todo.txt
+TODO: 6 of 6 tasks shown
 
 >>> todo.sh archive
 x 2009-02-13 notice the sunflowers
@@ -80,7 +82,7 @@ TODO: $HOME/todo.txt archived.
 2 stop
 5 visit http://example.com
 --
-TODO: 5 of 5 tasks shown from $HOME/todo.txt
+TODO: 5 of 5 tasks shown
 
 >>> todo.sh report
 TODO: Report file updated.
@@ -96,7 +98,7 @@ usage: todo.sh append ITEM# "TEXT TO APPEND"
 === 1
 
 >>> todo.sh append 2 and think
-2: stop and think
+2 stop and think
 
 >>> todo.sh -p list
 1 (B) smell the uppercase Roses +flowers @outside
@@ -105,10 +107,10 @@ usage: todo.sh append ITEM# "TEXT TO APPEND"
 2 stop and think
 5 visit http://example.com
 --
-TODO: 5 of 5 tasks shown from $HOME/todo.txt
+TODO: 5 of 5 tasks shown
 
 >>> todo.sh append 10 "hej!"
-10: No such todo.
+TODO: No task 10.
 === 1
 
 >>> todo.sh -p list
@@ -118,10 +120,10 @@ TODO: 5 of 5 tasks shown from $HOME/todo.txt
 2 stop and think
 5 visit http://example.com
 --
-TODO: 5 of 5 tasks shown from $HOME/todo.txt
+TODO: 5 of 5 tasks shown
 
 >>> todo.sh do 10
-10: No such todo.
+TODO: No task 10.
 === 1
 
 >>> todo.sh -p list
@@ -131,10 +133,11 @@ TODO: 5 of 5 tasks shown from $HOME/todo.txt
 2 stop and think
 5 visit http://example.com
 --
-TODO: 5 of 5 tasks shown from $HOME/todo.txt
+TODO: 5 of 5 tasks shown
 
 >>> todo.sh add "the coffee +wakeup"
-TODO: 'the coffee +wakeup' added on line 6.
+6 the coffee +wakeup
+TODO: 6 added.
 
 >>> todo.sh -p list
 1 (B) smell the uppercase Roses +flowers @outside
@@ -144,10 +147,10 @@ TODO: 'the coffee +wakeup' added on line 6.
 6 the coffee +wakeup
 5 visit http://example.com
 --
-TODO: 6 of 6 tasks shown from $HOME/todo.txt
+TODO: 6 of 6 tasks shown
 
 >>> todo.sh prepend 6 "make"
-6: make the coffee +wakeup
+6 make the coffee +wakeup
 
 >>> todo.sh -p list
 1 (B) smell the uppercase Roses +flowers @outside
@@ -157,7 +160,7 @@ TODO: 6 of 6 tasks shown from $HOME/todo.txt
 2 stop and think
 5 visit http://example.com
 --
-TODO: 6 of 6 tasks shown from $HOME/todo.txt
+TODO: 6 of 6 tasks shown
 
 >>> todo.sh remdup
 Usage: todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]

tests/test-lib.sh

@@ -542,7 +542,7 @@ test_todo_session () {
 		if [ $status = 0 ]; then
 		    test_expect_success "$1 $subnum" "$cmd > output && test_cmp expect output"
 		else
-		    test_expect_success "$1 $subnum" "$cmd > output || test $? = $status && test_cmp expect output"
+		    test_expect_success "$1 $subnum" "$cmd > output ; test \$? = $status && test_cmp expect output"
 		fi
 
 		subnum=$(($subnum + 1))
@@ -560,7 +560,7 @@ test_todo_session () {
 	if [ $status = 0 ]; then
 	    test_expect_success "$1 $subnum" "$cmd > output && test_cmp expect output"
 	else
-	    test_expect_success "$1 $subnum" "$cmd > output || test $? = $status && test_cmp expect output"
+	    test_expect_success "$1 $subnum" "$cmd > output ; test \$? = $status && test_cmp expect output"
 	fi
     fi
 }

todo.cfg

@@ -17,8 +17,13 @@ export TMP_FILE="$TODO_DIR/todo.tmp"
 
 # === COLOR MAP ===
 
-## If you have re-mapped your color codes, you may need to
+## Text coloring and formatting is done by inserting ANSI escape codes.
+## If you have re-mapped your color codes, or use the todo.txt
+## output in another output system (like Conky), you may need to
 ## over-ride by uncommenting and editing these defaults.
+## If you change any of these here, you also need to uncomment
+## the defaults in the COLORS section below. Otherwise, todo.txt
+## will still use the defaults!
 
 # export BLACK='\\033[0;30m'
 # export RED='\\033[0;31m'
@@ -38,16 +43,25 @@ export TMP_FILE="$TODO_DIR/todo.tmp"
 # export WHITE='\\033[1;37m'
 # export DEFAULT='\\033[0m'
 
-# === PRIORITY COLORS ===
+# === COLORS ===
 
-## Priorities can be any upper-case letter.
-## Colors are supported for the first three.
 ## Uncomment and edit to override these defaults.
-
+## Reference the constants from the color map above,
+## or use $NONE to disable highlighting.
+#
+# Priorities can be any upper-case letter.
+# A,B,C are highlighted; you can add coloring for more.
+#
 # export PRI_A=$YELLOW        # color for A priority
 # export PRI_B=$GREEN         # color for B priority
 # export PRI_C=$LIGHT_BLUE    # color for C priority
-# export PRI_X=$WHITE         # color for rest of them
+# export PRI_D=...            # define your own
+# export PRI_X=$WHITE         # color unless explicitly defined
+
+# There is highlighting for tasks that have been done,
+# but haven't been archived yet.
+#
+# export COLOR_DONE=$LIGHT_GREY
 
 # === BEHAVIOR ===