Compare commits
30 Commits
archive/te
...
upstream
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
da683366f4 | ||
|
|
e48ad81ecc | ||
|
|
7b5c983bb6 | ||
|
|
f67f630466 | ||
|
|
fe27b10765 | ||
|
|
c0c93c8c0c | ||
|
|
137140a542 | ||
|
|
322c6b95d6 | ||
|
|
28e8a4cd8b | ||
|
|
7f1bdbf3d9 | ||
|
|
a5481990fd | ||
|
|
38d75afeff | ||
|
|
7acb521190 | ||
|
|
f2b9734047 | ||
|
|
97035d3425 | ||
|
|
99e5e57a75 | ||
|
|
42424d5881 | ||
|
|
7ab90476f7 | ||
|
|
fac5533b96 | ||
|
|
736e69bd6c | ||
|
|
d2c44e9ffe | ||
|
|
f45bbd1a1d | ||
|
|
e0b93e48fb | ||
|
|
24d0fb003a | ||
|
|
3b0309d9bc | ||
|
|
b21d16878f | ||
|
|
3e82f3ca56 | ||
|
|
e5e31b0f75 | ||
|
|
d7056c5e1e | ||
|
|
92322e7064 |
18
tests/actions-test-lib.sh
Normal file
18
tests/actions-test-lib.sh
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
make_action()
|
||||||
|
{
|
||||||
|
unset TODO_ACTIONS_DIR
|
||||||
|
[ -d .todo.actions.d ] || mkdir .todo.actions.d
|
||||||
|
cat > ".todo.actions.d/$1" <<EOF
|
||||||
|
#!/bin/bash
|
||||||
|
[ "\$1" = "usage" ] && {
|
||||||
|
echo " $1 ITEM#[, ITEM#, ...] [TERM...]"
|
||||||
|
echo " This custom action does $1."
|
||||||
|
echo ""
|
||||||
|
exit
|
||||||
|
}
|
||||||
|
echo "custom action $1"
|
||||||
|
EOF
|
||||||
|
chmod +x ".todo.actions.d/$1"
|
||||||
|
}
|
||||||
@@ -9,8 +9,15 @@ On failure, it will print each offending line number and line.
|
|||||||
'
|
'
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
|
backtick_check()
|
||||||
|
{
|
||||||
|
sed -n -e 's/\(^\|[ \t]\)#.*//' -e '/`/{' -e '=;p' -e '}' "$@"
|
||||||
|
}
|
||||||
|
|
||||||
test_todo_session 'no old-style backtick command substitution' <<EOF
|
test_todo_session 'no old-style backtick command substitution' <<EOF
|
||||||
>>> sed -n -e 's/\(^\|[ \t]\)#.*//' -e '/\`/{' -e '=;p' -e '}' "$(which todo.sh)"
|
>>> backtick_check bin/todo.sh
|
||||||
|
|
||||||
|
>>> backtick_check ../../todo.cfg
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|||||||
@@ -164,4 +164,12 @@ TODO: Replaced task with:
|
|||||||
1 (A) 2010-07-04 this also has a new date
|
1 (A) 2010-07-04 this also has a new date
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
echo '2009-02-13 this is just a new one' > todo.txt
|
||||||
|
test_todo_session 'replace with prepended priority and date replaces existing date' <<EOF
|
||||||
|
>>> todo.sh replace 1 '(B) 2010-07-04 this also has a new date'
|
||||||
|
1 2009-02-13 this is just a new one
|
||||||
|
TODO: Replaced task with:
|
||||||
|
1 (B) 2010-07-04 this also has a new date
|
||||||
|
EOF
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|||||||
@@ -55,6 +55,16 @@ test_todo_session 'listcon e-mail address test' <<EOF
|
|||||||
@con02
|
@con02
|
||||||
EOF
|
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 'listcon with project' <<EOF
|
||||||
|
>>> todo.sh listcon +landscape
|
||||||
|
@garden
|
||||||
|
EOF
|
||||||
|
|
||||||
cat > todo.txt <<EOF
|
cat > todo.txt <<EOF
|
||||||
@con01 -- Some context 1 task
|
@con01 -- Some context 1 task
|
||||||
EOF
|
EOF
|
||||||
|
|||||||
44
tests/t2100-help.sh
Executable file
44
tests/t2100-help.sh
Executable file
@@ -0,0 +1,44 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
|
||||||
|
test_description='help functionality
|
||||||
|
|
||||||
|
This test covers the help output.
|
||||||
|
'
|
||||||
|
. ./actions-test-lib.sh
|
||||||
|
. ./test-lib.sh
|
||||||
|
|
||||||
|
# Note: To avoid having to adapt the test whenever the help documentation
|
||||||
|
# slightly changes, only check for the section headers.
|
||||||
|
test_todo_session 'help output' <<EOF
|
||||||
|
>>> todo.sh help | sed '/^ [A-Z]/!d'
|
||||||
|
Usage: todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]
|
||||||
|
Options:
|
||||||
|
Built-in Actions:
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_todo_session 'verbose help output' <<EOF
|
||||||
|
>>> todo.sh -v help | sed '/^ [A-Z]/!d'
|
||||||
|
Usage: todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]
|
||||||
|
Options:
|
||||||
|
Built-in Actions:
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_todo_session 'very verbose help output' <<EOF
|
||||||
|
>>> todo.sh -vv help | sed '/^ [A-Z]/!d'
|
||||||
|
Usage: todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]
|
||||||
|
Options:
|
||||||
|
Environment variables:
|
||||||
|
Built-in Actions:
|
||||||
|
EOF
|
||||||
|
|
||||||
|
make_action "foo"
|
||||||
|
test_todo_session 'help output with custom action' <<EOF
|
||||||
|
>>> todo.sh -v help | sed '/^ [A-Z]/!d'
|
||||||
|
Usage: todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]
|
||||||
|
Options:
|
||||||
|
Built-in Actions:
|
||||||
|
Add-on Actions:
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_done
|
||||||
66
tests/t2110-help-action.sh
Executable file
66
tests/t2110-help-action.sh
Executable file
@@ -0,0 +1,66 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
test_description='built-in actions help functionality
|
||||||
|
|
||||||
|
This test checks listing the usage help of a built-in action.
|
||||||
|
'
|
||||||
|
. ./test-lib.sh
|
||||||
|
|
||||||
|
test_todo_session 'nonexisting action help' <<'EOF'
|
||||||
|
>>> todo.sh help doesnotexist
|
||||||
|
TODO: No action "doesnotexist" exists.
|
||||||
|
=== 1
|
||||||
|
|
||||||
|
>>> todo.sh help hel
|
||||||
|
TODO: No action "hel" exists.
|
||||||
|
=== 1
|
||||||
|
|
||||||
|
>>> todo.sh help h
|
||||||
|
TODO: No action "h" exists.
|
||||||
|
=== 1
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_todo_session 'single action help' <<'EOF'
|
||||||
|
>>> todo.sh help shorthelp
|
||||||
|
shorthelp
|
||||||
|
List the one-line usage of all built-in and add-on actions.
|
||||||
|
\
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_todo_session 'multiple actions help' <<'EOF'
|
||||||
|
>>> todo.sh help shorthelp append
|
||||||
|
shorthelp
|
||||||
|
List the one-line usage of all built-in and add-on actions.
|
||||||
|
\
|
||||||
|
append ITEM# "TEXT TO APPEND"
|
||||||
|
app ITEM# "TEXT TO APPEND"
|
||||||
|
Adds TEXT TO APPEND to the end of the task on line ITEM#.
|
||||||
|
Quotes optional.
|
||||||
|
\
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_todo_session 'short and long form of action help' <<'EOF'
|
||||||
|
>>> todo.sh help append
|
||||||
|
append ITEM# "TEXT TO APPEND"
|
||||||
|
app ITEM# "TEXT TO APPEND"
|
||||||
|
Adds TEXT TO APPEND to the end of the task on line ITEM#.
|
||||||
|
Quotes optional.
|
||||||
|
\
|
||||||
|
|
||||||
|
>>> todo.sh help app
|
||||||
|
app ITEM# "TEXT TO APPEND"
|
||||||
|
Adds TEXT TO APPEND to the end of the task on line ITEM#.
|
||||||
|
Quotes optional.
|
||||||
|
\
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_todo_session 'mixed existing and nonexisting action help' <<'EOF'
|
||||||
|
>>> todo.sh help shorthelp doesnotexist list
|
||||||
|
shorthelp
|
||||||
|
List the one-line usage of all built-in and add-on actions.
|
||||||
|
\
|
||||||
|
TODO: No action "doesnotexist" exists.
|
||||||
|
=== 1
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_done
|
||||||
@@ -14,6 +14,7 @@ notice the sunflowers +sunflowers @outside @garden +shared +landscape
|
|||||||
(C) 2012-02-28 @outside mow the lawn
|
(C) 2012-02-28 @outside mow the lawn
|
||||||
x 2012-02-21 +herbs @oriental buy spices
|
x 2012-02-21 +herbs @oriental buy spices
|
||||||
x 2012-02-28 2012-02-21 +slack @home watch tv
|
x 2012-02-28 2012-02-21 +slack @home watch tv
|
||||||
|
2012-02-28 +herbs buy cinnamon @grocer
|
||||||
EOF
|
EOF
|
||||||
test_todo_completion 'simple task' 'todo.sh list 1' '"1 # simple task"'
|
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 'remove projects and contents from task' 'todo.sh list 2' '"2 # notice the sunflowers"'
|
||||||
@@ -21,5 +22,6 @@ 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 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 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_todo_completion 'keep done marker and remove timestamp and done date' 'todo.sh list 6' '"6 # x watch tv"'
|
||||||
|
test_todo_completion 'remove add date' 'todo.sh list 7' '"7 # buy cinnamon"'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|||||||
20
tests/t6100-completion-help.sh
Executable file
20
tests/t6100-completion-help.sh
Executable file
@@ -0,0 +1,20 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
|
||||||
|
test_description='Bash help completion functionality
|
||||||
|
|
||||||
|
This test checks todo_completion of actions for usage help.
|
||||||
|
'
|
||||||
|
. ./actions-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"
|
||||||
|
test_todo_completion 'all actions after command help' 'todo.sh command help ' "$ACTIONS $ADDONS"
|
||||||
|
test_todo_completion 'actions beginning with a' 'todo.sh help a' 'add a addto addm append app archive aardvark'
|
||||||
|
|
||||||
|
test_done
|
||||||
@@ -4,19 +4,9 @@ test_description='custom actions functionality
|
|||||||
|
|
||||||
This test covers the contract between todo.sh and custom actions.
|
This test covers the contract between todo.sh and custom actions.
|
||||||
'
|
'
|
||||||
|
. ./actions-test-lib.sh
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
unset TODO_ACTIONS_DIR
|
|
||||||
mkdir .todo.actions.d
|
|
||||||
make_action()
|
|
||||||
{
|
|
||||||
cat > ".todo.actions.d/$1" <<- EOF
|
|
||||||
#!/bin/bash
|
|
||||||
echo "custom action $1"
|
|
||||||
EOF
|
|
||||||
chmod +x ".todo.actions.d/$1"
|
|
||||||
}
|
|
||||||
|
|
||||||
make_action "foo"
|
make_action "foo"
|
||||||
test_todo_session 'executable action' <<EOF
|
test_todo_session 'executable action' <<EOF
|
||||||
>>> todo.sh foo
|
>>> todo.sh foo
|
||||||
|
|||||||
44
tests/t8010-listaddons.sh
Executable file
44
tests/t8010-listaddons.sh
Executable file
@@ -0,0 +1,44 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
test_description='listaddons functionality
|
||||||
|
|
||||||
|
This test checks listing of custom actions.
|
||||||
|
'
|
||||||
|
. ./actions-test-lib.sh
|
||||||
|
. ./test-lib.sh
|
||||||
|
|
||||||
|
test_todo_session 'no custom actions' <<EOF
|
||||||
|
>>> todo.sh listaddons
|
||||||
|
EOF
|
||||||
|
|
||||||
|
make_action "foo"
|
||||||
|
test_todo_session 'one custom action' <<EOF
|
||||||
|
>>> todo.sh listaddons
|
||||||
|
foo
|
||||||
|
EOF
|
||||||
|
|
||||||
|
make_action "bar"
|
||||||
|
make_action "ls"
|
||||||
|
make_action "quux"
|
||||||
|
test_todo_session 'multiple custom actions' <<EOF
|
||||||
|
>>> todo.sh listaddons
|
||||||
|
bar
|
||||||
|
foo
|
||||||
|
ls
|
||||||
|
quux
|
||||||
|
EOF
|
||||||
|
|
||||||
|
chmod -x .todo.actions.d/foo
|
||||||
|
# On Cygwin, clearing the executable flag may have no effect, as the Windows ACL
|
||||||
|
# may still grant execution rights. In this case, we skip the test.
|
||||||
|
if [ -x .todo.actions.d/foo ]; then
|
||||||
|
SKIP_TESTS="${SKIP_TESTS}${SKIP_TESTS+ }t8010.4"
|
||||||
|
fi
|
||||||
|
test_todo_session 'nonexecutable action' <<EOF
|
||||||
|
>>> todo.sh listaddons
|
||||||
|
bar
|
||||||
|
ls
|
||||||
|
quux
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_done
|
||||||
76
tests/t8020-actions-help.sh
Executable file
76
tests/t8020-actions-help.sh
Executable file
@@ -0,0 +1,76 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
test_description='custom actions help functionality
|
||||||
|
|
||||||
|
This test checks listing the usage help of a custom action.
|
||||||
|
'
|
||||||
|
. ./actions-test-lib.sh
|
||||||
|
. ./test-lib.sh
|
||||||
|
|
||||||
|
test_todo_session 'custom action help with no custom action directory' <<'EOF'
|
||||||
|
>>> todo.sh help foo
|
||||||
|
TODO: No action "foo" exists.
|
||||||
|
=== 1
|
||||||
|
EOF
|
||||||
|
|
||||||
|
make_action "foo"
|
||||||
|
make_action "bar"
|
||||||
|
make_action "ls"
|
||||||
|
make_action "quux"
|
||||||
|
|
||||||
|
test_todo_session 'custom action help' <<'EOF'
|
||||||
|
>>> todo.sh help foo
|
||||||
|
foo ITEM#[, ITEM#, ...] [TERM...]
|
||||||
|
This custom action does foo.
|
||||||
|
\
|
||||||
|
|
||||||
|
>>> todo.sh help bar
|
||||||
|
bar ITEM#[, ITEM#, ...] [TERM...]
|
||||||
|
This custom action does bar.
|
||||||
|
\
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_todo_session 'multiple custom actions help' <<'EOF'
|
||||||
|
>>> todo.sh help foo bar
|
||||||
|
foo ITEM#[, ITEM#, ...] [TERM...]
|
||||||
|
This custom action does foo.
|
||||||
|
\
|
||||||
|
bar ITEM#[, ITEM#, ...] [TERM...]
|
||||||
|
This custom action does bar.
|
||||||
|
\
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_todo_session 'nonexisting action help' <<'EOF'
|
||||||
|
>>> todo.sh help doesnotexist
|
||||||
|
TODO: No action "doesnotexist" exists.
|
||||||
|
=== 1
|
||||||
|
|
||||||
|
>>> todo.sh help foo doesnotexist bar
|
||||||
|
foo ITEM#[, ITEM#, ...] [TERM...]
|
||||||
|
This custom action does foo.
|
||||||
|
\
|
||||||
|
TODO: No action "doesnotexist" exists.
|
||||||
|
=== 1
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_todo_session 'mixed built-in and custom actions help' <<'EOF'
|
||||||
|
>>> todo.sh help foo shorthelp bar
|
||||||
|
foo ITEM#[, ITEM#, ...] [TERM...]
|
||||||
|
This custom action does foo.
|
||||||
|
\
|
||||||
|
shorthelp
|
||||||
|
List the one-line usage of all built-in and add-on actions.
|
||||||
|
\
|
||||||
|
bar ITEM#[, ITEM#, ...] [TERM...]
|
||||||
|
This custom action does bar.
|
||||||
|
\
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_todo_session 'custom override of built-in action help' <<'EOF'
|
||||||
|
>>> todo.sh help ls
|
||||||
|
ls ITEM#[, ITEM#, ...] [TERM...]
|
||||||
|
This custom action does ls.
|
||||||
|
\
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_done
|
||||||
2
todo.cfg
2
todo.cfg
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# Your todo.txt directory
|
# Your todo.txt directory
|
||||||
#export TODO_DIR="/Users/gina/Documents/todo"
|
#export TODO_DIR="/Users/gina/Documents/todo"
|
||||||
export TODO_DIR=`dirname "$0"`
|
export TODO_DIR=$(dirname "$0")
|
||||||
|
|
||||||
# Your todo/done/report.txt locations
|
# Your todo/done/report.txt locations
|
||||||
export TODO_FILE="$TODO_DIR/todo.txt"
|
export TODO_FILE="$TODO_DIR/todo.txt"
|
||||||
|
|||||||
91
todo.sh
91
todo.sh
@@ -54,11 +54,11 @@ shorthelp()
|
|||||||
del|rm ITEM# [TERM]
|
del|rm ITEM# [TERM]
|
||||||
depri|dp ITEM#[, ITEM#, ITEM#, ...]
|
depri|dp ITEM#[, ITEM#, ITEM#, ...]
|
||||||
do ITEM#[, ITEM#, ITEM#, ...]
|
do ITEM#[, ITEM#, ITEM#, ...]
|
||||||
help
|
help [ACTION...]
|
||||||
list|ls [TERM...]
|
list|ls [TERM...]
|
||||||
listall|lsa [TERM...]
|
listall|lsa [TERM...]
|
||||||
listaddons
|
listaddons
|
||||||
listcon|lsc
|
listcon|lsc [TERM...]
|
||||||
listfile|lf [SRC [TERM...]]
|
listfile|lf [SRC [TERM...]]
|
||||||
listpri|lsp [PRIORITIES] [TERM...]
|
listpri|lsp [PRIORITIES] [TERM...]
|
||||||
listproj|lsprj [TERM...]
|
listproj|lsprj [TERM...]
|
||||||
@@ -154,6 +154,12 @@ help()
|
|||||||
|
|
||||||
|
|
||||||
EndVerboseHelp
|
EndVerboseHelp
|
||||||
|
actionsHelp
|
||||||
|
addonHelp
|
||||||
|
}
|
||||||
|
|
||||||
|
actionsHelp()
|
||||||
|
{
|
||||||
cat <<-EndActionsHelp
|
cat <<-EndActionsHelp
|
||||||
Built-in Actions:
|
Built-in Actions:
|
||||||
add "THING I NEED TO DO +project @context"
|
add "THING I NEED TO DO +project @context"
|
||||||
@@ -200,8 +206,9 @@ help()
|
|||||||
do ITEM#[, ITEM#, ITEM#, ...]
|
do ITEM#[, ITEM#, ITEM#, ...]
|
||||||
Marks task(s) on line ITEM# as done in todo.txt.
|
Marks task(s) on line ITEM# as done in todo.txt.
|
||||||
|
|
||||||
help
|
help [ACTION...]
|
||||||
Display this help message.
|
Display help about usage, options, built-in and add-on actions,
|
||||||
|
or just the usage help for the passed ACTION(s).
|
||||||
|
|
||||||
list [TERM...]
|
list [TERM...]
|
||||||
ls [TERM...]
|
ls [TERM...]
|
||||||
@@ -223,9 +230,10 @@ help()
|
|||||||
listaddons
|
listaddons
|
||||||
Lists all added and overridden actions in the actions directory.
|
Lists all added and overridden actions in the actions directory.
|
||||||
|
|
||||||
listcon
|
listcon [TERM...]
|
||||||
lsc
|
lsc [TERM...]
|
||||||
Lists all the task contexts that start with the @ sign in todo.txt.
|
Lists all the task contexts that start with the @ sign in todo.txt.
|
||||||
|
If TERM specified, considers only tasks that contain TERM(s).
|
||||||
|
|
||||||
listfile [SRC [TERM...]]
|
listfile [SRC [TERM...]]
|
||||||
lf [SRC [TERM...]]
|
lf [SRC [TERM...]]
|
||||||
@@ -245,10 +253,11 @@ help()
|
|||||||
Hides all tasks that contain TERM(s) preceded by a minus sign
|
Hides all tasks that contain TERM(s) preceded by a minus sign
|
||||||
(i.e. -TERM).
|
(i.e. -TERM).
|
||||||
|
|
||||||
listproj
|
listproj [TERM...]
|
||||||
lsprj
|
lsprj [TERM...]
|
||||||
Lists all the projects (terms that start with a + sign) in
|
Lists all the projects (terms that start with a + sign) in
|
||||||
todo.txt.
|
todo.txt.
|
||||||
|
If TERM specified, considers only tasks that contain TERM(s).
|
||||||
|
|
||||||
move ITEM# DEST [SRC]
|
move ITEM# DEST [SRC]
|
||||||
mv ITEM# DEST [SRC]
|
mv ITEM# DEST [SRC]
|
||||||
@@ -278,9 +287,6 @@ help()
|
|||||||
List the one-line usage of all built-in and add-on actions.
|
List the one-line usage of all built-in and add-on actions.
|
||||||
|
|
||||||
EndActionsHelp
|
EndActionsHelp
|
||||||
|
|
||||||
addonHelp
|
|
||||||
exit 1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
addonHelp()
|
addonHelp()
|
||||||
@@ -302,6 +308,25 @@ addonHelp()
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
actionUsage()
|
||||||
|
{
|
||||||
|
for actionName
|
||||||
|
do
|
||||||
|
action="${TODO_ACTIONS_DIR}/${actionName}"
|
||||||
|
if [ -f "$action" -a -x "$action" ]; then
|
||||||
|
"$action" usage
|
||||||
|
else
|
||||||
|
builtinActionUsage=$(actionsHelp | sed -n -e "/^ ${actionName//\//\\/} /,/^\$/p" -e "/^ ${actionName//\//\\/}$/,/^\$/p")
|
||||||
|
if [ "$builtinActionUsage" ]; then
|
||||||
|
echo "$builtinActionUsage"
|
||||||
|
echo
|
||||||
|
else
|
||||||
|
die "TODO: No action \"${actionName}\" exists."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
die()
|
die()
|
||||||
{
|
{
|
||||||
echo "$*"
|
echo "$*"
|
||||||
@@ -389,21 +414,22 @@ replaceOrPrepend()
|
|||||||
else
|
else
|
||||||
input=$*
|
input=$*
|
||||||
fi
|
fi
|
||||||
cleaninput "for sed"
|
|
||||||
|
|
||||||
# Retrieve existing priority and prepended date
|
# Retrieve existing priority and prepended date
|
||||||
priority=$(sed -e "$item!d" -e $item's/^\((.) \)\{0,1\}\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} \)\{0,1\}.*/\1/' "$TODO_FILE")
|
local -r priAndDateExpr='^\((.) \)\{0,1\}\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} \)\{0,1\}'
|
||||||
prepdate=$(sed -e "$item!d" -e $item's/^\((.) \)\{0,1\}\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} \)\{0,1\}.*/\2/' "$TODO_FILE")
|
priority=$(sed -e "$item!d" -e "${item}s/${priAndDateExpr}.*/\\1/" "$TODO_FILE")
|
||||||
|
prepdate=$(sed -e "$item!d" -e "${item}s/${priAndDateExpr}.*/\\2/" "$TODO_FILE")
|
||||||
|
|
||||||
if [ "$prepdate" -a "$action" = "replace" ] && [ "$(echo "$input"|sed -e 's/^\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\}\)\{0,1\}.*/\1/')" ]; then
|
if [ "$prepdate" -a "$action" = "replace" ] && [ "$(echo "$input"|sed -e "s/${priAndDateExpr}.*/\\1\\2/")" ]; then
|
||||||
# If the replaced text starts with a date, it will replace the existing
|
# If the replaced text starts with a [priority +] date, it will replace
|
||||||
# date, too.
|
# the existing date, too.
|
||||||
prepdate=
|
prepdate=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Temporarily remove any existing priority and prepended date, perform the
|
# Temporarily remove any existing priority and prepended date, perform the
|
||||||
# change (replace/prepend) and re-insert the existing priority and prepended
|
# change (replace/prepend) and re-insert the existing priority and prepended
|
||||||
# date again.
|
# date again.
|
||||||
|
cleaninput "for sed"
|
||||||
sed -i.bak -e "$item s/^${priority}${prepdate}//" -e "$item s|^.*|${priority}${prepdate}${input}${backref}|" "$TODO_FILE"
|
sed -i.bak -e "$item s/^${priority}${prepdate}//" -e "$item s|^.*|${priority}${prepdate}${input}${backref}|" "$TODO_FILE"
|
||||||
if [ $TODOTXT_VERBOSE -gt 0 ]; then
|
if [ $TODOTXT_VERBOSE -gt 0 ]; then
|
||||||
getNewtodo "$item"
|
getNewtodo "$item"
|
||||||
@@ -858,7 +884,17 @@ _format()
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
export -f cleaninput getPrefix getTodo getNewtodo shellquote filtercommand _list getPadding _format die
|
listWordsWithSigil()
|
||||||
|
{
|
||||||
|
sigil=$1
|
||||||
|
shift
|
||||||
|
|
||||||
|
FILE=$TODO_FILE
|
||||||
|
[ "$TODOTXT_SOURCEVAR" ] && eval "FILE=$TODOTXT_SOURCEVAR"
|
||||||
|
eval "$(filtercommand 'cat "${FILE[@]}"' '' "$@")" | grep -o "[^ ]*${sigil}[^ ]\\+" | grep "^$sigil" | sort -u
|
||||||
|
}
|
||||||
|
|
||||||
|
export -f cleaninput getPrefix getTodo getNewtodo shellquote filtercommand _list listWordsWithSigil getPadding _format die
|
||||||
|
|
||||||
# == HANDLE ACTION ==
|
# == HANDLE ACTION ==
|
||||||
action=$( printf "%s\n" "$ACTION" | tr 'A-Z' 'a-z' )
|
action=$( printf "%s\n" "$ACTION" | tr 'A-Z' 'a-z' )
|
||||||
@@ -1075,6 +1111,11 @@ case $action in
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
"help" )
|
"help" )
|
||||||
|
shift ## Was help; new $1 is first help topic / action name
|
||||||
|
if [ $# -gt 0 ]; then
|
||||||
|
# Don't use PAGER here; we don't expect much usage output from one / few actions.
|
||||||
|
actionUsage "$@"
|
||||||
|
else
|
||||||
if [ -t 1 ] ; then # STDOUT is a TTY
|
if [ -t 1 ] ; then # STDOUT is a TTY
|
||||||
if which "${PAGER:-less}" >/dev/null 2>&1; then
|
if which "${PAGER:-less}" >/dev/null 2>&1; then
|
||||||
# we have a working PAGER (or less as a default)
|
# we have a working PAGER (or less as a default)
|
||||||
@@ -1082,6 +1123,7 @@ case $action in
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
help # just in case something failed above, we go ahead and just spew to STDOUT
|
help # just in case something failed above, we go ahead and just spew to STDOUT
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"shorthelp" )
|
"shorthelp" )
|
||||||
@@ -1105,7 +1147,7 @@ case $action in
|
|||||||
TOTAL=$( sed -n '$ =' "$TODO_FILE" )
|
TOTAL=$( sed -n '$ =' "$TODO_FILE" )
|
||||||
PADDING=${#TOTAL}
|
PADDING=${#TOTAL}
|
||||||
|
|
||||||
post_filter_command="awk -v TOTAL=$TOTAL -v PADDING=$PADDING '{ \$1 = sprintf(\"%\" PADDING \"d\", (\$1 > TOTAL ? 0 : \$1)); print }' "
|
post_filter_command="${post_filter_command:-}${post_filter_command:+ | }awk -v TOTAL=$TOTAL -v PADDING=$PADDING '{ \$1 = sprintf(\"%\" PADDING \"d\", (\$1 > TOTAL ? 0 : \$1)); print }' "
|
||||||
cat "$TODO_FILE" "$DONE_FILE" | TODOTXT_VERBOSE=0 _format '' "$PADDING" "$@"
|
cat "$TODO_FILE" "$DONE_FILE" | TODOTXT_VERBOSE=0 _format '' "$PADDING" "$@"
|
||||||
|
|
||||||
if [ $TODOTXT_VERBOSE -gt 0 ]; then
|
if [ $TODOTXT_VERBOSE -gt 0 ]; then
|
||||||
@@ -1133,23 +1175,20 @@ case $action in
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
"listcon" | "lsc" )
|
"listcon" | "lsc" )
|
||||||
FILE=$TODO_FILE
|
shift
|
||||||
[ "$TODOTXT_SOURCEVAR" ] && eval "FILE=$TODOTXT_SOURCEVAR"
|
listWordsWithSigil '@' "$@"
|
||||||
grep -ho '[^ ]*@[^ ]\+' "${FILE[@]}" | grep '^@' | sort -u
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"listproj" | "lsprj" )
|
"listproj" | "lsprj" )
|
||||||
FILE=$TODO_FILE
|
|
||||||
[ "$TODOTXT_SOURCEVAR" ] && eval "FILE=$TODOTXT_SOURCEVAR"
|
|
||||||
shift
|
shift
|
||||||
eval "$(filtercommand 'cat "${FILE[@]}"' '' "$@")" | grep -o '[^ ]*+[^ ]\+' | grep '^+' | sort -u
|
listWordsWithSigil '+' "$@"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"listpri" | "lsp" )
|
"listpri" | "lsp" )
|
||||||
shift ## was "listpri", new $1 is priority to list or first TERM
|
shift ## was "listpri", new $1 is priority to list or first TERM
|
||||||
|
|
||||||
pri=$(printf "%s\n" "$1" | tr 'a-z' 'A-Z' | grep -e '^[A-Z]$' -e '^[A-Z]-[A-Z]$') && shift || pri="A-Z"
|
pri=$(printf "%s\n" "$1" | tr 'a-z' 'A-Z' | grep -e '^[A-Z]$' -e '^[A-Z]-[A-Z]$') && shift || pri="A-Z"
|
||||||
post_filter_command="grep '^ *[0-9]\+ ([${pri}]) '"
|
post_filter_command="${post_filter_command:-}${post_filter_command:+ | }grep '^ *[0-9]\+ ([${pri}]) '"
|
||||||
_list "$TODO_FILE" "$@"
|
_list "$TODO_FILE" "$@"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|||||||
@@ -14,20 +14,23 @@ _todo()
|
|||||||
rm depri dp do help list ls listaddons listall lsa listcon \
|
rm depri dp do help list ls listaddons listall lsa listcon \
|
||||||
lsc listfile lf listpri lsp listproj lsprj move \
|
lsc listfile lf listpri lsp listproj lsprj move \
|
||||||
mv prepend prep pri p replace report shorthelp"
|
mv prepend prep pri p replace report shorthelp"
|
||||||
|
local -r MOVE_COMMAND_PATTERN='^(move|mv)$'
|
||||||
|
|
||||||
local _todo_sh=${_todo_sh:-todo.sh}
|
local _todo_sh=${_todo_sh:-todo.sh}
|
||||||
local completions
|
local completions
|
||||||
if [ $COMP_CWORD -eq 1 ]; then
|
if [ $COMP_CWORD -eq 1 ]; then
|
||||||
completions="$COMMANDS $(eval TODOTXT_VERBOSE=0 $_todo_sh command listaddons) $OPTS"
|
completions="$COMMANDS $(eval TODOTXT_VERBOSE=0 $_todo_sh command listaddons) $OPTS"
|
||||||
elif [[ $COMP_CWORD -gt 2 && ( \
|
elif [[ $COMP_CWORD -gt 2 && ( \
|
||||||
"${COMP_WORDS[COMP_CWORD-2]}" =~ ^(move|mv)$ || \
|
"${COMP_WORDS[COMP_CWORD-2]}" =~ $MOVE_COMMAND_PATTERN || \
|
||||||
"${COMP_WORDS[COMP_CWORD-3]}" =~ ^(move|mv)$ ) ]]; then
|
"${COMP_WORDS[COMP_CWORD-3]}" =~ $MOVE_COMMAND_PATTERN ) ]]; then
|
||||||
# "move ITEM# DEST [SRC]" has file arguments on positions 2 and 3.
|
# "move ITEM# DEST [SRC]" has file arguments on positions 2 and 3.
|
||||||
completions=$(eval TODOTXT_VERBOSE=0 $_todo_sh command listfile)
|
completions=$(eval TODOTXT_VERBOSE=0 $_todo_sh command listfile)
|
||||||
else
|
else
|
||||||
case "$prev" in
|
case "$prev" in
|
||||||
command)
|
command)
|
||||||
completions=$COMMANDS;;
|
completions=$COMMANDS;;
|
||||||
|
help)
|
||||||
|
completions="$COMMANDS $(eval TODOTXT_VERBOSE=0 $_todo_sh command listaddons)";;
|
||||||
addto|listfile|lf)
|
addto|listfile|lf)
|
||||||
completions=$(eval TODOTXT_VERBOSE=0 $_todo_sh command listfile);;
|
completions=$(eval TODOTXT_VERBOSE=0 $_todo_sh command listfile);;
|
||||||
-*) completions="$COMMANDS $(eval TODOTXT_VERBOSE=0 $_todo_sh command listaddons) $OPTS";;
|
-*) completions="$COMMANDS $(eval TODOTXT_VERBOSE=0 $_todo_sh command listaddons) $OPTS";;
|
||||||
@@ -58,8 +61,8 @@ _todo()
|
|||||||
# a safety check of the ls action output.
|
# a safety check of the ls action output.
|
||||||
local todo=$( \
|
local todo=$( \
|
||||||
eval TODOTXT_VERBOSE=0 $_todo_sh '-@ -+ -p -x command ls "^ *${cur} "' | \
|
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/' \
|
sed -e 's/^ *[0-9]\{1,\} //' -e 's/^\((.) \)\{0,1\}[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/^\([xX] \)\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} \)\{1,2\}/\1/' \
|
||||||
-e 's/[[:space:]]*$//' \
|
-e 's/[[:space:]]*$//' \
|
||||||
-e '1q' \
|
-e '1q' \
|
||||||
)
|
)
|
||||||
@@ -85,6 +88,9 @@ complete -F _todo todo.sh
|
|||||||
# If you define an alias (e.g. "t") to todo.sh, you need to explicitly enable
|
# If you define an alias (e.g. "t") to todo.sh, you need to explicitly enable
|
||||||
# completion for it, too:
|
# completion for it, too:
|
||||||
#complete -F _todo t
|
#complete -F _todo t
|
||||||
|
# It is recommended to put this line next to your alias definition in your
|
||||||
|
# ~/.bashrc (or wherever else you're defining your alias). If you simply
|
||||||
|
# uncomment it here, you will need to redo this on every todo.txt update!
|
||||||
|
|
||||||
# If you have renamed the todo.sh executable, or if it is not accessible through
|
# 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:
|
# PATH, you need to add and use a wrapper completion function, like this:
|
||||||
|
|||||||
Reference in New Issue
Block a user