doing 2.1.11 → 2.1.15

data/lib/completion/doing.fish

@@ -89,6 +89,7 @@ complete -xc doing -n '__fish_doing_needs_command' -a 'select' -d Display\ an\ i
 complete -xc doing -n '__fish_doing_needs_command' -a 'show' -d List\ all\ entries
 complete -xc doing -n '__fish_doing_needs_command' -a 'since' -d List\ entries\ since\ a\ date
 complete -xc doing -n '__fish_doing_needs_command' -a 'tag' -d Add\ tag\(s\)\ to\ last\ entry
+complete -xc doing -n '__fish_doing_needs_command' -a 'tag_dir' -d Set\ the\ default\ tags\ for\ the\ current\ directory
 complete -xc doing -n '__fish_doing_needs_command' -a 'tags' -d List\ all\ tags\ in\ the\ current\ Doing\ file
 complete -xc doing -n '__fish_doing_needs_command' -a 'template' -d Output\ HTML
 complete -xc doing -n '__fish_doing_needs_command' -a 'test' -d Test\ Stuff
@@ -98,16 +99,18 @@ 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
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command again resume' -d Repeat\ last\ entry\ matching\ tags
+complete -c doing -l val  -f -r -n '__fish_doing_using_command again resume' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command again resume' -d Force\ exact\ search\ string\ matching
 complete -c doing -l before  -f -r -n '__fish_doing_using_command archive move' -d Archive\ entries\ older\ than\ date
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command archive move' -d Tag\ boolean
@@ -118,6 +121,7 @@ complete -c doing -l not  -f  -n '__fish_doing_using_command archive move' -d Sh
 complete -c doing -l search  -f -r -n '__fish_doing_using_command archive move' -d Search\ filter
 complete -c doing -l to -s t -f -r -n '__fish_doing_using_command archive move' -d Move\ entries\ to
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command archive move' -d Tag\ filter
+complete -c doing -l val  -f -r -n '__fish_doing_using_command archive move' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command archive move' -d Force\ exact\ search\ string\ matching
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command autotag' -d Boolean
 complete -c doing -l count -s c -f -r -n '__fish_doing_using_command autotag' -d How\ many\ recent\ entries\ to\ autotag
@@ -136,12 +140,14 @@ complete -c doing -l section -s s -f -r -n '__fish_doing_using_command cancel' -
 complete -c doing -l search  -f -r -n '__fish_doing_using_command cancel' -d Cancel\ the\ last\ X\ entries\ matching\ search\ filter
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command cancel' -d Cancel\ the\ last\ X\ entries\ containing\ TAG
 complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command cancel' -d Cancel\ last\ entry
+complete -c doing -l val  -f -r -n '__fish_doing_using_command cancel' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command cancel' -d Force\ exact\ search\ string\ matching
 complete -c doing -l file -s f -f -r -n '__fish_doing_using_command completion' -d File\ to\ write\ output\ to
 complete -c doing -l type -s t -f -r -n '__fish_doing_using_command completion' -d Shell\ to\ generate\ for
 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 ask  -f  -n '__fish_doing_using_command done did' -d Prompt\ for\ note\ via\ multi-line\ input
 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 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
@@ -149,7 +155,7 @@ complete -c doing -l editor -s e -f  -n '__fish_doing_using_command done did' -d
 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
@@ -163,14 +169,18 @@ 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
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command finish' -d Force\ exact\ search\ string\ matching
 complete -c doing -l after  -f -r -n '__fish_doing_using_command grep search' -d Search\ entries\ newer\ than\ date
 complete -c doing -l before  -f -r -n '__fish_doing_using_command grep search' -d Search\ entries\ older\ than\ date
+complete -c doing -l bool  -f -r -n '__fish_doing_using_command grep search' -d Combine\ multiple\ tags\ or\ value\ queries\ using\ AND
 complete -c doing -l case  -f -r -n '__fish_doing_using_command grep search' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
+complete -c doing -l delete -s d -f  -n '__fish_doing_using_command grep search' -d Delete\ matching\ entries
 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 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
@@ -180,6 +190,7 @@ complete -c doing -l section -s s -f -r -n '__fish_doing_using_command grep sear
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command grep search' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command grep search' -d Sort\ tags\ by
 complete -c doing -l totals  -f  -n '__fish_doing_using_command grep search' -d Show\ intervals\ with\ totals\ at\ the\ end\ of\ output
+complete -c doing -l val  -f -r -n '__fish_doing_using_command grep search' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command grep search' -d Force\ exact\ string\ matching
 complete -c doing -F -n '__fish_doing_using_command import'
 complete -c doing -l after  -f -r -n '__fish_doing_using_command import' -d Import\ entries\ newer\ than\ date
@@ -193,18 +204,21 @@ 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
 complete -c doing -l case  -f -r -n '__fish_doing_using_command last' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
+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 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
@@ -220,12 +234,15 @@ complete -c doing -l section -s s -f -r -n '__fish_doing_using_command mark flag
 complete -c doing -l search  -f -r -n '__fish_doing_using_command mark flag' -d Flag\ the\ last\ entry\ matching\ search\ filter
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command mark flag' -d Flag\ the\ last\ entry\ containing\ TAG
 complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command mark flag' -d Flag\ last\ entry
+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
@@ -235,7 +252,9 @@ complete -c doing -l remove -s r -f  -n '__fish_doing_using_command note' -d Rep
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command note' -d Section
 complete -c doing -l search  -f -r -n '__fish_doing_using_command note' -d Add/remove\ note\ from\ last\ entry\ matching\ search\ filter
 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
@@ -266,6 +285,7 @@ complete -c doing -l resume -s r -f  -n '__fish_doing_using_command reset begin'
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command reset begin' -d Limit\ search\ to\ section
 complete -c doing -l search  -f -r -n '__fish_doing_using_command reset begin' -d Reset\ last\ entry\ matching\ search\ filter
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command reset begin' -d Reset\ last\ entry\ matching\ tag
+complete -c doing -l val  -f -r -n '__fish_doing_using_command reset begin' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command reset begin' -d Force\ exact\ search\ string\ matching
 complete -c doing -l before  -f -r -n '__fish_doing_using_command rotate' -d Rotate\ entries\ older\ than\ date
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command rotate' -d Tag\ boolean
@@ -275,6 +295,7 @@ complete -c doing -l not  -f  -n '__fish_doing_using_command rotate' -d Rotate\
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command rotate' -d Section\ to\ rotate
 complete -c doing -l search  -f -r -n '__fish_doing_using_command rotate' -d Search\ filter
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command rotate' -d Tag\ filter
+complete -c doing -l val  -f -r -n '__fish_doing_using_command rotate' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command rotate' -d Force\ exact\ search\ string\ matching
 complete -c doing -l column -s c -f  -n '__fish_doing_using_command sections' -d List\ in\ single\ column
 complete -c doing -l archive -s a -f  -n '__fish_doing_using_command select' -d Archive\ selected\ items
@@ -293,11 +314,13 @@ 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
 complete -c doing -l age -s a -f -r -n '__fish_doing_using_command show' -d Age
 complete -c doing -l after  -f -r -n '__fish_doing_using_command show' -d Show\ entries\ newer\ than\ date
@@ -319,6 +342,7 @@ complete -c doing -l tag  -f -r -n '__fish_doing_using_command show' -d Tag\ fil
 complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command show' -d Tag\ sort\ direction
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command show' -d Sort\ tags\ by
 complete -c doing -l totals  -f  -n '__fish_doing_using_command show' -d Show\ intervals\ with\ totals\ at\ the\ end\ of\ output
+complete -c doing -l val  -f -r -n '__fish_doing_using_command show' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command show' -d Force\ exact\ search\ string\ matching
 complete -c doing -l duration  -f  -n '__fish_doing_using_command since' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command since' -d Output\ to\ export\ format
@@ -341,7 +365,10 @@ complete -c doing -l section -s s -f -r -n '__fish_doing_using_command tag' -d S
 complete -c doing -l search  -f -r -n '__fish_doing_using_command tag' -d Tag\ entries\ matching\ search\ filter
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command tag' -d Tag\ the\ last\ X\ entries\ containing\ TAG
 complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command tag' -d Tag\ last\ entry
+complete -c doing -l value -s v -f -r -n '__fish_doing_using_command tag' -d Include\ a\ value
+complete -c doing -l val  -f -r -n '__fish_doing_using_command tag' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command tag' -d Force\ exact\ search\ string\ matching
+complete -c doing -l remove -s r -f  -n '__fish_doing_using_command tag_dir' -d Remove\ all\ default_tags\ from\ the\ local
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command tags' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l counts -s c -f  -n '__fish_doing_using_command tags' -d Show\ count\ of\ occurrences
 complete -c doing -l case  -f -r -n '__fish_doing_using_command tags' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
@@ -352,6 +379,7 @@ complete -c doing -l section -s s -f -r -n '__fish_doing_using_command tags' -d
 complete -c doing -l search  -f -r -n '__fish_doing_using_command tags' -d Get\ tags\ for\ items\ matching\ search
 complete -c doing -l sort  -f -r -n '__fish_doing_using_command tags' -d Sort\ by\ name\ or\ count
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command tags' -d Get\ tags\ for\ entries\ matching\ tags
+complete -c doing -l val  -f -r -n '__fish_doing_using_command tags' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command tags' -d Force\ exact\ search\ string\ matching
 complete -c doing -l column -s c -f  -n '__fish_doing_using_command template' -d List\ in\ single\ column\ for\ completion
 complete -c doing -l list -s l -f  -n '__fish_doing_using_command template' -d List\ all\ available\ templates
@@ -390,6 +418,7 @@ complete -c doing -l tag  -f -r -n '__fish_doing_using_command view' -d Tag\ fil
 complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command view' -d Tag\ sort\ direction
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command view' -d Sort\ tags\ by
 complete -c doing -l totals  -f  -n '__fish_doing_using_command view' -d Show\ intervals\ with\ totals\ at\ the\ end\ of\ output
+complete -c doing -l val  -f -r -n '__fish_doing_using_command view' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command view' -d Force\ exact\ search\ string\ matching
 complete -c doing -l column -s c -f  -n '__fish_doing_using_command views' -d List\ in\ single\ column
 complete -c doing -l after  -f -r -n '__fish_doing_using_command wiki' -d Include\ entries\ newer\ than\ date
@@ -411,7 +440,7 @@ complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command yesterday'
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command yesterday' -d Sort\ tags\ by
 complete -c doing -l totals  -f  -n '__fish_doing_using_command yesterday' -d Show\ time\ totals\ at\ the\ end\ of\ output
 complete -f -c doing -s o -l output -x -n '__fish_doing_using_command grep search on select show since today view yesterday' -a '(__fish_doing_export_plugins)'
-complete -f -c doing -s b -l bool -x -n '__fish_doing_using_command again resume archive move autotag cancel finish last mark flag note reset begin rotate show tag tags view wiki' -a 'and or not pattern'
+complete -f -c doing -s b -l bool -x -n '__fish_doing_using_command again resume archive move autotag cancel finish grep search last mark flag note reset begin rotate show tag tags view wiki' -a 'and or not pattern'
 complete -f -c doing -l case -x -n '__fish_doing_using_command again resume archive move cancel finish grep search import last mark flag note reset begin rotate select show show tag tags tags view' -a 'case-sensitive ignore smart'
 complete -f -c doing -l tag_sort -x -n '__fish_doing_using_command grep search on recent show since today view yesterday' -a 'name time'
 complete -f -c doing -l tag_order -x -n '__fish_doing_using_command show view yesterday' -a 'asc desc'

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/configuration.rb

@@ -101,7 +101,10 @@ module Doing
         'distance' => 3,
         'case' => 'smart' # sensitive, ignore, smart
       },
-      'include_notes' => true
+      'include_notes' => true,
+      'interaction' => {
+        'confirm_longer_than' => '5h'
+      }
     }
 
     def initialize(file = nil, options: {})

data/lib/doing/item.rb

@@ -57,6 +57,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 +131,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 +194,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
@@ -197,6 +234,37 @@ module Doing
       negate ? !matches : matches
     end
 
+    ##
+    ## Test if item matches tag values
+    ##
+    ## @param      queries (Array) The tag value queries to test
+    ## @param      bool    (Symbol) The boolean to use for multiple tags (:and, :or, :not)
+    ## @param      negate  [Boolean] negate the result?
+    ##
+    ## @return     [Boolean] true if tag/bool combination passes
+    ##
+    def tag_values?(queries, bool = :and, negate: false)
+      bool = bool.normalize_bool
+
+      matches = case bool
+                when :and
+                  all_values?(queries)
+                when :not
+                  no_values?(queries)
+                else
+                  any_values?(queries)
+                end
+      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
@@ -256,10 +324,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
@@ -385,6 +465,102 @@ module Doing
       false
     end
 
+    def tag_value(tag)
+      res = @title.match(/@#{tag.sub(/^@/, '').wildcard_to_rx}\((.*?)\)/)
+      res ? res[1] : nil
+    end
+
+    def number_or_date(value)
+      return nil unless value
+
+      if value.strip =~ /^[0-9.]+%?$/
+        value.strip.to_f
+      else
+        value.strip.chronify(guess: :end)
+      end
+    end
+
+    def split_value_query(query)
+      val_rx = /^(!)?@?(\S+) +(!?[<>=][=*]?|[$*^]=) +(.*?)$/
+      query.match(val_rx)
+    end
+
+    def any_values?(queries)
+      return true if queries.nil? || queries.empty?
+
+      queries.each do |q|
+        parts = split_value_query(q)
+        return true if tag_value_matches?(parts[2], parts[3], parts[4], parts[1])
+      end
+      false
+    end
+
+    def all_values?(queries)
+      return true if queries.nil? || queries.empty?
+
+      queries.each do |q|
+        parts = split_value_query(q)
+        return false unless tag_value_matches?(parts[2], parts[3], parts[4], parts[1])
+      end
+      true
+    end
+
+    def no_values?(queries)
+      return true if queries.nil? || queries.empty?
+
+      queries.each do |q|
+        parts = split_value_query(q)
+        return false if tag_value_matches?(parts[2], parts[3], parts[4], parts[1])
+      end
+      true
+    end
+
+    def tag_value_matches?(tag, comp, value, negate)
+      if all_tags?([tag])
+        tag_val = tag_value(tag)
+
+        if (value.chronify.nil? && value =~ /[a-z]/i && comp =~ /^!?==?$/) || comp =~ /[$*^]=/
+          is_match = case comp
+                     when /\^=/
+                       tag_val =~ /^#{value.wildcard_to_rx}/i
+                     when /\$=/
+                       tag_val =~ /#{value.wildcard_to_rx}$/i
+                     when %r{==}
+                       tag_val =~ /^#{value.wildcard_to_rx}$/i
+                     else
+                       tag_val =~ /#{value.wildcard_to_rx}/i
+                     end
+
+          comp =~ /!/ || negate ? !is_match : is_match
+        else
+          tag_val = number_or_date(tag_val)
+          val = number_or_date(value)
+
+          return false if val.nil? || tag_val.nil?
+
+          return false unless val.class == tag_val.class
+
+          matches = case comp
+                    when /^<$/
+                      tag_val < val
+                    when /^<=$/
+                      tag_val <= val
+                    when /^>$/
+                      tag_val > val
+                    when /^>=$/
+                      tag_val >= val
+                    when /^!=/
+                      tag_val != val
+                    when /^=/
+                      tag_val == val
+                    end
+          negate.nil? ? matches : !matches
+        end
+      else
+        false
+      end
+    end
+
     def to_query(query)
       parser = BooleanTermParser::QueryParser.new
       transformer = BooleanTermParser::QueryTransformer.new

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

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;'