ENH: Allow listpri filtering with priority ranges.

So far, the listpri action only supports a single priority. Allowing priority ranges (e.g. todo.sh listpri A-C @work) is a simple but useful enhancement.

Note: The syntax extension only clashes with the [TERM] filtering in a few corner cases, and this can be worked around (e.g. "todo.sh listpri A-Z A-Z" lists all prioritized tasks containing the text A-Z).

.gitignore

@@ -1,6 +1,3 @@
 VERSION-FILE
 tests/test-results
 tests/trash\ directory.*
-done.txt
-report.txt
-todo.txt

tests/README

@@ -125,10 +125,10 @@ Writing Tests
 -------------
 
 The test script is written as a shell script.  It should start
-with the standard "#!/bin/bash" with copyright notices, and an
+with the standard "#!/bin/sh" with copyright notices, and an
 assignment to variable 'test_description', like this:
 
-	#!/bin/bash
+	#!/bin/sh
 	#
 	# Copyright (c) 2005 Junio C Hamano
 	#
@@ -186,24 +186,6 @@ library for your script to use.
    expected output.  (See below for how to generate transcripts
    easily.)
 
- - test_todo_completion <message> <cmdline> <completions>
-
-   This takes three strings as parameter.  Based on <cmdline>,
-   the todo_completion script is triggered in the current test
-   environment and completions are compared with <completions>,
-   which should be a space-separated list.  If any completion
-   contains whitespace, quote it; the entire <completions>
-   argument is eval()'ed.
-   Include a trailing space in <cmdline> when you want to check
-   new argument completion; otherwise, completion is triggered
-   with the context of the last argument. <message> should state
-   what it is testing.
-
- - test_todo_custom_completion <completefunc> <message> <cmdline> <completions>
-
-   Same as above, but in addition allows to specify a custom
-   completion function.
-
  - test_tick [interval]
 
    The test harness has an internal view of time which is
@@ -223,13 +205,6 @@ library for your script to use.
 	    'git-write-tree should be able to write an empty tree.' \
 	    'tree=$(git-write-tree)'
 
- - test_expect_code <code> <message> <script>
-
-   This takes an exit status and two strings as parameter, and
-   evaluates the <script>.  If it yields <code>, test is
-   considered successful.  <message> should state what it is
-   testing.
-
  - test_expect_failure <message> <script>
 
    This is NOT the opposite of test_expect_success, but is used

tests/t0000-config.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='todo.sh configuration file location
 

tests/t0001-null.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='todo.sh basic null functionality test.
 

tests/t0002-actions.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='todo.sh actions.d
 

tests/t0100-code-nobacktick.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='no old-style backtick command substitution
 

tests/t1000-addlist.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='basic add and list functionality
 

tests/t1010-add-date.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='test the date on add feature
 

tests/t1020-addtolistfile.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='basic addto and list functionality
 

tests/t1030-addto-date.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='test the date on addto feature
 

tests/t1100-replace.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='basic replace functionality
 

tests/t1200-pri.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='basic priority functionality
 '

tests/t1250-listpri.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='list priority functionality
 '

tests/t1260-listprj.sh

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+test_description='list project functionality
+'
+. ./test-lib.sh
+
+cat > todo.txt <<EOF
+(B) smell the uppercase Roses +roses @outside +shared
+(C) notice the sunflowers +sunflowers @garden +shared +landscape
+stop
+EOF
+test_todo_session 'basic listproj' <<EOF
+>>> todo.sh listproj
++landscape
++roses
++shared
++sunflowers
+EOF
+
+test_todo_session 'listproj with context' <<EOF
+>>> todo.sh listproj @garden
++landscape
++shared
++sunflowers
+EOF
+
+TEST_TODO_CUSTOM=todo-custom.cfg
+cat todo.cfg > "$TEST_TODO_CUSTOM"
+cat >> "$TEST_TODO_CUSTOM" <<'EOF'
+export DEFAULT='</color>'
+export PRI_B='<color type=green>'
+export PRI_C='<color type=blue>'
+export TODOTXT_FINAL_FILTER='grep -i roses'
+EOF
+test_todo_session 'listproj with context special cases' <<EOF
+>>> todo.sh -+ -d "$TEST_TODO_CUSTOM" listproj @garden
++landscape
++shared
++sunflowers
+EOF
+
+test_done

tests/t1300-ls.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 
 test_description='list functionality

tests/t1310-listcon.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 
 test_description='listcon functionality
@@ -55,23 +55,4 @@ test_todo_session 'listcon e-mail address test' <<EOF
 @con02
 EOF
 
-cat > todo.txt <<EOF
-@con01 -- Some context 1 task
-EOF
-cat > done.txt <<EOF
-x 2012-02-21 @done01 -- Some context 1 done task
-x 2012-02-21 @done02 -- Some context 2 done task
-EOF
-test_todo_session 'listcon from done tasks' <<'EOF'
->>> TODOTXT_SOURCEVAR=\$DONE_FILE todo.sh listcon
-@done01
-@done02
-EOF
-test_todo_session 'listcon from combined open + done tasks' <<'EOF'
->>> TODOTXT_SOURCEVAR='("$TODO_FILE" "$DONE_FILE")' todo.sh listcon
-@con01
-@done01
-@done02
-EOF
-
 test_done

tests/t1320-listproj.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 
 test_description='listproj functionality
@@ -55,63 +55,4 @@ test_todo_session 'listproj embedded + test' <<EOF
 +prj02
 EOF
 
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +roses @outside +shared
-(C) notice the sunflowers +sunflowers @garden +shared +landscape
-stop
-EOF
-test_todo_session 'basic listproj' <<EOF
->>> todo.sh listproj
-+landscape
-+roses
-+shared
-+sunflowers
-EOF
-
-test_todo_session 'listproj with context' <<EOF
->>> todo.sh listproj @garden
-+landscape
-+shared
-+sunflowers
-EOF
-
-TEST_TODO_CUSTOM=todo-custom.cfg
-cat todo.cfg > "$TEST_TODO_CUSTOM"
-cat >> "$TEST_TODO_CUSTOM" <<'EOF'
-export DEFAULT='</color>'
-export PRI_B='<color type=green>'
-export PRI_C='<color type=blue>'
-export TODOTXT_FINAL_FILTER='grep -i roses'
-EOF
-test_todo_session 'listproj with context special cases' <<EOF
->>> todo.sh -+ -d "$TEST_TODO_CUSTOM" listproj @garden
-+landscape
-+shared
-+sunflowers
-EOF
-
-
-cat > todo.txt <<EOF
-+prj01 -- Some project 1 task
-EOF
-cat > done.txt <<EOF
-x 2012-02-21 +done01 -- Special project 1 done task
-x 2012-02-21 +done02 -- Some project 2 done task
-EOF
-test_todo_session 'listproj from done tasks' <<'EOF'
->>> TODOTXT_SOURCEVAR=\$DONE_FILE todo.sh listproj
-+done01
-+done02
-EOF
-test_todo_session 'listproj from done tasks with filtering' <<'EOF'
->>> TODOTXT_SOURCEVAR=\$DONE_FILE todo.sh listproj Special
-+done01
-EOF
-test_todo_session 'listproj from combined open + done tasks' <<'EOF'
->>> TODOTXT_SOURCEVAR='("$TODO_FILE" "$DONE_FILE")' todo.sh listproj
-+done01
-+done02
-+prj01
-EOF
-
 test_done

tests/t1330-ls-highlighting.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 
 test_description='list highlighting

tests/t1350-listall.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='listall functionality
 '

tests/t1400-prepend.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='basic prepend functionality
 '

tests/t1500-do.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='do functionality
 '

tests/t1600-append.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='basic append functionality
 

tests/t1700-depri.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='basic depriority functionality
 '

tests/t1800-del.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='basic del functionality
 '

tests/t1900-archive.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='archive functionality
 

tests/t1910-deduplicate.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='deduplicate functionality
 

tests/t1950-report.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='report functionality
 

tests/t2000-multiline.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='Multi-line functionality'
 
@@ -8,18 +8,18 @@ test_description='Multi-line functionality'
 # Create the expected file
 echo "1 smell the cheese
 TODO: Replaced task with:
-1 eat apples eat oranges drink milk">"$HOME/expect.multi"
+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"
+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"
+drink milk" > $HOME/output.multi
 
 # Test output against expected
 diff "$HOME/output.multi" "$HOME/expect.multi"
@@ -34,18 +34,18 @@ fi
 ## Add test
 # Create the expected file
 echo "2 eat apples eat oranges drink milk
-TODO: 2 added.">"$HOME/expect.multi"
+TODO: 2 added.">$HOME/expect.multi
 
 test_expect_success 'multiline squash item add' '
 (
 # Prepare single line todo file
-cat /dev/null > "$HOME/todo.txt"
+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"
+drink milk" > $HOME/output.multi
 
 # Test output against expected
 diff "$HOME/output.multi" "$HOME/expect.multi"
@@ -59,18 +59,18 @@ fi
 
 ## Append test
 # Create the expected file
-echo "1 smell the cheese eat apples eat oranges drink milk">"$HOME/expect.multi"
+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"
+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"
+drink milk" > $HOME/output.multi
 
 # Test output against expected
 diff "$HOME/output.multi" "$HOME/expect.multi"
@@ -84,18 +84,18 @@ fi
 
 ## Prepend test
 # Create the expected file
-echo "1 eat apples eat oranges drink milk smell the cheese">"$HOME/expect.multi"
+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"
+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"
+drink milk" > $HOME/output.multi
 
 # Test output against expected
 diff "$HOME/output.multi" "$HOME/expect.multi"
@@ -110,18 +110,18 @@ fi
 ## Multiple line addition
 # Create the expected file
 echo "2 eat apples
-TODO: 2 added." > "$HOME/expect.multi"
+TODO: 2 added." > $HOME/expect.multi
 echo "3 eat oranges
-TODO: 3 added." >>"$HOME/expect.multi"
+TODO: 3 added." >>$HOME/expect.multi
 echo "4 drink milk
-TODO: 4 added." >>"$HOME/expect.multi"
+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"
+drink milk" > $HOME/output.multi
 
 # Test output against expected
 diff "$HOME/output.multi" "$HOME/expect.multi"

tests/t6000-completion.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-
-test_description='Bash completion functionality
-
-This test checks basic todo_completion of actions and options
-'
-. ./test-lib.sh
-
-readonly ACTIONS='add a addto addm append app archive command del rm depri dp do help list ls listaddons listall lsa listcon lsc listfile lf listpri lsp listproj lsprj move mv prepend prep pri p replace report shorthelp'
-readonly OPTIONS='-@ -@@ -+ -++ -d -f -h -p -P -PP -a -n -t -v -vv -V -x'
-
-test_todo_completion 'all arguments' 'todo.sh ' "$ACTIONS $OPTIONS"
-test_todo_completion 'arguments beginning with a' 'todo.sh a' 'add a addto addm append app archive'
-test_todo_completion 'all options' 'todo.sh -' "$OPTIONS"
-test_todo_completion 'all actions after command action' 'todo.sh command ' "$ACTIONS"
-test_todo_completion 'all arguments after option' 'todo.sh -a ' "$ACTIONS $OPTIONS"
-test_todo_completion 'all arguments after options' 'todo.sh -a -p ' "$ACTIONS $OPTIONS"
-test_todo_completion 'all options after options' 'todo.sh -a -p -' "$OPTIONS"
-test_todo_completion 'nothing after action' 'todo.sh archive ' ''
-
-test_done

tests/t6010-completion-contexts.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-#
-
-test_description='Bash context completion functionality
-
-This test checks todo_completion of contexts
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-(B) smell the +roses @outside @outdoor +shared
-notice the sunflowers +sunflowers @outside @garden +shared +landscape
-stop
-EOF
-cat > done.txt <<EOF
-x 2012-02-21 +herbs @oriental buy spices
-x 2012-02-21 +slack @home watch tv
-EOF
-test_todo_completion 'all contexts' 'todo.sh list @' '@garden @outdoor @outside'
-test_todo_completion 'contexts beginning with o' 'todo.sh list @o' '@outdoor @outside'
-test_todo_completion 'contexts beginning with outs' 'todo.sh list @outs' '@outside'
-test_todo_completion 'contexts beginning with x' 'todo.sh list @x' ''
-
-test_todo_completion 'contexts from done tasks beginning with h' 'todo.sh list @h' '@home'
-test_todo_completion 'contexts from done tasks beginning with or' 'todo.sh list @or' '@oriental'
-
-test_done

tests/t6020-completion-projects.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-#
-
-test_description='Bash project completion functionality
-
-This test checks todo_completion of projects
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-(B) smell the +roses @outside @outdoor +shared
-notice the sunflowers +sunflowers @outside @garden +shared +landscape
-stop
-EOF
-cat > done.txt <<EOF
-x 2012-02-21 +herbs @oriental buy spices
-x 2012-02-21 +slack @home watch tv
-EOF
-test_todo_completion 'all projects' 'todo.sh list +' '+landscape +roses +shared +sunflowers'
-test_todo_completion 'projects beginning with s' 'todo.sh list +s' '+shared +sunflowers'
-test_todo_completion 'projects beginning with ro' 'todo.sh list +ro' '+roses'
-test_todo_completion 'projects beginning with x' 'todo.sh list +x' ''
-
-test_todo_completion 'projects from done tasks beginning with h' 'todo.sh list +h' '+herbs'
-test_todo_completion 'projects from done tasks beginning with sl' 'todo.sh list +sl' '+slack'
-
-test_done

tests/t6030-completion-tasks.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-
-test_description='Bash task number completion functionality
-
-This test checks todo_completion of a task number into the abbreviated task text.
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-simple task
-notice the sunflowers +sunflowers @outside @garden +shared +landscape
-(B) smell the +roses flower @outside @outdoor +shared
-(C) 2012-02-28 @outside mow the lawn
-x 2012-02-21 +herbs @oriental buy spices
-x 2012-02-28 2012-02-21 +slack @home watch tv
-EOF
-test_todo_completion 'simple task' 'todo.sh list 1' '"1 # simple task"'
-test_todo_completion 'remove projects and contents from task' 'todo.sh list 2' '"2 # notice the sunflowers"'
-test_todo_completion 'keep priority' 'todo.sh list 3' '"3 # (B) smell the flower"'
-test_todo_completion 'keep priority and remove timestamp' 'todo.sh list 4' '"4 # (C) mow the lawn"'
-test_todo_completion 'keep done marker and remove done date' 'todo.sh list 5' '"5 # x buy spices"'
-test_todo_completion 'keep done marker and remove timestamp and done date' 'todo.sh list 6' '"6 # x watch tv"'
-
-test_done

tests/t6040-completion-files.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-
-test_description='Bash todo file completion functionality
-
-This test checks todo_completion of files in TODO_DIR.
-'
-. ./test-lib.sh
-
-> dummy.txt
-readonly FILES='done.txt dummy.txt report.txt todo.txt'
-test_todo_completion 'all files after addto' 'todo.sh addto ' "$FILES"
-test_todo_completion 'files beginning with d after addto' 'todo.sh addto d' 'done.txt dummy.txt'
-test_todo_completion 'all files after listfile' 'todo.sh listfile ' "$FILES"
-test_todo_completion 'all files after lf' 'todo.sh -v lf ' "$FILES"
-test_todo_completion 'nothing after move' 'todo.sh move ' ''
-test_todo_completion 'all files after move ITEM#' 'todo.sh move 1 ' "$FILES"
-test_todo_completion 'all files after mv ITEM#' 'todo.sh mv 1 ' "$FILES"
-test_todo_completion 'all files after move ITEM# DEST' 'todo.sh move 1 todo.sh ' "$FILES"
-
-test_done

tests/t6050-completion-addons.sh

@@ -1,74 +0,0 @@
-#!/bin/bash
-#
-
-test_description='Bash add-on action completion functionality
-
-This test checks todo_completion of custom actions in .todo.actions.d
-'
-. ./test-lib.sh
-
-readonly ACTIONS='add a addto addm append app archive command del rm depri dp do help list ls listaddons listall lsa listcon lsc listfile lf listpri lsp listproj lsprj move mv prepend prep pri p replace report shorthelp'
-readonly OPTIONS='-@ -@@ -+ -++ -d -f -h -p -P -PP -a -n -t -v -vv -V -x'
-
-readonly ADDONS='bar baz foobar'
-makeCustomActions()
-{
-    set -e
-    mkdir "${1:?}"
-    for addon in $ADDONS
-    do
-        addonFile="${1}/$addon"
-        > "$addonFile"
-        chmod +x "$addonFile"
-    done
-
-    # Also create a subdirectory, to test that it is skipped.
-    mkdir "${1}/subdir"
-
-    # Also create a non-executable file, to test that it is skipped.
-    datafile="${1:?}/datafile"
-    > "$datafile"
-    chmod -x "$datafile"
-    [ -x "$datafile" ] && rm "$datafile"    # Some file systems may always make files executable; then, skip this check.
-
-    set +e
-}
-removeCustomActions()
-{
-    set -e
-    rmdir "${1}/subdir"
-    rm "${1:?}/"*
-    rmdir "$1"
-    set +e
-}
-
-#
-# Test resolution of the default TODO_ACTIONS_DIR.
-#
-makeCustomActions "$HOME/.todo.actions.d"
-test_todo_completion 'all arguments' 'todo.sh ' "$ACTIONS $ADDONS $OPTIONS"
-test_todo_completion 'all arguments after option' 'todo.sh -a ' "$ACTIONS $ADDONS $OPTIONS"
-test_todo_completion 'all arguments beginning with b' 'todo.sh b' 'bar baz'
-test_todo_completion 'all arguments beginning with f after options' 'todo.sh -a -v f' 'foobar'
-test_todo_completion 'nothing after addon action' 'todo.sh foobar ' ''
-removeCustomActions "$HOME/.todo.actions.d"
-
-#
-# Test resolution of an alternative TODO_ACTIONS_DIR.
-#
-mkdir  "$HOME/.todo"
-makeCustomActions "$HOME/.todo/actions"
-test_todo_completion 'all arguments with actions from .todo/actions/' 'todo.sh ' "$ACTIONS $ADDONS $OPTIONS"
-removeCustomActions "$HOME/.todo/actions"
-
-#
-# Test resolution of a configured TODO_ACTIONS_DIR.
-#
-makeCustomActions "$HOME/addons"
-cat >> todo.cfg <<'EOF'
-export TODO_ACTIONS_DIR="$HOME/addons"
-EOF
-test_todo_completion 'all arguments with actions from addons/' 'todo.sh ' "$ACTIONS $ADDONS $OPTIONS"
-removeCustomActions "$HOME/addons"
-
-test_done

tests/t6080-completion-path.sh

@@ -1,45 +0,0 @@
-#!/bin/bash
-#
-
-test_description='Bash completion with different path functionality
-
-This test checks that todo_completion can use a different path to todo.sh when
-it is not accessible through PATH.
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-(B) smell the +roses @outside @outdoor +shared
-notice the sunflowers +sunflowers @outside @garden +shared +landscape
-stop
-EOF
-
-mv bin/todo.sh bin/todo2.sh
-test_expect_success 'todo2.sh executable' 'todo2.sh list'
-
-# Define a second completion function that injects the different executable. In
-# real use, this would be installed via
-#   complete -F _todo2 todo2.sh
-_todo2()
-{
-    local _todo_sh='todo2.sh'
-    _todo "$@"
-}
-
-test_todo_custom_completion _todo2 'all todo2 contexts' 'todo2 list @' '@garden @outdoor @outside'
-
-
-
-# Remove the test environment's bin directory from the PATH, so that our test
-# executable must be launched with an explicit path.
-PATH=${PATH##"${PWD}/bin:"}
-test_expect_code 127 'todo2.sh executable not in PATH' 'todo2.sh'
-
-_todo2path()
-{
-    local _todo_sh='./bin/todo2.sh'
-    _todo "$@"
-}
-test_todo_custom_completion _todo2path 'all todo2 contexts' 'todo2 list @' '@garden @outdoor @outside'
-
-test_done

tests/t6090-completion-aliases.sh

@@ -1,62 +0,0 @@
-#!/bin/bash
-#
-
-test_description='Bash completion with different aliases functionality
-
-This test checks that todo_completion can use a different configuration
-when another todo.sh alias is defined that uses that configuration.
-'
-. ./test-lib.sh
-
-cat > todo.txt <<EOF
-(B) smell the +roses @outside @outdoor +shared
-notice the sunflowers +sunflowers @outside @garden +shared +landscape
-stop
-EOF
-cat > todo2.txt <<EOF
-+herbs @oriental buy spices
-+slack @home watch tv
-EOF
-
-cp todo.cfg todo2.cfg
-cat >> todo2.cfg <<'EOF'
-export TODO_FILE="$TODO_DIR/todo2.txt"
-EOF
-
-# Note: We cannot use aliases within the test framework, but functions are
-# equivalent and work fine.
-todo1()
-{
-    todo.sh "$@"
-}
-todo2()
-{
-    todo.sh -d "$HOME/todo2.cfg" "$@"
-}
-
-# Ensure that the test fixture works as planned.
-test_todo_session 'todo 1 and 2 contexts' <<EOF
->>> todo1 listcon
-@garden
-@outdoor
-@outside
-
->>> todo2 listcon
-@home
-@oriental
-EOF
-
-
-# Define a second completion function that injects the different configuration
-# file. In real use, this would be installed via
-#   complete -F _todo2 todo2
-_todo2()
-{
-    local _todo_sh='todo.sh -d "$HOME/todo2.cfg"'
-    _todo "$@"
-}
-
-test_todo_completion               'all todo1 contexts' 'todo1 list @' '@garden @outdoor @outside'
-test_todo_custom_completion _todo2 'all todo2 contexts' 'todo2 list @' '@home @oriental'
-
-test_done

tests/t8000-actions.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='custom actions functionality
 

tests/t9999-testsuite_example.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='basic tests imported from previous framework
 '

tests/test-lib.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Copyright (c) 2005 Junio C Hamano
 #
@@ -305,7 +305,7 @@ $cmp_output"
 		else
 			cmp_output=$(test_cmp expect output)
 			test_failure_ "$2" "$3" "
-expected exit code $1, actual ${eval_ret}${cmp_output:+
+* expected exit code $1, actual ${eval_ret}${cmp_output:+
 }${cmp_output}"
 		fi
 	fi
@@ -324,7 +324,7 @@ test_expect_code () {
 			test_ok_ "$2"
 		else
 			test_failure_ "$2" "$3" "
-expected exit code $1, actual ${eval_ret}"
+* expected exit code $1, actual ${eval_ret}"
 		fi
 	fi
 	echo >&3 ""
@@ -632,66 +632,6 @@ EOF
 	exit 0
 }
 
-test_todo_custom_completion () {
-	test "$#" = 4 ||
-	error "bug in the test script: not 4 parameters to test_todo_custom_completion"
-	completeFunc=$1
-	shift
-	if ! test_skip "$@"
-	then
-		description=$1
-		expected=$3
-
-		if [ "${2: -1}" = ' ' ]
-		then
-			offset=0
-			say >&3 "expecting completions after: '$2'"
-		else
-			offset=1
-			say >&3 "expecting context completions for: '$2'"
-		fi
-
-		SAVEIFS=$IFS
-		IFS=' ' set -- $2
-		COMP_WORDS=("$@")
-		COMP_CWORD=$(($# - $offset))
-		IFS=' ' eval "set -- $expected"
-		EXPECT=("$@")
-
-		source "$TEST_DIRECTORY/../todo_completion"
-		$completeFunc
-		ret=$?
-		if [ "$ret" = 0 ]
-		then
-			IFS=$'\n'
-			printf "%s${EXPECT:+\\n}" "${EXPECT[*]}" > expect
-			printf "%s${COMPREPLY:+\\n}" "${COMPREPLY[*]}" > compreply
-			IFS=$SAVEIFS
-
-			if [ ${#COMPREPLY[@]} -eq ${#EXPECT[@]} ]
-			then
-				if [ "${COMPREPLY[*]}" = "${EXPECT[*]}" ]
-				then
-					test_ok_ "$description"
-				else
-					test_failure_ "$description" "$(test_cmp expect compreply)"
-				fi
-			else
-				test_failure_ "$description" "expected ${#EXPECT[@]} completion(s), got ${#COMPREPLY[@]}:
-$(test_cmp expect compreply)"
-			fi
-		else
-			test_failure_ "$description" "expected completions, actual exit code $ret"
-		fi
-	fi
-	echo >&3 ""
-}
-test_todo_completion () {
-	test "$#" = 3 ||
-	error "bug in the test script: not 3 parameters to test_todo_completion"
-	test_todo_custom_completion _todo "$@"
-}
-
 test_init_todo "$test"
 # Use -P to resolve symlinks in our working directory so that the pwd
 # in subprocesses equals our $PWD (for pathname comparisons).

tests/testshell.sh

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

todo.sh

@@ -57,7 +57,6 @@ shorthelp()
 		    help
 		    list|ls [TERM...]
 		    listall|lsa [TERM...]
-		    listaddons
 		    listcon|lsc
 		    listfile|lf [SRC [TERM...]]
 		    listpri|lsp [PRIORITIES] [TERM...]
@@ -137,7 +136,7 @@ help()
 
 	EndOptionsHelp
 
-    [ $TODOTXT_VERBOSE -gt 1 ] && cat <<-'EndVerboseHelp'
+    [ $TODOTXT_VERBOSE -gt 1 ] && cat <<-EndVerboseHelp
 		  Environment variables:
 		    TODOTXT_AUTO_ARCHIVE            is same as option -a (0)/-A (1)
 		    TODOTXT_CFG_FILE=CONFIG_FILE    is same as option -d CONFIG_FILE
@@ -150,7 +149,6 @@ help()
 		    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
-		    TODOTXT_SOURCEVAR=\$DONE_FILE   use another source for listcon, listproj
 
 
 	EndVerboseHelp
@@ -220,9 +218,6 @@ help()
 		      TERM specified, lists entire todo.txt AND done.txt
 		      concatenated and sorted.
 
-		    listaddons
-		      Lists all added and overridden actions in the actions directory.
-
 		    listcon
 		    lsc
 		      Lists all the task contexts that start with the @ sign in todo.txt.
@@ -831,7 +826,7 @@ _format()
             {
                 if (match($0, /^[0-9]+ x /)) {
                     print highlight("COLOR_DONE") $0 highlight("DEFAULT")
-                } else if (match($0, /^[0-9]+ \([A-Z]\) /)) {
+                } else if (match($0, /^[0-9]+ \([A-Z]\)[[:space:]]/)) {
                     clr = highlight("PRI_" substr($0, RSTART + RLENGTH - 3, 1))
                     print \
                         (clr ? clr : highlight("PRI_X")) \
@@ -1133,16 +1128,12 @@ case $action in
     ;;
 
 "listcon" | "lsc" )
-    FILE=$TODO_FILE
-    [ "$TODOTXT_SOURCEVAR" ] && eval "FILE=$TODOTXT_SOURCEVAR"
-    grep -ho '[^ ]*@[^ ]\+' "${FILE[@]}" | grep '^@' | sort -u
+    grep -o '[^ ]*@[^ ]\+' "$TODO_FILE" | grep '^@' | sort -u
     ;;
 
 "listproj" | "lsprj" )
-    FILE=$TODO_FILE
-    [ "$TODOTXT_SOURCEVAR" ] && eval "FILE=$TODOTXT_SOURCEVAR"
     shift
-    eval "$(filtercommand 'cat "${FILE[@]}"' '' "$@")" | grep -o '[^ ]*+[^ ]\+' | grep '^+' | sort -u
+    eval "$(filtercommand 'cat "$TODO_FILE"' '' "$@")" | grep -o '[^ ]*+[^ ]\+' | grep '^+' | sort -u
     ;;
 
 "listpri" | "lsp" )
@@ -1304,18 +1295,6 @@ note: PRIORITY must be anywhere from A to Z."
     fi
     ;;
 
-"listaddons" )
-    if [ -d "$TODO_ACTIONS_DIR" ]; then
-        cd "$TODO_ACTIONS_DIR" || exit $?
-        for action in *
-        do
-            if [ -f "$action" -a -x "$action" ]; then
-                echo "$action"
-            fi
-        done
-    fi
-    ;;
-
 * )
     usage;;
 esac

todo_completion

@@ -11,39 +11,32 @@ _todo()
     local -r OPTS="-@ -@@ -+ -++ -d -f -h -p -P -PP -a -n -t -v -vv -V -x"
     local -r COMMANDS="\
         add a addto addm append app archive command del  \
-        rm depri dp do help list ls listaddons listall lsa listcon  \
+        rm depri dp do help list ls listall lsa listcon  \
         lsc listfile lf listpri lsp listproj lsprj move \
         mv prepend prep pri p replace report shorthelp"
 
-    local _todo_sh=${_todo_sh:-todo.sh}
+    # Add custom commands from add-ons, if installed.
+    # TODO: Filter for executable flag of files found in $TODO_ACTIONS_DIR.
+    local allCommands="$COMMANDS $('ls' "${TODO_ACTIONS_DIR:-$HOME/.todo.actions.d}/" 2>/dev/null)"
+
     local completions
     if [ $COMP_CWORD -eq 1 ]; then
-        completions="$COMMANDS $(eval TODOTXT_VERBOSE=0 $_todo_sh command listaddons) $OPTS"
+        completions="$allCommands $OPTS"
     elif [[ $COMP_CWORD -gt 2 && ( \
         "${COMP_WORDS[COMP_CWORD-2]}" =~ ^(move|mv)$ || \
         "${COMP_WORDS[COMP_CWORD-3]}" =~ ^(move|mv)$ ) ]]; then
         # "move ITEM# DEST [SRC]" has file arguments on positions 2 and 3.
-        completions=$(eval TODOTXT_VERBOSE=0 $_todo_sh command listfile)
+        completions=$(TODOTXT_VERBOSE=0 todo.sh command listfile)
     else
         case "$prev" in
             command)
                 completions=$COMMANDS;;
             addto|listfile|lf)
-                completions=$(eval TODOTXT_VERBOSE=0 $_todo_sh command listfile);;
-            -*) completions="$COMMANDS $(eval TODOTXT_VERBOSE=0 $_todo_sh command listaddons) $OPTS";;
+                completions=$(TODOTXT_VERBOSE=0 todo.sh command listfile);;
+            -*) completions="$allCommands $OPTS";;
             *)  case "$cur" in
-                    +*) completions=$(eval TODOTXT_VERBOSE=0 $_todo_sh command listproj)
-                        COMPREPLY=( $( compgen -W "$completions" -- $cur ))
-                        [ ${#COMPREPLY[@]} -gt 0 ] && return 0
-                        # Fall back to projects extracted from done tasks.
-                        completions=$(eval 'TODOTXT_VERBOSE=0 TODOTXT_SOURCEVAR=\$DONE_FILE' $_todo_sh command listproj)
-                        ;;
-                    @*) completions=$(eval TODOTXT_VERBOSE=0 $_todo_sh command listcon)
-                        COMPREPLY=( $( compgen -W "$completions" -- $cur ))
-                        [ ${#COMPREPLY[@]} -gt 0 ] && return 0
-                        # Fall back to contexts extracted from done tasks.
-                        completions=$(eval 'TODOTXT_VERBOSE=0 TODOTXT_SOURCEVAR=\$DONE_FILE' $_todo_sh command listcon)
-                        ;;
+                    +*) completions=$(TODOTXT_VERBOSE=0 todo.sh command listproj);;
+                    @*) completions=$(TODOTXT_VERBOSE=0 todo.sh command listcon);;
                     *)  if [[ "$cur" =~ ^[0-9]+$ ]]; then
                             # Remove the (padded) task number; we prepend the
                             # user-provided $cur instead.
@@ -57,8 +50,8 @@ _todo()
                             # Finally, limit the output to a single line just as
                             # a safety check of the ls action output.
                             local todo=$( \
-                                eval TODOTXT_VERBOSE=0 $_todo_sh '-@ -+ -p -x command ls "^ *${cur} "' | \
-                                sed -e 's/^ *[0-9]\{1,\} //' -e 's/\((.) \)[0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} /\1/' \
+                                TODOTXT_VERBOSE=0 todo.sh -@ -+ -p -x command ls "^ *${cur} " | \
+                                sed -e 's/^ *[0-9]\+ //' -e 's/\((.) \)[0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} /\1/' \
                                     -e 's/\([xX] \)\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} \)\{1,2\}/\1/' \
                                     -e 's/[[:space:]]*$//' \
                                     -e '1q' \
@@ -81,27 +74,6 @@ _todo()
     return 0
 }
 complete -F _todo todo.sh
-
 # If you define an alias (e.g. "t") to todo.sh, you need to explicitly enable
 # completion for it, too:
 #complete -F _todo t
-
-# If you have renamed the todo.sh executable, or if it is not accessible through
-# PATH, you need to add and use a wrapper completion function, like this:
-#_todoElsewhere()
-#{
-#    local _todo_sh='/path/to/todo2.sh'
-#    _todo "$@"
-#}
-#complete -F _todoElsewhere /path/to/todo2.sh
-
-# If you use aliases to use different configuration(s), you need to add and use
-# a wrapper completion function for each configuration if you want to complete
-# fron the actual configured task locations:
-#alias todo2='todo.sh -d "$HOME/todo2.cfg"'
-#_todo2()
-#{
-#    local _todo_sh='todo.sh -d "$HOME/todo2.cfg"'
-#    _todo "$@"
-#}
-#complete -F _todo2 todo2