doing 2.1.19 → 2.1.21

data/docs/doc/top-level-namespace.html

@@ -6,7 +6,7 @@
 <title>
   Top Level Namespace
   
-    &mdash; Documentation by YARD 0.9.26
+    &mdash; Documentation by YARD 0.9.27
   
 </title>
 
@@ -91,6 +91,97 @@
   
 </p>
 
+  
+    <h2>
+      Constant Summary
+      <small><a href="#" class="constants_summary_toggle">collapse</a></small>
+    </h2>
+
+    <dl class="constants">
+      
+        <dt id="REGEX_BOOL-constant" class="">REGEX_BOOL =
+          
+        </dt>
+        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$</span><span class='regexp_end'>/i</span></span></pre></dd>
+      
+        <dt id="REGEX_SORT_ORDER-constant" class="">REGEX_SORT_ORDER =
+          
+        </dt>
+        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^(?:a(?:sc)?|d(?:esc)?)$</span><span class='regexp_end'>/i</span></span></pre></dd>
+      
+        <dt id="REGEX_VALUE_QUERY-constant" class="">REGEX_VALUE_QUERY =
+          
+        </dt>
+        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^(?:!)?@?(?:\S+) +(?:!?[&lt;&gt;=][=*]?|[$*^]=) +(?:.*?)$</span><span class='regexp_end'>/</span></span></pre></dd>
+      
+        <dt id="REGEX_CLOCK-constant" class="">REGEX_CLOCK =
+          
+        </dt>
+        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>(?:\d{1,2}+(?::\d{1,2}+)?(?: *(?:am|pm))?|midnight|noon)</span><span class='tstring_end'>&#39;</span></span></pre></dd>
+      
+        <dt id="REGEX_TIME-constant" class="">REGEX_TIME =
+          
+        </dt>
+        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^</span><span class='embexpr_beg'>#{</span><span class='const'><span class='object_link'><a href="top-level-namespace.html#REGEX_CLOCK-constant" title="REGEX_CLOCK (constant)">REGEX_CLOCK</a></span></span><span class='embexpr_end'>}</span><span class='tstring_content'>$</span><span class='regexp_end'>/i</span></span></pre></dd>
+      
+        <dt id="REGEX_DAY-constant" class="">REGEX_DAY =
+          
+        </dt>
+        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^(mon|tue|wed|thur?|fri|sat|sun)(\w+(day)?)?$</span><span class='regexp_end'>/i</span></span></pre></dd>
+      
+        <dt id="REGEX_RANGE_INDICATOR-constant" class="">REGEX_RANGE_INDICATOR =
+          
+        </dt>
+        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'> +(?:to|through|thru|(?:un)?til|-+) +</span><span class='tstring_end'>&#39;</span></span></pre></dd>
+      
+        <dt id="REGEX_RANGE-constant" class="">REGEX_RANGE =
+          
+        </dt>
+        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^\S+</span><span class='embexpr_beg'>#{</span><span class='const'><span class='object_link'><a href="top-level-namespace.html#REGEX_RANGE_INDICATOR-constant" title="REGEX_RANGE_INDICATOR (constant)">REGEX_RANGE_INDICATOR</a></span></span><span class='embexpr_end'>}</span><span class='tstring_content'>+\S+</span><span class='regexp_end'>/i</span></span></pre></dd>
+      
+        <dt id="REGEX_TIME_RANGE-constant" class="">REGEX_TIME_RANGE =
+          
+        </dt>
+        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^</span><span class='embexpr_beg'>#{</span><span class='const'><span class='object_link'><a href="top-level-namespace.html#REGEX_CLOCK-constant" title="REGEX_CLOCK (constant)">REGEX_CLOCK</a></span></span><span class='embexpr_end'>}</span><span class='embexpr_beg'>#{</span><span class='const'><span class='object_link'><a href="top-level-namespace.html#REGEX_RANGE_INDICATOR-constant" title="REGEX_RANGE_INDICATOR (constant)">REGEX_RANGE_INDICATOR</a></span></span><span class='embexpr_end'>}</span><span class='embexpr_beg'>#{</span><span class='const'><span class='object_link'><a href="top-level-namespace.html#REGEX_CLOCK-constant" title="REGEX_CLOCK (constant)">REGEX_CLOCK</a></span></span><span class='embexpr_end'>}</span><span class='tstring_content'>$</span><span class='regexp_end'>/i</span></span></pre></dd>
+      
+        <dt id="InvalidExportType-constant" class="">InvalidExportType =
+          
+        </dt>
+        <dd><pre class="code"><span class='const'>Class</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='const'>RuntimeError</span><span class='rparen'>)</span></pre></dd>
+      
+        <dt id="MissingConfigFile-constant" class="">MissingConfigFile =
+          
+        </dt>
+        <dd><pre class="code"><span class='const'>Class</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='const'>RuntimeError</span><span class='rparen'>)</span></pre></dd>
+      
+        <dt id="TagArray-constant" class="">TagArray =
+          
+        </dt>
+        <dd><pre class="code"><span class='const'>Class</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='const'><span class='object_link'><a href="Array.html" title="Array (class)">Array</a></span></span><span class='rparen'>)</span></pre></dd>
+      
+        <dt id="DateBeginString-constant" class="">DateBeginString =
+          
+        </dt>
+        <dd><pre class="code"><span class='const'>Class</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='const'>DateTime</span><span class='rparen'>)</span></pre></dd>
+      
+        <dt id="DateEndString-constant" class="">DateEndString =
+          
+        </dt>
+        <dd><pre class="code"><span class='const'>Class</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='const'>DateTime</span><span class='rparen'>)</span></pre></dd>
+      
+        <dt id="DateRangeString-constant" class="">DateRangeString =
+          
+        </dt>
+        <dd><pre class="code"><span class='const'>Class</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='const'><span class='object_link'><a href="Array.html" title="Array (class)">Array</a></span></span><span class='rparen'>)</span></pre></dd>
+      
+        <dt id="DateIntervalString-constant" class="">DateIntervalString =
+          
+        </dt>
+        <dd><pre class="code"><span class='const'>Class</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='const'>DateTime</span><span class='rparen'>)</span></pre></dd>
+      
+    </dl>
+  
+
 
 
 
@@ -102,9 +193,9 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Jan 18 08:53:02 2022 by
+  Generated on Thu Jan 20 12:10:33 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.26 (ruby-3.0.1).
+  0.9.27 (ruby-3.0.1).
 </div>
 
     </div>

data/doing.gemspec

@@ -33,7 +33,7 @@ spec = Gem::Specification.new do |s|
   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('gli', '~> 2.20', '>= 2.20.1')
   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')

data/doing.rdoc

@@ -5,7 +5,7 @@ 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.1.19
+v2.1.21
 
 === Global Options
 === --config_file arg
@@ -92,6 +92,13 @@ Repeat last entry as new entry
 
 This command is designed to allow multiple time intervals to be created for an entry by duplicating it with a new start (and end, eventually) time
 ===== Options
+===== -b|--back|--started DATE_STRING
+
+Backdate start date by interval or set to time [4pm|20m|2h|"yesterday noon"]
+
+[Default Value] None
+
+
 ===== --bool BOOLEAN
 
 Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans
@@ -549,6 +556,7 @@ Start and end times as a date/time range `doing done --from "1am to 8am"`.
         Overrides other date flags.
 
 [Default Value] None
+[Must Match] (?i-mx:^\S+ +(?:to|through|thru|(?:un)?til|-+) ++\S+)
 
 
 ===== -n|--note TEXT
@@ -609,14 +617,14 @@ Mark last X entries as @done
 
 Marks the last X entries with a @done tag and current date. Does not alter already completed entries.
 ===== Options
-===== --at DATE_STRING
+===== --at|--finished DATE_STRING
 
 Set finish date to specific date/time (natural langauge parsed, e.g. --at=1:30pm). If used, ignores --back.
 
 [Default Value] None
 
 
-===== -b|--back DATE_STRING
+===== -b|--back|--started DATE_STRING
 
 Backdate completed date to date string [4pm|20m|2h|yesterday noon]
 
@@ -1039,7 +1047,7 @@ Add an item to the Later section
 
 
 ===== Options
-===== -b|--back DATE_STRING
+===== -b|--back|--started DATE_STRING
 
 Backdate start time to date string [4pm|20m|2h|yesterday noon]
 
@@ -1165,7 +1173,7 @@ This command makes it easy to start and stop these overarching entries. Just run
 big project` to start a @meanwhile entry, add other entries as you work on the project, then use `doing meanwhile` by
 itself to mark the entry as @done.
 ===== Options
-===== -b|--back DATE_STRING
+===== -b|--back|--started DATE_STRING
 
 Backdate start date for new entry to date string [4pm|20m|2h|yesterday noon]
 
@@ -2282,7 +2290,7 @@ View entries before specified time (e.g. 8am, 12:30pm, 15:00)
 [Default Value] None
 
 
-===== --from DATE_OR_RANGE
+===== --from TIME_RANGE
 
 Time range to show `doing today --from "12pm to 4pm"`
 
@@ -2615,6 +2623,7 @@ View entries before specified time (e.g. 8am, 12:30pm, 15:00)
 Time range to show, e.g. `doing yesterday --from "1am to 8am"`
 
 [Default Value] None
+[Must Match] (?i-mx:^(?:\d{1,2}+(?::\d{1,2}+)?(?: *(?:am|pm))?|midnight|noon) +(?:to|through|thru|(?:un)?til|-+) +(?:\d{1,2}+(?::\d{1,2}+)?(?: *(?:am|pm))?|midnight|noon)$)
 
 
 ===== -o|--output FORMAT

data/lib/completion/_doing.zsh

@@ -70,10 +70,10 @@ function _doing() {
                 args=(  )
             ;;
             again) 
-                args=( "(--ask)--ask}[Prompt for note via multi-line input]" "(--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=}"[Add a 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]" "(--val=)--val=}[Perform a tag value query]" {-x,--exact}"[Force exact search string matching]" )
+                args=( "(--ask)--ask}[Prompt for note via multi-line input]" "(--started=)--started=}[Backdate start date by interval or set to time [4pm|20m|2h|"yesterday noon"]]" "(--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=}"[Add a 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]" "(--val=)--val=}[Perform a tag value query]" {-x,--exact}"[Force exact search string matching]" )
             ;;
             resume) 
-                args=( "(--ask)--ask}[Prompt for note via multi-line input]" "(--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=}"[Add a 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]" "(--val=)--val=}[Perform a tag value query]" {-x,--exact}"[Force exact search string matching]" )
+                args=( "(--ask)--ask}[Prompt for note via multi-line input]" "(--started=)--started=}[Backdate start date by interval or set to time [4pm|20m|2h|"yesterday noon"]]" "(--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=}"[Add a 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]" "(--val=)--val=}[Perform a tag value query]" {-x,--exact}"[Force exact search string matching]" )
             ;;
             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]" "(--val=)--val=}[Perform a tag value query]" {-x,--exact}"[Force exact search string matching]" )
@@ -112,7 +112,7 @@ function _doing() {
                 args=( {-a,--archive}"[Immediately archive the entry]" "(--ask)--ask}[Prompt for note via multi-line input]" "(--finished=)--finished=}[Set finish date to specific date/time]" "(--started=)--started=}[Backdate start date by interval or set to time [4pm|20m|2h|"yesterday noon"]]" "(--date)--date}[Include date]" {-e,--editor}"[Edit entry with vim]" "(--from=)--from=}[Start and end times as a date/time range `doing done --from "1am to 8am"`]" {-n,--note=}"[Include a note]" {-r,--remove}"[Remove @done tag]" {-s,--section=}"[Section]" "(--for=)--for=}[Set completion date to start date plus interval]" {-u,--unfinished}"[Finish last entry not already marked @done]" )
             ;;
             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]" "(--for=)--for=}[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]" "(--val=)--val=}[Perform a tag value query]" {-x,--exact}"[Force exact search string matching]" )
+                args=( {-a,--archive}"[Archive entries]" "(--finished=)--finished=}[Set finish date to specific date/time]" "(--auto)--auto}[Auto-generate finish dates from next entrys start times start time]" "(--started=)--started=}[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]" "(--for=)--for=}[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]" "(--val=)--val=}[Perform a tag value query]" {-x,--exact}"[Force exact search string matching]" )
             ;;
             grep) 
                 args=( "(--after=)--after=}[Search entries newer than date]" "(--before=)--before=}[Search entries older than date]" "(--bool=)--bool=}[Combine multiple tags or value queries using AND]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-d,--delete}"[Delete matching entries]" "(--duration)--duration}[Show elapsed time on entries without @done tag]" {-e,--editor}"[Edit matching entries with vim]" "(--from=)--from=}[Date range to show]" {-h,--hilite}"[Highlight search matches in output]" {-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]" "(--val=)--val=}[Perform a tag value query]" {-x,--exact}"[Force exact string matching]" )
@@ -130,7 +130,7 @@ function _doing() {
                 args=( "(--bool=)--bool=}[Tag boolean]" "(--case=)--case=}[Case sensitivity for search string matching [(c)ase-sensitive]" {-d,--delete}"[Delete the last entry]" "(--duration)--duration}[Show elapsed time if entry is not tagged @done]" {-e,--editor}"[Edit entry with vim]" {-h,--hilite}"[Highlight search matches in output]" "(--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]" "(--val=)--val=}[Perform a tag value query]" {-x,--exact}"[Force exact search string matching]" )
             ;;
             later) 
-                args=( "(--ask)--ask}[Prompt for note via multi-line input]" {-b,--back=}"[Backdate start time to date string [4pm|20m|2h|yesterday noon]]" {-e,--editor}"[Edit entry with vim]" {-n,--note=}"[Note]" )
+                args=( "(--ask)--ask}[Prompt for note via multi-line input]" "(--started=)--started=}[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]" "(--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]" "(--val=)--val=}[Perform a tag value query]" {-x,--exact}"[Force exact search string matching]" )
@@ -139,7 +139,7 @@ function _doing() {
                 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]" "(--val=)--val=}[Perform a tag value query]" {-x,--exact}"[Force exact search string matching]" )
             ;;
             meanwhile) 
-                args=( {-a,--archive}"[Archive previous @meanwhile entry]" "(--ask)--ask}[Prompt for note via multi-line input]" {-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=( {-a,--archive}"[Archive previous @meanwhile entry]" "(--ask)--ask}[Prompt for note via multi-line input]" "(--started=)--started=}[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=( "(--ask)--ask}[Prompt for note via multi-line input]" "(--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]" "(--val=)--val=}[Perform a tag value query]" {-x,--exact}"[Force exact search string matching]" )

data/lib/completion/doing.bash

@@ -1,9 +1,9 @@
 _doing_again() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--ask --bool --case --editor --interactive --in --note --not --section --search --tag --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--ask --started --bool --case --editor --interactive --in --note --not --section --search --tag --val --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-e -i -n -s -x --ask --bool --case --editor --interactive --in --note --not --section --search --tag --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-e -i -n -s -x --ask --started --bool --case --editor --interactive --in --note --not --section --search --tag --val --exact' -- $token ) )
   
   fi
 }
@@ -91,9 +91,9 @@ _doing_done() {
 _doing_finish() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--archive --at --auto --back --bool --case --date --interactive --not --remove --section --search --for --tag --unfinished --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--archive --finished --auto --started --bool --case --date --interactive --not --remove --section --search --for --tag --unfinished --val --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -b -i -r -s -u -x --archive --at --auto --back --bool --case --date --interactive --not --remove --section --search --for --tag --unfinished --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -i -r -s -u -x --archive --finished --auto --started --bool --case --date --interactive --not --remove --section --search --for --tag --unfinished --val --exact' -- $token ) )
   
   fi
 }
@@ -141,9 +141,9 @@ _doing_last() {
 _doing_later() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--ask --back --editor --note' -- $token ) )
+    COMPREPLY=( $( compgen -W '--ask --started --editor --note' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-b -e -n --ask --back --editor --note' -- $token ) )
+    COMPREPLY=( $( compgen -W '-e -n --ask --started --editor --note' -- $token ) )
   
   fi
 }
@@ -161,9 +161,9 @@ _doing_mark() {
 _doing_meanwhile() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--archive --ask --back --editor --note --section' -- $token ) )
+    COMPREPLY=( $( compgen -W '--archive --ask --started --editor --note --section' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -b -e -n -s --archive --ask --back --editor --note --section' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -e -n -s --archive --ask --started --editor --note --section' -- $token ) )
   
   fi
 }

data/lib/completion/doing.fish

@@ -23,28 +23,97 @@ function __fish_doing_using_command
   and return 0
 end
 
+function __fish_doing_cache_timer_expired
+  set -l timer __fish_doing_cache_timer_$argv[1]
+  if not set -q $timer
+    set -g $timer (date '+%s')
+  end
+
+  if test (math (date '+%s') - $$timer) -gt $argv[2]
+    set -g $timer (date '+%s')
+    return 1
+  end
+
+  return 0
+end
+
+function __fish_doing_subcommands
+  if not set -q __fish_doing_subcommands_cache
+    or __fish_doing_cache_timer_expired subcommands 86400
+    set -g -a __fish_doing_subcommands_cache (doing help -c)
+  end
+  printf '%s
+' $__fish_doing_subcommands_cache
+end
+
 function __fish_doing_complete_sections
-  doing sections -c
+  if not set -q __fish_doing_sections_cache
+    or __fish_doing_cache_timer_expired sections 3600
+    set -g -a __fish_doing_sections_cache (doing sections -c)
+  end
+  printf '%s
+' $__fish_doing_sections_cache
+  __fish_doing_complete_show_tag
 end
 
 function __fish_doing_complete_views
-  doing views -c
+  if not set -q __fish_doing_views_cache
+    or __fish_doing_cache_timer_expired views 3600
+    set -g -a __fish_doing_views_cache (doing views -c)
+  end
+  printf '%s
+' $__fish_doing_views_cache
 end
 
-function __fish_doing_subcommands
-  doing help -c
+function __fish_doing_export_plugin
+  if not set -q __fish_doing_export_plugin_cache
+    or __fish_doing_cache_timer_expired export_plugins 3600
+    set -g -a __fish_doing_export_plugin_cache (doing plugins --type export -c)
+  end
+  printf '%s
+' $__fish_doing_export_plugin_cache
+end
+
+function __fish_doing_import_plugin
+  if not set -q __fish_doing_import_plugin_cache
+    or __fish_doing_cache_timer_expired import_plugins 3600
+    set -g -a __fish_doing_import_plugin_cache (doing plugins --type import -c)
+  end
+  printf '%s
+' $__fish_doing_import_plugin_cache
+end
+
+function __fish_doing_complete_template
+  if not set -q __fish_doing_template_cache
+    or __fish_doing_cache_timer_expired template 3600
+    set -g -a __fish_doing_template_cache (doing template -c)
+  end
+  printf '%s
+' $__fish_doing_template_cache
 end
 
-function __fish_doing_export_plugins
-  doing plugins --type export -c
+function __fish_doing_complete_tag
+  if not set -q __fish_doing_tag_cache
+    or __fish_doing_cache_timer_expired tags 60
+    set -g -a __fish_doing_tag_cache (doing tags)
+  end
+  printf '%s
+' $__fish_doing_tag_cache
 end
 
-function __fish_doing_import_plugins
-  doing plugins --type import -c
+function __fish_doing_complete_show_tag
+  if not set -q __fish_doing_tag_cache
+    or __fish_doing_cache_timer_expired tags 60
+    set -g -a __fish_doing_tag_cache (doing tags)
+  end
+  printf '@%s
+' $__fish_doing_tag_cache
 end
 
-function __fish_doing_complete_templates
-  doing template -c
+function __fish_doing_complete_args
+  for cmd in (doing commands_accepting -c $argv[1])
+    complete -x -c doing -l $argv[1] -n "__fish_doing_using_command $cmd" -a "(__fish_doing_complete_$argv[1])"
+  end
 end
 
 complete -c doing -f
@@ -57,6 +126,14 @@ complete -f -c doing -s t -l type -x -n '__fish_doing_using_command import' -a '
 
 complete -xc doing -n '__fish_seen_subcommand_from help; and not __fish_seen_subcommand_from (doing help -c)' -a "(doing help -c)"
 
+function __fish_doing_complete_args
+  for cmd in (doing commands_accepting -c $argv[1])
+    complete -x -c doing -l $argv[1] -n "__fish_doing_using_command $cmd" -a "(__fish_doing_complete_$argv[1])"
+  end
+end
+
+__fish_doing_complete_args tag
+
 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 move' -d Move\ entries\ between\ sections
@@ -100,6 +177,7 @@ complete -xc doing -n '__fish_doing_needs_command' -a 'views' -d List\ available
 complete -xc doing -n '__fish_doing_needs_command' -a 'wiki' -d Output\ a\ tag\ wiki
 complete -xc doing -n '__fish_doing_needs_command' -a 'yesterday' -d List\ entries\ from\ yesterday
 complete -c doing -l ask  -f  -n '__fish_doing_using_command again resume' -d Prompt\ for\ note\ via\ multi-line\ input
+complete -c doing -l started  -f -r -n '__fish_doing_using_command again resume' -d Backdate\ start\ date\ by\ interval\ or\ set\ to\ time\ \[4pm\|20m\|2h\|\"yesterday\ noon\"\]
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command again resume' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l case  -f -r -n '__fish_doing_using_command again resume' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command again resume' -d Edit\ duplicated\ entry\ with\ vim\ before\ adding
@@ -159,9 +237,9 @@ complete -c doing -l section -s s -f -r -n '__fish_doing_using_command done did'
 complete -c doing -l for  -f -r -n '__fish_doing_using_command done did' -d Set\ completion\ date\ to\ start\ date\ plus\ interval
 complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command done did' -d Finish\ last\ entry\ not\ already\ marked\ @done
 complete -c doing -l archive -s a -f  -n '__fish_doing_using_command finish' -d Archive\ entries
-complete -c doing -l at  -f -r -n '__fish_doing_using_command finish' -d Set\ finish\ date\ to\ specific\ date/time
+complete -c doing -l finished  -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 started  -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 case  -f -r -n '__fish_doing_using_command finish' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l date  -f  -n '__fish_doing_using_command finish' -d Include\ date
@@ -222,7 +300,7 @@ complete -c doing -l tag  -f -r -n '__fish_doing_using_command last' -d Tag\ fil
 complete -c doing -l val  -f -r -n '__fish_doing_using_command last' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command last' -d Force\ exact\ search\ string\ matching
 complete -c doing -l ask  -f  -n '__fish_doing_using_command later' -d Prompt\ for\ note\ via\ multi-line\ input
-complete -c doing -l back -s b -f -r -n '__fish_doing_using_command later' -d Backdate\ start\ time\ to\ date\ string\ \[4pm\|20m\|2h\|yesterday\ noon\]
+complete -c doing -l started  -f -r -n '__fish_doing_using_command later' -d Backdate\ start\ time\ to\ date\ string\ \[4pm\|20m\|2h\|yesterday\ noon\]
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command later' -d Edit\ entry\ with\ vim
 complete -c doing -l note -s n -f -r -n '__fish_doing_using_command later' -d Note
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command mark flag' -d Boolean
@@ -241,7 +319,7 @@ complete -c doing -l val  -f -r -n '__fish_doing_using_command mark flag' -d Per
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command mark flag' -d Force\ exact\ search\ string\ matching
 complete -c doing -l archive -s a -f  -n '__fish_doing_using_command meanwhile' -d Archive\ previous\ @meanwhile\ entry
 complete -c doing -l ask  -f  -n '__fish_doing_using_command meanwhile' -d Prompt\ for\ note\ via\ multi-line\ input
-complete -c doing -l back -s b -f -r -n '__fish_doing_using_command meanwhile' -d Backdate\ start\ date\ for\ new\ entry\ to\ date\ string\ \[4pm\|20m\|2h\|yesterday\ noon\]
+complete -c doing -l started  -f -r -n '__fish_doing_using_command meanwhile' -d Backdate\ start\ date\ for\ new\ entry\ to\ date\ string\ \[4pm\|20m\|2h\|yesterday\ noon\]
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command meanwhile' -d Edit\ entry\ with\ vim
 complete -c doing -l note -s n -f -r -n '__fish_doing_using_command meanwhile' -d Note
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command meanwhile' -d Section
@@ -444,7 +522,7 @@ 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 grep search on select show since today view yesterday' -a '(__fish_doing_export_plugin)'
 complete -f -c doing -s b -l bool -x -n '__fish_doing_using_command again resume archive move autotag cancel finish grep search last mark flag note reset begin rotate show tag tags view wiki' -a 'and or not pattern'
 complete -f -c doing -l case -x -n '__fish_doing_using_command again resume archive move cancel finish grep search import last mark flag note reset begin rotate select show show tag tags tags view' -a 'case-sensitive ignore smart'
 complete -f -c doing -l tag_sort -x -n '__fish_doing_using_command grep search on recent show since today view yesterday' -a 'name time'

data/lib/doing/completion/fish_completion.rb

@@ -31,28 +31,89 @@ module Doing
             and return 0
           end
 
+          function __fish_doing_cache_timer_expired
+            set -l timer __fish_doing_cache_timer_$argv[1]
+            if not set -q $timer
+              set -g $timer (date '+%s')
+            end
+
+            if test (math (date '+%s') - $$timer) -gt $argv[2]
+              set -g $timer (date '+%s')
+              return 1
+            end
+
+            return 0
+          end
+
+          function __fish_doing_subcommands
+            if not set -q __fish_doing_subcommands_cache
+              or __fish_doing_cache_timer_expired subcommands 86400
+              set -g -a __fish_doing_subcommands_cache (doing help -c)
+            end
+            printf '%s\n' $__fish_doing_subcommands_cache
+          end
+
           function __fish_doing_complete_sections
-            doing sections -c
+            if not set -q __fish_doing_sections_cache
+              or __fish_doing_cache_timer_expired sections 3600
+              set -g -a __fish_doing_sections_cache (doing sections -c)
+            end
+            printf '%s\n' $__fish_doing_sections_cache
+            __fish_doing_complete_show_tag
           end
 
           function __fish_doing_complete_views
-            doing views -c
+            if not set -q __fish_doing_views_cache
+              or __fish_doing_cache_timer_expired views 3600
+              set -g -a __fish_doing_views_cache (doing views -c)
+            end
+            printf '%s\n' $__fish_doing_views_cache
           end
 
-          function __fish_doing_subcommands
-            doing help -c
+          function __fish_doing_export_plugin
+            if not set -q __fish_doing_export_plugin_cache
+              or __fish_doing_cache_timer_expired export_plugins 3600
+              set -g -a __fish_doing_export_plugin_cache (doing plugins --type export -c)
+            end
+            printf '%s\n' $__fish_doing_export_plugin_cache
+          end
+
+          function __fish_doing_import_plugin
+            if not set -q __fish_doing_import_plugin_cache
+              or __fish_doing_cache_timer_expired import_plugins 3600
+              set -g -a __fish_doing_import_plugin_cache (doing plugins --type import -c)
+            end
+            printf '%s\n' $__fish_doing_import_plugin_cache
+          end
+
+          function __fish_doing_complete_template
+            if not set -q __fish_doing_template_cache
+              or __fish_doing_cache_timer_expired template 3600
+              set -g -a __fish_doing_template_cache (doing template -c)
+            end
+            printf '%s\n' $__fish_doing_template_cache
           end
 
-          function __fish_doing_export_plugins
-            doing plugins --type export -c
+          function __fish_doing_complete_tag
+            if not set -q __fish_doing_tag_cache
+              or __fish_doing_cache_timer_expired tags 60
+              set -g -a __fish_doing_tag_cache (doing tags)
+            end
+            printf '%s\n' $__fish_doing_tag_cache
           end
 
-          function __fish_doing_import_plugins
-            doing plugins --type import -c
+          function __fish_doing_complete_show_tag
+            if not set -q __fish_doing_tag_cache
+              or __fish_doing_cache_timer_expired tags 60
+              set -g -a __fish_doing_tag_cache (doing tags)
+            end
+            printf '@%s\n' $__fish_doing_tag_cache
           end
 
-          function __fish_doing_complete_templates
-            doing template -c
+          function __fish_doing_complete_args
+            for cmd in (doing commands_accepting -c $argv[1])
+              complete -x -c doing -l $argv[1] -n "__fish_doing_using_command $cmd" -a "(__fish_doing_complete_$argv[1])"
+            end
           end
 
           complete -c doing -f
@@ -64,6 +125,14 @@ module Doing
           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)"
+
+          function __fish_doing_complete_args
+            for cmd in (doing commands_accepting -c $argv[1])
+              complete -x -c doing -l $argv[1] -n "__fish_doing_using_command $cmd" -a "(__fish_doing_complete_$argv[1])"
+            end
+          end
+
+          __fish_doing_complete_args tag
         EOFUNCTIONS
       end
 
@@ -161,7 +230,7 @@ module Doing
         end
 
         unless need_export.empty?
-          out << "complete -f -c doing -s o -l output -x -n '__fish_doing_using_command #{need_export.join(' ')}' -a '(__fish_doing_export_plugins)'"
+          out << "complete -f -c doing -s o -l output -x -n '__fish_doing_using_command #{need_export.join(' ')}' -a '(__fish_doing_export_plugin)'"
         end
 
         unless need_bool.empty?

data/lib/doing/configuration.rb

@@ -30,6 +30,7 @@ module Doing
         'command_path' => File.join(Util.user_home, '.config', 'doing', 'commands')
       },
       'doing_file' => '~/.local/share/doing/what_was_i_doing.md',
+      'doing_file_sort' => 'desc',
       'backup_dir' => '~/.local/share/doing/doing_backup',
       'history_size' => 15,
       'current_section' => 'Currently',

data/lib/doing/hash.rb

@@ -38,7 +38,7 @@ module Doing
     #
     def deep_set(path, value)
       if path.count == 1
-        if value
+        unless value.nil? || value =~ /^ *$/
           self[path[0]] = value
         else
           delete(path[0])