todo_completion: FIX: Add completion for missing done and deduplicate built-in actions

Merge pull request #484 from inkarkat/fix-completion-missing

Author: inkarkat

tests/completion-test-lib.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+readonly ACTIONS='add a addto addm append app archive command del rm deduplicate depri dp do done 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'

tests/t6000-completion.sh

@@ -4,11 +4,9 @@ test_description='Bash completion functionality
 
 This test checks basic todo_completion of actions and options
 '
+. ./completion-test-lib.sh
 . ./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"

tests/t6050-completion-addons.sh

@@ -4,11 +4,9 @@ test_description='Bash add-on action completion functionality
 
 This test checks todo_completion of custom actions in .todo.actions.d
 '
+. ./completion-test-lib.sh
 . ./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'
 
 readonly CONTAINED='xeno zoolander'

tests/t6100-completion-help.sh

@@ -5,11 +5,11 @@ test_description='Bash help completion functionality
 This test checks todo_completion of actions for usage help.
 '
 . ./actions-test-lib.sh
+. ./completion-test-lib.sh
 . ./test-lib.sh
+
 make_action "zany"
 make_action "aardvark"
-
-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 ADDONS='aardvark zany'
 
 test_todo_completion 'all actions after help' 'todo.sh help ' "$ACTIONS $ADDONS"

todo_completion

@@ -13,7 +13,7 @@ _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 deduplicate depri dp do done help list ls listaddons listall lsa listcon \
         lsc listfile lf listpri lsp listproj lsprj move \
         mv prepend prep pri p replace report shorthelp"
     local -r MOVE_COMMAND_PATTERN='move|mv'