doing 2.0.22 → 2.1.0pre

data/doc/top-level-namespace.html

@@ -102,7 +102,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Nov 18 16:39:11 2021 by
+  Generated on Sat Nov 27 10:06:03 2021 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.26 (ruby-3.0.1).
 </div>

data/doing.gemspec

@@ -31,10 +31,13 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency 'redcarpet', '~> 3.5', '>= 3.5.1'
   s.add_development_dependency 'github-markup', '~> 4.0', '>= 4.0.0'
   s.add_development_dependency 'parallel_tests', '~> 3.7', '>= 3.7.3'
+  s.add_development_dependency 'tty-spinner', '~> 0.9', '>= 0.9.3'
   s.add_runtime_dependency('tty-progressbar', '~> 0.18', '>= 0.18.2')
   s.add_runtime_dependency('gli', '~> 2.19', '>= 2.19.2')
   s.add_runtime_dependency('haml','~>5.0.0', '>= 5.0.0')
   s.add_runtime_dependency('chronic','~> 0.10', '>= 0.10.2')
   s.add_runtime_dependency('deep_merge', '~> 1.2', '>= 1.2.1')
+  s.add_runtime_dependency('tty-link', '~> 0.1', '>= 0.1.1')
+  s.add_runtime_dependency('tty-which', '~> 0.5', '>= 0.5.0')
   # s.add_runtime_dependency('amatch', '~> 0.4', '>= 0.4.0')
 end

data/doing.rdoc

@@ -5,14 +5,14 @@ record of what you've been doing, complete with tag-based time tracking. The
 command line tool allows you to add entries, annotate with tags and notes, and
 view your entries with myriad options, with a focus on a "natural" language syntax.
 
-v2.0.22
+v2.1.0pre
 
 === Global Options
 === --config_file arg
 
 Use a specific configuration file. Deprecated, set $DOING_CONFIG instead.
 
-[Default Value] /Users/ttscoff/.doingrc
+[Default Value] /Users/ttscoff/.config/doing/config.yml
 
 
 === -f|--doing_file arg
@@ -42,6 +42,11 @@ Show this message
 
 
 
+=== --no
+Answer all yes/no menus with no
+
+
+
 === --[no-]notes
 Output notes if included in the template
 
@@ -72,6 +77,11 @@ Exclude auto tags and default tags
 
 
 
+=== --yes
+Answer all yes/no menus with yes
+
+
+
 === Commands
 ==== Command: <tt>add_section  SECTION_NAME</tt>
 Add a new section to the "doing" file
@@ -385,63 +395,98 @@ Shell to generate for (bash, zsh, fish)
 [Must Match] (?i-mx:^[bzf](?:[ai]?sh)?$)
 
 
-==== Command: <tt>config  KEY_PATH</tt>
+==== Command: <tt>config </tt>
 Edit the configuration file or output a value from it
 
-Run without arguments, `doing config` opens your `.doingrc` in an editor.
+Run without arguments, `doing config` opens your `config.yml` in an editor.
 If local configurations are found in the path between the current directory
-and `~/.doingrc`, a menu will allow you to select which to open in the editor.
+and the root (/), a menu will allow you to select which to open in the editor.
 
 It will use the editor defined in `config_editor_app`, or one specified with `--editor`.
 
-Use `doing config -d` to output the configuration to the terminal, and
+Use `doing config get` to output the configuration to the terminal, and
 provide a dot-separated key path to get a specific value. Shows the current value
 including keys/overrides set by local configs.
 ===== Options
-===== -a APP_NAME
+===== -d|--[no-]dump
+DEPRECATED
+
+
+
+===== -u|--[no-]update
+DEPRECATED
+
+
+
+===== Commands
+====== Command: <tt>edit </tt>
+Open config file in editor
+
+
+======= Options
+======= -a|--app APP_NAME
 
 Application to use
 
 [Default Value] None
 
 
-===== -b BUNDLE_ID
+======= -b|--bundle_id BUNDLE_ID
 
 Application bundle id to use
 
 [Default Value] None
 
 
-===== -e|--editor EDITOR
+======= -e|--editor EDITOR
 
 Editor to use
 
 [Default Value] None
 
 
-===== -o|--output FORMAT
+======= -x|--[no-]default
+Use the config_editor_app defined in ~/.config/doing/config.yml (config_editor_app not set)
 
-Format for --dump (json|yaml|raw)
+
+
+====== Command: <tt>get|dump </tt>
+Output a key's value
+
+
+======= Options
+======= -o|--output FORMAT
+
+Format for output (json|yaml|raw)
 
 [Default Value] yaml
 [Must Match] (?-mix:^(?:y(?:aml)?|j(?:son)?|r(?:aw)?)$)
 
 
-===== -d|--dump
-Show a config key value based on arguments. Separate key paths with colons or dots, e.g. "export_templates.html". Empty arguments outputs the entire config.
+====== Command: <tt>list </tt>
+List configuration paths, including .doingrc files in the current and parent directories
+
+Config files are listed in order of precedence (if there are multiple configs detected).
+  Values defined in the top item in the list will override values in configutations below it.
+====== Command: <tt>set </tt>
+Set a key's value in the config file
 
 
+======= Options
+======= -r|--remove
+Delete specified key
 
-===== -u|--update
-Update config file with missing configuration options
 
 
+====== Command: <tt>undo </tt>
+Undo the last change to a config file
 
-===== -x
-Use the config_editor_app defined in ~/.doingrc (config_editor_app not set)
 
+====== Command: <tt>update|refresh </tt>
+Update default config file, adding any missing keys
 
 
+[Default Command] edit
 ==== Command: <tt>done|did  ENTRY</tt>
 Add a completed item with @done(date). No argument finishes last entry.
 
@@ -455,9 +500,9 @@ Set finish date to specific date/time (natural langauge parsed, e.g. --at=1:30pm
 [Default Value] None
 
 
-===== -b|--back DATE_STRING
+===== -b|--back|--started DATE_STRING
 
-Backdate start date by interval [4pm|20m|2h|yesterday noon]
+Backdate start date by interval or set to time [4pm|20m|2h|"yesterday noon"]
 
 [Default Value] None
 
@@ -710,7 +755,7 @@ List commands one per line, to assist with shell completion
 ==== Command: <tt>import  PATH</tt>
 Import entries from an external source
 
-Imports entries from other sources. Available plugins: calendar, doing, timing
+Imports entries from other sources. Available plugins: calendar, capturething, doing, timing
 ===== Options
 ===== --after DATE_STRING
 
@@ -773,7 +818,7 @@ Tag all imported entries
 
 ===== --type TYPE
 
-Import type (calendar|doing|timing)
+Import type (calendar|capturething|doing|timing)
 
 [Default Value] doing
 
@@ -1086,9 +1131,9 @@ A parenthetical at the end of the entry will be converted to a note.
 
 Run with no argument to create a new entry using vim.
 ===== Options
-===== -b|--back DATE_STRING
+===== -b|--back|--started DATE_STRING
 
-Backdate start time [4pm|20m|2h|yesterday noon]
+Backdate start time [4pm|20m|2h|"yesterday noon"]
 
 [Default Value] None
 
@@ -1159,7 +1204,7 @@ Show time totals at the end of output
 ==== Command: <tt>open </tt>
 Open the "doing" file in an editor
 
-`doing open` defaults to using the editor_app setting in /Users/ttscoff/.doingrc (not set).
+`doing open` defaults to using the editor_app setting in /Users/ttscoff/.config/doing/config.yml (not set).
 ===== Options
 ===== -a|--app APP_NAME
 
@@ -1175,6 +1220,13 @@ Open with app bundle id
 [Default Value] None
 
 
+===== -e|--editor COMMAND
+
+Open with editor command (e.g. vim, mate)
+
+[Default Value] None
+
+
 ==== Command: <tt>plugins </tt>
 List installed plugins
 
@@ -1734,7 +1786,7 @@ Tag the last X entries containing TAG.
 
 
 ===== -a|--autotag
-Autotag entries based on autotag configuration in ~/.doingrc
+Autotag entries based on autotag configuration in ~/.config/doing/config.yml
 
 
 
@@ -1784,7 +1836,7 @@ Output HTML, CSS, and Markdown (ERB) templates for customization
 Templates are printed to STDOUT for piping to a file.
   Save them and use them in the configuration file under export_templates.
 ===== Options
-===== -c
+===== -c|--[no-]column
 List in single column for completion
 
 
@@ -1850,7 +1902,7 @@ Show time totals at the end of output
 
 
 ==== Command: <tt>undo </tt>
-Undo the last change to the doing_file
+Undo the last change to the Doing file
 
 
 ===== Options

data/example_plugin.rb

@@ -14,13 +14,13 @@
 # Change what the plugin says by generating a template with
 # `doing template --type say`, saving it to a file, and
 # putting the path to that file in `export_templates->say` in
-# .doingrc.
+# config.yml.
 #
 # export_templates:
 #   say: /path/to/template.txt
 #
 # Use a different voice by adding a `say_voice` key to your
-# .doingrc. Use `say -v ?` to see available voices.
+# config.yml. Use `say -v ?` to see available voices.
 #
 # say_voice: Zarvox
 
@@ -136,9 +136,9 @@ module Doing
       # or :map to generate output.
       i = items[-1]
 
-      # Format the item. Items are a hash with 4 keys: date,
-      # title, section (parent section), and note. Start
-      # time is in item.date. The wwid object has some
+      # Format the item. Items are an object with 4 methods:
+      # date, title, section (parent section), and note.
+      # Start time is in item.date. The wwid object has some
       # methods for calculation and formatting, including
       # wwid.item.end_date to convert the @done timestamp to
       # an end date.

data/lib/completion/_doing.zsh

@@ -48,7 +48,7 @@ function _doing() {
                   'template:Output HTML'
                   'test:Test Stuff'
                   'today:List entries from today'
-                  'undo:Undo the last change to the doing_file'
+                  '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'
@@ -66,22 +66,22 @@ function _doing() {
                 args=(  )
             ;;
             again) 
-                args=( "(--bool=)--bool=}[Boolean used to combine multiple tags]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-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]" "(--not)--not}[Resume items that *dont* match search/tag filterst* match search/tag filters]" {-s,--section=}"[Get last entry from a specific section]" "(--search=)--search=}[Repeat last entry matching search]" "(--tag=)--tag=}[Repeat last entry matching tags]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             resume) 
-                args=( "(--bool=)--bool=}[Boolean used to combine multiple tags]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-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]" "(--not)--not}[Resume items that *dont* match search/tag filterst* match search/tag filters]" {-s,--section=}"[Get last entry from a specific section]" "(--search=)--search=}[Repeat last entry matching search]" "(--tag=)--tag=}[Repeat last entry matching tags]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             archive) 
-                args=( "(--before=)--before=}[Archive entries older than date]" "(--bool=)--bool=}[Tag boolean]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-k,--keep=}"[How many items to keep]" "(--label)--label}[Label moved items with @from(SECTION_NAME)]" "(--not)--not}[Show items that *dont* match search stringt* match search string]" "(--search=)--search=}[Search filter]" {-t,--to=}"[Move entries to]" "(--tag=)--tag=}[Tag filter]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             move) 
-                args=( "(--before=)--before=}[Archive entries older than date]" "(--bool=)--bool=}[Tag boolean]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-k,--keep=}"[How many items to keep]" "(--label)--label}[Label moved items with @from(SECTION_NAME)]" "(--not)--not}[Show items that *dont* match search stringt* match search string]" "(--search=)--search=}[Search filter]" {-t,--to=}"[Move entries to]" "(--tag=)--tag=}[Tag filter]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             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]" )
+                args=(  )
             ;;
             cancel) 
-                args=( {-a,--archive}"[Archive entries]" "(--bool=)--bool=}[Boolean]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-i,--interactive}"[Select item(s) to cancel from a menu of matching entries]" "(--not)--not}[Finish items that *dont* match search/tag filterst* match search/tag filters]" {-s,--section=}"[Section]" "(--search=)--search=}[Cancel the last X entries matching search filter]" "(--tag=)--tag=}[Cancel the last X entries containing TAG]" {-u,--unfinished}"[Cancel last entry]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             choose) 
                 args=(  )
@@ -90,115 +90,115 @@ function _doing() {
                 args=(  )
             ;;
             completion) 
-                args=( {-f,--file=}"[File to write output to]" {-t,--type=}"[Shell to generate for]" )
+                args=(  )
             ;;
             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]" )
+                args=(  )
             ;;
             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]" )
+                args=(  )
             ;;
             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]" )
+                args=(  )
             ;;
             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]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" "(--date)--date}[Include date]" {-i,--interactive}"[Select item(s) to finish from a menu of matching entries]" "(--not)--not}[Finish items that *dont* match search/tag filterst* match search/tag filters]" {-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]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             grep) 
-                args=( "(--after=)--after=}[Constrain search to entries newer than date]" "(--before=)--before=}[Constrain search to entries older than date]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-i,--interactive}"[Display an interactive menu of results to perform further operations]" "(--not)--not}[Show items that *dont* match search stringt* match search string]" {-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]" {-x,--exact}"[Force exact string matching]" )
+                args=(  )
             ;;
             search) 
-                args=( "(--after=)--after=}[Constrain search to entries newer than date]" "(--before=)--before=}[Constrain search to entries older than date]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-i,--interactive}"[Display an interactive menu of results to perform further operations]" "(--not)--not}[Show items that *dont* match search stringt* match search string]" {-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]" {-x,--exact}"[Force exact string matching]" )
+                args=(  )
             ;;
             help) 
                 args=(  )
             ;;
             import) 
-                args=( "(--after=)--after=}[Import entries newer than date]" "(--autotag)--autotag}[Autotag entries]" "(--before=)--before=}[Import entries older than date]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-f,--from=}"[Date range to import]" "(--not)--not}[Import items that *dont* match search/tag/date filterst* match search/tag/date filters]" "(--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]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             last) 
-                args=( "(--bool=)--bool=}[Tag boolean]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-e,--editor}"[Edit entry with vim]" "(--not)--not}[Show items that *dont* match search string or tag filtert* match search string or tag filter]" {-s,--section=}"[Specify a section]" "(--search=)--search=}[Search filter]" "(--tag=)--tag=}[Tag filter]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             later) 
-                args=( {-b,--back=}"[Backdate start time to date string [4pm|20m|2h|yesterday noon]]" {-e,--editor}"[Edit entry with vim]" {-n,--note=}"[Note]" )
+                args=(  )
             ;;
             mark) 
-                args=( "(--bool=)--bool=}[Boolean]" {-c,--count=}"[How many recent entries to tag]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-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]" "(--not)--not}[Flag items that *dont* match search/tag/date filterst* match search/tag/date filters]" {-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]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             flag) 
-                args=( "(--bool=)--bool=}[Boolean]" {-c,--count=}"[How many recent entries to tag]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-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]" "(--not)--not}[Flag items that *dont* match search/tag/date filterst* match search/tag/date filters]" {-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]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             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]" )
+                args=(  )
             ;;
             note) 
-                args=( "(--bool=)--bool=}[Boolean]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-e,--editor}"[Edit entry with vim]" {-i,--interactive}"[Select item for new note from a menu of matching entries]" "(--not)--not}[Add note to item that *doesnt* match search/tag filterst* match search/tag filters]" {-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]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             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]" )
+                args=(  )
             ;;
             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]" )
+                args=(  )
             ;;
             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]" )
+                args=(  )
             ;;
             open) 
-                args=( {-a,--app=}"[Open with app name]" {-b,--bundle_id=}"[Open with app bundle id]" )
+                args=(  )
             ;;
             plugins) 
-                args=( {-c,--column}"[List in single column for completion]" {-t,--type=}"[List plugins of type]" )
+                args=(  )
             ;;
             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]" )
+                args=(  )
             ;;
             reset) 
-                args=( "(--bool=)--bool=}[Boolean]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-i,--interactive}"[Select from a menu of matching entries]" "(--not)--not}[Reset items that *dont* match search/tag filterst* match search/tag filters]" {-r,--resume}"[Resume entry]" {-s,--section=}"[Limit search to section]" "(--search=)--search=}[Reset last entry matching search filter]" "(--tag=)--tag=}[Reset last entry matching tag]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             begin) 
-                args=( "(--bool=)--bool=}[Boolean]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-i,--interactive}"[Select from a menu of matching entries]" "(--not)--not}[Reset items that *dont* match search/tag filterst* match search/tag filters]" {-r,--resume}"[Resume entry]" {-s,--section=}"[Limit search to section]" "(--search=)--search=}[Reset last entry matching search filter]" "(--tag=)--tag=}[Reset last entry matching tag]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             rotate) 
-                args=( "(--before=)--before=}[Rotate entries older than date]" "(--bool=)--bool=}[Tag boolean]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-k,--keep=}"[How many items to keep in each section]" "(--not)--not}[Rotate items that *dont* match search string or tag filtert* match search string or tag filter]" {-s,--section=}"[Section to rotate]" "(--search=)--search=}[Search filter]" "(--tag=)--tag=}[Tag filter]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             sections) 
-                args=( {-c,--column}"[List in single column]" )
+                args=(  )
             ;;
             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]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-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]" "(--not)--not}[Select items that *dont* match search/tag filterst* match search/tag filters]" {-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]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             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]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-f,--from=}"[Date range to show]" {-i,--interactive}"[Select from a menu of matching entries to perform additional operations]" "(--not)--not}[Show items that *dont* match search/tag/date filterst* match search/tag/date filters]" {-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]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             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]" )
+                args=(  )
             ;;
             tag) 
-                args=( {-a,--autotag}"[Autotag entries based on autotag configuration in ~/]" "(--bool=)--bool=}[Boolean]" {-c,--count=}"[How many recent entries to tag]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-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]" "(--not)--not}[Tag items that *dont* match search/tag filterst* match search/tag filters]" {-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]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             template) 
-                args=( {-l,--list}"[List all available templates]" )
+                args=(  )
             ;;
             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]" )
+                args=(  )
             ;;
             undo) 
-                args=( {-f,--file=}"[Specify alternate doing file]" )
+                args=(  )
             ;;
             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]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" "(--color)--color}[Include colors in output]" {-i,--interactive}"[Select from a menu of matching entries to perform additional operations]" "(--not)--not}[Show items that *dont* match search stringt* match search string]" {-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]" {-x,--exact}"[Force exact search string matching]" )
+                args=(  )
             ;;
             views) 
-                args=( {-c,--column}"[List in single column]" )
+                args=(  )
             ;;
             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]" )
+                args=(  )
             ;;
             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]" )
+                args=(  )
             ;;
     esac
 

data/lib/completion/doing.bash

@@ -71,9 +71,9 @@ _doing_completion() {
 _doing_config() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--dump --editor --output --update' -- $token ) )
+    COMPREPLY=( $( compgen -W '--dump --update' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-d -e -o -u --dump --editor --output --update' -- $token ) )
+    COMPREPLY=( $( compgen -W '-d -u --dump --update' -- $token ) )
   
   fi
 }
@@ -81,9 +81,9 @@ _doing_config() {
 _doing_done() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--archive --at --back --date --editor --note --remove --section --took --unfinished' -- $token ) )
+    COMPREPLY=( $( compgen -W '--archive --at --started --date --editor --note --remove --section --took --unfinished' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -b -e -n -r -s -t -u --archive --at --back --date --editor --note --remove --section --took --unfinished' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -e -n -r -s -t -u --archive --at --started --date --editor --note --remove --section --took --unfinished' -- $token ) )
   
   fi
 }
@@ -181,9 +181,9 @@ _doing_note() {
 _doing_now() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--back --editor --finish_last --note --section' -- $token ) )
+    COMPREPLY=( $( compgen -W '--started --editor --finish_last --note --section' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-b -e -f -n -s --back --editor --finish_last --note --section' -- $token ) )
+    COMPREPLY=( $( compgen -W '-e -f -n -s --started --editor --finish_last --note --section' -- $token ) )
   
   fi
 }
@@ -201,9 +201,9 @@ _doing_on() {
 _doing_open() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--app --bundle_id' -- $token ) )
+    COMPREPLY=( $( compgen -W '--app --bundle_id --editor' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -b --app --bundle_id' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -b -e --app --bundle_id --editor' -- $token ) )
   
   fi
 }
@@ -321,9 +321,9 @@ _doing_tag() {
 _doing_template() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--list' -- $token ) )
+    COMPREPLY=( $( compgen -W '--column --list' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-l --list' -- $token ) )
+    COMPREPLY=( $( compgen -W '-c -l --column --list' -- $token ) )
   
   fi
 }