Compare commits
1 Commits
archive/re
...
archive/tr
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4359290b3c |
@@ -1,91 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
test_description='report functionality
|
|
||||||
|
|
||||||
This test checks the reporting and the format of the report file.
|
|
||||||
'
|
|
||||||
. ./test-lib.sh
|
|
||||||
|
|
||||||
cat > todo.txt <<EOF
|
|
||||||
(B) smell the uppercase Roses +flowers @outside
|
|
||||||
stop and think
|
|
||||||
smell the coffee +wakeup
|
|
||||||
make the coffee +wakeup
|
|
||||||
visit http://example.com
|
|
||||||
EOF
|
|
||||||
|
|
||||||
test_todo_session 'create new report' <<EOF
|
|
||||||
>>> todo.sh report
|
|
||||||
2009-02-13T04:40:00 5 0
|
|
||||||
TODO: Report file updated.
|
|
||||||
|
|
||||||
>>> 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
|
|
||||||
EOF
|
|
||||||
|
|
||||||
test_todo_session 'report of done tasks' <<EOF
|
|
||||||
>>> todo.sh -A do 3
|
|
||||||
3 x 2009-02-13 smell the coffee +wakeup
|
|
||||||
TODO: 3 marked as done.
|
|
||||||
x 2009-02-13 smell the coffee +wakeup
|
|
||||||
TODO: $HOME/todo.txt archived.
|
|
||||||
|
|
||||||
>>> todo.sh report
|
|
||||||
2009-02-13T04:40:00 4 1
|
|
||||||
TODO: Report file updated.
|
|
||||||
|
|
||||||
>>> todo.sh -p list
|
|
||||||
1 (B) smell the uppercase Roses +flowers @outside
|
|
||||||
3 make the coffee +wakeup
|
|
||||||
2 stop and think
|
|
||||||
4 visit http://example.com
|
|
||||||
--
|
|
||||||
TODO: 4 of 4 tasks shown
|
|
||||||
EOF
|
|
||||||
|
|
||||||
test_todo_session 'report performs archiving' <<EOF
|
|
||||||
>>> todo.sh -a do 3
|
|
||||||
3 x 2009-02-13 make the coffee +wakeup
|
|
||||||
TODO: 3 marked as done.
|
|
||||||
|
|
||||||
>>> todo.sh report
|
|
||||||
2009-02-13T04:40:00 3 2
|
|
||||||
TODO: Report file updated.
|
|
||||||
|
|
||||||
>>> todo.sh -p list
|
|
||||||
1 (B) smell the uppercase Roses +flowers @outside
|
|
||||||
2 stop and think
|
|
||||||
3 visit http://example.com
|
|
||||||
--
|
|
||||||
TODO: 3 of 3 tasks shown
|
|
||||||
|
|
||||||
>>> todo.sh -p listfile done.txt
|
|
||||||
2 x 2009-02-13 make the coffee +wakeup
|
|
||||||
1 x 2009-02-13 smell the coffee +wakeup
|
|
||||||
--
|
|
||||||
DONE: 2 of 2 tasks shown
|
|
||||||
EOF
|
|
||||||
|
|
||||||
test_todo_session 'report is unchanged when no changes' <<EOF
|
|
||||||
>>> cat report.txt
|
|
||||||
2009-02-13T04:40:00 5 0
|
|
||||||
2009-02-13T04:40:00 4 1
|
|
||||||
2009-02-13T04:40:00 3 2
|
|
||||||
|
|
||||||
>>> todo.sh report
|
|
||||||
2009-02-13T04:40:00 3 2
|
|
||||||
TODO: Report file is up-to-date.
|
|
||||||
|
|
||||||
>>> cat report.txt
|
|
||||||
2009-02-13T04:40:00 5 0
|
|
||||||
2009-02-13T04:40:00 4 1
|
|
||||||
2009-02-13T04:40:00 3 2
|
|
||||||
EOF
|
|
||||||
|
|
||||||
test_done
|
|
||||||
@@ -85,8 +85,13 @@ TODO: $HOME/todo.txt archived.
|
|||||||
TODO: 5 of 5 tasks shown
|
TODO: 5 of 5 tasks shown
|
||||||
|
|
||||||
>>> todo.sh report
|
>>> todo.sh report
|
||||||
2009-02-13T04:40:00 5 1
|
|
||||||
TODO: Report file updated.
|
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
|
>>> todo.sh append g a
|
||||||
usage: todo.sh append ITEM# "TEXT TO APPEND"
|
usage: todo.sh append ITEM# "TEXT TO APPEND"
|
||||||
|
|||||||
24
todo.sh
24
todo.sh
@@ -991,7 +991,7 @@ case $action in
|
|||||||
|
|
||||||
# Split multiple depri's, if comma separated change to whitespace separated
|
# Split multiple depri's, if comma separated change to whitespace separated
|
||||||
# Loop the 'depri' function for each item
|
# Loop the 'depri' function for each item
|
||||||
for item in $(echo $* | tr ',' ' '); do
|
for item in ${*//,/ }; do
|
||||||
getTodo "$item"
|
getTodo "$item"
|
||||||
|
|
||||||
if [[ "$todo" = \(?\)\ * ]]; then
|
if [[ "$todo" = \(?\)\ * ]]; then
|
||||||
@@ -1015,7 +1015,7 @@ case $action in
|
|||||||
|
|
||||||
# Split multiple do's, if comma separated change to whitespace separated
|
# Split multiple do's, if comma separated change to whitespace separated
|
||||||
# Loop the 'do' function for each item
|
# Loop the 'do' function for each item
|
||||||
for item in $(echo $* | tr ',' ' '); do
|
for item in ${*//,/ }; do
|
||||||
getTodo "$item"
|
getTodo "$item"
|
||||||
|
|
||||||
# Check if this item has already been done
|
# Check if this item has already been done
|
||||||
@@ -1191,20 +1191,18 @@ note: PRIORITY must be anywhere from A to Z."
|
|||||||
sed '/^x /!d' "$TODO_FILE" >> "$DONE_FILE"
|
sed '/^x /!d' "$TODO_FILE" >> "$DONE_FILE"
|
||||||
sed -i.bak '/^x /d' "$TODO_FILE"
|
sed -i.bak '/^x /d' "$TODO_FILE"
|
||||||
|
|
||||||
|
NUMLINES=$( sed -n '$ =' "$TODO_FILE" )
|
||||||
|
if [ ${NUMLINES:-0} = "0" ]; then
|
||||||
|
echo "datetime todos dones" >> "$REPORT_FILE"
|
||||||
|
fi
|
||||||
|
#now report
|
||||||
TOTAL=$( sed -n '$ =' "$TODO_FILE" )
|
TOTAL=$( sed -n '$ =' "$TODO_FILE" )
|
||||||
TDONE=$( sed -n '$ =' "$DONE_FILE" )
|
TDONE=$( sed -n '$ =' "$DONE_FILE" )
|
||||||
NEWDATA="${TOTAL:-0} ${TDONE:-0}"
|
TECHO=$(echo $(date +%Y-%m-%d-%T); echo ' '; echo ${TOTAL:-0}; echo ' ';
|
||||||
LASTREPORT=$(sed -ne '$p' "$REPORT_FILE")
|
echo ${TDONE:-0})
|
||||||
LASTDATA=${LASTREPORT#* } # Strip timestamp.
|
echo $TECHO >> "$REPORT_FILE"
|
||||||
if [ "$LASTDATA" = "$NEWDATA" ]; then
|
|
||||||
echo "$LASTREPORT"
|
|
||||||
[ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: Report file is up-to-date."
|
|
||||||
else
|
|
||||||
NEWREPORT="$(date +%Y-%m-%dT%T) ${NEWDATA}"
|
|
||||||
echo "${NEWREPORT}" >> "$REPORT_FILE"
|
|
||||||
echo "${NEWREPORT}"
|
|
||||||
[ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: Report file updated."
|
[ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: Report file updated."
|
||||||
fi
|
cat "$REPORT_FILE"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
* )
|
* )
|
||||||
|
|||||||
Reference in New Issue
Block a user