RubyGems - doing - Versions diffs - 2.1.26 → 2.1.30 - Mend

doing 2.1.26 → 2.1.30

Files changed (156) hide show

checksums.yaml +4 -4
data/.yardoc/checksums +15 -20
data/.yardoc/object_types +0 -0
data/.yardoc/objects/root.dat +0 -0
data/CHANGELOG.md +52 -0
data/Dockerfile +5 -5
data/Dockerfile-2.6 +5 -5
data/Dockerfile-2.7 +5 -4
data/Dockerfile-3.0 +5 -4
data/Gemfile.lock +2 -1
data/README.md +1 -1
data/Rakefile +2 -3
data/bin/commands/add_section.rb +2 -0
data/bin/commands/again.rb +23 -65
data/bin/commands/archive.rb +20 -61
data/bin/commands/cancel.rb +27 -69
data/bin/commands/changes.rb +53 -12
data/bin/commands/colors.rb +4 -2
data/bin/commands/commands.rb +4 -2
data/bin/commands/commands_accepting.rb +62 -11
data/bin/commands/completion.rb +10 -7
data/bin/commands/config.rb +8 -8
data/bin/commands/done.rb +3 -17
data/bin/commands/finish.rb +7 -30
data/bin/commands/flag.rb +15 -51
data/bin/commands/grep.rb +12 -28
data/bin/commands/import.rb +3 -33
data/bin/commands/last.rb +3 -36
data/bin/commands/meanwhile.rb +3 -13
data/bin/commands/note.rb +13 -52
data/bin/commands/now.rb +15 -21
data/bin/commands/on.rb +3 -4
data/bin/commands/open.rb +3 -3
data/bin/commands/recent.rb +3 -4
data/bin/commands/redo.rb +6 -2
data/bin/commands/reset.rb +19 -52
data/bin/commands/rotate.rb +5 -36
data/bin/commands/select.rb +23 -41
data/bin/commands/show.rb +28 -74
data/bin/commands/since.rb +3 -4
data/bin/commands/tag.rb +4 -34
data/bin/commands/tags.rb +5 -32
data/bin/commands/today.rb +3 -4
data/bin/commands/view.rb +36 -73
data/bin/commands/yesterday.rb +4 -5
data/bin/doing +150 -13
data/docs/doc/Array.html +3 -502
data/docs/doc/BooleanTermParser/Clause.html +1 -1
data/docs/doc/BooleanTermParser/Operator.html +1 -1
data/docs/doc/BooleanTermParser/Query.html +1 -1
data/docs/doc/BooleanTermParser/QueryParser.html +1 -1
data/docs/doc/BooleanTermParser/QueryTransformer.html +1 -1
data/docs/doc/BooleanTermParser.html +1 -1
data/docs/doc/Doing/Color.html +62 -56
data/docs/doc/Doing/Completion.html +1 -1
data/docs/doc/Doing/Configuration.html +35 -1
data/docs/doc/Doing/Errors/DoingNoTraceError.html +1 -1
data/docs/doc/Doing/Errors/DoingRuntimeError.html +1 -1
data/docs/doc/Doing/Errors/DoingStandardError.html +1 -1
data/docs/doc/Doing/Errors/EmptyInput.html +1 -1
data/docs/doc/Doing/Errors/NoResults.html +1 -1
data/docs/doc/Doing/Errors/PluginException.html +1 -1
data/docs/doc/Doing/Errors/UserCancelled.html +1 -1
data/docs/doc/Doing/Errors/WrongCommand.html +1 -1
data/docs/doc/Doing/Errors.html +1 -1
data/docs/doc/Doing/Hooks.html +1 -1
data/docs/doc/Doing/Item.html +1 -1
data/docs/doc/Doing/Items.html +2 -2
data/docs/doc/Doing/LogAdapter.html +1 -1
data/docs/doc/Doing/Note.html +2 -2
data/docs/doc/Doing/Pager.html +1 -1
data/docs/doc/Doing/Plugins.html +1 -1
data/docs/doc/Doing/Prompt.html +1 -1
data/docs/doc/Doing/Section.html +1 -1
data/docs/doc/Doing/TemplateString.html +2 -2
data/docs/doc/Doing/Types.html +41 -1
data/docs/doc/Doing/Util/Backup.html +1 -1
data/docs/doc/Doing/Util.html +1 -1
data/docs/doc/Doing/WWID.html +10 -10
data/docs/doc/Doing.html +3 -3
data/docs/doc/FalseClass.html +35 -1
data/docs/doc/GLI/Commands/Help.html +1 -1
data/docs/doc/GLI/Commands/MarkdownDocumentListener.html +1 -1
data/docs/doc/GLI/Commands.html +1 -1
data/docs/doc/GLI.html +1 -1
data/docs/doc/Hash.html +1 -1
data/docs/doc/Object.html +1 -1
data/docs/doc/PhraseParser/Operator.html +1 -1
data/docs/doc/PhraseParser/PhraseClause.html +1 -1
data/docs/doc/PhraseParser/Query.html +1 -1
data/docs/doc/PhraseParser/QueryParser.html +1 -1
data/docs/doc/PhraseParser/QueryTransformer.html +1 -1
data/docs/doc/PhraseParser/TermClause.html +1 -1
data/docs/doc/PhraseParser.html +1 -1
data/docs/doc/Status.html +1 -1
data/docs/doc/String.html +287 -3155
data/docs/doc/Symbol.html +40 -6
data/docs/doc/Time.html +1 -1
data/docs/doc/TrueClass.html +35 -1
data/docs/doc/_index.html +5 -10
data/docs/doc/class_list.html +1 -1
data/docs/doc/file.README.html +2 -2
data/docs/doc/index.html +2 -2
data/docs/doc/method_list.html +278 -678
data/docs/doc/top-level-namespace.html +2 -2
data/doing.gemspec +1 -0
data/doing.rdoc +297 -206
data/lib/completion/_doing.zsh +32 -32
data/lib/completion/doing.bash +30 -30
data/lib/completion/doing.fish +87 -77
data/lib/doing/array/array.rb +4 -0
data/lib/doing/array/nested_hash.rb +17 -0
data/lib/doing/{array.rb → array/tags.rb} +7 -25
data/lib/doing/changelog/change.rb +26 -11
data/lib/doing/changelog/changes.rb +37 -8
data/lib/doing/changelog/version.rb +11 -3
data/lib/doing/{array_chronify.rb → chronify/array.rb} +0 -0
data/lib/doing/chronify/chronify.rb +5 -0
data/lib/doing/{numeric_chronify.rb → chronify/numeric.rb} +0 -0
data/lib/doing/{string_chronify.rb → chronify/string.rb} +0 -0
data/lib/doing/colors.rb +115 -54
data/lib/doing/completion/zsh_completion.rb +5 -0
data/lib/doing/configuration.rb +9 -5
data/lib/doing/good.rb +8 -0
data/lib/doing/help_monkey_patch.rb +6 -5
data/lib/doing/item.rb +5 -5
data/lib/doing/items.rb +2 -2
data/lib/doing/log_adapter.rb +35 -2
data/lib/doing/normalize.rb +188 -0
data/lib/doing/plugins/export/dayone_export.rb +1 -1
data/lib/doing/plugins/export/html_export.rb +1 -1
data/lib/doing/plugins/export/json_export.rb +1 -1
data/lib/doing/plugins/export/markdown_export.rb +1 -1
data/lib/doing/plugins/export/template_export.rb +3 -1
data/lib/doing/prompt.rb +1 -3
data/lib/doing/section.rb +1 -1
data/lib/doing/string/highlight.rb +95 -0
data/lib/doing/string/query.rb +129 -0
data/lib/doing/string/string.rb +12 -0
data/lib/doing/string/tags.rb +164 -0
data/lib/doing/string/transform.rb +168 -0
data/lib/doing/string/truncate.rb +75 -0
data/lib/doing/string/url.rb +82 -0
data/lib/doing/template_string.rb +0 -22
data/lib/doing/types.rb +8 -0
data/lib/doing/util.rb +13 -9
data/lib/doing/version.rb +1 -1
data/lib/doing/wwid.rb +54 -36
data/lib/doing.rb +5 -6
data/lib/examples/plugins/wiki_export/wiki_export.rb +1 -1
data/lib/helpers/threaded_tests.rb +15 -2
data/scripts/deploy.rb +107 -0
data/scripts/runtests.sh +4 -0
metadata +39 -8
data/lib/doing/string.rb +0 -765
data/lib/doing/symbol.rb +0 -28

data/lib/completion/doing.fish CHANGED Viewed

@@ -151,7 +151,6 @@ complete -xc doing -n '__fish_doing_needs_command' -a 'grep search' -d Search\ f
 complete -xc doing -n '__fish_doing_needs_command' -a 'help' -d Shows\ a\ list\ of\ commands\ or\ help\ for\ one\ command
 complete -xc doing -n '__fish_doing_needs_command' -a 'import' -d Import\ entries\ from\ an\ external\ source
 complete -xc doing -n '__fish_doing_needs_command' -a 'last' -d Show\ the\ last\ entry
-complete -xc doing -n '__fish_doing_needs_command' -a 'later' -d Add\ an\ item\ to\ the\ Later\ section
 complete -xc doing -n '__fish_doing_needs_command' -a 'mark flag' -d Mark\ last\ entry\ as\ flagged
 complete -xc doing -n '__fish_doing_needs_command' -a 'meanwhile' -d Finish\ any\ running\ @meanwhile\ tasks\ and\ optionally\ create\ a\ new\ one
 complete -xc doing -n '__fish_doing_needs_command' -a 'note' -d Add\ a\ note\ to\ the\ last\ entry
@@ -160,6 +159,7 @@ complete -xc doing -n '__fish_doing_needs_command' -a 'on' -d List\ entries\ for
 complete -xc doing -n '__fish_doing_needs_command' -a 'open' -d Open\ the\ \"doing\"\ file\ in\ an\ editor
 complete -xc doing -n '__fish_doing_needs_command' -a 'plugins' -d List\ installed\ plugins
 complete -xc doing -n '__fish_doing_needs_command' -a 'recent' -d List\ recent\ entries
+complete -xc doing -n '__fish_doing_needs_command' -a 'redo' -d Redo\ an\ undo\ command
 complete -xc doing -n '__fish_doing_needs_command' -a 'reset begin' -d Reset\ the\ start\ time\ of\ an\ entry
 complete -xc doing -n '__fish_doing_needs_command' -a 'rotate' -d Move\ entries\ to\ archive\ file
 complete -xc doing -n '__fish_doing_needs_command' -a 'sections' -d List\ sections
@@ -177,29 +177,32 @@ complete -xc doing -n '__fish_doing_needs_command' -a 'view' -d Display\ a\ user
 complete -xc doing -n '__fish_doing_needs_command' -a 'views' -d List\ available\ custom\ views
 complete -xc doing -n '__fish_doing_needs_command' -a 'wiki' -d Output\ a\ tag\ wiki
 complete -xc doing -n '__fish_doing_needs_command' -a 'yesterday' -d List\ entries\ from\ yesterday
+complete -c doing -l noauto -s X -f  -n '__fish_doing_using_command again resume' -d Exclude\ auto\ tags\ and\ default\ tags
 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 started  -f -r -n '__fish_doing_using_command again resume' -d Backdate\ start\ date\ for\ new\ entry\ to\ date\ string\ \[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\ /opt/homebrew/bin/vim\ before\ adding
+complete -c doing -l editor -s e -f  -n '__fish_doing_using_command again resume' -d Edit\ entry\ with\ vim
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command again resume' -d Select\ item\ to\ resume\ from\ a\ menu\ of\ matching\ entries
 complete -c doing -l in  -f -r -n '__fish_doing_using_command again resume' -d Add\ new\ entry\ to\ section
-complete -c doing -l note -s n -f -r -n '__fish_doing_using_command again resume' -d Add\ a\ note
-complete -c doing -l not  -f  -n '__fish_doing_using_command again resume' -d Resume\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
+complete -c doing -l note -s n -f -r -n '__fish_doing_using_command again resume' -d Include\ a\ note
+complete -c doing -l not  -f  -n '__fish_doing_using_command again resume' -d Repeat\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command again resume' -d Get\ last\ entry\ from\ a\ specific\ section
-complete -c doing -l search  -f -r -n '__fish_doing_using_command again resume' -d Repeat\ last\ entry\ matching\ search
-complete -c doing -l tag  -f -r -n '__fish_doing_using_command again resume' -d Repeat\ last\ entry\ matching\ tags
+complete -c doing -l search  -f -r -n '__fish_doing_using_command again resume' -d Filter\ entries\ using\ a\ search\ query
+complete -c doing -l tag  -f -r -n '__fish_doing_using_command again resume' -d Filter\ entries\ by\ tag
 complete -c doing -l val  -f -r -n '__fish_doing_using_command again resume' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command again resume' -d Force\ exact\ search\ string\ matching
+complete -c doing -l after  -f -r -n '__fish_doing_using_command archive move' -d Archive\ entries\ newer\ than\ date
 complete -c doing -l before  -f -r -n '__fish_doing_using_command archive move' -d Archive\ entries\ older\ than\ date
-complete -c doing -l bool  -f -r -n '__fish_doing_using_command archive move' -d Tag\ boolean
+complete -c doing -l bool  -f -r -n '__fish_doing_using_command archive move' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l case  -f -r -n '__fish_doing_using_command archive move' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
+complete -c doing -l from  -f -r -n '__fish_doing_using_command archive move' -d Date\ range
 complete -c doing -l keep -s k -f -r -n '__fish_doing_using_command archive move' -d How\ many\ items\ to\ keep
 complete -c doing -l label  -f  -n '__fish_doing_using_command archive move' -d Label\ moved\ items\ with\ @from\(SECTION_NAME\)
-complete -c doing -l not  -f  -n '__fish_doing_using_command archive move' -d Show\ items\ that\ \*don\'t\*\ match\ search\ string
-complete -c doing -l search  -f -r -n '__fish_doing_using_command archive move' -d Search\ filter
+complete -c doing -l not  -f  -n '__fish_doing_using_command archive move' -d Archive\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
+complete -c doing -l search  -f -r -n '__fish_doing_using_command archive move' -d Filter\ entries\ using\ a\ search\ query
 complete -c doing -l to -s t -f -r -n '__fish_doing_using_command archive move' -d Move\ entries\ to
-complete -c doing -l tag  -f -r -n '__fish_doing_using_command archive move' -d Tag\ filter
+complete -c doing -l tag  -f -r -n '__fish_doing_using_command archive move' -d Filter\ entries\ by\ tag
 complete -c doing -l val  -f -r -n '__fish_doing_using_command archive move' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command archive move' -d Force\ exact\ search\ string\ matching
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command autotag' -d Boolean
@@ -211,29 +214,35 @@ complete -c doing -l search  -f -r -n '__fish_doing_using_command autotag' -d Au
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command autotag' -d Autotag\ the\ last\ X\ entries\ containing\ TAG
 complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command autotag' -d Autotag\ last\ entry
 complete -c doing -l archive -s a -f  -n '__fish_doing_using_command cancel' -d Archive\ entries
-complete -c doing -l bool  -f -r -n '__fish_doing_using_command cancel' -d Boolean
+complete -c doing -l bool  -f -r -n '__fish_doing_using_command cancel' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l case  -f -r -n '__fish_doing_using_command cancel' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command cancel' -d Select\ item\(s\)\ to\ cancel\ from\ a\ menu\ of\ matching\ entries
-complete -c doing -l not  -f  -n '__fish_doing_using_command cancel' -d Finish\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
+complete -c doing -l not  -f  -n '__fish_doing_using_command cancel' -d Cancel\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command cancel' -d Section
-complete -c doing -l search  -f -r -n '__fish_doing_using_command cancel' -d Cancel\ the\ last\ X\ entries\ matching\ search\ filter
-complete -c doing -l tag  -f -r -n '__fish_doing_using_command cancel' -d Cancel\ the\ last\ X\ entries\ containing\ TAG
+complete -c doing -l search  -f -r -n '__fish_doing_using_command cancel' -d Filter\ entries\ using\ a\ search\ query
+complete -c doing -l tag  -f -r -n '__fish_doing_using_command cancel' -d Filter\ entries\ by\ tag
 complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command cancel' -d Cancel\ last\ entry
 complete -c doing -l val  -f -r -n '__fish_doing_using_command cancel' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command cancel' -d Force\ exact\ search\ string\ matching
+complete -c doing -l changes -s C -f  -n '__fish_doing_using_command changes changelog' -d Only\ output\ changes
 complete -c doing -l all -s a -f  -n '__fish_doing_using_command changes changelog' -d Display\ all\ versions
+complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command changes changelog' -d Open\ changelog\ in\ interactive\ viewer
 complete -c doing -l lookup -s l -f -r -n '__fish_doing_using_command changes changelog' -d Look\ up\ a\ specific\ version
+complete -c doing -l markdown  -f  -n '__fish_doing_using_command changes changelog' -d Output\ raw\ Markdown
+complete -c doing -l render  -f  -n '__fish_doing_using_command changes changelog' -d Force\ rendered\ output
 complete -c doing -l search -s s -f -r -n '__fish_doing_using_command changes changelog' -d Show\ changelogs\ matching\ search\ terms
+complete -c doing -l sort  -f -r -n '__fish_doing_using_command changes changelog' -d Sort\ order
 complete -c doing -l file -s f -f -r -n '__fish_doing_using_command completion' -d File\ to\ write\ output\ to
 complete -c doing -l type -s t -f -r -n '__fish_doing_using_command completion' -d Shell\ to\ generate\ for
 complete -c doing -l dump -s d -f  -n '__fish_doing_using_command config' -d DEPRECATED
 complete -c doing -l update -s u -f  -n '__fish_doing_using_command config' -d DEPRECATED
+complete -c doing -l noauto -s X -f  -n '__fish_doing_using_command done did' -d Exclude\ auto\ tags\ and\ default\ tags
 complete -c doing -l archive -s a -f  -n '__fish_doing_using_command done did' -d Immediately\ archive\ the\ entry
 complete -c doing -l ask  -f  -n '__fish_doing_using_command done did' -d Prompt\ for\ note\ via\ multi-line\ input
 complete -c doing -l finished  -f -r -n '__fish_doing_using_command done did' -d Set\ finish\ date\ to\ specific\ date/time
-complete -c doing -l started  -f -r -n '__fish_doing_using_command done did' -d Backdate\ start\ date\ by\ interval\ or\ set\ to\ time\ \[4pm\|20m\|2h\|\"yesterday\ noon\"\]
+complete -c doing -l started  -f -r -n '__fish_doing_using_command done did' -d Backdate\ start\ date\ for\ new\ entry\ to\ date\ string\ \[4pm\|20m\|2h\|yesterday\ noon\]
 complete -c doing -l date  -f  -n '__fish_doing_using_command done did' -d Include\ date
-complete -c doing -l editor -s e -f  -n '__fish_doing_using_command done did' -d Edit\ entry\ with\ /opt/homebrew/bin/vim
+complete -c doing -l editor -s e -f  -n '__fish_doing_using_command done did' -d Edit\ entry\ with\ vim
 complete -c doing -l from  -f -r -n '__fish_doing_using_command done did' -d Start\ and\ end\ times\ as\ a\ date/time\ range\ \`doing\ done\ --from\ \"1am\ to\ 8am\"\`
 complete -c doing -l note -s n -f -r -n '__fish_doing_using_command done did' -d Include\ a\ note
 complete -c doing -l remove -s r -f  -n '__fish_doing_using_command done did' -d Remove\ @done\ tag
@@ -244,17 +253,18 @@ complete -c doing -l archive -s a -f  -n '__fish_doing_using_command finish' -d
 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 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 bool  -f -r -n '__fish_doing_using_command finish' -d Boolean\ used\ to\ combine\ multiple\ tags
 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
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command finish' -d Select\ item\(s\)\ to\ finish\ from\ a\ menu\ of\ matching\ entries
 complete -c doing -l not  -f  -n '__fish_doing_using_command finish' -d Finish\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
-complete -c doing -l remove -s r -f  -n '__fish_doing_using_command finish' -d Remove\ done\ tag
+complete -c doing -l remove -s r -f  -n '__fish_doing_using_command finish' -d Remove\ @done\ tag
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command finish' -d Section
-complete -c doing -l search  -f -r -n '__fish_doing_using_command finish' -d Finish\ the\ last\ X\ entries\ matching\ search\ filter
+complete -c doing -l search  -f -r -n '__fish_doing_using_command finish' -d Filter\ entries\ using\ a\ search\ query
 complete -c doing -l for  -f -r -n '__fish_doing_using_command finish' -d Set\ the\ completed\ date\ to\ the\ start\ date\ plus\ XX\[hmd\]
-complete -c doing -l tag  -f -r -n '__fish_doing_using_command finish' -d Finish\ the\ last\ X\ entries\ containing\ TAG
+complete -c doing -l tag  -f -r -n '__fish_doing_using_command finish' -d Filter\ entries\ by\ tag
 complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command finish' -d Finish\ last\ entry
+complete -c doing -l update  -f  -n '__fish_doing_using_command finish' -d Overwrite\ existing\ @done\ tag\ with\ new\ date
 complete -c doing -l val  -f -r -n '__fish_doing_using_command finish' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command finish' -d Force\ exact\ search\ string\ matching
 complete -c doing -l after  -f -r -n '__fish_doing_using_command grep search' -d Search\ entries\ newer\ than\ date
@@ -264,8 +274,8 @@ complete -c doing -l case  -f -r -n '__fish_doing_using_command grep search' -d
 complete -c doing -l config_template  -f -r -n '__fish_doing_using_command grep search' -d Output\ using\ a\ template\ from\ configuration
 complete -c doing -l delete -s d -f  -n '__fish_doing_using_command grep search' -d Delete\ matching\ entries
 complete -c doing -l duration  -f  -n '__fish_doing_using_command grep search' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
-complete -c doing -l editor -s e -f  -n '__fish_doing_using_command grep search' -d Edit\ matching\ entries\ with\ /opt/homebrew/bin/vim
-complete -c doing -l from  -f -r -n '__fish_doing_using_command grep search' -d Date\ range\ to\ show
+complete -c doing -l editor -s e -f  -n '__fish_doing_using_command grep search' -d Edit\ matching\ entries\ with\ vim
+complete -c doing -l from  -f -r -n '__fish_doing_using_command grep search' -d Date\ range
 complete -c doing -l hilite -s h -f  -n '__fish_doing_using_command grep search' -d Highlight\ search\ matches\ in\ output
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command grep search' -d Display\ an\ interactive\ menu\ of\ results\ to\ perform\ further\ operations
 complete -c doing -l not  -f  -n '__fish_doing_using_command grep search' -d Show\ items\ that\ \*don\'t\*\ match\ search\ string
@@ -283,69 +293,67 @@ complete -c doing -l after  -f -r -n '__fish_doing_using_command import' -d Impo
 complete -c doing -l autotag  -f  -n '__fish_doing_using_command import' -d Autotag\ entries
 complete -c doing -l before  -f -r -n '__fish_doing_using_command import' -d Import\ entries\ older\ than\ date
 complete -c doing -l case  -f -r -n '__fish_doing_using_command import' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
-complete -c doing -l from -s f -f -r -n '__fish_doing_using_command import' -d Date\ range\ to\ import
+complete -c doing -l from  -f -r -n '__fish_doing_using_command import' -d Date\ range
 complete -c doing -l not  -f  -n '__fish_doing_using_command import' -d Import\ items\ that\ \*don\'t\*\ match\ search/tag/date\ filters
 complete -c doing -l only_timed  -f  -n '__fish_doing_using_command import' -d Only\ import\ items\ with\ recorded\ time\ intervals
 complete -c doing -l overlap  -f  -n '__fish_doing_using_command import' -d Allow\ entries\ that\ overlap\ existing\ times
 complete -c doing -l prefix  -f -r -n '__fish_doing_using_command import' -d Prefix\ entries\ with
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command import' -d Target\ section
-complete -c doing -l search  -f -r -n '__fish_doing_using_command import' -d Only\ import\ items\ matching\ search
+complete -c doing -l search  -f -r -n '__fish_doing_using_command import' -d Filter\ entries\ using\ a\ search\ query
 complete -c doing -l tag -s t -f -r -n '__fish_doing_using_command import' -d Tag\ all\ imported\ entries
 complete -c doing -l type  -f -r -n '__fish_doing_using_command import' -d Import\ type
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command import' -d Force\ exact\ search\ string\ matching
-complete -c doing -l bool  -f -r -n '__fish_doing_using_command last' -d Tag\ boolean
+complete -c doing -l bool  -f -r -n '__fish_doing_using_command last' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l case  -f -r -n '__fish_doing_using_command last' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l config_template  -f -r -n '__fish_doing_using_command last' -d Output\ using\ a\ template\ from\ configuration
 complete -c doing -l delete -s d -f  -n '__fish_doing_using_command last' -d Delete\ the\ last\ entry
 complete -c doing -l duration  -f  -n '__fish_doing_using_command last' -d Show\ elapsed\ time\ if\ entry\ is\ not\ tagged\ @done
-complete -c doing -l editor -s e -f  -n '__fish_doing_using_command last' -d Edit\ entry\ with\ /opt/homebrew/bin/vim
+complete -c doing -l editor -s e -f  -n '__fish_doing_using_command last' -d Edit\ entry\ with\ vim
 complete -c doing -l hilite -s h -f  -n '__fish_doing_using_command last' -d Highlight\ search\ matches\ in\ output
-complete -c doing -l not  -f  -n '__fish_doing_using_command last' -d Show\ items\ that\ \*don\'t\*\ match\ search\ string\ or\ tag\ filter
+complete -c doing -l not  -f  -n '__fish_doing_using_command last' -d Show\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command last' -d Specify\ a\ section
-complete -c doing -l search  -f -r -n '__fish_doing_using_command last' -d Search\ filter
-complete -c doing -l tag  -f -r -n '__fish_doing_using_command last' -d Tag\ filter
+complete -c doing -l search  -f -r -n '__fish_doing_using_command last' -d Filter\ entries\ using\ a\ search\ query
+complete -c doing -l tag  -f -r -n '__fish_doing_using_command last' -d Filter\ entries\ by\ tag
 complete -c doing -l template  -f -r -n '__fish_doing_using_command last' -d Override\ output\ format\ with\ a\ template\ string\ containing\ \%placeholders
 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 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\ /opt/homebrew/bin/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
+complete -c doing -l bool  -f -r -n '__fish_doing_using_command mark flag' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l count -s c -f -r -n '__fish_doing_using_command mark flag' -d How\ many\ recent\ entries\ to\ tag
 complete -c doing -l case  -f -r -n '__fish_doing_using_command mark flag' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l date -s d -f  -n '__fish_doing_using_command mark flag' -d Include\ current\ date/time\ with\ tag
 complete -c doing -l force  -f  -n '__fish_doing_using_command mark flag' -d Don\'t\ ask\ permission\ to\ flag\ all\ entries\ when\ count\ is\ 0
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command mark flag' -d Select\ item\(s\)\ to\ flag\ from\ a\ menu\ of\ matching\ entries
-complete -c doing -l not  -f  -n '__fish_doing_using_command mark flag' -d Flag\ items\ that\ \*don\'t\*\ match\ search/tag/date\ filters
+complete -c doing -l not  -f  -n '__fish_doing_using_command mark flag' -d Flag\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
 complete -c doing -l remove -s r -f  -n '__fish_doing_using_command mark flag' -d Remove\ flag
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command mark flag' -d Section
-complete -c doing -l search  -f -r -n '__fish_doing_using_command mark flag' -d Flag\ the\ last\ entry\ matching\ search\ filter
-complete -c doing -l tag  -f -r -n '__fish_doing_using_command mark flag' -d Flag\ the\ last\ entry\ containing\ TAG
+complete -c doing -l search  -f -r -n '__fish_doing_using_command mark flag' -d Filter\ entries\ using\ a\ search\ query
+complete -c doing -l tag  -f -r -n '__fish_doing_using_command mark flag' -d Filter\ entries\ by\ tag
 complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command mark flag' -d Flag\ last\ entry
 complete -c doing -l val  -f -r -n '__fish_doing_using_command mark flag' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command mark flag' -d Force\ exact\ search\ string\ matching
+complete -c doing -l noauto -s X -f  -n '__fish_doing_using_command meanwhile' -d Exclude\ auto\ tags\ and\ default\ tags
 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 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\ /opt/homebrew/bin/vim
-complete -c doing -l note -s n -f -r -n '__fish_doing_using_command meanwhile' -d Note
+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 Include\ a\ note
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command meanwhile' -d Section
 complete -c doing -l ask  -f  -n '__fish_doing_using_command note' -d Prompt\ for\ note\ via\ multi-line\ input
-complete -c doing -l bool  -f -r -n '__fish_doing_using_command note' -d Boolean
+complete -c doing -l bool  -f -r -n '__fish_doing_using_command note' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l case  -f -r -n '__fish_doing_using_command note' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
-complete -c doing -l editor -s e -f  -n '__fish_doing_using_command note' -d Edit\ entry\ with\ /opt/homebrew/bin/vim
+complete -c doing -l editor -s e -f  -n '__fish_doing_using_command note' -d Edit\ entry\ with\ vim
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command note' -d Select\ item\ for\ new\ note\ from\ a\ menu\ of\ matching\ entries
-complete -c doing -l not  -f  -n '__fish_doing_using_command note' -d Add\ note\ to\ item\ that\ \*doesn\'t\*\ match\ search/tag\ filters
+complete -c doing -l not  -f  -n '__fish_doing_using_command note' -d Note\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
 complete -c doing -l remove -s r -f  -n '__fish_doing_using_command note' -d Replace/Remove\ last\ entry\'s\ note
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command note' -d Section
-complete -c doing -l search  -f -r -n '__fish_doing_using_command note' -d Add/remove\ note\ from\ last\ entry\ matching\ search\ filter
-complete -c doing -l tag  -f -r -n '__fish_doing_using_command note' -d Add/remove\ note\ from\ last\ entry\ matching\ tag
+complete -c doing -l search  -f -r -n '__fish_doing_using_command note' -d Filter\ entries\ using\ a\ search\ query
+complete -c doing -l tag  -f -r -n '__fish_doing_using_command note' -d Filter\ entries\ by\ tag
 complete -c doing -l val  -f -r -n '__fish_doing_using_command note' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command note' -d Force\ exact\ search\ string\ matching
+complete -c doing -l noauto -s X -f  -n '__fish_doing_using_command now next' -d Exclude\ auto\ tags\ and\ default\ tags
 complete -c doing -l ask  -f  -n '__fish_doing_using_command now next' -d Prompt\ for\ note\ via\ multi-line\ input
-complete -c doing -l started  -f -r -n '__fish_doing_using_command now next' -d Backdate\ start\ time\ \[4pm\|20m\|2h\|\"yesterday\ noon\"\]
-complete -c doing -l editor -s e -f  -n '__fish_doing_using_command now next' -d Edit\ entry\ with\ /opt/homebrew/bin/vim
+complete -c doing -l started  -f -r -n '__fish_doing_using_command now next' -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 now next' -d Edit\ entry\ with\ vim
 complete -c doing -l finish_last -s f -f  -n '__fish_doing_using_command now next' -d Timed\ entry
 complete -c doing -l from  -f -r -n '__fish_doing_using_command now next' -d Set\ a\ start\ and\ optionally\ end\ time\ as\ a\ date\ range
 complete -c doing -l note -s n -f -r -n '__fish_doing_using_command now next' -d Include\ a\ note
@@ -371,31 +379,33 @@ complete -c doing -l times -s t -f  -n '__fish_doing_using_command recent' -d Sh
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command recent' -d Sort\ tags\ by
 complete -c doing -l template  -f -r -n '__fish_doing_using_command recent' -d Override\ output\ format\ with\ a\ template\ string\ containing\ \%placeholders
 complete -c doing -l totals  -f  -n '__fish_doing_using_command recent' -d Show\ intervals\ with\ totals\ at\ the\ end\ of\ output
-complete -c doing -l bool  -f -r -n '__fish_doing_using_command reset begin' -d Boolean
+complete -c doing -l file -s f -f -r -n '__fish_doing_using_command redo' -d Specify\ alternate\ doing\ file
+complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command redo' -d Select\ from\ an\ interactive\ menu
+complete -c doing -l bool  -f -r -n '__fish_doing_using_command reset begin' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l case  -f -r -n '__fish_doing_using_command reset begin' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command reset begin' -d Select\ from\ a\ menu\ of\ matching\ entries
 complete -c doing -l not  -f  -n '__fish_doing_using_command reset begin' -d Reset\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
 complete -c doing -l resume -s r -f  -n '__fish_doing_using_command reset begin' -d Resume\ entry
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command reset begin' -d Limit\ search\ to\ section
-complete -c doing -l search  -f -r -n '__fish_doing_using_command reset begin' -d Reset\ last\ entry\ matching\ search\ filter
-complete -c doing -l tag  -f -r -n '__fish_doing_using_command reset begin' -d Reset\ last\ entry\ matching\ tag
+complete -c doing -l search  -f -r -n '__fish_doing_using_command reset begin' -d Filter\ entries\ using\ a\ search\ query
+complete -c doing -l tag  -f -r -n '__fish_doing_using_command reset begin' -d Filter\ entries\ by\ tag
 complete -c doing -l val  -f -r -n '__fish_doing_using_command reset begin' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command reset begin' -d Force\ exact\ search\ string\ matching
 complete -c doing -l before  -f -r -n '__fish_doing_using_command rotate' -d Rotate\ entries\ older\ than\ date
-complete -c doing -l bool  -f -r -n '__fish_doing_using_command rotate' -d Tag\ boolean
+complete -c doing -l bool  -f -r -n '__fish_doing_using_command rotate' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l case  -f -r -n '__fish_doing_using_command rotate' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l keep -s k -f -r -n '__fish_doing_using_command rotate' -d How\ many\ items\ to\ keep\ in\ each\ section
-complete -c doing -l not  -f  -n '__fish_doing_using_command rotate' -d Rotate\ items\ that\ \*don\'t\*\ match\ search\ string\ or\ tag\ filter
+complete -c doing -l not  -f  -n '__fish_doing_using_command rotate' -d Rotate\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command rotate' -d Section\ to\ rotate
-complete -c doing -l search  -f -r -n '__fish_doing_using_command rotate' -d Search\ filter
-complete -c doing -l tag  -f -r -n '__fish_doing_using_command rotate' -d Tag\ filter
+complete -c doing -l search  -f -r -n '__fish_doing_using_command rotate' -d Filter\ entries\ using\ a\ search\ query
+complete -c doing -l tag  -f -r -n '__fish_doing_using_command rotate' -d Filter\ entries\ by\ tag
 complete -c doing -l val  -f -r -n '__fish_doing_using_command rotate' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command rotate' -d Force\ exact\ search\ string\ matching
 complete -c doing -l column -s c -f  -n '__fish_doing_using_command sections' -d List\ in\ single\ column
 complete -c doing -l archive -s a -f  -n '__fish_doing_using_command select' -d Archive\ selected\ items
-complete -c doing -l after  -f -r -n '__fish_doing_using_command select' -d Select\ from\ entries\ newer\ than\ date
+complete -c doing -l after  -f -r -n '__fish_doing_using_command select' -d Select\ entries\ newer\ than\ date
 complete -c doing -l resume  -f  -n '__fish_doing_using_command select' -d Copy\ selection\ as\ a\ new\ entry\ with\ current\ time\ and\ no\ @done\ tag
-complete -c doing -l before  -f -r -n '__fish_doing_using_command select' -d Select\ from\ entries\ older\ than\ date
+complete -c doing -l before  -f -r -n '__fish_doing_using_command select' -d Select\ entries\ older\ than\ date
 complete -c doing -l cancel -s c -f  -n '__fish_doing_using_command select' -d Cancel\ selected\ items
 complete -c doing -l case  -f -r -n '__fish_doing_using_command select' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l delete -s d -f  -n '__fish_doing_using_command select' -d Delete\ selected\ items
@@ -403,7 +413,7 @@ complete -c doing -l editor -s e -f  -n '__fish_doing_using_command select' -d E
 complete -c doing -l finish -s f -f  -n '__fish_doing_using_command select' -d Add\ @done\ with\ current\ time\ to\ selected\ item\(s\)
 complete -c doing -l flag  -f  -n '__fish_doing_using_command select' -d Add\ flag\ to\ selected\ item\(s\)
 complete -c doing -l force  -f  -n '__fish_doing_using_command select' -d Perform\ action\ without\ confirmation
-complete -c doing -l from  -f -r -n '__fish_doing_using_command select' -d Date\ range\ to\ show
+complete -c doing -l from  -f -r -n '__fish_doing_using_command select' -d Date\ range
 complete -c doing -l move -s m -f -r -n '__fish_doing_using_command select' -d Move\ selected\ items\ to\ section
 complete -c doing -l menu  -f  -n '__fish_doing_using_command select' -d Use\ --no-menu\ to\ skip\ the\ interactive\ menu
 complete -c doing -l not  -f  -n '__fish_doing_using_command select' -d Select\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
@@ -412,29 +422,29 @@ complete -c doing -l query -s q -f -r -n '__fish_doing_using_command select' -d
 complete -c doing -l remove -s r -f  -n '__fish_doing_using_command select' -d Reverse\ -c
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command select' -d Select\ from\ a\ specific\ section
 complete -c doing -l save_to  -f -r -n '__fish_doing_using_command select' -d Save\ selected\ entries\ to\ file\ using\ --output\ format
-complete -c doing -l search  -f -r -n '__fish_doing_using_command select' -d Select\ from\ entries\ matching\ search\ filter
+complete -c doing -l search  -f -r -n '__fish_doing_using_command select' -d Filter\ entries\ using\ a\ search\ query
 complete -c doing -l tag -s t -f -r -n '__fish_doing_using_command select' -d Tag\ selected\ entries
 complete -c doing -l val  -f -r -n '__fish_doing_using_command select' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command select' -d Force\ exact\ search\ string\ matching
 complete -c doing -l age -s a -f -r -n '__fish_doing_using_command show' -d Age
 complete -c doing -l after  -f -r -n '__fish_doing_using_command show' -d Show\ entries\ newer\ than\ date
-complete -c doing -l bool -s b -f -r -n '__fish_doing_using_command show' -d Tag\ boolean
 complete -c doing -l before  -f -r -n '__fish_doing_using_command show' -d Show\ entries\ older\ than\ date
+complete -c doing -l bool  -f -r -n '__fish_doing_using_command show' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l count -s c -f -r -n '__fish_doing_using_command show' -d Max\ count\ to\ show
 complete -c doing -l case  -f -r -n '__fish_doing_using_command show' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l config_template  -f -r -n '__fish_doing_using_command show' -d Output\ using\ a\ template\ from\ configuration
 complete -c doing -l duration  -f  -n '__fish_doing_using_command show' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
-complete -c doing -l from  -f -r -n '__fish_doing_using_command show' -d Date\ range\ to\ show
+complete -c doing -l from  -f -r -n '__fish_doing_using_command show' -d Date\ range
 complete -c doing -l hilite -s h -f  -n '__fish_doing_using_command show' -d Highlight\ search\ matches\ in\ output
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command show' -d Select\ from\ a\ menu\ of\ matching\ entries\ to\ perform\ additional\ operations
 complete -c doing -l menu -s m -f  -n '__fish_doing_using_command show' -d Select\ section\ or\ tag\ to\ display\ from\ a\ menu
-complete -c doing -l not  -f  -n '__fish_doing_using_command show' -d Show\ items\ that\ \*don\'t\*\ match\ search/tag/date\ filters
+complete -c doing -l not  -f  -n '__fish_doing_using_command show' -d Show\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command show' -d Output\ to\ export\ format
 complete -c doing -l only_timed  -f  -n '__fish_doing_using_command show' -d Only\ show\ items\ with\ recorded\ time\ intervals
 complete -c doing -l sort -s s -f -r -n '__fish_doing_using_command show' -d Sort\ order
-complete -c doing -l search  -f -r -n '__fish_doing_using_command show' -d Search\ filter
+complete -c doing -l search  -f -r -n '__fish_doing_using_command show' -d Filter\ entries\ using\ a\ search\ query
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command show' -d Show\ time\ intervals\ on\ @done\ tasks
-complete -c doing -l tag  -f -r -n '__fish_doing_using_command show' -d Tag\ filter
+complete -c doing -l tag  -f -r -n '__fish_doing_using_command show' -d Filter\ entries\ by\ tag
 complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command show' -d Tag\ sort\ direction
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command show' -d Sort\ tags\ by
 complete -c doing -l template  -f -r -n '__fish_doing_using_command show' -d Override\ output\ format\ with\ a\ template\ string\ containing\ \%placeholders
@@ -450,7 +460,7 @@ complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command since' -d So
 complete -c doing -l template  -f -r -n '__fish_doing_using_command since' -d Override\ output\ format\ with\ a\ template\ string\ containing\ \%placeholders
 complete -c doing -l totals  -f  -n '__fish_doing_using_command since' -d Show\ time\ totals\ at\ the\ end\ of\ output
 complete -c doing -l autotag -s a -f  -n '__fish_doing_using_command tag' -d Autotag\ entries\ based\ on\ autotag\ configuration\ in\ \~/
-complete -c doing -l bool  -f -r -n '__fish_doing_using_command tag' -d Boolean
+complete -c doing -l bool  -f -r -n '__fish_doing_using_command tag' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l count -s c -f -r -n '__fish_doing_using_command tag' -d How\ many\ recent\ entries\ to\ tag
 complete -c doing -l case  -f -r -n '__fish_doing_using_command tag' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l date -s d -f  -n '__fish_doing_using_command tag' -d Include\ current\ date/time\ with\ tag
@@ -461,8 +471,8 @@ complete -c doing -l remove -s r -f  -n '__fish_doing_using_command tag' -d Remo
 complete -c doing -l regex  -f  -n '__fish_doing_using_command tag' -d Interpret\ tag\ string\ as\ regular\ expression
 complete -c doing -l rename  -f -r -n '__fish_doing_using_command tag' -d Replace\ existing\ tag\ with\ tag\ argument
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command tag' -d Section
-complete -c doing -l search  -f -r -n '__fish_doing_using_command tag' -d Tag\ entries\ matching\ search\ filter
-complete -c doing -l tag  -f -r -n '__fish_doing_using_command tag' -d Tag\ the\ last\ X\ entries\ containing\ TAG
+complete -c doing -l search  -f -r -n '__fish_doing_using_command tag' -d Filter\ entries\ using\ a\ search\ query
+complete -c doing -l tag  -f -r -n '__fish_doing_using_command tag' -d Filter\ entries\ by\ tag
 complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command tag' -d Tag\ last\ entry
 complete -c doing -l value -s v -f -r -n '__fish_doing_using_command tag' -d Include\ a\ value
 complete -c doing -l val  -f -r -n '__fish_doing_using_command tag' -d Perform\ a\ tag\ value\ query
@@ -473,12 +483,12 @@ complete -c doing -l counts -s c -f  -n '__fish_doing_using_command tags' -d Sho
 complete -c doing -l case  -f -r -n '__fish_doing_using_command tags' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command tags' -d Select\ items\ to\ scan\ from\ a\ menu\ of\ matching\ entries
 complete -c doing -l line -s l -f  -n '__fish_doing_using_command tags' -d Output\ in\ a\ single\ line\ with\ @\ symbols
-complete -c doing -l not  -f  -n '__fish_doing_using_command tags' -d Get\ tags\ from\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
+complete -c doing -l not  -f  -n '__fish_doing_using_command tags' -d Show\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
 complete -c doing -l order -s o -f -r -n '__fish_doing_using_command tags' -d Sort\ order
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command tags' -d Section
-complete -c doing -l search  -f -r -n '__fish_doing_using_command tags' -d Get\ tags\ for\ items\ matching\ search
+complete -c doing -l search  -f -r -n '__fish_doing_using_command tags' -d Filter\ entries\ using\ a\ search\ query
 complete -c doing -l sort  -f -r -n '__fish_doing_using_command tags' -d Sort\ by\ name\ or\ count
-complete -c doing -l tag  -f -r -n '__fish_doing_using_command tags' -d Get\ tags\ for\ entries\ matching\ tags
+complete -c doing -l tag  -f -r -n '__fish_doing_using_command tags' -d Filter\ entries\ by\ tag
 complete -c doing -l val  -f -r -n '__fish_doing_using_command tags' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command tags' -d Force\ exact\ search\ string\ matching
 complete -c doing -l column -s c -f  -n '__fish_doing_using_command template' -d List\ in\ single\ column\ for\ completion
@@ -500,24 +510,24 @@ complete -c doing -l file -s f -f -r -n '__fish_doing_using_command undo' -d Spe
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command undo' -d Select\ from\ recent\ backups
 complete -c doing -l prune -s p -f -r -n '__fish_doing_using_command undo' -d Remove\ old\ backups
 complete -c doing -l redo -s r -f  -n '__fish_doing_using_command undo' -d Redo\ last\ undo
-complete -c doing -l after  -f -r -n '__fish_doing_using_command view' -d View\ entries\ newer\ than\ date
+complete -c doing -l after  -f -r -n '__fish_doing_using_command view' -d Show\ entries\ newer\ than\ date
 complete -c doing -l age  -f -r -n '__fish_doing_using_command view' -d Age
-complete -c doing -l bool -s b -f -r -n '__fish_doing_using_command view' -d Tag\ boolean
-complete -c doing -l before  -f -r -n '__fish_doing_using_command view' -d View\ entries\ older\ than\ date
+complete -c doing -l before  -f -r -n '__fish_doing_using_command view' -d Show\ entries\ older\ than\ date
+complete -c doing -l bool  -f -r -n '__fish_doing_using_command view' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l count -s c -f -r -n '__fish_doing_using_command view' -d Count\ to\ display
 complete -c doing -l case  -f -r -n '__fish_doing_using_command view' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l color  -f  -n '__fish_doing_using_command view' -d Include\ colors\ in\ output
 complete -c doing -l duration  -f  -n '__fish_doing_using_command view' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
-complete -c doing -l from  -f -r -n '__fish_doing_using_command view' -d Date\ range\ to\ show
+complete -c doing -l from  -f -r -n '__fish_doing_using_command view' -d Date\ range
 complete -c doing -l hilite -s h -f  -n '__fish_doing_using_command view' -d Highlight\ search\ matches\ in\ output
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command view' -d Select\ from\ a\ menu\ of\ matching\ entries\ to\ perform\ additional\ operations
-complete -c doing -l not  -f  -n '__fish_doing_using_command view' -d Show\ items\ that\ \*don\'t\*\ match\ search\ string
+complete -c doing -l not  -f  -n '__fish_doing_using_command view' -d Show\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command view' -d Output\ to\ export\ format
 complete -c doing -l only_timed  -f  -n '__fish_doing_using_command view' -d Only\ show\ items\ with\ recorded\ time\ intervals
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command view' -d Section
-complete -c doing -l search  -f -r -n '__fish_doing_using_command view' -d Search\ filter
+complete -c doing -l search  -f -r -n '__fish_doing_using_command view' -d Filter\ entries\ using\ a\ search\ query
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command view' -d Show\ time\ intervals\ on\ @done\ tasks
-complete -c doing -l tag  -f -r -n '__fish_doing_using_command view' -d Tag\ filter
+complete -c doing -l tag  -f -r -n '__fish_doing_using_command view' -d Filter\ entries\ by\ tag
 complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command view' -d Tag\ sort\ direction
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command view' -d Sort\ tags\ by
 complete -c doing -l totals  -f  -n '__fish_doing_using_command view' -d Show\ intervals\ with\ totals\ at\ the\ end\ of\ output
@@ -546,7 +556,7 @@ complete -c doing -l template  -f -r -n '__fish_doing_using_command yesterday' -
 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_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 case -x -n '__fish_doing_using_command again resume archive move cancel changes changelog finish grep search import last mark flag note reset begin rotate select show show tag tags tags view' -a 'case-sensitive ignore smart'
 complete -f -c doing -l tag_sort -x -n '__fish_doing_using_command grep search on recent show since today view yesterday' -a 'name time'
 complete -f -c doing -l tag_order -x -n '__fish_doing_using_command show view yesterday' -a 'asc desc'
 complete -f -c doing -s a -l age -x -n '__fish_doing_using_command show view' -a 'oldest newest'

data/lib/doing/array/array.rb ADDED Viewed

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+require_relative 'tags'
+require_relative 'nested_hash'

data/lib/doing/array/nested_hash.rb ADDED Viewed

@@ -0,0 +1,17 @@
+module Doing
+  ##
+  ## Array helpers
+  ##
+  class ::Array
+    ##
+    ## Convert array to nested hash, setting last key to value
+    ##
+    ## @param      value  The value to set
+    ##
+    def nested_hash(value = nil)
+      hsh = Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
+      hsh.dig(*self[0..-2])[fetch(-1)] = value
+      hsh
+    end
+  end
+end

data/lib/doing/{array.rb → array/tags.rb} RENAMED Viewed

@@ -6,15 +6,15 @@ module Doing
   ##
   class ::Array
     ##
-    ## Convert an @tags to plain strings
+    ## Convert an array of @tags to plain strings
     ##
     ## @return     [Array] array of strings
     ##
     def tags_to_array
-      map(&:remove_at)
+      map(&:remove_at).map(&:strip)
     end
-    # Convert strings to @tags
+    # Convert array of strings to array of @tags
     #
     # @return     [Array] Array of @tags
     #
@@ -25,21 +25,16 @@ module Doing
       map(&:add_at)
     end
-    def to_tags!
-      replace to_tags
-    end
     ##
     ## Hightlight @tags in string for console output
     ##
     ## @param      color  [String] the color to highlight
     ##                    with
     ##
-    ## @return     [String] string with @tags highlighted
+    ## @return     [Array] Array of highlighted @tags
     ##
     def highlight_tags(color = 'cyan')
-      tag_color = Doing::Color.send(color)
-      to_tags.map { |t| "#{tag_color}#{t}" }
+      to_tags.map { |t| Doing::Color.send(color.to_sym, t) }
     end
     ##
@@ -47,21 +42,8 @@ module Doing
     ##
     ## @return     [String] Highlighted tag array joined with comma
     ##
-    def log_tags
-      highlight_tags.join(', ')
-    end
-    ##
-    ## Convert array to nested hash, setting last key to value
-    ##
-    ## @param      value  The value to set
-    ##
-    def nested_hash(value)
-      raise StandardError, 'Value can not be nil' if value.nil?
-      hsh = Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
-      hsh.dig(*self[0..-2])[self.fetch(-1)] = value
-      hsh
+    def log_tags(color = 'cyan')
+      highlight_tags(color).join(', ')
     end
   end
 end

data/lib/doing/changelog/change.rb CHANGED Viewed

@@ -5,7 +5,7 @@ module Doing
   class Change
     attr_reader :version, :content
-    attr_accessor :entries
+    attr_accessor :entries, :change_date
     def initialize(version, content)
       @version = Version.new(version)
@@ -14,6 +14,9 @@ module Doing
     end
     def parse_entries
+      date = @content.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}$/)
+      @change_date = Time.parse(date[0]) if date
       @entries = []
       types = @content.scan(/(?<=\n|\A)#### (NEW|IMPROVED|FIXED)(.*?)(?=\n####|\Z)/m)
       types.each do |type|
@@ -28,7 +31,7 @@ module Doing
       matches = []
-      if search_string.is_rx?
+      if search_string.rx?
         matches = @entries.select { |e| e.string =~ search_string.to_rx(distance: 2, case_type: case_type) }
       else
         query = search_string.gsub(/(-)?--/, '\1]]').to_phrase_query
@@ -53,14 +56,9 @@ module Doing
       { version: @version, content: @content }
     end
-    def to_s
-      out = ["### #{@version}"]
-      items = {
-        new: [],
-        improved: [],
-        fixed: [],
-        other: []
-      }
+    def split_items
+      items = { new: [], improved: [], fixed: [], other: [] }
       @entries.each do |e|
         type = e.type.downcase.to_sym
         if items.key?(type)
@@ -70,7 +68,14 @@ module Doing
         end
       end
-      items.each do |type, members|
+      items
+    end
+    def to_s
+      date = @change_date.nil? ? '' : " _(#{@change_date.strftime('%F')})_"
+      out = ["### __#{@version}__#{date}"]
+      split_items.each do |type, members|
         if members.count.positive?
           out << "#### #{type.to_s.capitalize}"
           out << members.map(&:to_s).join("\n")
@@ -80,6 +85,16 @@ module Doing
       out.join("\n\n")
     end
+    def changes_only
+      out = []
+      split_items.each do |_, members|
+        out << members.map(&:to_s).join("\n")
+      end
+      out.join("\n")
+    end
     private
     def all_searches?(text, searches)