doing 2.0.5.pre → 2.0.9.pre

data/lib/completion/_doing.zsh

@@ -1,151 +1,203 @@
-#compdef doing
-
-local ret=1 state
+compdef _doing doing
+
+function _doing() {
+    local line state
+
+    function _commands {
+        local -a commands
+
+        commands=(
+                  'add_section:Add a new section to the "doing" file'
+                  'again:Repeat last entry as new entry'
+                  'resume:Repeat last entry as new entry'
+                  'archive:Move entries between sections'
+                  'move:Move entries between sections'
+                  'autotag:Autotag last entry or filtered entries'
+                  'cancel:End last X entries with no time tracked'
+                  'choose:Select a section to display from a menu'
+                  'colors:List available color variables for configuration templates and views'
+                  'config:Edit the configuration file or output a value from it'
+                  'done:Add a completed item with @done(date)'
+                  'did:Add a completed item with @done(date)'
+                  'finish:Mark last X entries as @done'
+                  'grep:Search for entries'
+                  'search:Search for entries'
+                  'help:Shows a list of commands or help for one command'
+                  'import:Import entries from an external source'
+                  'last:Show the last entry'
+                  'later:Add an item to the Later section'
+                  'mark:Mark last entry as flagged'
+                  'flag:Mark last entry as flagged'
+                  'meanwhile:Finish any running @meanwhile tasks and optionally create a new one'
+                  'note:Add a note to the last entry'
+                  'now:Add an entry'
+                  'next:Add an entry'
+                  'on:List entries for a date'
+                  'open:Open the "doing" file in an editor'
+                  'plugins:List installed plugins'
+                  'recent:List recent entries'
+                  'reset:Reset the start time of an entry'
+                  'begin:Reset the start time of an entry'
+                  'rotate:Move entries to archive file'
+                  'sections:List sections'
+                  'select:Display an interactive menu to perform operations'
+                  'show:List all entries'
+                  'since:List entries since a date'
+                  'tag:Add tag(s) to last entry'
+                  'template:Output HTML'
+                  'test:Test Stuff'
+                  'today:List entries from today'
+                  'undo:Undo the last change to the doing_file'
+                  'view:Display a user-created view'
+                  'views:List available custom views'
+                  'wiki:Output a tag wiki'
+                  'yesterday:List entries from yesterday'
+        )
+        _describe 'command' commands
+    }
 
-_arguments \
-  ':subcommand:->subcommand' \
-  '*::options:->options' && ret=0
+    _arguments -C             "1: :_commands"             "*::arg:->args"
 
-case $state in
-    subcommand)
-        local -a subcommands
-        subcommands=(
-            'help:Shows a list of commands or help for one command'
-            'now:Add an entry'
-            'note:Add a note to the last entry'
-            'meanwhile:Finish any running @meanwhile tasks and optionally create a new one'
-            'later:Add an item to the Later section'
-            'done:Add a completed item with @done(date). No argument finishes last entry.'
-            'finish:Mark last X entries as @done'
-            'tag:Tag last entry'
-            'mark:Mark last entry as highlighted'
-            'show:List all entries'
-            'grep:Search for entries'
-            'recent:List recent entries'
-            'today:List entries from today'
-            'yesterday:List entries from yesterday'
-            'last:Show the last entry'
-            'sections:List sections'
-            'choose:Select a section to display from a menu'
-            'add_section:Add a new section to the "doing" file'
-            'view:Display a user-created view'
-            'views:List available custom views'
-            'archive:Move entries in between sections'
-            'open:Open the "doing" file in an editor'
-            'config:Edit the configuration file'
-            'undo:Undo the last change to the doing_file'
-        )
-        _describe -t subcommands 'doing subcommand' subcommands && ret=0
-    ;;
 
-    options)
-        age=({-a,--age=}"[Age (oldest/newest) (default: newest)]")
-        app=({-a,--app=}"[Edit entry with specified app (default: none)")
-        archive=({-a,--archive}"[Archive previous @meanwhile entry]")
-        back="--back=[Backdate start time (4pm|20m|2h|yesterday noon) (default: none)]"
-        boolean=({-b,--boolean=}"[Tag boolean (AND,OR,NONE) (default: OR)]")
-        bool=({-b,--bool=}"[Tag boolean (default: AND)]")
-        count=({-c,--count=}"[How many recent entries to tag (default: 1)]")
-        count=({-c,--count=}"[Max count to show (default: 0)]")
-        date=({-d,--date}"[Include date (default: enabled)]")
-        editor=( {-e,--editor}"[Edit entry with $EDITOR]")
-        finish=({-f,--finish_last}"[Timed entry, marks last entry in section as @done]")
-        file=({-f,--file=}"[Specify alternate doing file (default: none)]")
-        noarchive="--no-archive[Don't archive previous @meanwhile entry]"
-        nodate="--no-date[Don't include date]"
-        noeditor="--no-editor[Don't edit entry with $EDITOR]"
-        note=({-n,--note=}"[Note (default: none)]")
-        notimes="--no-times[Don't show time intervals on @done tasks.]"
-        nototals="--no-totals[Don't show intervals with totals at the end of output]"
-        output=({-o,--output=}"[Output to export format (csv|html) (default: none)]")
-        remove=({-r,--remove}"[Replace/Remove last entry's note]")
-        section=({-s,--section=}"[Section (default: Currently)]")
-        sort=({-s,--sort=}"[Sort order (asc/desc) (default: asc)]")
-        times=({-t,--times}"[Show time intervals on @done tasks (default: enabled)]")
-        took=({-t,--took=}"[Set completion date to start date plus XX(mhd) or (HH:MM) (default: none)]")
-        totals="--totals[Show intervals with totals at the end of output]"
 
-        case $words[1] in
-            now)
-                args=( $back $noeditor $editor $note $section $finish )
+    case $line[1] in
+        add_section) 
+                args=(  )
             ;;
-
-            note)
-                args=( $section $editor $remove )
+            again) 
+                args=( "(--bool=)--bool=}[Boolean used to combine multiple tags]" {-e,--editor}"[Edit duplicated entry with vim before adding]" {-i,--interactive}"[Select item to resume from a menu of matching entries]" "(--in=)--in=}[Add new entry to section]" {-n,--note=}"[Note]" {-s,--section=}"[Get last entry from a specific section]" "(--search=)--search=}[Repeat last entry matching search]" "(--tag=)--tag=}[Repeat last entry matching tags]" )
             ;;
-
-            meanwhile)
-                args=( $back $noeditor $editor $note $section $archive $noarchive )
+            resume) 
+                args=( "(--bool=)--bool=}[Boolean used to combine multiple tags]" {-e,--editor}"[Edit duplicated entry with vim before adding]" {-i,--interactive}"[Select item to resume from a menu of matching entries]" "(--in=)--in=}[Add new entry to section]" {-n,--note=}"[Note]" {-s,--section=}"[Get last entry from a specific section]" "(--search=)--search=}[Repeat last entry matching search]" "(--tag=)--tag=}[Repeat last entry matching tags]" )
             ;;
-
-            later)
-                args=( $back $noeditor $editor $note $app )
+            archive) 
+                args=( "(--before=)--before=}[Archive entries older than date]" "(--bool=)--bool=}[Tag boolean]" {-k,--keep=}"[How many items to keep]" "(--label)--label}[Label moved items with @from(SECTION_NAME)]" "(--search=)--search=}[Search filter]" {-t,--to=}"[Move entries to]" "(--tag=)--tag=}[Tag filter]" )
             ;;
-
-            done)
-                args=( $back $took $section $remove $date $nodate $archive $editor $noeditor )
+            move) 
+                args=( "(--before=)--before=}[Archive entries older than date]" "(--bool=)--bool=}[Tag boolean]" {-k,--keep=}"[How many items to keep]" "(--label)--label}[Label moved items with @from(SECTION_NAME)]" "(--search=)--search=}[Search filter]" {-t,--to=}"[Move entries to]" "(--tag=)--tag=}[Tag filter]" )
             ;;
-
-            finish)
-                args=( $back $took $section $date $nodate $archive $editor $noeditor )
+            autotag) 
+                args=( "(--bool=)--bool=}[Boolean]" {-c,--count=}"[How many recent entries to autotag]" "(--force)--force}[Dont ask permission to autotag all entries when count is 0t ask permission to autotag all entries when count is 0]" {-i,--interactive}"[Select item(s) to tag from a menu of matching entries]" {-s,--section=}"[Section]" "(--search=)--search=}[Autotag entries matching search filter]" "(--tag=)--tag=}[Autotag the last X entries containing TAG]" {-u,--unfinished}"[Autotag last entry]" )
             ;;
-
-            tag)
-                args=( $section $count $date $remove )
+            cancel) 
+                args=( {-a,--archive}"[Archive entries]" "(--bool=)--bool=}[Boolean]" {-i,--interactive}"[Select item(s) to cancel from a menu of matching entries]" {-s,--section=}"[Section]" "(--tag=)--tag=}[Cancel the last X entries containing TAG]" {-u,--unfinished}"[Cancel last entry]" )
             ;;
-
-            mark)
-                args=( $section $remove )
+            choose) 
+                args=(  )
             ;;
-
-            show)
-                args=( $boolean $count $age $sort $output $times $notimes $totals $nototals )
+            colors) 
+                args=(  )
             ;;
-
-            grep)
-                args=( $section $output $times $notimes $totals $nototals )
+            config) 
+                args=( {-d,--dump}"[Show a config key value based on arguments]" {-e,--editor=}"[Editor to use]" {-o,--output=}"[Format for --dump]" {-u,--update}"[Update config file with missing configuration options]" )
             ;;
-
-            recent)
-                args=( $section $times $notimes $totals $nototals )
+            done) 
+                args=( {-a,--archive}"[Immediately archive the entry]" "(--at=)--at=}[Set finish date to specific date/time]" {-b,--back=}"[Backdate start date by interval [4pm|20m|2h|yesterday noon]]" "(--date)--date}[Include date]" {-e,--editor}"[Edit entry with vim]" {-n,--note=}"[Include a note]" {-r,--remove}"[Remove @done tag]" {-s,--section=}"[Section]" {-t,--took=}"[Set completion date to start date plus interval]" {-u,--unfinished}"[Finish last entry not already marked @done]" )
             ;;
-
-            today)
-                args=( $output $times $notimes $totals $nototals )
+            did) 
+                args=( {-a,--archive}"[Immediately archive the entry]" "(--at=)--at=}[Set finish date to specific date/time]" {-b,--back=}"[Backdate start date by interval [4pm|20m|2h|yesterday noon]]" "(--date)--date}[Include date]" {-e,--editor}"[Edit entry with vim]" {-n,--note=}"[Include a note]" {-r,--remove}"[Remove @done tag]" {-s,--section=}"[Section]" {-t,--took=}"[Set completion date to start date plus interval]" {-u,--unfinished}"[Finish last entry not already marked @done]" )
             ;;
-
-            yesterday)
-                args=( $output $times $notimes $totals $nototals )
+            finish) 
+                args=( {-a,--archive}"[Archive entries]" "(--at=)--at=}[Set finish date to specific date/time]" "(--auto)--auto}[Auto-generate finish dates from next entrys start times start time]" {-b,--back=}"[Backdate completed date to date string [4pm|20m|2h|yesterday noon]]" "(--bool=)--bool=}[Boolean]" "(--date)--date}[Include date]" {-i,--interactive}"[Select item(s) to finish from a menu of matching entries]" {-r,--remove}"[Remove done tag]" {-s,--section=}"[Section]" "(--search=)--search=}[Finish the last X entries matching search filter]" {-t,--took=}"[Set the completed date to the start date plus XX[hmd]]" "(--tag=)--tag=}[Finish the last X entries containing TAG]" {-u,--unfinished}"[Finish last entry]" )
             ;;
-
-            view)
-                args=( $section $count $output $times $notimes $totals $nototals )
+            grep) 
+                args=( "(--after=)--after=}[Constrain search to entries newer than date]" "(--before=)--before=}[Constrain search to entries older than date]" {-i,--interactive}"[Display an interactive menu of results to perform further operations]" {-o,--output=}"[Output to export format]" "(--only_timed)--only_timed}[Only show items with recorded time intervals]" {-s,--section=}"[Section]" {-t,--times}"[Show time intervals on @done tasks]" "(--tag_sort=)--tag_sort=}[Sort tags by]" "(--totals)--totals}[Show intervals with totals at the end of output]" )
             ;;
-
-            archive)
-                args=( $keep $to $bool )
+            search) 
+                args=( "(--after=)--after=}[Constrain search to entries newer than date]" "(--before=)--before=}[Constrain search to entries older than date]" {-i,--interactive}"[Display an interactive menu of results to perform further operations]" {-o,--output=}"[Output to export format]" "(--only_timed)--only_timed}[Only show items with recorded time intervals]" {-s,--section=}"[Section]" {-t,--times}"[Show time intervals on @done tasks]" "(--tag_sort=)--tag_sort=}[Sort tags by]" "(--totals)--totals}[Show intervals with totals at the end of output]" )
             ;;
-
-            open)
-                args=( 
-                    "-a [open with app name (default:none)" 
-                    "-b [open with app bundle id (default: none)"
-                    "-e [open with $EDITOR]"
-                )
+            help) 
+                args=(  )
             ;;
-
-            config)
-                args=( $editor )
+            import) 
+                args=( "(--after=)--after=}[Import entries newer than date]" "(--autotag)--autotag}[Autotag entries]" "(--before=)--before=}[Import entries older than date]" {-f,--from=}"[Date range to import]" "(--only_timed)--only_timed}[Only import items with recorded time intervals]" "(--overlap)--overlap}[Allow entries that overlap existing times]" "(--prefix=)--prefix=}[Prefix entries with]" {-s,--section=}"[Target section]" "(--search=)--search=}[Only import items matching search]" "(--tag=)--tag=}[Tag all imported entries]" "(--type=)--type=}[Import type]" )
             ;;
-
-            undo)
-                args=( $file )
+            last) 
+                args=( "(--bool=)--bool=}[Tag boolean]" {-e,--editor}"[Edit entry with vim]" {-s,--section=}"[Specify a section]" "(--search=)--search=}[Search filter]" "(--tag=)--tag=}[Tag filter]" )
             ;;
+            later) 
+                args=( {-b,--back=}"[Backdate start time to date string [4pm|20m|2h|yesterday noon]]" {-e,--editor}"[Edit entry with vim]" {-n,--note=}"[Note]" )
+            ;;
+            mark) 
+                args=( "(--bool=)--bool=}[Boolean]" {-c,--count=}"[How many recent entries to tag]" {-d,--date}"[Include current date/time with tag]" "(--force)--force}[Dont ask permission to flag all entries when count is 0t ask permission to flag all entries when count is 0]" {-i,--interactive}"[Select item(s) to flag from a menu of matching entries]" {-r,--remove}"[Remove flag]" {-s,--section=}"[Section]" "(--search=)--search=}[Flag the last entry matching search filter]" "(--tag=)--tag=}[Flag the last entry containing TAG]" {-u,--unfinished}"[Flag last entry]" )
+            ;;
+            flag) 
+                args=( "(--bool=)--bool=}[Boolean]" {-c,--count=}"[How many recent entries to tag]" {-d,--date}"[Include current date/time with tag]" "(--force)--force}[Dont ask permission to flag all entries when count is 0t ask permission to flag all entries when count is 0]" {-i,--interactive}"[Select item(s) to flag from a menu of matching entries]" {-r,--remove}"[Remove flag]" {-s,--section=}"[Section]" "(--search=)--search=}[Flag the last entry matching search filter]" "(--tag=)--tag=}[Flag the last entry containing TAG]" {-u,--unfinished}"[Flag last entry]" )
+            ;;
+            meanwhile) 
+                args=( {-a,--archive}"[Archive previous @meanwhile entry]" {-b,--back=}"[Backdate start date for new entry to date string [4pm|20m|2h|yesterday noon]]" {-e,--editor}"[Edit entry with vim]" {-n,--note=}"[Note]" {-s,--section=}"[Section]" )
+            ;;
+            note) 
+                args=( "(--bool=)--bool=}[Boolean]" {-e,--editor}"[Edit entry with vim]" {-i,--interactive}"[Select item for new note from a menu of matching entries]" {-r,--remove}"[Replace/Remove last entrys notes note]" {-s,--section=}"[Section]" "(--search=)--search=}[Add/remove note from last entry matching search filter]" "(--tag=)--tag=}[Add/remove note from last entry matching tag]" )
+            ;;
+            now) 
+                args=( {-b,--back=}"[Backdate start time [4pm|20m|2h|yesterday noon]]" {-e,--editor}"[Edit entry with vim]" {-f,--finish_last}"[Timed entry]" {-n,--note=}"[Include a note]" {-s,--section=}"[Section]" )
+            ;;
+            next) 
+                args=( {-b,--back=}"[Backdate start time [4pm|20m|2h|yesterday noon]]" {-e,--editor}"[Edit entry with vim]" {-f,--finish_last}"[Timed entry]" {-n,--note=}"[Include a note]" {-s,--section=}"[Section]" )
+            ;;
+            on) 
+                args=( {-o,--output=}"[Output to export format]" {-s,--section=}"[Section]" {-t,--times}"[Show time intervals on @done tasks]" "(--tag_sort=)--tag_sort=}[Sort tags by]" "(--totals)--totals}[Show time totals at the end of output]" )
+            ;;
+            open) 
+                args=( {-a,--app=}"[Open with app name]" {-b,--bundle_id=}"[Open with app bundle id]" )
+            ;;
+            plugins) 
+                args=( {-c,--column}"[List in single column for completion]" {-t,--type=}"[List plugins of type]" )
+            ;;
+            recent) 
+                args=( {-i,--interactive}"[Select from a menu of matching entries to perform additional operations]" {-s,--section=}"[Section]" {-t,--times}"[Show time intervals on @done tasks]" "(--tag_sort=)--tag_sort=}[Sort tags by]" "(--totals)--totals}[Show intervals with totals at the end of output]" )
+            ;;
+            reset) 
+                args=( "(--bool=)--bool=}[Boolean]" {-i,--interactive}"[Select from a menu of matching entries]" {-r,--resume}"[Resume entry]" {-s,--section=}"[Set the start date of an item to now]" "(--search=)--search=}[Reset last entry matching search filter]" "(--tag=)--tag=}[Reset last entry matching tag]" )
+            ;;
+            begin) 
+                args=( "(--bool=)--bool=}[Boolean]" {-i,--interactive}"[Select from a menu of matching entries]" {-r,--resume}"[Resume entry]" {-s,--section=}"[Set the start date of an item to now]" "(--search=)--search=}[Reset last entry matching search filter]" "(--tag=)--tag=}[Reset last entry matching tag]" )
+            ;;
+            rotate) 
+                args=( "(--before=)--before=}[Rotate entries older than date]" "(--bool=)--bool=}[Tag boolean]" {-k,--keep=}"[How many items to keep in each section]" {-s,--section=}"[Section to rotate]" "(--search=)--search=}[Search filter]" "(--tag=)--tag=}[Tag filter]" )
+            ;;
+            sections) 
+                args=( {-c,--column}"[List in single column]" )
+            ;;
+            select) 
+                args=( {-a,--archive}"[Archive selected items]" "(--resume)--resume}[Copy selection as a new entry with current time and no @done tag]" {-c,--cancel}"[Cancel selected items]" {-d,--delete}"[Delete selected items]" {-e,--editor}"[Edit selected item(s)]" {-f,--finish}"[Add @done with current time to selected item(s)]" "(--flag)--flag}[Add flag to selected item(s)]" "(--force)--force}[Perform action without confirmation]" {-m,--move=}"[Move selected items to section]" "(--menu)--menu}[Use --no-menu to skip the interactive menu]" {-o,--output=}"[Output entries to format]" "(--search=)--search=}[Initial search query for filtering]" {-r,--remove}"[Reverse -c]" {-s,--section=}"[Select from a specific section]" "(--save_to=)--save_to=}[Save selected entries to file using --output format]" {-t,--tag=}"[Tag selected entries]" )
+            ;;
+            show) 
+                args=( {-a,--age=}"[Age]" "(--after=)--after=}[View entries newer than date]" {-b,--bool=}"[Tag boolean]" "(--before=)--before=}[View entries older than date]" {-c,--count=}"[Max count to show]" {-f,--from=}"[Date range to show]" {-i,--interactive}"[Select from a menu of matching entries to perform additional operations]" {-o,--output=}"[Output to export format]" "(--only_timed)--only_timed}[Only show items with recorded time intervals]" {-s,--sort=}"[Sort order]" "(--search=)--search=}[Search filter]" {-t,--times}"[Show time intervals on @done tasks]" "(--tag=)--tag=}[Tag filter]" "(--tag_order=)--tag_order=}[Tag sort direction]" "(--tag_sort=)--tag_sort=}[Sort tags by]" "(--totals)--totals}[Show intervals with totals at the end of output]" )
+            ;;
+            since) 
+                args=( {-o,--output=}"[Output to export format]" {-s,--section=}"[Section]" {-t,--times}"[Show time intervals on @done tasks]" "(--tag_sort=)--tag_sort=}[Sort tags by]" "(--totals)--totals}[Show time totals at the end of output]" )
+            ;;
+            tag) 
+                args=( {-a,--autotag}"[Autotag entries based on autotag configuration in ~/]" "(--bool=)--bool=}[Boolean]" {-c,--count=}"[How many recent entries to tag]" {-d,--date}"[Include current date/time with tag]" "(--force)--force}[Dont ask permission to tag all entries when count is 0t ask permission to tag all entries when count is 0]" {-i,--interactive}"[Select item(s) to tag from a menu of matching entries]" {-r,--remove}"[Remove given tag(s)]" "(--regex)--regex}[Interpret tag string as regular expression]" "(--rename=)--rename=}[Replace existing tag with tag argument]" {-s,--section=}"[Section]" "(--search=)--search=}[Tag entries matching search filter]" "(--tag=)--tag=}[Tag the last X entries containing TAG]" {-u,--unfinished}"[Tag last entry]" )
+            ;;
+            template) 
+                args=( {-l,--list}"[List all available templates]" )
+            ;;
+            test) 
+                args=(  )
+            ;;
+            today) 
+                args=( "(--after=)--after=}[View entries after specified time]" "(--before=)--before=}[View entries before specified time]" {-o,--output=}"[Output to export format]" {-s,--section=}"[Specify a section]" {-t,--times}"[Show time intervals on @done tasks]" "(--tag_sort=)--tag_sort=}[Sort tags by]" "(--totals)--totals}[Show time totals at the end of output]" )
+            ;;
+            undo) 
+                args=( {-f,--file=}"[Specify alternate doing file]" )
+            ;;
+            view) 
+                args=( "(--after=)--after=}[View entries newer than date]" {-b,--bool=}"[Tag boolean]" "(--before=)--before=}[View entries older than date]" {-c,--count=}"[Count to display]" "(--color)--color}[Include colors in output]" {-i,--interactive}"[Select from a menu of matching entries to perform additional operations]" {-o,--output=}"[Output to export format]" "(--only_timed)--only_timed}[Only show items with recorded time intervals]" {-s,--section=}"[Section]" "(--search=)--search=}[Search filter]" {-t,--times}"[Show time intervals on @done tasks]" "(--tag=)--tag=}[Tag filter]" "(--tag_order=)--tag_order=}[Tag sort direction]" "(--tag_sort=)--tag_sort=}[Sort tags by]" "(--totals)--totals}[Show intervals with totals at the end of output]" )
+            ;;
+            views) 
+                args=( {-c,--column}"[List in single column]" )
+            ;;
+            wiki) 
+                args=( "(--after=)--after=}[Include entries newer than date]" {-b,--bool=}"[Tag boolean]" "(--before=)--before=}[Include entries older than date]" {-f,--from=}"[Date range to include]" "(--only_timed)--only_timed}[Only show items with recorded time intervals]" {-s,--section=}"[Section to rotate]" "(--search=)--search=}[Search filter]" "(--tag=)--tag=}[Tag filter]" )
+            ;;
+            yesterday) 
+                args=( "(--after=)--after=}[View entries after specified time]" "(--before=)--before=}[View entries before specified time]" {-o,--output=}"[Output to export format]" {-s,--section=}"[Specify a section]" {-t,--times}"[Show time intervals on @done tasks]" "(--tag_order=)--tag_order=}[Tag sort direction]" "(--tag_sort=)--tag_sort=}[Sort tags by]" "(--totals)--totals}[Show time totals at the end of output]" )
+            ;;
+    esac
 
-        esac
-
-        _arguments $args && ret=0
-    ;;
-esac
+    _arguments -s $args
+}
 
-return ret

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"