doing 2.0.5.pre → 2.0.6.pre

data/lib/completion/doing.bash

@@ -1,9 +1,9 @@
 _doing_again() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--bool --editor --in --note --section --search --tag' -- $token ) )
+    COMPREPLY=( $( compgen -W '--bool --editor --interactive --in --note --section --search --tag' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-e -n -s --bool --editor --in --note --section --search --tag' -- $token ) )
+    COMPREPLY=( $( compgen -W '-e -i -n -s --bool --editor --interactive --in --note --section --search --tag' -- $token ) )
   
   fi
 }
@@ -38,12 +38,22 @@ IFS="$OLD_IFS"
   fi
 }
 
+_doing_autotag() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--bool --count --force --interactive --section --search --tag --unfinished' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-c -i -s -u --bool --count --force --interactive --section --search --tag --unfinished' -- $token ) )
+  
+  fi
+}
+
 _doing_cancel() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--archive --bool --section --tag --unfinished' -- $token ) )
+    COMPREPLY=( $( compgen -W '--archive --bool --interactive --section --tag --unfinished' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -s -u --archive --bool --section --tag --unfinished' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -i -s -u --archive --bool --interactive --section --tag --unfinished' -- $token ) )
   
   fi
 }
@@ -51,9 +61,9 @@ _doing_cancel() {
 _doing_config() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--editor --update' -- $token ) )
+    COMPREPLY=( $( compgen -W '--dump --editor --output --update' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-e -u --editor --update' -- $token ) )
+    COMPREPLY=( $( compgen -W '-d -e -o -u --dump --editor --output --update' -- $token ) )
   
   fi
 }
@@ -61,9 +71,9 @@ _doing_config() {
 _doing_done() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--archive --at --back --date --editor --remove --section --took' -- $token ) )
+    COMPREPLY=( $( compgen -W '--archive --at --back --date --editor --note --remove --section --took --unfinished' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -b -e -r -s -t --archive --at --back --date --editor --remove --section --took' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -b -e -n -r -s -t -u --archive --at --back --date --editor --note --remove --section --took --unfinished' -- $token ) )
   
   fi
 }
@@ -71,9 +81,9 @@ _doing_done() {
 _doing_finish() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--archive --at --auto --back --bool --date --section --search --took --tag --unfinished' -- $token ) )
+    COMPREPLY=( $( compgen -W '--archive --at --auto --back --bool --date --interactive --remove --section --search --took --tag --unfinished' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -b -s -t -u --archive --at --auto --back --bool --date --section --search --took --tag --unfinished' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -b -i -r -s -t -u --archive --at --auto --back --bool --date --interactive --remove --section --search --took --tag --unfinished' -- $token ) )
   
   fi
 }
@@ -131,9 +141,9 @@ _doing_later() {
 _doing_mark() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--remove --section --unfinished' -- $token ) )
+    COMPREPLY=( $( compgen -W '--bool --count --date --force --interactive --remove --section --search --tag --unfinished' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-r -s -u --remove --section --unfinished' -- $token ) )
+    COMPREPLY=( $( compgen -W '-c -d -i -r -s -u --bool --count --date --force --interactive --remove --section --search --tag --unfinished' -- $token ) )
   
   fi
 }
@@ -151,9 +161,9 @@ _doing_meanwhile() {
 _doing_note() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--editor --remove --section' -- $token ) )
+    COMPREPLY=( $( compgen -W '--bool --editor --interactive --remove --section --search --tag' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-e -r -s --editor --remove --section' -- $token ) )
+    COMPREPLY=( $( compgen -W '-e -i -r -s --bool --editor --interactive --remove --section --search --tag' -- $token ) )
   
   fi
 }
@@ -181,9 +191,9 @@ _doing_on() {
 _doing_open() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--app --bundle_id --editor' -- $token ) )
+    COMPREPLY=( $( compgen -W '--app --bundle_id' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -b -e --app --bundle_id --editor' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -b --app --bundle_id' -- $token ) )
   
   fi
 }
@@ -201,9 +211,19 @@ _doing_plugins() {
 _doing_recent() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '--interactive --section --times --tag_sort --totals' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-s -t --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '-i -s -t --interactive --section --times --tag_sort --totals' -- $token ) )
+  
+  fi
+}
+
+_doing_reset() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--bool --interactive --resume --section --search --tag' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-i -r -s --bool --interactive --resume --section --search --tag' -- $token ) )
   
   fi
 }
@@ -231,9 +251,9 @@ _doing_sections() {
 _doing_select() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--archive --cancel --delete --editor --finish --flag --force --move --menu --output --query --remove --section --save_to --tag' -- $token ) )
+    COMPREPLY=( $( compgen -W '--archive --resume --cancel --delete --editor --finish --flag --force --move --menu --output --search --remove --section --save_to --tag' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -c -d -e -f -m -o -q -r -s -t --archive --cancel --delete --editor --finish --flag --force --move --menu --output --query --remove --section --save_to --tag' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -c -d -e -f -m -o -r -s -t --archive --resume --cancel --delete --editor --finish --flag --force --move --menu --output --search --remove --section --save_to --tag' -- $token ) )
   
   fi
 }
@@ -246,9 +266,9 @@ local words=$(doing sections)
 IFS="$OLD_IFS"
 
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--age --after --bool --before --count --from --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '--age --after --bool --before --count --from --interactive --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -b -c -f -o -s -t --age --after --bool --before --count --from --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -b -c -f -i -o -s -t --age --after --bool --before --count --from --interactive --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals' -- $token ) )
   else
   local nocasematchWasOff=0
   shopt nocasematch >/dev/null || nocasematchWasOff=1
@@ -281,9 +301,9 @@ _doing_since() {
 _doing_tag() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--autotag --bool --count --date --force --remove --regex --rename --section --search --tag --unfinished' -- $token ) )
+    COMPREPLY=( $( compgen -W '--autotag --bool --count --date --force --interactive --remove --regex --rename --section --search --tag --unfinished' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -c -d -r -s -u --autotag --bool --count --date --force --remove --regex --rename --section --search --tag --unfinished' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -c -d -i -r -s -u --autotag --bool --count --date --force --interactive --remove --regex --rename --section --search --tag --unfinished' -- $token ) )
   
   fi
 }
@@ -326,9 +346,9 @@ local words=$(doing views)
 IFS="$OLD_IFS"
 
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--after --bool --before --count --color --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '--after --bool --before --count --color --interactive --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-b -c -o -s -t --after --bool --before --count --color --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '-b -c -i -o -s -t --after --bool --before --count --color --interactive --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals' -- $token ) )
   else
   local nocasematchWasOff=0
   shopt nocasematch >/dev/null || nocasematchWasOff=1
@@ -358,6 +378,16 @@ _doing_views() {
   fi
 }
 
+_doing_wiki() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--after --bool --before --from --only_timed --section --search --tag' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-b -f -s --after --bool --before --from --only_timed --section --search --tag' -- $token ) )
+  
+  fi
+}
+
 _doing_yesterday() {
   
   if [[ "$token" == --* ]]; then
@@ -374,7 +404,8 @@ _doing()
   local token=${COMP_WORDS[$COMP_CWORD]}
 
   if [[ $last =~ (again|resume) ]]; then _doing_again
-    elif [[ $last =~ (archive) ]]; then _doing_archive
+    elif [[ $last =~ (archive|move) ]]; then _doing_archive
+    elif [[ $last =~ (autotag) ]]; then _doing_autotag
     elif [[ $last =~ (cancel) ]]; then _doing_cancel
     elif [[ $last =~ (config) ]]; then _doing_config
     elif [[ $last =~ (done|did) ]]; then _doing_done
@@ -392,6 +423,7 @@ _doing()
     elif [[ $last =~ (open) ]]; then _doing_open
     elif [[ $last =~ (plugins) ]]; then _doing_plugins
     elif [[ $last =~ (recent) ]]; then _doing_recent
+    elif [[ $last =~ (reset|begin) ]]; then _doing_reset
     elif [[ $last =~ (rotate) ]]; then _doing_rotate
     elif [[ $last =~ (sections) ]]; then _doing_sections
     elif [[ $last =~ (select) ]]; then _doing_select
@@ -403,6 +435,7 @@ _doing()
     elif [[ $last =~ (undo) ]]; then _doing_undo
     elif [[ $last =~ (view) ]]; then _doing_view
     elif [[ $last =~ (views) ]]; then _doing_views
+    elif [[ $last =~ (wiki) ]]; then _doing_wiki
     elif [[ $last =~ (yesterday) ]]; then _doing_yesterday
   else
     OLD_IFS="$IFS"

data/lib/completion/doing.fish

@@ -55,14 +55,16 @@ complete -f -c doing -n '__fish_doing_using_command view' -a '(__fish_doing_comp
 complete -f -c doing -n '__fish_doing_using_command template' -a '(__fish_doing_complete_templates)'
 complete -f -c doing -s t -l type -x -n '__fish_doing_using_command import' -a '(__fish_doing_import_plugins)'
 
+complete -xc doing -n '__fish_seen_subcommand_from help; and not __fish_seen_subcommand_from (doing help -c)' -a "(doing help -c)"
 
 complete -xc doing -n '__fish_doing_needs_command' -a 'add_section' -d Add\ a\ new\ section\ to\ the\ \"doing\"\ file
 complete -xc doing -n '__fish_doing_needs_command' -a 'again resume' -d Repeat\ last\ entry\ as\ new\ entry
-complete -xc doing -n '__fish_doing_needs_command' -a 'archive' -d Move\ entries\ between\ sections
+complete -xc doing -n '__fish_doing_needs_command' -a 'archive move' -d Move\ entries\ between\ sections
+complete -xc doing -n '__fish_doing_needs_command' -a 'autotag' -d Autotag\ last\ entry\ or\ filtered\ entries
 complete -xc doing -n '__fish_doing_needs_command' -a 'cancel' -d End\ last\ X\ entries\ with\ no\ time\ tracked
 complete -xc doing -n '__fish_doing_needs_command' -a 'choose' -d Select\ a\ section\ to\ display\ from\ a\ menu
 complete -xc doing -n '__fish_doing_needs_command' -a 'colors' -d List\ available\ color\ variables\ for\ configuration\ templates\ and\ views
-complete -xc doing -n '__fish_doing_needs_command' -a 'config' -d Edit\ the\ configuration\ file
+complete -xc doing -n '__fish_doing_needs_command' -a 'config' -d Edit\ the\ configuration\ file\ or\ output\ a\ value\ from\ it
 complete -xc doing -n '__fish_doing_needs_command' -a 'done did' -d Add\ a\ completed\ item\ with\ @done\(date\)
 complete -xc doing -n '__fish_doing_needs_command' -a 'finish' -d Mark\ last\ X\ entries\ as\ @done
 complete -xc doing -n '__fish_doing_needs_command' -a 'grep search' -d Search\ for\ entries
@@ -70,7 +72,7 @@ complete -xc doing -n '__fish_doing_needs_command' -a 'help' -d Shows\ a\ list\
 complete -xc doing -n '__fish_doing_needs_command' -a 'import' -d Import\ entries\ from\ an\ external\ source
 complete -xc doing -n '__fish_doing_needs_command' -a 'last' -d Show\ the\ last\ entry
 complete -xc doing -n '__fish_doing_needs_command' -a 'later' -d Add\ an\ item\ to\ the\ Later\ section
-complete -xc doing -n '__fish_doing_needs_command' -a 'mark flag' -d Mark\ last\ entry\ as\ highlighted
+complete -xc doing -n '__fish_doing_needs_command' -a 'mark flag' -d Mark\ last\ entry\ as\ flagged
 complete -xc doing -n '__fish_doing_needs_command' -a 'meanwhile' -d Finish\ any\ running\ @meanwhile\ tasks\ and\ optionally\ create\ a\ new\ one
 complete -xc doing -n '__fish_doing_needs_command' -a 'note' -d Add\ a\ note\ to\ the\ last\ entry
 complete -xc doing -n '__fish_doing_needs_command' -a 'now next' -d Add\ an\ entry
@@ -78,6 +80,7 @@ complete -xc doing -n '__fish_doing_needs_command' -a 'on' -d List\ entries\ for
 complete -xc doing -n '__fish_doing_needs_command' -a 'open' -d Open\ the\ \"doing\"\ file\ in\ an\ editor
 complete -xc doing -n '__fish_doing_needs_command' -a 'plugins' -d List\ installed\ plugins
 complete -xc doing -n '__fish_doing_needs_command' -a 'recent' -d List\ recent\ entries
+complete -xc doing -n '__fish_doing_needs_command' -a 'reset begin' -d Reset\ the\ start\ time\ of\ an\ entry
 complete -xc doing -n '__fish_doing_needs_command' -a 'rotate' -d Move\ entries\ to\ archive\ file
 complete -xc doing -n '__fish_doing_needs_command' -a 'sections' -d List\ sections
 complete -xc doing -n '__fish_doing_needs_command' -a 'select' -d Display\ an\ interactive\ menu\ to\ perform\ operations
@@ -85,46 +88,65 @@ complete -xc doing -n '__fish_doing_needs_command' -a 'show' -d List\ all\ entri
 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 'template' -d Output\ HTML
+complete -xc doing -n '__fish_doing_needs_command' -a 'test' -d Test\ Stuff
 complete -xc doing -n '__fish_doing_needs_command' -a 'today' -d List\ entries\ from\ today
 complete -xc doing -n '__fish_doing_needs_command' -a 'undo' -d Undo\ the\ last\ change\ to\ the\ doing_file
 complete -xc doing -n '__fish_doing_needs_command' -a 'view' -d Display\ a\ user-created\ view
 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 bool  -f -r -n '__fish_doing_using_command again resume' -d Boolean\ used\ to\ combine\ multiple\ tags
-complete -c doing -l editor -s e -f  -n '__fish_doing_using_command again resume' -d Edit\ duplicated\ entry\ with\ before\ adding
+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 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 before  -f -r -n '__fish_doing_using_command archive' -d Archive\ entries\ older\ than\ date
-complete -c doing -l bool  -f -r -n '__fish_doing_using_command archive' -d Tag\ boolean
-complete -c doing -l keep -s k -f -r -n '__fish_doing_using_command archive' -d How\ many\ items\ to\ keep
-complete -c doing -l label  -f  -n '__fish_doing_using_command archive' -d Label\ moved\ items\ with\ @from\(SECTION_NAME\)
-complete -c doing -l search  -f -r -n '__fish_doing_using_command archive' -d Search\ filter
-complete -c doing -l to -s t -f -r -n '__fish_doing_using_command archive' -d Move\ entries\ to
-complete -c doing -l tag  -f -r -n '__fish_doing_using_command archive' -d Tag\ filter
+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
+complete -c doing -l keep -s k -f -r -n '__fish_doing_using_command archive move' -d How\ many\ items\ to\ keep
+complete -c doing -l label  -f  -n '__fish_doing_using_command archive move' -d Label\ moved\ items\ with\ @from\(SECTION_NAME\)
+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 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
+complete -c doing -l force  -f  -n '__fish_doing_using_command autotag' -d Don\'t\ ask\ permission\ to\ autotag\ all\ entries\ when\ count\ is\ 0
+complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command autotag' -d Select\ item\(s\)\ to\ tag\ from\ a\ menu\ of\ matching\ entries
+complete -c doing -l section -s s -f -r -n '__fish_doing_using_command autotag' -d Section
+complete -c doing -l search  -f -r -n '__fish_doing_using_command autotag' -d Autotag\ entries\ matching\ search\ filter
+complete -c doing -l tag  -f -r -n '__fish_doing_using_command autotag' -d Autotag\ the\ last\ X\ entries\ containing\ TAG
+complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command autotag' -d Autotag\ last\ entry
 complete -c doing -l archive -s a -f  -n '__fish_doing_using_command cancel' -d Archive\ entries
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command cancel' -d Boolean
+complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command cancel' -d Select\ item\(s\)\ to\ cancel\ from\ a\ menu\ of\ matching\ entries
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command cancel' -d Section
 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 -F -n '__fish_doing_using_command config'
+complete -c doing -l dump -s d -f  -n '__fish_doing_using_command config' -d Show\ a\ config\ key\ value\ based\ on\ arguments
 complete -c doing -l editor -s e -f -r -n '__fish_doing_using_command config' -d Editor\ to\ use
+complete -c doing -l output -s o -f -r -n '__fish_doing_using_command config' -d Format\ for\ --dump
 complete -c doing -l update -s u -f  -n '__fish_doing_using_command config' -d Update\ config\ file\ with\ missing\ configuration\ options
 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 back -s b -f -r -n '__fish_doing_using_command done did' -d Backdate\ start\ date\ by\ interval\ \[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
+complete -c doing -l editor -s e -f  -n '__fish_doing_using_command done did' -d Edit\ entry\ with\ vim
+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 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
 complete -c doing -l auto  -f  -n '__fish_doing_using_command finish' -d Auto-generate\ finish\ dates\ from\ next\ entry\'s\ start\ time
 complete -c doing -l back -s b -f -r -n '__fish_doing_using_command finish' -d Backdate\ completed\ date\ to\ date\ string\ \[4pm\|20m\|2h\|yesterday\ noon\]
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command finish' -d Boolean
 complete -c doing -l date  -f  -n '__fish_doing_using_command finish' -d Include\ date
+complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command finish' -d Select\ item\(s\)\ to\ finish\ from\ a\ menu\ of\ matching\ entries
+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\]
@@ -152,28 +174,39 @@ complete -c doing -l search  -f -r -n '__fish_doing_using_command import' -d Onl
 complete -c doing -l tag  -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 bool  -f -r -n '__fish_doing_using_command last' -d Tag\ boolean
-complete -c doing -l editor -s e -f  -n '__fish_doing_using_command last' -d Edit\ entry\ with
+complete -c doing -l editor -s e -f  -n '__fish_doing_using_command last' -d Edit\ entry\ with\ vim
 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 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
+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
-complete -c doing -l remove -s r -f  -n '__fish_doing_using_command mark flag' -d Remove\ mark
+complete -c doing -l bool  -f -r -n '__fish_doing_using_command mark flag' -d Boolean
+complete -c doing -l count -s c -f -r -n '__fish_doing_using_command mark flag' -d How\ many\ recent\ entries\ to\ tag
+complete -c doing -l date -s d -f  -n '__fish_doing_using_command mark flag' -d Include\ current\ date/time\ with\ tag
+complete -c doing -l force  -f  -n '__fish_doing_using_command mark flag' -d Don\'t\ ask\ permission\ to\ flag\ all\ entries\ when\ count\ is\ 0
+complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command mark flag' -d Select\ item\(s\)\ to\ flag\ from\ a\ menu\ of\ matching\ entries
+complete -c doing -l remove -s r -f  -n '__fish_doing_using_command mark flag' -d Remove\ flag
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command mark flag' -d Section
-complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command mark flag' -d Mark\ last\ entry\ not\ marked\ @done
+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 archive -s a -f  -n '__fish_doing_using_command meanwhile' -d Archive\ previous\ @meanwhile\ entry
 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
+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 editor -s e -f  -n '__fish_doing_using_command note' -d Edit\ entry\ with
+complete -c doing -l bool  -f -r -n '__fish_doing_using_command note' -d Boolean
+complete -c doing -l editor -s e -f  -n '__fish_doing_using_command note' -d Edit\ entry\ with\ vim
+complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command note' -d Select\ item\ for\ new\ note\ from\ a\ menu\ of\ matching\ entries
 complete -c doing -l remove -s r -f  -n '__fish_doing_using_command note' -d Replace/Remove\ last\ entry\'s\ note
 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 back -s b -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
+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
-complete -c doing -l note -s n -f -r -n '__fish_doing_using_command now next' -d Note
+complete -c doing -l note -s n -f -r -n '__fish_doing_using_command now next' -d Include\ a\ note
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command now next' -d Section
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command on' -d Output\ to\ export\ format
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command on' -d Section
@@ -182,13 +215,19 @@ complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command on' -d Sort\
 complete -c doing -l totals  -f  -n '__fish_doing_using_command on' -d Show\ time\ totals\ at\ the\ end\ of\ output
 complete -c doing -l app -s a -f -r -n '__fish_doing_using_command open' -d Open\ with\ app\ name
 complete -c doing -l bundle_id -s b -f -r -n '__fish_doing_using_command open' -d Open\ with\ app\ bundle\ id
-complete -c doing -l editor -s e -f  -n '__fish_doing_using_command open' -d Open\ with\ \$EDITOR
 complete -c doing -l column -s c -f  -n '__fish_doing_using_command plugins' -d List\ in\ single\ column\ for\ completion
 complete -c doing -l type -s t -f -r -n '__fish_doing_using_command plugins' -d List\ plugins\ of\ type
+complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command recent' -d Select\ from\ a\ menu\ of\ matching\ entries\ to\ perform\ additional\ operations
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command recent' -d Section
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command recent' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command recent' -d Sort\ tags\ by
 complete -c doing -l totals  -f  -n '__fish_doing_using_command recent' -d Show\ intervals\ with\ totals\ at\ the\ end\ of\ output
+complete -c doing -l bool  -f -r -n '__fish_doing_using_command reset begin' -d Boolean
+complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command reset begin' -d Select\ from\ a\ menu\ of\ matching\ entries
+complete -c doing -l resume -s r -f  -n '__fish_doing_using_command reset begin' -d Resume\ entry
+complete -c doing -l section -s s -f -r -n '__fish_doing_using_command reset begin' -d Set\ the\ start\ date\ of\ an\ item\ to\ now
+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 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
 complete -c doing -l keep -s k -f -r -n '__fish_doing_using_command rotate' -d How\ many\ items\ to\ keep\ in\ each\ section
@@ -197,6 +236,7 @@ complete -c doing -l search  -f -r -n '__fish_doing_using_command rotate' -d Sea
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command rotate' -d Tag\ filter
 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
+complete -c doing -l resume  -f  -n '__fish_doing_using_command select' -d Copy\ selection\ as\ a\ new\ entry\ with\ current\ time\ and\ no\ @done\ tag
 complete -c doing -l cancel -s c -f  -n '__fish_doing_using_command select' -d Cancel\ selected\ items
 complete -c doing -l delete -s d -f  -n '__fish_doing_using_command select' -d Delete\ selected\ items
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command select' -d Edit\ selected\ item\(s\)
@@ -206,7 +246,7 @@ complete -c doing -l force  -f  -n '__fish_doing_using_command select' -d Perfor
 complete -c doing -l move -s m -f -r -n '__fish_doing_using_command select' -d Move\ selected\ items\ to\ section
 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 output -s o -f -r -n '__fish_doing_using_command select' -d Output\ entries\ to\ format
-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 search  -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
@@ -217,6 +257,7 @@ complete -c doing -l bool -s b -f -r -n '__fish_doing_using_command show' -d Tag
 complete -c doing -l before  -f -r -n '__fish_doing_using_command show' -d View\ entries\ older\ than\ date
 complete -c doing -l count -s c -f -r -n '__fish_doing_using_command show' -d Max\ count\ to\ show
 complete -c doing -l from -s f -f -r -n '__fish_doing_using_command show' -d Date\ range\ to\ show
+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 output -s o -f -r -n '__fish_doing_using_command show' -d Output\ to\ export\ format
 complete -c doing -l only_timed  -f  -n '__fish_doing_using_command show' -d Only\ show\ items\ with\ recorded\ time\ intervals
 complete -c doing -l sort -s s -f -r -n '__fish_doing_using_command show' -d Sort\ order
@@ -236,6 +277,7 @@ complete -c doing -l bool  -f -r -n '__fish_doing_using_command tag' -d Boolean
 complete -c doing -l count -s c -f -r -n '__fish_doing_using_command tag' -d How\ many\ recent\ entries\ to\ tag
 complete -c doing -l date -s d -f  -n '__fish_doing_using_command tag' -d Include\ current\ date/time\ with\ tag
 complete -c doing -l force  -f  -n '__fish_doing_using_command tag' -d Don\'t\ ask\ permission\ to\ tag\ all\ entries\ when\ count\ is\ 0
+complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command tag' -d Select\ item\(s\)\ to\ tag\ from\ a\ menu\ of\ matching\ entries
 complete -c doing -l remove -s r -f  -n '__fish_doing_using_command tag' -d Remove\ given\ tag\(s\)
 complete -c doing -l regex  -f  -n '__fish_doing_using_command tag' -d Interpret\ tag\ string\ as\ regular\ expression
 complete -c doing -l rename  -f -r -n '__fish_doing_using_command tag' -d Replace\ existing\ tag\ with\ tag\ argument
@@ -257,6 +299,7 @@ complete -c doing -l bool -s b -f -r -n '__fish_doing_using_command view' -d Tag
 complete -c doing -l before  -f -r -n '__fish_doing_using_command view' -d View\ entries\ older\ than\ date
 complete -c doing -l count -s c -f -r -n '__fish_doing_using_command view' -d Count\ to\ display
 complete -c doing -l color  -f  -n '__fish_doing_using_command view' -d Include\ colors\ 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 output -s o -f -r -n '__fish_doing_using_command view' -d Output\ to\ export\ format
 complete -c doing -l only_timed  -f  -n '__fish_doing_using_command view' -d Only\ show\ items\ with\ recorded\ time\ intervals
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command view' -d Section
@@ -267,6 +310,14 @@ complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command view' -d Ta
 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 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
+complete -c doing -l bool -s b -f -r -n '__fish_doing_using_command wiki' -d Tag\ boolean
+complete -c doing -l before  -f -r -n '__fish_doing_using_command wiki' -d Include\ entries\ older\ than\ date
+complete -c doing -l from -s f -f -r -n '__fish_doing_using_command wiki' -d Date\ range\ to\ include
+complete -c doing -l only_timed  -f  -n '__fish_doing_using_command wiki' -d Only\ show\ items\ with\ recorded\ time\ intervals
+complete -c doing -l section -s s -f -r -n '__fish_doing_using_command wiki' -d Section\ to\ rotate
+complete -c doing -l search  -f -r -n '__fish_doing_using_command wiki' -d Search\ filter
+complete -c doing -l tag  -f -r -n '__fish_doing_using_command wiki' -d Tag\ filter
 complete -c doing -l after  -f -r -n '__fish_doing_using_command yesterday' -d View\ entries\ after\ specified\ time
 complete -c doing -l before  -f -r -n '__fish_doing_using_command yesterday' -d View\ entries\ before\ specified\ time
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command yesterday' -d Output\ to\ export\ format
@@ -275,4 +326,4 @@ complete -c doing -l times -s t -f  -n '__fish_doing_using_command yesterday' -d
 complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command yesterday' -d Tag\ sort\ direction
 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 o -l output -x -n '__fish_doing_using_command config grep search on select show since today view yesterday' -a '(__fish_doing_export_plugins)'

data/lib/doing/cli_status.rb

@@ -18,6 +18,10 @@ module Status
     $stderr.print format("#{esc['kill']}#{esc['boldyellow']}> #{esc['whiteboard']}%s#{esc['default']}%s", msg, reset ? "\r" : "\n")
   end
 
+  def clear
+    $stderr.print format("\r#{esc['kill']}")
+  end
+
   def esc
     e = {}
     e['kill'] = "\033[2K"

data/lib/doing/errors.rb

@@ -2,53 +2,61 @@
 
 module Doing
   module Errors
-
     class UserCancelled < ::StandardError
-      def initialize(msg='Cancelled')
+      def initialize(msg = 'Cancelled', topic = 'Exited:')
         Doing.logger.output_results
-        Doing.logger.log_now(:warn, 'Exited:', msg)
+        Doing.logger.log_now(:warn, topic, msg)
         Process.exit 1
       end
     end
 
     class EmptyInput < ::StandardError
-      def initialize(msg='No input')
+      def initialize(msg = 'No input', topic = 'Exited:')
         Doing.logger.output_results
-        Doing.logger.log_now(:warn, 'Exited:', 'Input empty')
+        Doing.logger.log_now(:warn, topic, msg)
         Process.exit 1
       end
     end
 
     class DoingStandardError < ::StandardError
-      def initialize(msg='')
+      def initialize(msg = '')
         Doing.logger.output_results
 
         super
       end
     end
 
+    class WrongCommand < ::StandardError
+      def initialize(msg = 'wrong command', topic = 'Error:')
+        Doing.logger.warn(topic, msg)
+
+        super(msg)
+      end
+    end
+
     class DoingRuntimeError < ::RuntimeError
-      def initialize(msg='')
+      def initialize(msg = 'Runtime Error', topic: 'Error:')
         Doing.logger.output_results
-
-        super
+        Doing.logger.log_now(:error, topic, msg)
+        Process.exit 1
       end
     end
 
     class NoResults < ::StandardError
-      def initialize(msg='No results')
+      def initialize(msg = 'No results', topic = 'Exited:')
         Doing.logger.output_results
+        Doing.logger.log_now(:warn, topic, msg)
         Process.exit 0
 
       end
     end
 
     class DoingNoTraceError < ::StandardError
-      def initialize(msg = nil, level = nil)
+      def initialize(msg = nil, level = nil, topic = nil)
         level ||= :error
         Doing.logger.output_results
         if msg
-          Doing.logger.log_now(level, msg)
+          Doing.logger.log_now(level, topic, msg)
         end
 
         Process.exit 1
@@ -58,7 +66,7 @@ module Doing
     class PluginException < ::StandardError
       attr_reader :plugin
 
-      def initialize(msg = 'Plugin error', type: nil, plugin: nil)
+      def initialize(msg = 'Plugin error', type = nil, plugin = nil)
         @plugin = plugin || 'Unknown Plugin'
 
         type ||= 'Unknown'
@@ -73,8 +81,7 @@ module Doing
 
         msg = "(#{@type}: #{@plugin}) #{msg}"
 
-        Doing.logger.error('Plugin Error:', msg)
-        Doing.logger.output_results
+        Doing.logger.log_now(:error, 'Plugin:', msg)
         Process.exit 1
       end
     end

data/lib/doing/log_adapter.rb

@@ -18,17 +18,17 @@ module Doing
       error: ::Logger::ERROR
     }.freeze
 
-    COUNT_KEYS = [
-      :added_tags,
-      :removed_tags,
-      :added,
-      :updated,
-      :deleted,
-      :completed,
-      :archived,
-      :moved,
-      :completed_archived,
-      :skipped
+    COUNT_KEYS = %i[
+      added_tags
+      removed_tags
+      added
+      updated
+      deleted
+      completed
+      archived
+      moved
+      completed_archived
+      skipped
     ].freeze
 
     #
@@ -293,6 +293,22 @@ module Doing
       end
     end
 
+    def output_results
+      total_counters
+
+      results = @results.select { |msg| write_message?(msg[:level]) }.uniq
+
+      if @logdev == $stdout
+        $stdout.print results.map {|res| res[:message].uncolor }.join("\n")
+      else
+        results.each do |msg|
+          @logdev.puts color_message(msg[:level], msg[:message])
+        end
+      end
+    end
+
+    private
+
     def color_message(level, topic, message = nil, &block)
       colors = Doing::Color
       message = message(topic, message, &block)
@@ -324,19 +340,5 @@ module Doing
 
       "#{prefix} #{message.highlight_tags}#{colors.reset}"
     end
-
-    def output_results
-      total_counters
-
-      results = @results.select { |msg| write_message?(msg[:level]) }.uniq
-
-      if @logdev == $stdout
-        $stdout.print results.map {|res| res[:message].uncolor }.join("\n")
-      else
-        results.each do |msg|
-          @logdev.puts color_message(msg[:level], msg[:message])
-        end
-      end
-    end
   end
 end