doing 2.1.13 → 2.1.17

data/lib/completion/doing.bash

@@ -1,9 +1,9 @@
 _doing_again() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--bool --case --editor --interactive --in --note --not --section --search --tag --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--ask --bool --case --editor --interactive --in --note --not --section --search --tag --val --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-e -i -n -s -x --bool --case --editor --interactive --in --note --not --section --search --tag --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-e -i -n -s -x --ask --bool --case --editor --interactive --in --note --not --section --search --tag --val --exact' -- $token ) )
   
   fi
 }
@@ -81,9 +81,9 @@ _doing_config() {
 _doing_done() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--archive --at --started --date --editor --note --remove --section --took --unfinished' -- $token ) )
+    COMPREPLY=( $( compgen -W '--archive --ask --finished --started --date --editor --from --note --remove --section --for --unfinished' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -e -n -r -s -t -u --archive --at --started --date --editor --note --remove --section --took --unfinished' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -e -n -r -s -u --archive --ask --finished --started --date --editor --from --note --remove --section --for --unfinished' -- $token ) )
   
   fi
 }
@@ -91,9 +91,9 @@ _doing_done() {
 _doing_finish() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--archive --at --auto --back --bool --case --date --interactive --not --remove --section --search --took --tag --unfinished --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--archive --at --auto --back --bool --case --date --interactive --not --remove --section --search --for --tag --unfinished --val --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -b -i -r -s -t -u -x --archive --at --auto --back --bool --case --date --interactive --not --remove --section --search --took --tag --unfinished --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -b -i -r -s -u -x --archive --at --auto --back --bool --case --date --interactive --not --remove --section --search --for --tag --unfinished --val --exact' -- $token ) )
   
   fi
 }
@@ -101,9 +101,9 @@ _doing_finish() {
 _doing_grep() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--after --before --bool --case --delete --duration --editor --from --interactive --not --output --only_timed --section --times --tag_sort --totals --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--after --before --bool --case --delete --duration --editor --from --hilite --interactive --not --output --only_timed --section --times --tag_sort --totals --val --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-d -e -i -o -s -t -x --after --before --bool --case --delete --duration --editor --from --interactive --not --output --only_timed --section --times --tag_sort --totals --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-d -e -h -i -o -s -t -x --after --before --bool --case --delete --duration --editor --from --hilite --interactive --not --output --only_timed --section --times --tag_sort --totals --val --exact' -- $token ) )
   
   fi
 }
@@ -123,7 +123,7 @@ _doing_import() {
   if [[ "$token" == --* ]]; then
     COMPREPLY=( $( compgen -W '--after --autotag --before --case --from --not --only_timed --overlap --prefix --section --search --tag --type --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-f -s -x --after --autotag --before --case --from --not --only_timed --overlap --prefix --section --search --tag --type --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-f -s -t -x --after --autotag --before --case --from --not --only_timed --overlap --prefix --section --search --tag --type --exact' -- $token ) )
   
   fi
 }
@@ -131,9 +131,9 @@ _doing_import() {
 _doing_last() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--bool --case --delete --duration --editor --not --section --search --tag --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--bool --case --delete --duration --editor --hilite --not --section --search --tag --val --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-d -e -s -x --bool --case --delete --duration --editor --not --section --search --tag --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-d -e -h -s -x --bool --case --delete --duration --editor --hilite --not --section --search --tag --val --exact' -- $token ) )
   
   fi
 }
@@ -141,9 +141,9 @@ _doing_last() {
 _doing_later() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--back --editor --note' -- $token ) )
+    COMPREPLY=( $( compgen -W '--ask --back --editor --note' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-b -e -n --back --editor --note' -- $token ) )
+    COMPREPLY=( $( compgen -W '-b -e -n --ask --back --editor --note' -- $token ) )
   
   fi
 }
@@ -161,9 +161,9 @@ _doing_mark() {
 _doing_meanwhile() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--archive --back --editor --note --section' -- $token ) )
+    COMPREPLY=( $( compgen -W '--archive --ask --back --editor --note --section' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -b -e -n -s --archive --back --editor --note --section' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -b -e -n -s --archive --ask --back --editor --note --section' -- $token ) )
   
   fi
 }
@@ -171,9 +171,9 @@ _doing_meanwhile() {
 _doing_note() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--bool --case --editor --interactive --not --remove --section --search --tag --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--ask --bool --case --editor --interactive --not --remove --section --search --tag --val --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-e -i -r -s -x --bool --case --editor --interactive --not --remove --section --search --tag --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-e -i -r -s -x --ask --bool --case --editor --interactive --not --remove --section --search --tag --val --exact' -- $token ) )
   
   fi
 }
@@ -181,9 +181,9 @@ _doing_note() {
 _doing_now() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--started --editor --finish_last --note --section' -- $token ) )
+    COMPREPLY=( $( compgen -W '--ask --started --editor --finish_last --note --section' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-e -f -n -s --started --editor --finish_last --note --section' -- $token ) )
+    COMPREPLY=( $( compgen -W '-e -f -n -s --ask --started --editor --finish_last --note --section' -- $token ) )
   
   fi
 }
@@ -261,9 +261,9 @@ _doing_sections() {
 _doing_select() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--archive --after --resume --before --cancel --case --delete --editor --finish --flag --force --from --move --menu --not --output --search --remove --section --save_to --tag --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--archive --after --resume --before --cancel --case --delete --editor --finish --flag --force --from --move --menu --not --output --query --remove --section --save_to --search --tag --val --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -c -d -e -f -m -o -r -s -t -x --archive --after --resume --before --cancel --case --delete --editor --finish --flag --force --from --move --menu --not --output --search --remove --section --save_to --tag --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -c -d -e -f -m -o -q -r -s -t -x --archive --after --resume --before --cancel --case --delete --editor --finish --flag --force --from --move --menu --not --output --query --remove --section --save_to --search --tag --val --exact' -- $token ) )
   
   fi
 }
@@ -276,9 +276,9 @@ local words=$(doing sections)
 IFS="$OLD_IFS"
 
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--age --after --bool --before --count --case --duration --from --interactive --menu --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--age --after --bool --before --count --case --duration --from --hilite --interactive --menu --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals --val --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -b -c -i -m -o -s -t -x --age --after --bool --before --count --case --duration --from --interactive --menu --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -b -c -h -i -m -o -s -t -x --age --after --bool --before --count --case --duration --from --hilite --interactive --menu --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals --val --exact' -- $token ) )
   else
   local nocasematchWasOff=0
   shopt nocasematch >/dev/null || nocasematchWasOff=1
@@ -376,9 +376,9 @@ local words=$(doing views)
 IFS="$OLD_IFS"
 
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--after --age --bool --before --count --case --color --duration --from --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--after --age --bool --before --count --case --color --duration --from --hilite --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --val --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-b -c -i -o -s -t -x --after --age --bool --before --count --case --color --duration --from --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-b -c -h -i -o -s -t -x --after --age --bool --before --count --case --color --duration --from --hilite --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --val --exact' -- $token ) )
   else
   local nocasematchWasOff=0
   shopt nocasematch >/dev/null || nocasematchWasOff=1

data/lib/completion/doing.fish

@@ -99,12 +99,13 @@ complete -xc doing -n '__fish_doing_needs_command' -a 'view' -d Display\ a\ user
 complete -xc doing -n '__fish_doing_needs_command' -a 'views' -d List\ available\ custom\ views
 complete -xc doing -n '__fish_doing_needs_command' -a 'wiki' -d Output\ a\ tag\ wiki
 complete -xc doing -n '__fish_doing_needs_command' -a 'yesterday' -d List\ entries\ from\ yesterday
+complete -c doing -l ask  -f  -n '__fish_doing_using_command again resume' -d Prompt\ for\ note\ via\ multi-line\ input
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command again resume' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l case  -f -r -n '__fish_doing_using_command again resume' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command again resume' -d Edit\ duplicated\ entry\ with\ vim\ before\ adding
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command again resume' -d Select\ item\ to\ resume\ from\ a\ menu\ of\ matching\ entries
 complete -c doing -l in  -f -r -n '__fish_doing_using_command again resume' -d Add\ new\ entry\ to\ section
-complete -c doing -l note -s n -f -r -n '__fish_doing_using_command again resume' -d Note
+complete -c doing -l note -s n -f -r -n '__fish_doing_using_command again resume' -d Add\ a\ note
 complete -c doing -l not  -f  -n '__fish_doing_using_command again resume' -d Resume\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command again resume' -d Get\ last\ entry\ from\ a\ specific\ section
 complete -c doing -l search  -f -r -n '__fish_doing_using_command again resume' -d Repeat\ last\ entry\ matching\ search
@@ -146,14 +147,16 @@ complete -c doing -l type -s t -f -r -n '__fish_doing_using_command completion'
 complete -c doing -l dump -s d -f  -n '__fish_doing_using_command config' -d DEPRECATED
 complete -c doing -l update -s u -f  -n '__fish_doing_using_command config' -d DEPRECATED
 complete -c doing -l archive -s a -f  -n '__fish_doing_using_command done did' -d Immediately\ archive\ the\ entry
-complete -c doing -l at  -f -r -n '__fish_doing_using_command done did' -d Set\ finish\ date\ to\ specific\ date/time
+complete -c doing -l ask  -f  -n '__fish_doing_using_command done did' -d Prompt\ for\ note\ via\ multi-line\ input
+complete -c doing -l finished  -f -r -n '__fish_doing_using_command done did' -d Set\ finish\ date\ to\ specific\ date/time
 complete -c doing -l started  -f -r -n '__fish_doing_using_command done did' -d Backdate\ start\ date\ by\ interval\ or\ set\ to\ time\ \[4pm\|20m\|2h\|\"yesterday\ noon\"\]
 complete -c doing -l date  -f  -n '__fish_doing_using_command done did' -d Include\ date
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command done did' -d Edit\ entry\ with\ vim
+complete -c doing -l from  -f -r -n '__fish_doing_using_command done did' -d Start\ and\ end\ times\ as\ a\ date/time\ range\ \`doing\ done\ --from\ \"1am\ to\ 8am\"\`
 complete -c doing -l note -s n -f -r -n '__fish_doing_using_command done did' -d Include\ a\ note
 complete -c doing -l remove -s r -f  -n '__fish_doing_using_command done did' -d Remove\ @done\ tag
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command done did' -d Section
-complete -c doing -l took -s t -f -r -n '__fish_doing_using_command done did' -d Set\ completion\ date\ to\ start\ date\ plus\ interval
+complete -c doing -l for  -f -r -n '__fish_doing_using_command done did' -d Set\ completion\ date\ to\ start\ date\ plus\ interval
 complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command done did' -d Finish\ last\ entry\ not\ already\ marked\ @done
 complete -c doing -l archive -s a -f  -n '__fish_doing_using_command finish' -d Archive\ entries
 complete -c doing -l at  -f -r -n '__fish_doing_using_command finish' -d Set\ finish\ date\ to\ specific\ date/time
@@ -167,7 +170,7 @@ complete -c doing -l not  -f  -n '__fish_doing_using_command finish' -d Finish\
 complete -c doing -l remove -s r -f  -n '__fish_doing_using_command finish' -d Remove\ done\ tag
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command finish' -d Section
 complete -c doing -l search  -f -r -n '__fish_doing_using_command finish' -d Finish\ the\ last\ X\ entries\ matching\ search\ filter
-complete -c doing -l took -s t -f -r -n '__fish_doing_using_command finish' -d Set\ the\ completed\ date\ to\ the\ start\ date\ plus\ XX\[hmd\]
+complete -c doing -l for  -f -r -n '__fish_doing_using_command finish' -d Set\ the\ completed\ date\ to\ the\ start\ date\ plus\ XX\[hmd\]
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command finish' -d Finish\ the\ last\ X\ entries\ containing\ TAG
 complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command finish' -d Finish\ last\ entry
 complete -c doing -l val  -f -r -n '__fish_doing_using_command finish' -d Perform\ a\ tag\ value\ query
@@ -180,6 +183,7 @@ complete -c doing -l delete -s d -f  -n '__fish_doing_using_command grep search'
 complete -c doing -l duration  -f  -n '__fish_doing_using_command grep search' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command grep search' -d Edit\ matching\ entries\ with\ vim
 complete -c doing -l from  -f -r -n '__fish_doing_using_command grep search' -d Date\ range\ to\ show
+complete -c doing -l hilite -s h -f  -n '__fish_doing_using_command grep search' -d Highlight\ search\ matches\ in\ output
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command grep search' -d Display\ an\ interactive\ menu\ of\ results\ to\ perform\ further\ operations
 complete -c doing -l not  -f  -n '__fish_doing_using_command grep search' -d Show\ items\ that\ \*don\'t\*\ match\ search\ string
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command grep search' -d Output\ to\ export\ format
@@ -202,7 +206,7 @@ complete -c doing -l overlap  -f  -n '__fish_doing_using_command import' -d Allo
 complete -c doing -l prefix  -f -r -n '__fish_doing_using_command import' -d Prefix\ entries\ with
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command import' -d Target\ section
 complete -c doing -l search  -f -r -n '__fish_doing_using_command import' -d Only\ import\ items\ matching\ search
-complete -c doing -l tag  -f -r -n '__fish_doing_using_command import' -d Tag\ all\ imported\ entries
+complete -c doing -l tag -s t -f -r -n '__fish_doing_using_command import' -d Tag\ all\ imported\ entries
 complete -c doing -l type  -f -r -n '__fish_doing_using_command import' -d Import\ type
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command import' -d Force\ exact\ search\ string\ matching
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command last' -d Tag\ boolean
@@ -210,12 +214,14 @@ complete -c doing -l case  -f -r -n '__fish_doing_using_command last' -d Case\ s
 complete -c doing -l delete -s d -f  -n '__fish_doing_using_command last' -d Delete\ the\ last\ entry
 complete -c doing -l duration  -f  -n '__fish_doing_using_command last' -d Show\ elapsed\ time\ if\ entry\ is\ not\ tagged\ @done
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command last' -d Edit\ entry\ with\ vim
+complete -c doing -l hilite -s h -f  -n '__fish_doing_using_command last' -d Highlight\ search\ matches\ in\ output
 complete -c doing -l not  -f  -n '__fish_doing_using_command last' -d Show\ items\ that\ \*don\'t\*\ match\ search\ string\ or\ tag\ filter
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command last' -d Specify\ a\ section
 complete -c doing -l search  -f -r -n '__fish_doing_using_command last' -d Search\ filter
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command last' -d Tag\ filter
 complete -c doing -l val  -f -r -n '__fish_doing_using_command last' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command last' -d Force\ exact\ search\ string\ matching
+complete -c doing -l ask  -f  -n '__fish_doing_using_command later' -d Prompt\ for\ note\ via\ multi-line\ input
 complete -c doing -l back -s b -f -r -n '__fish_doing_using_command later' -d Backdate\ start\ time\ to\ date\ string\ \[4pm\|20m\|2h\|yesterday\ noon\]
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command later' -d Edit\ entry\ with\ vim
 complete -c doing -l note -s n -f -r -n '__fish_doing_using_command later' -d Note
@@ -234,10 +240,12 @@ complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command mark fla
 complete -c doing -l val  -f -r -n '__fish_doing_using_command mark flag' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command mark flag' -d Force\ exact\ search\ string\ matching
 complete -c doing -l archive -s a -f  -n '__fish_doing_using_command meanwhile' -d Archive\ previous\ @meanwhile\ entry
+complete -c doing -l ask  -f  -n '__fish_doing_using_command meanwhile' -d Prompt\ for\ note\ via\ multi-line\ input
 complete -c doing -l back -s b -f -r -n '__fish_doing_using_command meanwhile' -d Backdate\ start\ date\ for\ new\ entry\ to\ date\ string\ \[4pm\|20m\|2h\|yesterday\ noon\]
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command meanwhile' -d Edit\ entry\ with\ vim
 complete -c doing -l note -s n -f -r -n '__fish_doing_using_command meanwhile' -d Note
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command meanwhile' -d Section
+complete -c doing -l ask  -f  -n '__fish_doing_using_command note' -d Prompt\ for\ note\ via\ multi-line\ input
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command note' -d Boolean
 complete -c doing -l case  -f -r -n '__fish_doing_using_command note' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command note' -d Edit\ entry\ with\ vim
@@ -249,6 +257,7 @@ complete -c doing -l search  -f -r -n '__fish_doing_using_command note' -d Add/r
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command note' -d Add/remove\ note\ from\ last\ entry\ matching\ tag
 complete -c doing -l val  -f -r -n '__fish_doing_using_command note' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command note' -d Force\ exact\ search\ string\ matching
+complete -c doing -l ask  -f  -n '__fish_doing_using_command now next' -d Prompt\ for\ note\ via\ multi-line\ input
 complete -c doing -l started  -f -r -n '__fish_doing_using_command now next' -d Backdate\ start\ time\ \[4pm\|20m\|2h\|\"yesterday\ noon\"\]
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command now next' -d Edit\ entry\ with\ vim
 complete -c doing -l finish_last -s f -f  -n '__fish_doing_using_command now next' -d Timed\ entry
@@ -308,10 +317,11 @@ complete -c doing -l move -s m -f -r -n '__fish_doing_using_command select' -d M
 complete -c doing -l menu  -f  -n '__fish_doing_using_command select' -d Use\ --no-menu\ to\ skip\ the\ interactive\ menu
 complete -c doing -l not  -f  -n '__fish_doing_using_command select' -d Select\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command select' -d Output\ entries\ to\ format
-complete -c doing -l search  -f -r -n '__fish_doing_using_command select' -d Initial\ search\ query\ for\ filtering
+complete -c doing -l query -s q -f -r -n '__fish_doing_using_command select' -d Initial\ search\ query\ for\ filtering
 complete -c doing -l remove -s r -f  -n '__fish_doing_using_command select' -d Reverse\ -c
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command select' -d Select\ from\ a\ specific\ section
 complete -c doing -l save_to  -f -r -n '__fish_doing_using_command select' -d Save\ selected\ entries\ to\ file\ using\ --output\ format
+complete -c doing -l search  -f -r -n '__fish_doing_using_command select' -d Select\ from\ entries\ matching\ search\ filter
 complete -c doing -l tag -s t -f -r -n '__fish_doing_using_command select' -d Tag\ selected\ entries
 complete -c doing -l val  -f -r -n '__fish_doing_using_command select' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command select' -d Force\ exact\ search\ string\ matching
@@ -323,6 +333,7 @@ complete -c doing -l count -s c -f -r -n '__fish_doing_using_command show' -d Ma
 complete -c doing -l case  -f -r -n '__fish_doing_using_command show' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l duration  -f  -n '__fish_doing_using_command show' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
 complete -c doing -l from  -f -r -n '__fish_doing_using_command show' -d Date\ range\ to\ show
+complete -c doing -l hilite -s h -f  -n '__fish_doing_using_command show' -d Highlight\ search\ matches\ in\ output
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command show' -d Select\ from\ a\ menu\ of\ matching\ entries\ to\ perform\ additional\ operations
 complete -c doing -l menu -s m -f  -n '__fish_doing_using_command show' -d Select\ section\ or\ tag\ to\ display\ from\ a\ menu
 complete -c doing -l not  -f  -n '__fish_doing_using_command show' -d Show\ items\ that\ \*don\'t\*\ match\ search/tag/date\ filters
@@ -400,6 +411,7 @@ complete -c doing -l case  -f -r -n '__fish_doing_using_command view' -d Case\ s
 complete -c doing -l color  -f  -n '__fish_doing_using_command view' -d Include\ colors\ in\ output
 complete -c doing -l duration  -f  -n '__fish_doing_using_command view' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
 complete -c doing -l from  -f -r -n '__fish_doing_using_command view' -d Date\ range\ to\ show
+complete -c doing -l hilite -s h -f  -n '__fish_doing_using_command view' -d Highlight\ search\ matches\ in\ output
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command view' -d Select\ from\ a\ menu\ of\ matching\ entries\ to\ perform\ additional\ operations
 complete -c doing -l not  -f  -n '__fish_doing_using_command view' -d Show\ items\ that\ \*don\'t\*\ match\ search\ string
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command view' -d Output\ to\ export\ format

data/lib/doing/array_chronify.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Doing
+  # Chronify array helpers
+  class ::Array
+    ##
+    ## Format [d, h, m] as string
+    ##
+    ## @param      time    [Array] Array of [days, hours,
+    ##                     minutes]
+    ## @param      format  [Symbol] The format, :dhm, :hm, :m, :clock, :natural
+    ## @return     [String] formatted string
+    ##
+    def time_string(format: :dhm)
+      raise InvalidArgument, 'Invalid array, must be [d,h,m]' unless count == 3
+
+      d, h, m = self
+      case format
+      when :clock
+        format('%<d>02d:%<h>02d:%<m>02d', d: d, h: h, m: m)
+      when :dhm
+        output = []
+        output.push(format('%<d>dd', d: d)) if d.positive?
+        output.push(format('%<h>dh', h: h)) if h.positive?
+        output.push(format('%<m>dm', m: m)) if m.positive?
+        output.join(' ')
+      when :hm
+        h += d * 24 if d.positive?
+        format('%<h> 4dh %<m>02dm', h: h, m: m)
+      when :m
+        h += d * 24 if d.positive?
+        m += h * 60 if h.positive?
+        format('%<m> 4dm', m: m)
+      when :natural
+        human = []
+        human.push(format('%<d>d %<s>s', d: d, s: 'day'.to_p(d))) if d.positive?
+        human.push(format('%<h>d %<s>s', h: h, s: 'hour'.to_p(h))) if h.positive?
+        human.push(format('%<m>d %<s>s', m: m, s: 'minute'.to_p(m))) if m.positive?
+        human.join(', ')
+      when :speech
+        human = []
+        human.push(format('%<d>d %<s>s', d: d, s: 'day'.to_p(d))) if d.positive?
+        human.push(format('%<h>d %<s>s', h: h, s: 'hour'.to_p(h))) if h.positive?
+        human.push(format('%<m>d %<s>s', m: m, s: 'minute'.to_p(m))) if m.positive?
+        last = human.pop
+        case human.count
+        when 2
+          human.join(', ') + ", and #{last}"
+        when 1
+          "#{human[0]} and #{last}"
+        when 0
+          last
+        end
+      end
+    end
+  end
+end

data/lib/doing/colors.rb

@@ -24,6 +24,7 @@ module Doing
       [:yellow, 33],
       [:blue, 34],
       [:magenta, 35],
+      [:purple, 35],
       [:cyan, 36],
       [:white, 37],
       [:bgblack, 40],
@@ -32,6 +33,7 @@ module Doing
       [:bgyellow, 43],
       [:bgblue, 44],
       [:bgmagenta, 45],
+      [:bgpurple, 45],
       [:bgcyan, 46],
       [:bgwhite, 47],
       [:boldblack, 90], # High intensity, aixterm (works in OS X)
@@ -40,6 +42,7 @@ module Doing
       [:boldyellow, 93],
       [:boldblue, 94],
       [:boldmagenta, 95],
+      [:boldpurple, 95],
       [:boldcyan, 96],
       [:boldwhite, 97],
       [:boldbgblack, 100], # High intensity background, aixterm (works in OS X)
@@ -48,6 +51,7 @@ module Doing
       [:boldbgyellow, 103],
       [:boldbgblue, 104],
       [:boldbgmagenta, 105],
+      [:boldbgpurple, 105],
       [:boldbgcyan, 106],
       [:boldbgwhite, 107],
       [:softpurple, '0;35;40'],

data/lib/doing/configuration.rb

@@ -99,9 +99,13 @@ module Doing
       'search' => {
         'matching' => 'pattern', # fuzzy, pattern, exact
         'distance' => 3,
-        'case' => 'smart' # sensitive, ignore, smart
+        'case' => 'smart', # sensitive, ignore, smart
+        'highlight' => false
       },
-      'include_notes' => true
+      'include_notes' => true,
+      'interaction' => {
+        'confirm_longer_than' => '5h'
+      }
     }
 
     def initialize(file = nil, options: {})

data/lib/doing/item.rb

@@ -9,6 +9,8 @@ module Doing
 
     # attr_reader :id
 
+    include Color
+
     ##
     ## Initialize an item with date, title, section, and
     ## optional note
@@ -57,6 +59,25 @@ module Doing
       @end_date ||= Time.parse(Regexp.last_match(1)) if @title =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/
     end
 
+    def calculate_end_date(opt)
+      if opt[:took]
+        if @date + opt[:took] > Time.now
+          @date = Time.now - opt[:took]
+          Time.now
+        else
+          @date + opt[:took]
+        end
+      elsif opt[:back]
+        if opt[:back].is_a? Integer
+          @date + opt[:back]
+        else
+          @date + (opt[:back] - @date)
+        end
+      else
+        Time.now
+      end
+    end
+
     # Generate a hash that represents the entry
     #
     # @return [String] entry hash
@@ -112,6 +133,19 @@ module Doing
       (start_a >= start_b && start_a <= end_b) || (end_a >= start_b && end_a <= end_b) || (start_a < start_b && end_a > end_b)
     end
 
+    ##
+    ## Updates the title of the Item by expanding natural
+    ## language dates within configured date tags (tags
+    ## whose value is expected to be a date)
+    ##
+    ## @param      additional_tags  An array of additional
+    ##                              tag names to consider
+    ##                              dates
+    ##
+    def expand_date_tags(additional_tags = nil)
+      @title.expand_date_tags(additional_tags)
+    end
+
     ##
     ## Add (or remove) tags from the title of the item
     ##
@@ -162,6 +196,11 @@ module Doing
       @title.scan(/(?<= |\A)@([^\s(]+)/).map { |tag| tag[0] }.sort.uniq
     end
 
+    ##
+    ## convert tags on item to an array with @ symbols removed
+    ##
+    ## @return     [Array] array of tags
+    ##
     def tag_array
       tags.tags_to_array
     end
@@ -220,10 +259,46 @@ module Doing
       negate ? !matches : matches
     end
 
+    ##
+    ## Determine if case should be ignored for searches
+    ##
+    ## @param      search     [String] The search string
+    ## @param      case_type  [Symbol] The case type
+    ##
+    ## @return     [Boolean] case should be ignored
+    ##
     def ignore_case(search, case_type)
       (case_type == :smart && search !~ /[A-Z]/) || case_type == :ignore
     end
 
+    def highlight_search(search, distance: nil, negate: false, case_type: nil)
+      prefs = Doing.config.settings['search'] || {}
+      matching = prefs.fetch('matching', 'pattern').normalize_matching
+      distance ||= prefs.fetch('distance', 3).to_i
+      case_type ||= prefs.fetch('case', 'smart').normalize_case
+      new_note = Note.new
+
+      if search.is_rx? || matching == :fuzzy
+        rx = search.to_rx(distance: distance, case_type: case_type)
+        new_title = @title.gsub(rx) { |m| yellow(m) }
+        new_note.add(@note.to_s.gsub(rx) { |m| yellow(m) })
+      else
+        query = to_phrase_query(search.strip)
+
+        if query[:must].nil? && query[:must_not].nil?
+          query[:must] = query[:should]
+          query[:should] = []
+        end
+        query[:must].concat(query[:should]).each do |s|
+          rx = Regexp.new(s.wildcard_to_rx, ignore_case(s, case_type))
+          new_title = @title.gsub(rx) { |m| yellow(m) }
+          new_note.add(@note.to_s.gsub(rx) { |m| yellow(m) })
+        end
+      end
+
+      Item.new(@date, new_title, @section, new_note)
+    end
+
     ##
     ## Test if item matches search string
     ##
@@ -279,10 +354,22 @@ module Doing
       negate ? !matches : matches
     end
 
+    ##
+    ## Test if item is included in never_finish config and
+    ## thus should not receive a @done tag
+    ##
+    ## @return     [Boolean] item should receive @done tag
+    ##
     def should_finish?
       should?('never_finish')
     end
 
+    ##
+    ## Test if item is included in never_time config and
+    ## thus should not receive a date on the @done tag
+    ##
+    ## @return     [Boolean] item should receive @done date
+    ##
     def should_time?
       should?('never_time')
     end
@@ -315,6 +402,27 @@ module Doing
       "\t- #{@date.strftime('%Y-%m-%d %H:%M')} | #{@title}#{@note.empty? ? '' : "\n#{@note}"}"
     end
 
+    ##
+    ## outputs a colored string with relative date and highlighted tags
+    ##
+    ## @return     Pretty representation of the object.
+    ##
+    def to_pretty(elements: %i[date title section])
+      output = []
+      elements.each do |e|
+        case e
+        when :date
+          output << format('%13s |', @date.relative_date).cyan
+        when :section
+          output << "#{magenta}(#{white(@section)}#{magenta})"
+        when :title
+          output << @title.white.highlight_tags('cyan')
+        end
+      end
+
+      output.join(' ')
+    end
+
     # @private
     def inspect
       # %(<Doing::Item @date=#{@date} @title="#{@title}" @section:"#{@section}" @note:#{@note.to_s}>)

data/lib/doing/log_adapter.rb

@@ -52,7 +52,7 @@ module Doing
       COUNT_KEYS.each { |key| @counters[key] = { tag: [], count: 0 } }
       @results = []
       @logdev = $stderr
-      @max_length = `tput cols`.strip.to_i - 5 || 85
+      @max_length = TTY::Screen.columns - 5 || 85
       self.log_level = level
       @prev_level = level
     end
@@ -398,9 +398,9 @@ module Doing
       return topic.ljust(TOPIC_WIDTH) if topic && message.strip.empty?
 
       topic = formatted_topic(topic, colon: block_given?)
-      message.truncmiddle!(@max_length - TOPIC_WIDTH - 5)
+      # message.truncmiddle!(@max_length - TOPIC_WIDTH - 5)
       out = topic + message
-      out.truncate!(@max_length) if @max_length.positive?
+      # out.truncate!(@max_length) if @max_length.positive?
       messages << out
       out
     end

data/lib/doing/numeric_chronify.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Doing
+  ##
+  ## Number helpers
+  ##
+  class ::Numeric
+    ##
+    ## Format human readable time from seconds
+    ##
+    ## @param      seconds  [Integer] Seconds
+    ##
+    def format_time(human: false)
+      return [0, 0, 0] if nil?
+
+      seconds = dup.to_i
+      minutes = (seconds / 60).to_i
+      hours = (minutes / 60).to_i
+      if human
+        minutes = (minutes % 60).to_i
+        [0, hours, minutes]
+      else
+        days = (hours / 24).to_i
+        hours = (hours % 24).to_i
+        minutes = (minutes % 60).to_i
+        [days, hours, minutes]
+      end
+    end
+
+    ##
+    ## Format seconds as natural language time string
+    ##
+    ## @param      format  [Symbol] The format to output
+    ##                     (:dhm, :hm, :m, :clock, :natural)
+    ##
+    def time_string(format: :dhm)
+      format_time(human: true).time_string(format: format)
+    end
+  end
+end

data/lib/doing/plugins/export/dayone_export.rb

@@ -84,7 +84,7 @@ module Doing
         interval ||= false
         human_time = false
         if interval
-          d, h, m = wwid.format_time(wwid.get_interval(i, formatted: false))
+          d, h, m = wwid.get_interval(i, formatted: false).format_time
           human_times = []
           human_times << format('%<d>d day%<p>s', d: d, p: d == 1 ? '' : 's') if d > 0
           human_times << format('%<h>d hour%<p>s', h: h, p: h == 1 ? '' : 's') if h > 0

data/lib/doing/plugins/export/json_export.rb

@@ -56,7 +56,7 @@ module Doing
             end_date: end_date,
             title: title.strip, #+ " #{note}"
             note: note.instance_of?(Array) ? note.to_s : note,
-            time: '%02d:%02d:%02d' % wwid.format_time(interval),
+            time: interval.time_string(format: :clock),
             tags: tags
           }
 
@@ -68,7 +68,7 @@ module Doing
           new_item = {
             'id' => index + 1,
             'content' => title.strip, #+ " #{note}"
-            'title' => title.strip + " (#{'%02d:%02d:%02d' % wwid.format_time(interval)})",
+            'title' => title.strip + " (#{interval.time_string(format: :clock)})",
             'start' => i.date.strftime('%F %T'),
             'type' => 'box',
             'style' => 'color:#4c566b;background-color:#d8dee9;'