doing 2.1.26 → 2.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89acdccf306ca4dc321dc892e5fea91070b002a16f37672791d8d62db2adc640
-  data.tar.gz: 3380e462bf2744a887192282ea1adfadefec985140aa0a701fd3f60bddc9f8db
+  metadata.gz: b897cc1d14bff24b026ccfe6e66861da45d5cab9b842e896c108a80569945790
+  data.tar.gz: c90c0ce2ef63b3b6ae0fdf7b8980640b7e4802bef6d9325c95375b7cddc830db
 SHA512:
-  metadata.gz: 0ba19a752642d7c974ce5c2c209571f81001453b30c8c4062cac25cb985919bcb0c0e42fbd3cf157e5a40db809f521e96dbdde949725347b33f5b237080ef8d2
-  data.tar.gz: b446437bc24b5476a052d6370d793828a63f88bf0b04af21e869ccc16c146cbdb88a53220f732471c7a1646e77ca8763c295ee255fe6e2aaaf064213700cacdb
+  metadata.gz: 7d895dd6fe2b1c21718f5d627fd7cc6b9d278f318a4cf456d15cd34562a81814048dd3fd570955fdbb9e5ac818b87b6093621e5c9c1c0827c3247d7c14827021
+  data.tar.gz: 41c1438c813c34e475ef69f28efa73473e4fbebff63839264000218d60a2e4feca67e37c981eba87840cce43a51bc269e40b84940107c4ba111cc3cb22deda3d

data/.yardoc/checksums

@@ -1,34 +1,29 @@
-lib/doing/good.rb de4a18a87ac6d316037750944f91f0a3739adafc
+lib/doing/good.rb afeaffc5f1931b2892aa611125da461178ca1def
 lib/doing/hash.rb 321c27f54f332260c6adced7e451016b79574d38
-lib/doing/item.rb 8aec1775784e73fd7181efca4482dac94d466619
+lib/doing/item.rb b5c5cc0d1543b678ee2c4bc10d381e555e318b82
 lib/doing/note.rb bbadd9e34e6dc43a2af1110a5107f46c39d2547f
 lib/doing/time.rb 60183c3c31532ffea1440c766de0f90042e0fd10
-lib/doing/util.rb 183577d0d9dee966dcf65645b312b17b958e46d6
-lib/doing/wwid.rb 1410410c6072cc330baedea27e30a371ec7d3136
-lib/doing/array.rb b50c4604cb685dff87bc16bc20f21a5956b2b396
+lib/doing/util.rb 3c5a795dce204584be149e9bbcf1d25f3368e901
+lib/doing/wwid.rb 5e6cd1fa0641a762e17a14c7e0fce09968dbe661
 lib/doing/hooks.rb 1b75ca731f9e8cb0b7a32785d6e496ee67a70d5c
-lib/doing/items.rb 69c762d337d9dad2b780cd08cc1c8785310e23ba
+lib/doing/items.rb dbda21422a06828f221fe462ff159d228b942044
 lib/doing/pager.rb 7f9d5551c8f5411c3d39b3d984ac7118f98f5da5
-lib/doing/types.rb df05c1282d5f6b8efda68c6f289499683a5cc7d1
-lib/doing/colors.rb b7239a69e10c5df9378a5843441af5b93c1872f8
+lib/doing/types.rb 6263b1871efa1e8f6053d3bce69ebf678d27324e
+lib/doing/colors.rb 8c2d1c8c7e99022d33f1548c5456a0f02d570c4f
 lib/doing/errors.rb af07e482a5389924edc2337749c81cda501098f0
-lib/doing/prompt.rb eaa388322b1c8190e50882638e70b58010376c8d
-lib/doing/string.rb 32fd00cfdfb01a664e194e70ffcad199cd217741
-lib/doing/symbol.rb 309799458a1bc715c2707307c9a62ab26086275e
-lib/doing/section.rb 206e119cf818f1e76798753e611180fe77bc299a
-lib/doing/version.rb a44860dcd8bbb820478d02ef0f8e2378db4a9b15
+lib/doing/prompt.rb 330b8e6e1e85f73b54f602a0aeac58b6b422fabb
+lib/doing/section.rb 48f200cf363a555b51d90d6477939cf3cf83f241
+lib/doing/version.rb bcf0f3a6ad0a8d30d33f1f3f218d59a88ae6a915
 lib/doing/changelog.rb f7d1bd424e63400ab0613ef3358e614fdf53e2b5
+lib/doing/normalize.rb b9925102db5f19cae0e524ffd1be979ab5bc1199
 lib/doing/cli_status.rb dbedd454c4cbbd0fed9ef30120f6ec85d18b9356
 lib/doing/completion.rb c658e7dc7898fb022a21b2bd77bedb958ca3b067
-lib/doing/log_adapter.rb 62ee66981878bd7285ccf0dfeca90a3d6d2af985
+lib/doing/log_adapter.rb 1bc8cab3af769a0caa0c64e8ce63c7860a628578
 lib/doing/util_backup.rb c13f71072581b1f0d2269853611ba09273261bf9
-lib/doing/configuration.rb 30c3d9ada7d8e538fcdf725318845ad5310facf6
+lib/doing/configuration.rb 649c0dbe9b3d661e1004a2367ec74fdc673c2e69
 lib/doing/phrase_parser.rb 8f1789d7cf8326d8cc231b4a21505a93f8de20d2
-lib/doing/array_chronify.rb b39b40268b1751b18acf6bae4e53885818e45f62
 lib/doing/plugin_manager.rb cb16a82c3182ef7008359670ab96ff6b39270ccc
-lib/doing/string_chronify.rb 888afa2175f3bb6cac0d68e3cb0f27cf162bb1bf
-lib/doing/template_string.rb 3b35970f2a68112192d2bb97c1298b90cf717b3d
-lib/doing/numeric_chronify.rb bedeff62a95f8a8ff116e1bf0cc1d9eb2707a900
-lib/doing/help_monkey_patch.rb 6aa514c249e519db507ae528de2604c18cc36045
+lib/doing/template_string.rb 5d7c7ac9bdf0d44bc32a0442b2fdd243bd1eee24
+lib/doing/help_monkey_patch.rb bd234939e797f2578c1155985383ef4a279d4d46
 lib/doing/boolean_term_parser.rb 075977892ac5c6e3435cb8877d8b8b68eb1962e3
 lib/doing/markdown_document_listener.rb 45485f225068a34951ec818a345f642323e5ba35

data/CHANGELOG.md

@@ -1,3 +1,55 @@
+### 2.1.30
+
+2022-02-16 07:18
+
+#### IMPROVED
+
+- `doing changes` does a better job of parsing a lookup string like '>= 2.1.10 < 2.1.15'
+
+#### FIXED
+
+- System agnostic platform detection, so commands that check for Darwin won't error out on other systems
+- `doing completions` debugging code
+
+### 2.1.29
+
+2022-02-14 12:42
+
+#### IMPROVED
+
+- `doing changes --interactive` will load up a changelog viewer using fzf. Because it makes me happy, that's why.
+
+### 2.1.28
+
+2022-02-14 11:39
+
+#### FIXED
+
+- Lines merging in `doing changes --changes` output
+
+### 2.1.27
+
+2022-02-14 06:04
+
+#### NEW
+
+- `doing finish --update` will overwrite any existing @done tag with a new date (current time or set with `--at` or `--back`)
+
+#### IMPROVED
+
+- Code refactoring and cleanup
+- Include release dates in `doing changes` output when available
+- Allow various naming conventions for %color strings in templates. Now `boldwhite`, `brightwhite`, `bg_bold_cyan`, and `bold_bg_cyan` all work (for example)
+- Common flags (e.g. --search, --tag) found on multiple commands consolidated and help descriptions matched
+- `commands_accepting` now accepts multiple arguments and a `--bool` flag
+- `changes` command can now output changes only (no version numbers) and defaults to raw Markdown if not a TTY or the `--md` flag is used
+- `doing archive` now accepts `--after` and `--from` date filters
+
+#### FIXED
+
+- Some flag descriptions in help
+- Editor detection
+
 ### 2.1.26
 
 2022-01-23 16:14

data/Dockerfile

@@ -1,9 +1,9 @@
 FROM ruby:3.0.1
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN mkdir /doing
 WORKDIR /doing
-COPY ./ /doing/
+# COPY ./ /doing/
 RUN gem install bundler:2.2.17
-# RUN bundle update --bundler
-RUN bundle install
-CMD ["rake", "parallel:test"]
+RUN apt-get update -y
+RUN apt-get install -y less
+CMD ["scripts/runtests.sh"]

data/Dockerfile-2.6

@@ -1,9 +1,9 @@
 FROM ruby:2.6
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN mkdir /doing
 WORKDIR /doing
-COPY ./ /doing/
+# COPY ./ /doing/
 RUN gem install bundler:2.2.17
-# RUN bundle update --bundler
-RUN bundle install
-# ENTRYPOINT rake parallel:test
-CMD ["rake", "parallel:test"]
+RUN apt-get update -y
+RUN apt-get install -y less
+CMD ["scripts/runtests.sh"]

data/Dockerfile-2.7

@@ -1,8 +1,9 @@
 FROM ruby:2.7
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN mkdir /doing
 WORKDIR /doing
-COPY ./ /doing/
+# COPY ./ /doing/
 RUN gem install bundler:2.2.17
-# RUN bundle update --bundler
-RUN bundle install
-CMD ["rake", "parallel:test"]
+RUN apt-get update -y
+RUN apt-get install -y less
+CMD ["scripts/runtests.sh"]

data/Dockerfile-3.0

@@ -1,8 +1,9 @@
 FROM ruby:3.0.0
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN mkdir /doing
 WORKDIR /doing
-COPY ./ /doing/
+# COPY ./ /doing/
 RUN gem install bundler:2.2.17
-# RUN bundle update --bundler
-RUN bundle install
-CMD ["rake", "parallel:test"]
+RUN apt-get update -y
+RUN apt-get install -y less
+CMD ["scripts/runtests.sh"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.1.26)
+    doing (2.1.30)
       chronic (~> 0.10, >= 0.10.2)
       deep_merge (~> 1.2, >= 1.2.1)
       gli (~> 2.20, >= 2.20.1)
@@ -9,6 +9,7 @@ PATH
       parslet (~> 2.0, >= 2.0.0)
       plist (~> 3.6, >= 3.6.0)
       safe_yaml (~> 1.0)
+      sys-uname (~> 1.2, >= 1.2.2)
       tty-link (~> 0.1, >= 0.1.1)
       tty-markdown (~> 0.7, >= 0.7.0)
       tty-progressbar (~> 0.18, >= 0.18.2)

data/README.md

@@ -8,7 +8,7 @@ _If you're one of the rare people like me who find this useful, feel free to
 
 <!--README-->
 
-The current version of `doing` is <!--VER-->2.1.25<!--END VER-->.
+The current version of `doing` is <!--VER-->2.1.29<!--END VER-->.
 
 Find all of the documentation in the [doing wiki][wiki].
 

data/Rakefile

@@ -77,15 +77,14 @@ task :dockertest, :version, :login do |_, args|
     file = 'Dockerfile'
   end
 
-
   puts `docker build . --file #{file} -t #{img}`
 
-  exec "docker run -it #{img} /bin/bash -l" if args[:login]
+  exec "docker run -v #{File.dirname(__FILE__)}:/doing -it #{img} /bin/bash -l" if args[:login]
 
   spinner = TTY::Spinner.new('[:spinner] Running tests ...', hide_cursor: true)
 
   spinner.auto_spin
-  res = `docker run --rm -it #{img}`
+  res = `docker run --rm -v #{File.dirname(__FILE__)}:/doing -it #{img}`
   # commit = puts `bash -c "docker commit $(docker ps -a|grep #{img}|awk '{print $1}'|head -n 1) #{img}"`.strip
   spinner.success
   spinner.stop

data/bin/commands/add_section.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @@add_section
 desc 'Add a new section to the "doing" file'
 arg_name 'SECTION_NAME'

data/bin/commands/again.rb

@@ -1,11 +1,18 @@
+# frozen_string_literal: true
+
 # @@again @@resume
 desc 'Repeat last entry as new entry'
-long_desc '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'
+long_desc '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'
 command %i[again resume] do |c|
-  c.example 'doing resume', desc: 'Duplicate the most recent entry with a new start time, removing any @done tag'
-  c.example 'doing again', desc: 'again is an alias for resume'
-  c.example 'doing resume --editor', desc: 'Repeat the last entry, opening the new entry in the default editor'
-  c.example 'doing resume --tag project1 --in Projects', desc: 'Repeat the last entry tagged @project1, creating the new entry in the Projects section'
+  c.example 'doing resume',
+            desc: 'Duplicate the most recent entry with a new start time, removing any @done tag'
+  c.example 'doing again',
+            desc: 'again is an alias for resume'
+  c.example 'doing resume --editor',
+            desc: 'Repeat the last entry, opening the new entry in the default editor'
+  c.example 'doing resume --tag project1 --in Projects',
+            desc: 'Repeat the last entry tagged @project1, creating the new entry in the Projects section'
   c.example 'doing resume --interactive', desc: 'Select the entry to repeat from a menu'
 
   c.desc 'Get last entry from a specific section'
@@ -16,84 +23,35 @@ command %i[again resume] do |c|
   c.arg_name 'SECTION_NAME'
   c.flag [:in]
 
-  c.desc 'Backdate start date by interval or set to time [4pm|20m|2h|"yesterday noon"]'
-  c.arg_name 'DATE_STRING'
-  c.flag %i[b back started], type: DateBeginString
-
-  c.desc 'Repeat last entry matching tags. Combine multiple tags with a comma. Wildcards allowed (*, ?)'
-  c.arg_name 'TAG'
-  c.flag [:tag], type: TagArray
-
-  c.desc 'Repeat last entry matching search. Surround with
-  slashes for regex (e.g. "/query/"), start with a single quote for exact match ("\'query").'
-  c.arg_name 'QUERY'
-  c.flag [:search]
-
-  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
-  c.arg_name 'QUERY'
-  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
-
-  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
-  # c.switch [:fuzzy], default_value: false, negatable: false
-
-  c.desc 'Force exact search string matching (case sensitive)'
-  c.switch %i[x exact], default_value: @config.exact_match?, negatable: @config.exact_match?
-
-  c.desc 'Resume items that *don\'t* match search/tag filters'
-  c.switch [:not], default_value: false, negatable: false
-
-  c.desc 'Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]'
-  c.arg_name 'TYPE'
-  c.flag [:case], must_match: /^[csi]/, default_value: @settings.dig('search', 'case')
-
-  c.desc 'Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans'
-  c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
-
-  c.desc "Edit duplicated entry with #{Doing::Util.default_editor} before adding"
-  c.switch %i[e editor], negatable: false, default_value: false
-
-  c.desc 'Add a note'
-  c.arg_name 'TEXT'
-  c.flag %i[n note]
-
-  c.desc 'Prompt for note via multi-line input'
-  c.switch %i[ask], negatable: false, default_value: false
-
   c.desc 'Select item to resume from a menu of matching entries'
   c.switch %i[i interactive], negatable: false, default_value: false
 
+  add_options(:add_entry, c)
+  add_options(:search, c)
+  add_options(:tag_filter, c)
+
   c.action do |_global_options, options, _args|
     options[:fuzzy] = false
-    tags = options[:tag].nil? ? [] : options[:tag]
-
-    options[:case] = options[:case].normalize_case
 
     if options[:search]
-      search = options[:search]
-      search.sub!(/^'?/, "'") if options[:exact]
-      options[:search] = search
+      options[:search] = options[:exact] ? options[:search].sub(/^'?/, "'") : options[:search]
     end
 
     if options[:back]
-      date = options[:back]
+      options[:date] = options[:back]
       raise InvalidTimeExpression, 'Unable to parse date string for --back' if date.nil?
+
     else
-      date = Time.now
+      options[:date] = Time.now
     end
 
     note = Doing::Note.new(options[:note])
     note.add(Doing::Prompt.read_lines(prompt: 'Add a note')) if options[:ask]
 
     options[:note] = note
+    options[:tag] ||= []
+    options[:tag_bool] = options[:bool]
 
-    opts = options.clone
-
-    opts[:tag] = tags
-    opts[:tag_bool] = options[:bool].normalize_bool
-    opts[:interactive] = options[:interactive]
-    opts[:date] = date
-
-    @wwid.repeat_last(opts)
+    @wwid.repeat_last(options)
   end
 end

data/bin/commands/archive.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @@archive @@move
 desc 'Move entries between sections'
 long_desc %(Argument can be a section name to move all entries from a section,
@@ -10,7 +12,8 @@ command %i[archive move] do |c|
   c.example 'doing archive Currently', desc: 'Move all entries in the Currently section to Archive section'
   c.example 'doing archive @done', desc: 'Move all entries tagged @done to Archive'
   c.example 'doing archive --to Later @project1', desc: 'Move all entries tagged @project1 to Later section'
-  c.example 'doing move Later --tag project1 --to Currently', desc: 'Move entries in Later tagged @project1 to Currently (move is an alias for archive)'
+  c.example 'doing move Later --tag project1 --to Currently',
+            desc: 'Move entries in Later tagged @project1 to Currently (move is an alias for archive)'
 
   c.desc 'How many items to keep (ignored if archiving by tag or search)'
   c.arg_name 'X'
@@ -23,74 +26,30 @@ command %i[archive move] do |c|
   c.desc 'Label moved items with @from(SECTION_NAME)'
   c.switch [:label], default_value: true, negatable: true
 
-  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?). Added for compatibility with other commands'
-  c.arg_name 'TAG'
-  c.flag [:tag], type: TagArray
-
-  c.desc 'Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans'
-  c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
-
-  c.desc 'Search filter'
-  c.arg_name 'QUERY'
-  c.flag [:search]
-
-  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
-  c.arg_name 'QUERY'
-  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
-
-  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
-  # c.switch [:fuzzy], default_value: false, negatable: false
-
-  c.desc 'Force exact search string matching (case sensitive)'
-  c.switch %i[x exact], default_value: @config.exact_match?, negatable: @config.exact_match?
-
-  c.desc 'Show items that *don\'t* match search string'
-  c.switch [:not], default_value: false, negatable: false
-
-  c.desc 'Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]'
-  c.arg_name 'TYPE'
-  c.flag [:case], must_match: /^[csi]/, default_value: @settings.dig('search', 'case')
-
-  c.desc 'Archive entries older than date
-    (Flexible date format, e.g. 1/27/2021, 2020-07-19, or Monday 3pm)'
-  c.arg_name 'DATE_STRING'
-  c.flag [:before], type: DateEndString
+  add_options(:search, c)
+  add_options(:tag_filter, c)
+  add_options(:date_filter, c)
 
   c.action do |_global_options, options, args|
     options[:fuzzy] = false
-    if args.empty?
-      section = @settings['current_section']
-      tags = []
-    elsif args[0] =~ /^all/i
-      section = 'all'
-    elsif args[0] =~ /^@\S+/
-      section = 'all'
-      tags = args.map { |t| t.sub(/^@/, '').strip }
-    else
-      section = args[0].cap_first
-      tags = args.length > 1 ? args[1..].map { |t| t.sub(/^@/, '').strip } : []
-    end
+    section, tags = if args.empty?
+                      [@settings['current_section'], []]
+                    elsif args[0] =~ /^all/i
+                      ['all', []]
+                    elsif args[0] =~ /^@\S+/
+                      ['all', args.tags_to_array]
+                    else
+                      [args.shift.cap_first, args.tags_to_array]
+                    end
 
     raise InvalidArgument, '--keep and --count can not be used together' if options[:keep] && options[:count]
 
     tags.concat(options[:tag]) if options[:tag]
 
-    search = nil
-
-    options[:case] = options[:case].normalize_case
-
-    if options[:search]
-      search = options[:search]
-      search.sub!(/^'?/, "'") if options[:exact]
-    end
-
-    opts = options.clone
-    opts[:search] = search
-    opts[:bool] = options[:bool].normalize_bool
-    opts[:destination] = options[:to]
-    opts[:tags] = tags
+    options[:search] = options[:search].sub(/^'?/, "'") if options[:search] && options[:exact]
+    options[:destination] = options[:to]
+    options[:tags] = tags
 
-    @wwid.archive(section, opts)
+    @wwid.archive(section, options)
   end
 end

data/bin/commands/cancel.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 # @@cancel
 desc 'End last X entries with no time tracked'
-long_desc 'Adds @done tag without datestamp so no elapsed time is recorded. Alias for `doing finish --no-date`'
+long_desc 'Adds @done tag without datestamp so no elapsed time is recorded.
+           Alias for `doing finish --no-date`'
 arg_name 'COUNT'
 command :cancel do |c|
   c.example 'doing cancel', desc: 'Cancel the last entry'
@@ -13,90 +16,45 @@ command :cancel do |c|
   c.arg_name 'NAME'
   c.flag %i[s section]
 
-  c.desc 'Cancel the last X entries containing TAG. Separate multiple tags with comma (--tag=tag1,tag2). Wildcards allowed (*, ?)'
-  c.arg_name 'TAG'
-  c.flag [:tag], type: TagArray
-
-  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans'
-  c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
-
-  c.desc 'Cancel the last X entries matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("\'query")'
-  c.arg_name 'QUERY'
-  c.flag [:search]
-
-  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
-  c.arg_name 'QUERY'
-  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
-
-  # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
-  # c.switch [:fuzzy], default_value: false, negatable: false
-
-  c.desc 'Force exact search string matching (case sensitive)'
-  c.switch %i[x exact], default_value: @config.exact_match?, negatable: @config.exact_match?
-
-  c.desc 'Finish items that *don\'t* match search/tag filters'
-  c.switch [:not], default_value: false, negatable: false
-
-  c.desc 'Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]'
-  c.arg_name 'TYPE'
-  c.flag [:case], must_match: /^[csi]/, default_value: @settings.dig('search', 'case')
-
   c.desc 'Cancel last entry (or entries) not already marked @done'
   c.switch %i[u unfinished], negatable: false, default_value: false
 
   c.desc 'Select item(s) to cancel from a menu of matching entries'
   c.switch %i[i interactive], negatable: false, default_value: false
 
+  add_options(:search, c)
+  add_options(:tag_filter, c)
+
   c.action do |_global_options, options, args|
     options[:fuzzy] = false
-    if options[:section]
-      section = @wwid.guess_section(options[:section]) || options[:section].cap_first
-    else
-      section = @settings['current_section']
-    end
-
-    if options[:tag].nil?
-      tags = []
-    else
-      tags = options[:tag]
-    end
+    options[:section] = if options[:section]
+                          @wwid.guess_section(options[:section]) || options[:section].cap_first
+                        else
+                          @settings['current_section']
+                        end
 
     raise InvalidArgument, 'Only one argument allowed' if args.length > 1
 
-    raise InvalidArgument, 'Invalid argument (specify number of recent items to mark @done)' unless args.empty? || args[0] =~ /\d+/
+    unless args.empty? || args[0] =~ /\d+/
+      raise InvalidArgument, 'Invalid argument (specify number of recent items to mark @done)'
 
-    if options[:interactive]
-      count = 0
-    else
-      count = args[0] ? args[0].to_i : 1
     end
 
-    search = nil
+    options[:count] = if options[:interactive]
+                        0
+                      else
+                        args[0] ? args[0].to_i : 1
+                      end
 
-    if options[:search]
-      search = options[:search]
-      search.sub!(/^'?/, "'") if options[:exact]
-    end
+    options[:search] = options[:search].sub(/^'?/, "'") if options[:search] && options[:exact]
 
-    opts = {
-      archive: options[:archive],
-      case: options[:case].normalize_case,
-      count: count,
-      date: false,
-      fuzzy: options[:fuzzy],
-      interactive: options[:interactive],
-      not: options[:not],
-      search: search,
-      section: section,
-      sequential: false,
-      tag: tags,
-      tag_bool: options[:bool].normalize_bool,
-      tags: ['done'],
-      unfinished: options[:unfinished],
-      val: options[:val]
-    }
+    options[:case] = options[:case].normalize_case
+    options[:date] = false
+    options[:sequential] = false
+    options[:tag] ||= []
+    options[:tag_bool] = options[:bool].normalize_bool
+    options[:tags] = ['done']
 
-    @wwid.tag_last(opts)
+    @wwid.tag_last(options)
   end
 end