listcon/listproj: Work around bug in older GNU greps.

Commit df4f9150 introduced the use of "grep -w -o".  This
combination was broken from the introduction of -o (in 2001) until
subsequent release of GNU grep 2.5.3 in 2007---see changelog for
2005-11-10.  In particular, OS X uses a pre-2.5.3 version
of GNU grep.

Work around by replacing with two greps: one to find maximal
strings with @s in them (still relying on -o) and the second to
extract contexts.

Reported by Jon Smajda <jon@smajda.com>; fix developed
in conjunction with Philippe Teuwen <phil@teuwen.org>.

Signed-off-by: Emil Sit <sit@emilsit.net>

README

@@ -1,9 +0,0 @@
-    TODO.TXT Command Line Interface
-
-    Latest stable release: http://github.com/ginatrapani/todo.txt-cli/downloads
-    First release: 5/11/2006
-    Original conception by: Gina Trapani (http://ginatrapani.org)
-    Contributors: http://github.com/ginatrapani/todo.txt-cli/network
-    License: GPL, http://www.gnu.org/copyleft/gpl.html
-    More information and mailing list at http://todotxt.com
-    To contribute, fork the repository at http://github.com/ginatrapani/todo.txt-cli/tree/master

README.textile

@@ -0,0 +1,26 @@
+h1. TODO.TXT Command Line Interface
+
+A simple and extensible shell script for managing your todo.txt file.
+
+h2. "Downloads":http://github.com/ginatrapani/todo.txt-cli/downloads
+
+"Download the latest stable release":http://github.com/ginatrapani/todo.txt-cli/downloads for use on your desktop or server.
+
+h2. "Documentation":http://wiki.github.com/ginatrapani/todo.txt-cli
+
+* "User Documentation":http://wiki.github.com/ginatrapani/todo.txt-cli/user-documentation - Find out "how to install and use Todo.txt CLI":http://wiki.github.com/ginatrapani/todo.txt-cli/user-documentation, and get tips and tricks.
+
+* "Developer Documentation":http://wiki.github.com/ginatrapani/todo.txt-cli/developer-documentation - "Contribute to Todo.txt CLI":http://wiki.github.com/ginatrapani/todo.txt-cli/developer-documentation and build your own custom add-ons.
+
+h2. "Mailing List":http://groups.yahoo.com/group/todotxt/
+
+Get support from users and developers on the "mailing list":http://groups.yahoo.com/group/todotxt/.
+
+h2. Quick Links
+
+* Original anemic release by "Gina Trapani":http://ginatrapani.org on 5/11/2006.
+* Raised to great heights by "brainy and dedicated volunteers":http://github.com/ginatrapani/todo.txt-cli/network.
+* Licensed under the "GPL":http://www.gnu.org/copyleft/gpl.html
+* "Add-on Directory":http://wiki.github.com/ginatrapani/todo.txt-cli/todosh-add-on-directory
+* "Changelog":http://wiki.github.com/ginatrapani/todo.txt-cli/todosh-changelog
+* "Known Bugs":http://github.com/ginatrapani/todo.txt-cli/issues

tests/README

@@ -176,6 +176,23 @@ Test harness library
 There are a handful helper functions defined in the test harness
 library for your script to use.
 
+ - test_todo_session <message> < transcript
+
+   This takes a single string as a parameter, which is treated
+   as a base description of what is being tested, and then
+   reads from standard input a transcript of todo.sh commands
+   and expected output.  Each command is run in the current
+   test environment and the output is compared with the
+   expected output.  (See below for how to generate transcripts
+   easily.)
+
+ - test_tick [interval]
+
+   The test harness has an internal view of time which is
+   implemented by wrapping the date command.  This takes a single
+   optional positive integer parameter which indicates how much
+   to advance the internal time.  The default value is one day.
+
  - test_expect_success <message> <script>
 
    This takes two strings as parameter, and evaluates the
@@ -211,9 +228,31 @@ library for your script to use.
    exit with an appropriate error code.
 
 
+Generating test transcripts
+---------------------------
+
+You can generate test scripts from screenshots as following:
+
+    $ ./testshell.sh
+
+You'll be in a special test environment with an empty todo.txt
+and the dates and timestamps will be artificially fixed.
+
+Then the session can be used to make a unit test thanks to
+test_todo_session, see the existing tests as examples.
+
+Be careful to replace all occurences of the full path to the test
+directory by $HOME as testshell.sh will explain you when you execute it
+otherwise the tests will work properly only on your own computer.
+
+Don't use "script" as this would log every keystroke, not only what's
+visible!!
+
+
 Credits
 -------
 
 This test framework was derived from the framework used by
 git itself, written originally by Junio Hamano and licensed
-for use under the GPL.
+for use under the GPL.  It was specialized for todo.txt-cli
+by Emil Sit and Philippe Teuwen.

tests/t0000-config.sh

@@ -23,10 +23,10 @@ EOF
 
 cat > test.cfg << EOF
 export TODO_DIR=.
-export TODO_FILE="$TODO_DIR/todo.txt"
+export TODO_FILE="\$TODO_DIR/todo.txt"
-export DONE_FILE="$TODO_DIR/done.txt"
+export DONE_FILE="\$TODO_DIR/done.txt"
-export REPORT_FILE="$TODO_DIR/report.txt"
+export REPORT_FILE="\$TODO_DIR/report.txt"
-export TMP_FILE="$TODO_DIR/todo.tmp"
+export TMP_FILE="\$TODO_DIR/todo.tmp"
 touch used_config
 EOF
 

tests/t1000-addlist.sh

@@ -0,0 +1,58 @@
+#!/bin/sh
+
+test_description='basic add and list functionality
+
+This test just makes sure the basic add and list
+command work, including support for filtering.
+'
+. ./test-lib.sh
+
+#
+# Add and list
+#
+test_todo_session 'basic add/list' <<EOF
+>>> todo.sh add notice the daisies
+TODO: 'notice the daisies' added on line 1.
+
+>>> todo.sh list
+1 notice the daisies
+--
+TODO: 1 of 1 tasks shown from $HOME/todo.txt
+
+>>> todo.sh add smell the roses
+TODO: 'smell the roses' added on line 2.
+
+>>> todo.sh list
+1 notice the daisies
+2 smell the roses
+--
+TODO: 2 of 2 tasks shown from $HOME/todo.txt
+EOF
+
+#
+# Filter
+#
+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.sh list smell
+2 smell the roses
+--
+TODO: 1 of 2 tasks shown from $HOME/todo.txt
+EOF
+
+test_todo_session 'case-insensitive filtering' <<EOF
+>>> todo.sh add smell the uppercase Roses
+TODO: 'smell the uppercase Roses' added on line 3.
+
+>>> todo.sh list roses
+2 smell the roses
+3 smell the uppercase Roses
+--
+TODO: 2 of 3 tasks shown from $HOME/todo.txt
+EOF
+
+test_done

tests/t1010-add-date.sh

@@ -0,0 +1,69 @@
+#!/bin/sh
+
+test_description='test the date on add feature
+
+Tests paths by which we might automatically add
+a date to each item.
+'
+. ./test-lib.sh
+
+#
+# Add and list
+#
+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.
+
+>>> todo.sh list
+1 2009-02-13 notice the daisies
+--
+TODO: 1 of 1 tasks shown from $HOME/todo.txt
+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.
+
+>>> 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
+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.
+
+>>> 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
+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 add take out the trash
+TODO: '2009-02-15 take out the trash' added on line 4.
+
+>>> todo.sh list
+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
+--
+TODO: 4 of 4 tasks shown from $HOME/todo.txt
+EOF
+
+test_done

tests/t1100-replace.sh

@@ -0,0 +1,71 @@
+#!/bin/sh
+
+test_description='basic replace functionality
+
+Ensure we can replace items successfully.
+'
+. ./test-lib.sh
+
+#
+# Set up the basic todo.txt
+#
+todo.sh add notice the daisies > /dev/null
+
+test_todo_session 'replace usage' <<EOF
+>>> todo.sh replace adf asdfa
+=== 1
+usage: todo.sh replace ITEM# "UPDATED ITEM"
+EOF
+
+test_todo_session 'basic replace' <<EOF
+>>> todo.sh replace 1 "smell the cows"
+1: notice the daisies
+replaced with
+1: smell the cows
+
+>>> todo.sh list
+1 smell the cows
+--
+TODO: 1 of 1 tasks shown from $HOME/todo.txt
+
+>>> todo.sh replace 1 smell the roses
+1: smell the cows
+replaced with
+1: smell the roses
+
+>>> todo.sh list
+1 smell the roses
+--
+TODO: 1 of 1 tasks shown from $HOME/todo.txt
+EOF
+
+cat > todo.txt <<EOF
+smell the cows
+grow some corn
+thrash some hay
+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
+
+>>> todo.sh replace 3 jump on hay
+3: thrash some hay
+replaced with
+3: jump on hay
+
+>>> todo.sh replace 4 collect the eggs
+4: chase the chickens
+replaced with
+4: collect the eggs
+EOF
+
+test_todo_session 'replace error' << EOF
+>>> todo.sh replace 10 "hej!"
+=== 1
+10: No such todo.
+EOF
+
+test_done

tests/t1200-pri.sh

@@ -0,0 +1,89 @@
+#!/bin/sh
+
+test_description='basic priority functionality
+'
+. ./test-lib.sh
+
+test_todo_session 'priority usage' <<EOF
+>>> todo.sh pri B B
+usage: todo.sh pri ITEM# PRIORITY
+note: PRIORITY must be anywhere from A to Z.
+=== 1
+EOF
+
+cat > todo.txt <<EOF
+smell the uppercase Roses +flowers @outside
+notice the sunflowers
+stop
+EOF
+test_todo_session 'basic priority' <<EOF
+>>> todo.sh list
+2 notice the sunflowers
+1 smell the uppercase Roses +flowers @outside
+3 stop
+--
+TODO: 3 of 3 tasks shown from $HOME/todo.txt
+
+>>> todo.sh pri 1 B
+1: (B) smell the uppercase Roses +flowers @outside
+TODO: 1 prioritized (B).
+
+>>> todo.sh 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.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.sh pri 2 C
+2: (C) notice the sunflowers
+TODO: 2 prioritized (C).
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+2 (C) notice the sunflowers
+3 stop
+--
+TODO: 3 of 3 tasks shown from $HOME/todo.txt
+
+>>> todo.sh pri 2 A
+2: (A) notice the sunflowers
+TODO: 2 prioritized (A).
+
+>>> 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 from $HOME/todo.txt
+
+>>> todo.sh pri 2 a
+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.sh add "smell the coffee +wakeup"
+TODO: 'smell the coffee +wakeup' added on line 4.
+
+>>> todo.sh -p list
+2 (A) notice the sunflowers
+1 (B) smell the uppercase Roses +flowers @outside
+4 smell the coffee +wakeup
+3 stop
+--
+TODO: 4 of 4 tasks shown from $HOME/todo.txt
+EOF
+
+test_done

tests/t1300-ls.sh

@@ -0,0 +1,515 @@
+#!/bin/sh
+#
+
+test_description='list functionality
+
+This test checks various list functionality including
+sorting, output filtering and line numbering.
+'
+. ./test-lib.sh
+
+TEST_TODO_=todo.cfg
+
+cat > todo.txt <<EOF
+ccc xxx this line should be third.
+aaa zzz this line should be first.
+bbb yyy this line should be second.
+EOF
+
+#
+# check the sort filter
+#
+TEST_TODO1_=todo1.cfg
+sed -e "s/^.*export TODOTXT_SORT_COMMAND=.*$/export TODOTXT_SORT_COMMAND='env LC_COLLATE=C sort -r -f -k2'/" "${TEST_TODO_}" > "${TEST_TODO1_}"
+
+test_todo_session 'checking TODOTXT_SORT_COMMAND' <<EOF
+>>> todo.sh ls
+2 aaa zzz this line should be first.
+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.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
+EOF
+
+#
+# check the final filter
+#
+TEST_TODO2_=todo2.cfg
+sed -e "s%^.*export TODOTXT_FINAL_FILTER=.*$%export TODOTXT_FINAL_FILTER=\"sed 's/^\\\(..\\\{20\\\}\\\).....*$/\\\1.../'\"%" "${TEST_TODO_}" > "${TEST_TODO2_}"
+
+test_todo_session 'checking TODOTXT_FINAL_FILTER' <<EOF
+>>> todo.sh -d "$TEST_TODO2_" ls
+2 aaa zzz this line s...
+3 bbb yyy this line s...
+1 ccc xxx this line s...
+--
+TODO: 3 of 3 tasks shown from $HOME/todo.txt
+EOF
+
+#
+# check the  p command line option
+#
+cat > todo.txt <<EOF
+(A) @con01 +prj01 -- Some project 01 task, pri A
+(A) @con01 +prj02 -- Some project 02 task, pri A
+(A) @con02 +prj03 -- Some project 03 task, pri A
+(A) @con02 +prj04 -- Some project 04 task, pri A
+(B) @con01 +prj01 -- Some project 01 task, pri B
+(B) @con01 +prj02 -- Some project 02 task, pri B
+(B) @con02 +prj03 -- Some project 03 task, pri B
+(B) @con02 +prj04 -- Some project 04 task, pri B
+(C) @con01 +prj01 -- Some project 01 task, pri C
+(C) @con01 +prj02 -- Some project 02 task, pri C
+(C) @con02 +prj03 -- Some project 03 task, pri C
+(C) @con02 +prj04 -- Some project 04 task, pri C
+(D) @con01 +prj01 -- Some project 01 task, pri D
+(D) @con01 +prj02 -- Some project 02 task, pri D
+(D) @con02 +prj03 -- Some project 03 task, pri D
+(D) @con02 +prj04 -- Some project 04 task, pri D
+@con01 +prj01 -- Some project 01 task, no priority
+@con01 +prj02 -- Some project 02 task, no priority
+@con02 +prj03 -- Some project 03 task, no priorty
+@con02 +prj04 -- Some project 04 task, no priority
+EOF
+test_todo_session 'plain mode option' <<EOF
+>>> todo.sh ls
+01 (A) @con01 +prj01 -- Some project 01 task, pri A
+02 (A) @con01 +prj02 -- Some project 02 task, pri A
+03 (A) @con02 +prj03 -- Some project 03 task, pri A
+04 (A) @con02 +prj04 -- Some project 04 task, pri A
+05 (B) @con01 +prj01 -- Some project 01 task, pri B
+06 (B) @con01 +prj02 -- Some project 02 task, pri B
+07 (B) @con02 +prj03 -- Some project 03 task, pri B
+08 (B) @con02 +prj04 -- Some project 04 task, pri B
+09 (C) @con01 +prj01 -- Some project 01 task, pri C
+10 (C) @con01 +prj02 -- Some project 02 task, pri C
+11 (C) @con02 +prj03 -- Some project 03 task, pri C
+12 (C) @con02 +prj04 -- Some project 04 task, pri C
+13 (D) @con01 +prj01 -- Some project 01 task, pri D
+14 (D) @con01 +prj02 -- Some project 02 task, pri D
+15 (D) @con02 +prj03 -- Some project 03 task, pri D
+16 (D) @con02 +prj04 -- Some project 04 task, pri D
+17 @con01 +prj01 -- Some project 01 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
+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.sh -p ls
+01 (A) @con01 +prj01 -- Some project 01 task, pri A
+02 (A) @con01 +prj02 -- Some project 02 task, pri A
+03 (A) @con02 +prj03 -- Some project 03 task, pri A
+04 (A) @con02 +prj04 -- Some project 04 task, pri A
+05 (B) @con01 +prj01 -- Some project 01 task, pri B
+06 (B) @con01 +prj02 -- Some project 02 task, pri B
+07 (B) @con02 +prj03 -- Some project 03 task, pri B
+08 (B) @con02 +prj04 -- Some project 04 task, pri B
+09 (C) @con01 +prj01 -- Some project 01 task, pri C
+10 (C) @con01 +prj02 -- Some project 02 task, pri C
+11 (C) @con02 +prj03 -- Some project 03 task, pri C
+12 (C) @con02 +prj04 -- Some project 04 task, pri C
+13 (D) @con01 +prj01 -- Some project 01 task, pri D
+14 (D) @con01 +prj02 -- Some project 02 task, pri D
+15 (D) @con02 +prj03 -- Some project 03 task, pri D
+16 (D) @con02 +prj04 -- Some project 04 task, pri D
+17 @con01 +prj01 -- Some project 01 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
+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
+EOF
+
+#
+# check the P,@,+ command line options
+#
+cat > todo.txt <<EOF
+(A) @con01 +prj01 -- Some project 01 task, pri A
+(A) @con01 +prj02 -- Some project 02 task, pri A
+(A) @con02 +prj03 -- Some project 03 task, pri A
+(A) @con02 +prj04 -- Some project 04 task, pri A
+(B) @con01 +prj01 -- Some project 01 task, pri B
+(B) @con01 +prj02 -- Some project 02 task, pri B
+(B) @con02 +prj03 -- Some project 03 task, pri B
+(B) @con02 +prj04 -- Some project 04 task, pri B
+(C) @con01 +prj01 -- Some project 01 task, pri C
+(C) @con01 +prj02 -- Some project 02 task, pri C
+(C) @con02 +prj03 -- Some project 03 task, pri C
+(C) @con02 +prj04 -- Some project 04 task, pri C
+(D) @con01 +prj01 -- Some project 01 task, pri D
+(D) @con01 +prj02 -- Some project 02 task, pri D
+(D) @con02 +prj03 -- Some project 03 task, pri D
+(D) @con02 +prj04 -- Some project 04 task, pri D
+@con01 +prj01 -- Some project 01 task, no priority
+@con01 +prj02 -- Some project 02 task, no priority
+@con02 +prj03 -- Some project 03 task, no priorty
+@con02 +prj04 -- Some project 04 task, no priority
+EOF
+test_todo_session 'context, project, and priority suppression' <<EOF
+>>> todo.sh ls
+01 (A) @con01 +prj01 -- Some project 01 task, pri A
+02 (A) @con01 +prj02 -- Some project 02 task, pri A
+03 (A) @con02 +prj03 -- Some project 03 task, pri A
+04 (A) @con02 +prj04 -- Some project 04 task, pri A
+05 (B) @con01 +prj01 -- Some project 01 task, pri B
+06 (B) @con01 +prj02 -- Some project 02 task, pri B
+07 (B) @con02 +prj03 -- Some project 03 task, pri B
+08 (B) @con02 +prj04 -- Some project 04 task, pri B
+09 (C) @con01 +prj01 -- Some project 01 task, pri C
+10 (C) @con01 +prj02 -- Some project 02 task, pri C
+11 (C) @con02 +prj03 -- Some project 03 task, pri C
+12 (C) @con02 +prj04 -- Some project 04 task, pri C
+13 (D) @con01 +prj01 -- Some project 01 task, pri D
+14 (D) @con01 +prj02 -- Some project 02 task, pri D
+15 (D) @con02 +prj03 -- Some project 03 task, pri D
+16 (D) @con02 +prj04 -- Some project 04 task, pri D
+17 @con01 +prj01 -- Some project 01 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
+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.sh ls @con01
+01 (A) @con01 +prj01 -- Some project 01 task, pri A
+02 (A) @con01 +prj02 -- Some project 02 task, pri A
+05 (B) @con01 +prj01 -- Some project 01 task, pri B
+06 (B) @con01 +prj02 -- Some project 02 task, pri B
+09 (C) @con01 +prj01 -- Some project 01 task, pri C
+10 (C) @con01 +prj02 -- Some project 02 task, pri C
+13 (D) @con01 +prj01 -- Some project 01 task, pri D
+14 (D) @con01 +prj02 -- Some project 02 task, pri D
+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.sh -P ls @con01
+01 @con01 +prj01 -- Some project 01 task, pri A
+02 @con01 +prj02 -- Some project 02 task, pri A
+05 @con01 +prj01 -- Some project 01 task, pri B
+06 @con01 +prj02 -- Some project 02 task, pri B
+09 @con01 +prj01 -- Some project 01 task, pri C
+10 @con01 +prj02 -- Some project 02 task, pri C
+13 @con01 +prj01 -- Some project 01 task, pri D
+14 @con01 +prj02 -- Some project 02 task, pri D
+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.sh -+ ls @con01
+01 (A) @con01 -- Some project 01 task, pri A
+02 (A) @con01 -- Some project 02 task, pri A
+05 (B) @con01 -- Some project 01 task, pri B
+06 (B) @con01 -- Some project 02 task, pri B
+09 (C) @con01 -- Some project 01 task, pri C
+10 (C) @con01 -- Some project 02 task, pri C
+13 (D) @con01 -- Some project 01 task, pri D
+14 (D) @con01 -- Some project 02 task, pri D
+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.sh -@ ls @con01
+01 (A) +prj01 -- Some project 01 task, pri A
+02 (A) +prj02 -- Some project 02 task, pri A
+05 (B) +prj01 -- Some project 01 task, pri B
+06 (B) +prj02 -- Some project 02 task, pri B
+09 (C) +prj01 -- Some project 01 task, pri C
+10 (C) +prj02 -- Some project 02 task, pri C
+13 (D) +prj01 -- Some project 01 task, pri D
+14 (D) +prj02 -- Some project 02 task, pri D
+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.sh -P -@ ls @con01
+01 +prj01 -- Some project 01 task, pri A
+02 +prj02 -- Some project 02 task, pri A
+05 +prj01 -- Some project 01 task, pri B
+06 +prj02 -- Some project 02 task, pri B
+09 +prj01 -- Some project 01 task, pri C
+10 +prj02 -- Some project 02 task, pri C
+13 +prj01 -- Some project 01 task, pri D
+14 +prj02 -- Some project 02 task, pri D
+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.sh -P -@ -+ -P -@ -+ ls @con01
+01 (A) @con01 +prj01 -- Some project 01 task, pri A
+02 (A) @con01 +prj02 -- Some project 02 task, pri A
+05 (B) @con01 +prj01 -- Some project 01 task, pri B
+06 (B) @con01 +prj02 -- Some project 02 task, pri B
+09 (C) @con01 +prj01 -- Some project 01 task, pri C
+10 (C) @con01 +prj02 -- Some project 02 task, pri C
+13 (D) @con01 +prj01 -- Some project 01 task, pri D
+14 (D) @con01 +prj02 -- Some project 02 task, pri D
+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.sh -P -@ -+ -P -@ -+ -P -@ -+ ls @con01
+01 -- Some project 01 task, pri A
+02 -- Some project 02 task, pri A
+05 -- Some project 01 task, pri B
+06 -- Some project 02 task, pri B
+09 -- Some project 01 task, pri C
+10 -- Some project 02 task, pri C
+13 -- Some project 01 task, pri D
+14 -- Some project 02 task, pri D
+17 -- Some project 01 task, no priority
+18 -- Some project 02 task, no priority
+--
+TODO: 10 of 20 tasks shown from $HOME/todo.txt
+EOF
+
+#
+# check the line number padding
+#
+cat > todo.txt <<EOF
+hex00 this is one line
+hex01 this is another 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
+hex0A this is another line
+hex0B this is another line
+hex0C this is another line
+hex0D this is another line
+hex0E this is another line
+hex0F this is another line
+hex10 this is line is a multiple of 16
+hex11 this is another line
+hex12 this is another line
+hex13 this is another line
+hex14 this is another line
+hex15 this is another line
+hex16 this is another line
+hex17 this is another line
+hex18 this is another line
+hex19 this is another line
+hex1A this is another line
+hex1B this is another line
+hex1C this is another line
+hex1D this is another line
+hex1E this is another line
+hex1F this is another line
+hex20 this is line is a multiple of 16
+hex21 this is another line
+hex22 this is another line
+hex23 this is another line
+hex24 this is another line
+hex25 this is another line
+hex26 this is another line
+hex27 this is another line
+hex28 this is another line
+hex29 this is another line
+hex2A this is another line
+hex2B this is another line
+hex2C this is another line
+hex2D this is another line
+hex2E this is another line
+hex2F this is another line
+hex30 this is line is a multiple of 16
+hex31 this is another line
+hex32 this is another line
+hex33 this is another line
+hex34 this is another line
+hex35 this is another line
+hex36 this is another line
+hex37 this is another line
+hex38 this is another line
+hex39 this is another line
+hex3A this is another line
+hex3B this is another line
+hex3C this is another line
+hex3D this is another line
+hex3E this is another line
+hex3F this is another line
+hex40 this is line is a multiple of 16
+hex41 this is another line
+hex42 this is another line
+hex43 this is another line
+hex44 this is another line
+hex45 this is another line
+hex46 this is another line
+hex47 this is another line
+hex48 this is another line
+hex49 this is another line
+hex4A this is another line
+hex4B this is another line
+hex4C this is another line
+hex4D this is another line
+hex4E this is another line
+hex4F this is another line
+hex50 this is line is a multiple of 16
+hex51 this is another line
+hex52 this is another line
+hex53 this is another line
+hex54 this is another line
+hex55 this is another line
+hex56 this is another line
+hex57 this is another line
+hex58 this is another line
+hex59 this is another line
+hex5A this is another line
+hex5B this is another line
+hex5C this is another line
+hex5D this is another line
+hex5E this is another line
+hex5F this is another line
+hex60 this is line is a multiple of 16
+hex61 this is another line
+hex62 this is another line
+hex63 this is another line
+hex64 this is another line
+hex65 this is another line
+hex66 this is another line
+hex67 this is another line
+hex68 this is another line
+hex69 this is another line
+hex6A this is another line
+hex6B this is another line
+hex6C this is another line
+hex6D this is another line
+hex6E this is another line
+hex6F this is another line
+EOF
+test_todo_session 'check line number padding, out to 3 digits' <<EOF
+>>> todo.sh ls
+001 hex00 this is one line
+002 hex01 this is another line
+003 hex02 this is another line
+004 hex03 this is another line
+005 hex04 this is another line
+006 hex05 this is another line
+007 hex06 this is another line
+008 hex07 this is another line
+009 hex08 this is another line
+010 hex09 this is another line
+011 hex0A this is another line
+012 hex0B this is another line
+013 hex0C this is another line
+014 hex0D this is another line
+015 hex0E this is another line
+016 hex0F this is another line
+017 hex10 this is line is a multiple of 16
+018 hex11 this is another line
+019 hex12 this is another line
+020 hex13 this is another line
+021 hex14 this is another line
+022 hex15 this is another line
+023 hex16 this is another line
+024 hex17 this is another line
+025 hex18 this is another line
+026 hex19 this is another line
+027 hex1A this is another line
+028 hex1B this is another line
+029 hex1C this is another line
+030 hex1D this is another line
+031 hex1E this is another line
+032 hex1F this is another line
+033 hex20 this is line is a multiple of 16
+034 hex21 this is another line
+035 hex22 this is another line
+036 hex23 this is another line
+037 hex24 this is another line
+038 hex25 this is another line
+039 hex26 this is another line
+040 hex27 this is another line
+041 hex28 this is another line
+042 hex29 this is another line
+043 hex2A this is another line
+044 hex2B this is another line
+045 hex2C this is another line
+046 hex2D this is another line
+047 hex2E this is another line
+048 hex2F this is another line
+049 hex30 this is line is a multiple of 16
+050 hex31 this is another line
+051 hex32 this is another line
+052 hex33 this is another line
+053 hex34 this is another line
+054 hex35 this is another line
+055 hex36 this is another line
+056 hex37 this is another line
+057 hex38 this is another line
+058 hex39 this is another line
+059 hex3A this is another line
+060 hex3B this is another line
+061 hex3C this is another line
+062 hex3D this is another line
+063 hex3E this is another line
+064 hex3F this is another line
+065 hex40 this is line is a multiple of 16
+066 hex41 this is another line
+067 hex42 this is another line
+068 hex43 this is another line
+069 hex44 this is another line
+070 hex45 this is another line
+071 hex46 this is another line
+072 hex47 this is another line
+073 hex48 this is another line
+074 hex49 this is another line
+075 hex4A this is another line
+076 hex4B this is another line
+077 hex4C this is another line
+078 hex4D this is another line
+079 hex4E this is another line
+080 hex4F this is another line
+081 hex50 this is line is a multiple of 16
+082 hex51 this is another line
+083 hex52 this is another line
+084 hex53 this is another line
+085 hex54 this is another line
+086 hex55 this is another line
+087 hex56 this is another line
+088 hex57 this is another line
+089 hex58 this is another line
+090 hex59 this is another line
+091 hex5A this is another line
+092 hex5B this is another line
+093 hex5C this is another line
+094 hex5D this is another line
+095 hex5E this is another line
+096 hex5F this is another line
+097 hex60 this is line is a multiple of 16
+098 hex61 this is another line
+099 hex62 this is another line
+100 hex63 this is another line
+101 hex64 this is another line
+102 hex65 this is another line
+103 hex66 this is another line
+104 hex67 this is another line
+105 hex68 this is another line
+106 hex69 this is another line
+107 hex6A this is another line
+108 hex6B this is another line
+109 hex6C this is another line
+110 hex6D this is another line
+111 hex6E this is another line
+112 hex6F this is another line
+--
+TODO: 112 of 112 tasks shown from $HOME/todo.txt
+EOF
+
+test_done

tests/t1310-listcon.sh

@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+
+test_description='listcon functionality
+
+This test checks basic context listing functionality
+'
+. ./test-lib.sh
+
+cat > todo.txt <<EOF
+item 1
+item 2
+item 3
+EOF
+test_expect_success 'listcon no contexts' '
+    todo.sh listcon > output && ! test -s output
+'
+
+cat > todo.txt <<EOF
+(A) @1 -- Some context 1 task, whitespace, one char
+(A) @c2 -- Some context 2 task, whitespace, two char
+@con03 -- Some context 3 task, no whitespace
+@con04 -- Some context 4 task, no whitespace
+@con05@con06 -- weird context
+EOF
+test_todo_session 'Single context per line' <<EOF
+>>> todo.sh listcon
+@1
+@c2
+@con03
+@con04
+@con05@con06
+EOF
+
+cat > todo.txt <<EOF
+@con01 -- Some context 1 task
+@con02 -- Some context 2 task
+@con02 @con03 -- Multi-context task
+EOF
+test_todo_session 'Multi-context per line' <<EOF
+>>> todo.sh listcon
+@con01
+@con02
+@con03
+EOF
+
+cat > todo.txt <<EOF
+@con01 -- Some context 1 task
+@con02 -- Some context 2 task
+@con02 ginatrapani@gmail.com -- Some context 2 task
+EOF
+test_todo_session 'listcon e-mail address test' <<EOF
+>>> todo.sh listcon
+@con01
+@con02
+EOF
+
+test_done

tests/t1320-listproj.sh

@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+
+test_description='listproj functionality
+
+This test checks basic project listing functionality
+'
+. ./test-lib.sh
+
+cat > todo.txt <<EOF
+item 1
+item 2
+item 3
+EOF
+test_expect_success 'listproj no projects' '
+    todo.sh listproj > output && ! test -s output
+'
+
+cat > todo.txt <<EOF
+(A) +1 -- Some project 1 task, whitespace, one char
+(A) +p2 -- Some project 2 task, whitespace, two char
++prj03 -- Some project 3 task, no whitespace
++prj04 -- Some project 4 task, no whitespace
++prj05+prj06 -- weird project
+EOF
+test_todo_session 'Single project per line' <<EOF
+>>> todo.sh listproj
++1
++p2
++prj03
++prj04
++prj05+prj06
+EOF
+
+cat > todo.txt <<EOF
++prj01 -- Some project 1 task
++prj02 -- Some project 2 task
++prj02 +prj03 -- Multi-project task
+EOF
+test_todo_session 'Multi-project per line' <<EOF
+>>> todo.sh listproj
++prj01
++prj02
++prj03
+EOF
+
+cat > todo.txt <<EOF
++prj01 -- Some project 1 task
++prj02 -- Some project 2 task
++prj02 ginatrapani+todo@gmail.com -- Some project 2 task
+EOF
+test_todo_session 'listproj embedded + test' <<EOF
+>>> todo.sh listproj
++prj01
++prj02
+EOF
+
+test_done

tests/t9999-testsuite_example.sh

@@ -0,0 +1,168 @@
+#!/bin/sh
+
+test_description='basic tests imported from previous framework
+'
+. ./test-lib.sh
+
+cat > todo.txt <<EOF
+(B) smell the uppercase Roses +flowers @outside
+(A) notice the sunflowers
+stop
+smell the coffee +wakeup
+EOF
+test_todo_session 'basic tests' <<EOF
+>>> todo.sh -p list
+2 (A) notice the sunflowers
+1 (B) smell the uppercase Roses +flowers @outside
+4 smell the coffee +wakeup
+3 stop
+--
+TODO: 4 of 4 tasks shown from $HOME/todo.txt
+
+>>> todo.sh -p list +flowers
+1 (B) smell the uppercase Roses +flowers @outside
+--
+TODO: 1 of 4 tasks shown from $HOME/todo.txt
+
+>>> 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.sh -p list flowers out
+1 (B) smell the uppercase Roses +flowers @outside
+--
+TODO: 1 of 4 tasks shown from $HOME/todo.txt
+
+>>> todo.sh -a do 2
+2: x 2009-02-13 notice the sunflowers
+TODO: 2 marked as done.
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+4 smell the coffee +wakeup
+3 stop
+2 x 2009-02-13 notice the sunflowers
+--
+TODO: 4 of 4 tasks shown from $HOME/todo.txt
+
+>>> todo.sh add "make the coffee +wakeup"
+TODO: 'make the coffee +wakeup' added on line 5.
+
+>>> 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.sh add "visit http://example.com"
+TODO: 'visit http://example.com' added on line 6.
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+5 make the coffee +wakeup
+4 smell the coffee +wakeup
+3 stop
+6 visit http://example.com
+2 x 2009-02-13 notice the sunflowers
+--
+TODO: 6 of 6 tasks shown from $HOME/todo.txt
+
+>>> todo.sh archive
+x 2009-02-13 notice the sunflowers
+TODO: $HOME/todo.txt archived.
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+4 make the coffee +wakeup
+3 smell the coffee +wakeup
+2 stop
+5 visit http://example.com
+--
+TODO: 5 of 5 tasks shown from $HOME/todo.txt
+
+>>> todo.sh report
+TODO: Report file updated.
+2009-02-13-04:40:00 5 1
+
+>>> todo.sh report
+TODO: Report file updated.
+2009-02-13-04:40:00 5 1
+2009-02-13-04:40:00 5 1
+
+>>> todo.sh append g a
+usage: todo.sh append ITEM# "TEXT TO APPEND"
+=== 1
+
+>>> todo.sh append 2 and think
+2: stop and think
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+4 make the coffee +wakeup
+3 smell the coffee +wakeup
+2 stop and think
+5 visit http://example.com
+--
+TODO: 5 of 5 tasks shown from $HOME/todo.txt
+
+>>> todo.sh append 10 "hej!"
+10: No such todo.
+=== 1
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+4 make the coffee +wakeup
+3 smell the coffee +wakeup
+2 stop and think
+5 visit http://example.com
+--
+TODO: 5 of 5 tasks shown from $HOME/todo.txt
+
+>>> todo.sh do 10
+10: No such todo.
+=== 1
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+4 make the coffee +wakeup
+3 smell the coffee +wakeup
+2 stop and think
+5 visit http://example.com
+--
+TODO: 5 of 5 tasks shown from $HOME/todo.txt
+
+>>> todo.sh add "the coffee +wakeup"
+TODO: 'the coffee +wakeup' added on line 6.
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+4 make the coffee +wakeup
+3 smell the coffee +wakeup
+2 stop and think
+6 the coffee +wakeup
+5 visit http://example.com
+--
+TODO: 6 of 6 tasks shown from $HOME/todo.txt
+
+>>> todo.sh prepend 6 "make"
+6: make the coffee +wakeup
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+4 make the coffee +wakeup
+6 make the coffee +wakeup
+3 smell the coffee +wakeup
+2 stop and think
+5 visit http://example.com
+--
+TODO: 6 of 6 tasks shown from $HOME/todo.txt
+
+>>> todo.sh remdup
+Usage: todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]
+Try 'todo.sh -h' for more information.
+=== 1
+EOF
+
+test_done

tests/test-lib.sh

@@ -37,7 +37,9 @@ VISUAL=:
 unset CDPATH
 
 # Protect ourselves from using predefined TODOTXT_CFG_FILE
-unset TODOTXT_CFG_FILE
+unset TODOTXT_CFG_FILE $(set|sed '/^TODOTXT_/!d;s/=.*//')
+# To prevent any damage if someone has still those exported somehow in his env:
+unset TODO_FILE DONE_FILE REPORT_FILE TMP_FILE
 
 # Each test should start with something like this, after copyright notices:
 #
@@ -407,9 +409,12 @@ test_done () {
 	esac
 }
 
-# Make sure we are testing the latest version.
+# Use -P to resolve symlinks in our working directory so that the pwd
+# in subprocesses equals our $PWD (for pathname comparisons).
+cd -P .
+
+# Record our location for reference.
 TEST_DIRECTORY=$(pwd)
-PATH=$TEST_DIRECTORY/..:$PATH
 
 # Test repository
 test="trash directory.$(basename "$0" .sh)"
@@ -431,12 +436,149 @@ test_init_todo () {
 	cd "$root" || error "Cannot setup todo dir in $root"
         # Initialize the configuration file. Carefully quoted.
         sed -e 's|TODO_DIR=.*$|TODO_DIR="'"$TEST_DIRECTORY/$test"'"|' $TEST_DIRECTORY/../todo.cfg > todo.cfg
+
+	# Install latest todo.sh
+	mkdir bin
+	ln -s "$TEST_DIRECTORY/../todo.sh" bin/todo.sh
+
+	# Initialize a hack date script
+	TODO_TEST_REAL_DATE=$(which date)
+	TODO_TEST_TIME=1234500000
+	export PATH TODO_TEST_REAL_DATE TODO_TEST_TIME
+
+	# Trying to detect the version of "date" on current system
+	DATE_STYLE=unknown
+	# on GNU systems (versions may vary):
+	#date --version
+	#date (GNU coreutils) 6.10
+	#...
+	if date --version 2>&1 | grep -q "GNU"; then
+		DATE_STYLE=GNU
+	# on Mac OS X 10.5:
+	#date --version
+	#date: illegal option -- -
+	#usage: date [-jnu] [-d dst] [-r seconds] [-t west] [-v[+|-]val[ymwdHMS]] ...
+	#[-f fmt date | [[[mm]dd]HH]MM[[cc]yy][.ss]] [+format]
+	elif date --version 2>&1 | grep -q -e "-jnu"; then
+		DATE_STYLE=Mac10.5
+	# on Mac OS X 10.4:
+	#date --version
+	#date: illegal option -- -
+	#usage: date [-nu] [-r seconds] [+format]
+	#       date [[[[[cc]yy]mm]dd]hh]mm[.ss]
+	elif date --version 2>&1 | grep -q -e "-nu"; then
+		DATE_STYLE=Mac10.4
+	fi
+
+	case $DATE_STYLE in
+		GNU)
+			cat > bin/date <<-EOF
+			#!/bin/sh
+			exec "$TODO_TEST_REAL_DATE" -d @\$TODO_TEST_TIME \$@
+			EOF
+			chmod 755 bin/date
+		;;
+		Mac10.5)
+			cat > bin/date <<-EOF
+			#!/bin/sh
+			exec "$TODO_TEST_REAL_DATE" -j -f %s \$TODO_TEST_TIME \$@
+			EOF
+			chmod 755 bin/date
+		;;
+		Mac10.4)
+			cat > bin/date <<-EOF
+			#!/bin/sh
+			exec "$TODO_TEST_REAL_DATE" -r \$TODO_TEST_TIME \$@
+			EOF
+			chmod 755 bin/date
+		;;
+		*)
+			echo "WARNING: Current date executable not recognized"
+			echo "So today date will be used, expect false negative tests..."
+		;;
+	esac
+
+	# Ensure a correct PATH for testing.
+	PATH=$owd/$root/bin:$PATH
+	export PATH
+
 	cd "$owd"
 }
 
+# Usage: test_tick [increment]
+test_tick () {
+	TODO_TEST_TIME=$(($TODO_TEST_TIME + ${1:-86400}))
+}
+
+# Generate and run a series of tests based on a transcript.
+# Usage: test_todo_session "description" <<EOF
+# >>> command
+# output1
+# output2
+# >>> command
+# === exit status
+# output3
+# output4
+# EOF
+test_todo_session () {
+    test "$#" = 1 ||
+    error "bug in the test script: extra args to test_todo_session"
+    subnum=1
+    cmd=""
+    status=0
+    > expect
+    while read line
+    do
+	case $line in
+	">>> "*)
+	    test -z "$cmd" || error "bug in the test script: missing blank line separator in test_todo_session"
+	    cmd=${line#>>> }
+	    ;;
+	"=== "*)
+	    status=${line#=== }
+	    ;;
+	"")
+	    if [ ! -z "$cmd" ]; then
+		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"
+		fi
+
+		subnum=$(($subnum + 1))
+		cmd=""
+		status=0
+		> expect
+	    fi
+	    ;;
+	*)
+	    echo $line >> expect
+	    ;;
+	esac
+    done
+    if [ ! -z "$cmd" ]; then
+	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"
+	fi
+    fi
+}
+
+test_shell () {
+	trap - EXIT
+	export PS1='$(ret_val=$?; [ "$ret_val" != "0" ] && echo -e "=== $ret_val\n\n>>> "||echo "\n>>> ")'
+	cat <<EOF
+Do your tests session here and
+don't forget to replace the hardcoded path with \$HOME in the transcript:
+$HOME/todo.txt => \$HOME/todo.txt
+EOF
+	bash --noprofile --norc
+	exit 0
+}
 
 test_init_todo "$test"
-# Use -P to resolve symlinks in our working directory so that the cwd
+# Use -P to resolve symlinks in our working directory so that the pwd
 # in subprocesses equals our $PWD (for pathname comparisons).
 cd -P "$test" || exit 1
 

tests/testshell.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+test_description='Providing an interactive shell in the proper environment'
+. ./test-lib.sh
+
+test_shell

todo.cfg

@@ -52,4 +52,15 @@ export TMP_FILE="$TODO_DIR/todo.tmp"
 # === BEHAVIOR ===
 
 ## customize list output
+#
+# TODOTXT_SORT_COMMAND will filter after line numbers are
+# inserted, but before colorization, and before hiding of
+# priority, context, and project.
+#
 # export TODOTXT_SORT_COMMAND='env LC_COLLATE=C sort -f -k2'
+
+# TODOTXT_FINAL_FILTER will filter list output after colorization,
+# priority hiding, context hiding, and project hiding. That is,
+# just before the list output is displayed.
+#
+# export TODOTXT_FINAL_FILTER='cat'

todo.sh

@@ -17,13 +17,17 @@ EndVersion
     exit 1
 }
 
-oneline_usage="todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]"
+# Set script name early.
+TODO_SH=$(basename "$0")
+export TODO_SH
+
+oneline_usage="$TODO_SH [-fhpantvV] [-d todo_config] action [task_number] [task_description]"
 
 usage()
 {
     sed -e 's/^    //' <<EndUsage
     Usage: $oneline_usage
-    Try 'todo.sh -h' for more information.
+    Try '$TODO_SH -h' for more information.
 EndUsage
     exit 1
 }
@@ -204,6 +208,7 @@ help()
         TODOTXT_VERBOSE=1               is same as option -v
         TODOTXT_DEFAULT_ACTION=""       run this when called with no arguments
         TODOTXT_SORT_COMMAND="sort ..." customize list output
+        TODOTXT_FINAL_FILTER="sed ..."  customize list after color, P@+ hiding
 EndHelp
 
     if [ -d "$TODO_ACTIONS_DIR" ]
@@ -343,8 +348,10 @@ TODOTXT_AUTO_ARCHIVE=${TODOTXT_AUTO_ARCHIVE:-1}
 TODOTXT_DATE_ON_ADD=${TODOTXT_DATE_ON_ADD:-0}
 TODOTXT_DEFAULT_ACTION=${TODOTXT_DEFAULT_ACTION:-}
 TODOTXT_SORT_COMMAND=${TODOTXT_SORT_COMMAND:-env LC_COLLATE=C sort -f -k2}
+TODOTXT_FINAL_FILTER=${TODOTXT_FINAL_FILTER:-cat}
 
-export TODOTXT_VERBOSE TODOTXT_PLAIN TODOTXT_CFG_FILE TODOTXT_FORCE TODOTXT_PRESERVE_LINE_NUMBERS TODOTXT_AUTO_ARCHIVE TODOTXT_DATE_ON_ADD TODOTXT_SORT_COMMAND
+# Export all TODOTXT_* variables
+export ${!TODOTXT_@}
 
 # Default color map
 export NONE=''
@@ -387,9 +394,6 @@ then
     export TODO_ACTIONS_DIR
 fi
 
-TODO_SH="$0"
-export TODO_SH
-
 # === SANITY CHECKS (thanks Karl!) ===
 [ -r "$TODOTXT_CFG_FILE" ] || die "Fatal error: Cannot read configuration file $TODOTXT_CFG_FILE"
 
@@ -494,7 +498,7 @@ _list() {
             s/^  /00/;
             s/^ /0/;
           ''' \
-        | ${TODOTXT_SORT_COMMAND}                                        \
+        | eval ${TODOTXT_SORT_COMMAND}                                        \
         | sed '''
             /^[0-9]\{'$PADDING'\} x /! {
                 s/\(.*(A).*\)/'$PRI_A'\1'$DEFAULT'/g;
@@ -508,6 +512,7 @@ _list() {
             s/'${HIDE_PROJECTS_SUBSTITUTION:-^}'//g
             s/'${HIDE_CONTEXTS_SUBSTITUTION:-^}'//g
           '''                                                   \
+        | eval ${TODOTXT_FINAL_FILTER}                          \
     )
     echo -ne "$filtered_items${filtered_items:+\n}"
 
@@ -552,7 +557,7 @@ case $action in
         echo -n "Add: "
         read input
     else
-        [ -z "$2" ] && die "usage: $0 add \"TODO ITEM\""
+        [ -z "$2" ] && die "usage: $TODO_SH add \"TODO ITEM\""
         shift
         input=$*
     fi
@@ -567,9 +572,9 @@ case $action in
     cleanup;;
 
 "addto" )
-    [ -z "$2" ] && die "usage: $0 addto DEST \"TODO ITEM\""
+    [ -z "$2" ] && die "usage: $TODO_SH addto DEST \"TODO ITEM\""
     dest="$TODO_DIR/$2"
-    [ -z "$3" ] && die "usage: $0 addto DEST \"TODO ITEM\""
+    [ -z "$3" ] && die "usage: $TODO_SH addto DEST \"TODO ITEM\""
     shift
     shift
     input=$*
@@ -584,7 +589,7 @@ case $action in
     cleanup;;
 
 "append" | "app" )
-    errmsg="usage: $0 append ITEM# \"TEXT TO APPEND\""
+    errmsg="usage: $TODO_SH append ITEM# \"TEXT TO APPEND\""
     shift; item=$1; shift
 
     [ -z "$item" ] && die "$errmsg"
@@ -610,7 +615,7 @@ case $action in
 
 "del" | "rm" )
     # replace deleted line with a blank line when TODOTXT_PRESERVE_LINE_NUMBERS is 1
-    errmsg="usage: $0 del ITEM#"
+    errmsg="usage: $TODO_SH del ITEM#"
     item=$2
     [ -z "$item" ] && die "$errmsg"
 
@@ -649,7 +654,7 @@ case $action in
 
 "depri" | "dp" )
     item=$2
-    errmsg="usage: $0 depri ITEM#"
+    errmsg="usage: $TODO_SH depri ITEM#"
 
     todo=$(sed "$item!d" "$TODO_FILE")
     [ -z "$todo" ] && die "$item: No such todo."
@@ -669,7 +674,7 @@ case $action in
     fi;;
 
 "do" )
-    errmsg="usage: $0 do ITEM#"
+    errmsg="usage: $TODO_SH do ITEM#"
     item=$2
     [ -z "$item" ] && die "$errmsg"
     [[ "$item" = +([0-9]) ]] || die "$errmsg"
@@ -721,11 +726,11 @@ case $action in
     ;;
 
 "listcon" | "lsc" )
-    grep -w -o '@[^ ]\+' "$TODO_FILE" | sort -u
+    grep -o '[^ ]*@[^ ]\+' "$TODO_FILE" | grep '^@' | sort -u
     cleanup ;;
 
 "listproj" | "lsprj" )
-    grep -w -o '+[^ ]\+' "$TODO_FILE" | sort -u
+    grep -o '[^ ]*+[^ ]\+' "$TODO_FILE" | grep '^+' | sort -u
     cleanup ;;
 
 
@@ -736,7 +741,7 @@ case $action in
     then
         ## A priority was specified
         pri=$( printf "%s\n" "$1" | tr 'a-z' 'A-Z' | grep '^[A-Z]$' ) || {
-            die "usage: $0 listpri PRIORITY
+            die "usage: $TODO_SH listpri PRIORITY
             note: PRIORITY must a single letter from A to Z."
         }
     else
@@ -750,7 +755,7 @@ case $action in
 
 "move" | "mv" )
     # replace moved line with a blank line when TODOTXT_PRESERVE_LINE_NUMBERS is 1
-    errmsg="usage: $0 mv ITEM# DEST [SRC]"
+    errmsg="usage: $TODO_SH mv ITEM# DEST [SRC]"
     item=$2
     dest="$TODO_DIR/$3"
     src="$TODO_DIR/$4"
@@ -798,7 +803,7 @@ case $action in
     cleanup;;
 
 "prepend" | "prep" )
-    errmsg="usage: $0 prepend ITEM# \"TEXT TO PREPEND\""
+    errmsg="usage: $TODO_SH prepend ITEM# \"TEXT TO PREPEND\""
     shift; item=$1; shift
 
     [ -z "$item" ] && die "$errmsg"
@@ -826,7 +831,7 @@ case $action in
     item=$2
     newpri=$( printf "%s\n" "$3" | tr 'a-z' 'A-Z' )
 
-    errmsg="usage: $0 pri ITEM# PRIORITY
+    errmsg="usage: $TODO_SH pri ITEM# PRIORITY
 note: PRIORITY must be anywhere from A to Z."
 
     [ "$#" -ne 3 ] && die "$errmsg"
@@ -847,7 +852,7 @@ note: PRIORITY must be anywhere from A to Z."
     fi;;
 
 "replace" )
-    errmsg="usage: $0 replace ITEM# \"UPDATED ITEM\""
+    errmsg="usage: $TODO_SH replace ITEM# \"UPDATED ITEM\""
     shift; item=$1; shift
 
     [ -z "$item" ] && die "$errmsg"