doing 2.1.26 → 2.1.27

data/bin/commands/now.rb

@@ -20,13 +20,6 @@ command %i[now next] do |c|
   c.arg_name 'NAME'
   c.flag %i[s section]
 
-  c.desc "Edit entry with #{Doing::Util.default_editor}"
-  c.switch %i[e editor], negatable: false, default_value: false
-
-  c.desc 'Backdate start time [4pm|20m|2h|"yesterday noon"]'
-  c.arg_name 'DATE_STRING'
-  c.flag %i[b back started], type: DateBeginString
-
   c.desc %(
         Set a start and optionally end time as a date range ("from 1pm to 2:30pm").
         If an end time is provided, a dated @done tag will be added
@@ -37,19 +30,16 @@ command %i[now next] do |c|
   c.desc 'Timed entry, marks last entry in section as @done'
   c.switch %i[f finish_last], negatable: false, default_value: false
 
-  c.desc 'Include 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
+  add_options(:add_entry, c)
 
   # c.desc "Edit entry with specified app"
   # c.arg_name 'editor_app'
   # # c.flag [:a, :app]
 
   c.action do |_global_options, options, args|
-    raise InvalidArgument, "--back and --from cannot be used together" if options[:back] && options[:from]
+    @wwid.auto_tag = !options[:noauto]
+
+    raise InvalidArgument, '--back and --from cannot be used together' if options[:back] && options[:from]
 
     if options[:back]
       date = options[:back]
@@ -61,13 +51,17 @@ command %i[now next] do |c|
     end
     raise InvalidTimeExpression.new('unable to parse date string', topic: 'Parser:') if date.nil?
 
-    if options[:section]
-      section = @wwid.guess_section(options[:section]) || options[:section].cap_first
-    else
-      options[:section] = @settings['current_section']
-    end
-
-    ask_note = options[:ask] && !options[:editor] && args.count.positive? ? Doing::Prompt.read_lines(prompt: 'Add a note') : ''
+    section = if options[:section]
+                @wwid.guess_section(options[:section]) || options[:section].cap_first
+              else
+                @settings['current_section']
+              end
+
+    ask_note = if options[:ask] && !options[:editor] && args.count.positive?
+                 Doing::Prompt.read_lines(prompt: 'Add a note')
+               else
+                 ''
+               end
 
     if options[:editor]
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?

data/bin/commands/on.rb

@@ -23,10 +23,9 @@ command :on do |c|
   c.switch [:totals], default_value: false, negatable: false
 
   c.desc 'Sort tags by (name|time)'
-  default = 'time'
-  default = @settings['tag_sort'] || 'name'
+  default = @settings['tag_sort'].normalize_tag_sort || :name
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: REGEX_TAG_SORT, default_value: default, type: TagSortSymbol
 
   c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
   c.arg_name 'FORMAT'
@@ -58,7 +57,7 @@ command :on do |c|
     Doing.logger.debug('Interpreter:', message)
 
     options[:times] = true if options[:totals]
-    options[:sort_tags] = options[:tag_sort] =~ /^n/i
+    options[:sort_tags] = options[:tag_sort]
 
     Doing::Pager.page @wwid.list_date([start, finish], options[:section], options[:times], options[:output],
                         { template: options[:template], config_template: options[:config_template], duration: options[:duration], totals: options[:totals], sort_tags: options[:sort_tags] }).chomp

data/bin/commands/recent.rb

@@ -30,10 +30,9 @@ command :recent do |c|
   c.switch [:totals], default_value: false, negatable: false
 
   c.desc 'Sort tags by (name|time)'
-  default = 'time'
-  default = @settings['tag_sort'] || 'name'
+  default = @settings['tag_sort'].normalize_tag_sort || :name
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: REGEX_TAG_SORT, default_value: default, type: TagSortSymbol
 
   c.desc 'Select from a menu of matching entries to perform additional operations'
   c.switch %i[i interactive], negatable: false, default_value: false
@@ -55,7 +54,7 @@ command :recent do |c|
       end
 
       options[:times] = true if options[:totals]
-      options[:sort_tags] = options[:tag_sort] =~ /^n/i
+      options[:sort_tags] = options[:tag_sort]
 
       template = @settings['templates']['recent'].deep_merge(@settings['templates']['default'])
       tags_color = template.key?('tags_color') ? template['tags_color'] : nil

data/bin/commands/redo.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 # @@redo
-long_desc 'Shortcut for `doing undo -r`, reverses the last undo command. You cannot undo a redo'
+desc 'Redo an undo command'
+long_desc 'Shortcut for `doing undo -r`, reverses the last undo command. Specify a count to redo multiple undos'
 arg_name 'COUNT'
 command :redo do |c|
   c.desc 'Specify alternate doing file'
@@ -12,7 +15,8 @@ command :redo do |c|
   c.action do |_global, options, args|
     file = options[:file] || @wwid.doing_file
     count = args.empty? ? 1 : args[0].to_i
-    raise InvalidArgument, "Invalid count specified for redo" unless count&.positive?
+    raise InvalidArgument, 'Invalid count specified for redo' unless count&.positive?
+
     if options[:interactive]
       Doing::Util::Backup.select_redo(file)
     else

data/bin/commands/reset.rb

@@ -20,54 +20,24 @@ command %i[reset begin] do |c|
   c.desc 'Change start date but do not remove @done (shortcut for --no-resume)'
   c.switch [:n]
 
-  c.desc 'Reset last entry matching tag. Wildcards allowed (*, ?)'
-  c.arg_name 'TAG'
-  c.flag [:tag]
-
-  c.desc 'Reset last entry 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 'Reset 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 (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 'Select 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|
-    if args.count > 0
+    if args.count.positive?
       reset_date = args.join(' ').chronify(guess: :begin)
       raise InvalidArgument, 'Invalid date string' unless reset_date
+
     else
       reset_date = Time.now
     end
 
     options[:fuzzy] = false
-    if options[:section]
-      options[:section] = @wwid.guess_section(options[:section]) || options[:section].cap_first
-    end
 
-    options[:bool] = options[:bool].normalize_bool
-
-    options[:case] = options[:case].normalize_case
+    options[:section] = @wwid.guess_section(options[:section]) || options[:section].cap_first if options[:section]
 
     if options[:search]
       search = options[:search]
@@ -75,25 +45,22 @@ command %i[reset begin] do |c|
       options[:search] = search
     end
 
-
     items = @wwid.filter_items([], opt: options)
 
-    if options[:interactive]
-      last_entry = Doing::Prompt.choose_from_items(items, include_section: options[:section].nil?,
-        menu: true,
-        header: '',
-        prompt: 'Select an entry to start/reset > ',
-        multiple: false,
-        sort: false,
-        show_if_single: true)
-    else
-      last_entry = items.reverse.last
-    end
+    last_entry = if options[:interactive]
+                   Doing::Prompt.choose_from_items(items, include_section: options[:section].nil?,
+                                                          menu: true,
+                                                          header: '',
+                                                          prompt: 'Select an entry to start/reset > ',
+                                                          multiple: false,
+                                                          sort: false,
+                                                          show_if_single: true)
+                 else
+                   items.reverse.last
+                 end
 
-    unless last_entry
-      Doing.logger.warn('Not found:', 'No entry matching parameters was found.')
-      return
-    end
+
+    raise NoResults, 'No entry matching parameters was found.' unless last_entry
 
     old_item = last_entry.clone
 

data/bin/commands/rotate.rb

@@ -16,49 +16,18 @@ command :rotate do |c|
   c.arg_name 'SECTION_NAME'
   c.flag %i[s section], default_value: 'All'
 
-  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]
-
-  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 'Rotate items that *don\'t* match search string or tag filter'
-  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 'Rotate 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]
 
-  c.action do |_global_options, options, args|
-    options[:fuzzy] = false
-    if options[:section] && options[:section] !~ /^all$/i
-      options[:section] = @wwid.guess_section(options[:section])
-    end
+  add_options(:search, c)
+  add_options(:tag_filter, c)
 
-    options[:bool] = options[:bool].normalize_bool
+  c.action do |_global_options, options, _args|
+    options[:fuzzy] = false
 
-    options[:case] = options[:case].normalize_case
+    options[:section] = @wwid.guess_section(options[:section]) if options[:section] && options[:section] !~ /^all$/i
 
     search = nil
 

data/bin/commands/select.rb

@@ -14,9 +14,13 @@ sbtrkt  fuzzy-match   Items that match s*b*t*r*k*t
 
 !fire   inverse-exact-match   Items that do not include fire'
 command :select do |c|
-  c.example 'doing select', desc: 'Select from all entries. A menu of available actions will be presented after confirming the selection.'
-  c.example 'doing select --editor', desc: 'Select entries from a menu and batch edit them in your default editor'
-  c.example 'doing select --after "yesterday 12pm" --tag project1', desc: 'Display a menu of entries created after noon yesterday, add @project1 to selected entries'
+  c.example 'doing select',
+            desc: 'Select from all entries. A menu of actions will be presented after confirming the selection.'
+  c.example 'doing select --editor',
+            desc: 'Select entries from a menu and batch edit them in your default editor'
+  c.example 'doing select --after "yesterday 12pm" --tag project1',
+            desc: 'Display a menu of entries created after noon yesterday, add @project1 to selected entries'
+
   c.desc 'Select from a specific section'
   c.arg_name 'SECTION'
   c.flag %i[s section]
@@ -38,48 +42,21 @@ command :select do |c|
   c.arg_name 'SECTION'
   c.flag %i[m move]
 
-  c.desc 'Initial search query for filtering. Matching is fuzzy. For exact matching, start query with a single quote, e.g. `--query "\'search"'
+  c.desc 'Initial search query for filtering. Matching is fuzzy. For exact matching, start query with a single quote,
+          e.g. `--query "\'search"'
   c.arg_name 'QUERY'
   c.flag %i[q query]
 
-  c.desc 'Select from 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.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 'Select from entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
-  c.arg_name 'DATE_STRING'
-  c.flag [:before], type: DateBeginString
-
-  c.desc 'Select from entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
-  c.arg_name 'DATE_STRING'
-  c.flag [:after], type: DateEndString
-
-  c.desc %(
-      Date range to show, or a single day to filter date on.
-      Date range argument should be quoted. Date specifications can be natural language.
-      To specify a range, use "to" or "through": `doing select --from "monday 8am to friday 5pm"`.
-
-      If values are only time(s) (6am to noon) all dates will be included, but entries will be filtered
-      by time of day.
-    )
-  c.arg_name 'DATE_OR_RANGE'
-  c.flag [:from], type: DateRangeString
-
-  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 'Select 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 'Use --no-menu to skip the interactive menu. Use with --query to filter items and act on results automatically. Test with `--output doing` to preview matches'
+  c.desc 'Use --no-menu to skip the interactive menu. Use with --query to filter items and act on results automatically.
+          Test with `--output doing` to preview matches'
   c.switch %i[menu], negatable: true, default_value: true
 
   c.desc 'Cancel selected items (add @done without timestamp)'
@@ -108,15 +85,20 @@ command :select do |c|
   c.arg_name 'FORMAT'
   c.flag %i[o output]
 
-  c.desc "Copy selection as a new entry with current time and no @done tag. Only works with single selections. Can be combined with --editor."
+  c.desc 'Copy selection as a new entry with current time and no @done tag.
+          Only works with single selections. Can be combined with --editor.'
   c.switch %i[again resume], negatable: false, default_value: false
 
-  c.action do |_global_options, options, args|
-    raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+  add_options(:search, c)
+  add_options(:date_filter, c)
 
-    raise InvalidArgument, '--no-menu requires --query' if !options[:menu] && !options[:query]
+  c.action do |_global_options, options, _args|
+    if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+      raise DoingRuntimeError, %(Invalid output type "#{options[:output]}")
+
+    end
 
-    options[:case] = options[:case].normalize_case
+    raise InvalidArgument, '--no-menu requires --query' if !options[:menu] && !options[:query]
 
     @wwid.interactive(options) # hooked
   end

data/bin/commands/show.rb

@@ -18,69 +18,20 @@ command :show do |c|
   c.example 'doing show Ideas @doing --from "mon to fri"', desc: 'Show entries tagged @doing from the Ideas section added between monday and friday of the current week.'
   c.example 'doing show --interactive Later @doing', desc: 'Create a menu from entries from the Later section tagged @doing to perform batch actions'
 
-  c.desc 'Tag filter, combine multiple tags with a comma. Use `--tag pick` for a menu of available tags. Wildcards allowed (*, ?). Added for compatibility with other commands'
-  c.arg_name 'TAG'
-  c.flag [:tag], type: TagArray
-
-  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 'Tag boolean (AND,OR,NOT). Use PATTERN to parse + and - as booleans'
-  c.arg_name 'BOOLEAN'
-  c.flag %i[b bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
-
   c.desc 'Max count to show'
   c.arg_name 'MAX'
   c.flag %i[c count], default_value: 0, must_match: /^\d+$/, type: Integer
 
   c.desc 'Age (oldest|newest)'
   c.arg_name 'AGE'
-  c.flag %i[a age], default_value: 'newest'
-
-  c.desc 'Show entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
-  c.arg_name 'DATE_STRING'
-  c.flag [:before], type: DateBeginString
-
-  c.desc 'Show entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
-  c.arg_name 'DATE_STRING'
-  c.flag [:after], type: DateEndString
-
-  c.desc %(
-      Date range to show, or a single day to filter date on.
-      Date range argument should be quoted. Date specifications can be natural language.
-      To specify a range, use "to" or "through": `doing show --from "monday 8am to friday 5pm"`.
-
-      If values are only time(s) (6am to noon) all dates will be included, but entries will be filtered
-      by time of day.
-    )
-
-  c.arg_name 'DATE_OR_RANGE'
-  c.flag [:from], type: DateRangeString
-
-  c.desc 'Search filter, surround with slashes for regex (/query/), start with single quote for exact match ("\'query")'
-  c.arg_name 'QUERY'
-  c.flag [:search]
+  c.flag %i[a age], default_value: :newest, type: AgeSymbol
 
   c.desc "Highlight search matches in output. Only affects command line output"
   c.switch %i[h hilite], default_value: @settings.dig('search', 'highlight')
 
-  # 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/tag/date 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 'Sort order (asc/desc)'
   c.arg_name 'ORDER'
-  c.flag %i[s sort], must_match: REGEX_SORT_ORDER, default_value: 'asc'
+  c.flag %i[s sort], must_match: REGEX_SORT_ORDER, default_value: :asc, type: OrderSymbol
 
   c.desc 'Show time intervals on @done tasks'
   c.switch %i[t times], default_value: true, negatable: true
@@ -92,14 +43,13 @@ command :show do |c|
   c.switch [:totals], default_value: false, negatable: false
 
   c.desc 'Sort tags by (name|time)'
-  default = 'time'
-  default = @settings['tag_sort'] || 'name'
+  default = @settings['tag_sort'].normalize_tag_sort || :name
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(?:name|time)/i, default_value: default
+  c.flag [:tag_sort], must_match: REGEX_TAG_SORT, default_value: default, type: TagSortSymbol
 
   c.desc 'Tag sort direction (asc|desc)'
   c.arg_name 'DIRECTION'
-  c.flag [:tag_order], must_match: REGEX_SORT_ORDER, default_value: 'asc'
+  c.flag [:tag_order], must_match: REGEX_SORT_ORDER, default_value: :asc, type: OrderSymbol
 
   c.desc 'Only show items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: false
@@ -121,9 +71,17 @@ command :show do |c|
   c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
   c.arg_name 'FORMAT'
   c.flag %i[o output]
+
+  add_options(:search, c)
+  add_options(:tag_filter, c)
+  add_options(:date_filter, c)
+
   c.action do |global_options, options, args|
     options[:fuzzy] = false
-    raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+    if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+      raise DoingRuntimeError, %(Invalid output type "#{options[:output]}")
+
+    end
 
     tag_filter = false
     tags = []
@@ -142,7 +100,7 @@ command :show do |c|
       else
         begin
           section = @wwid.guess_section(args[0])
-        rescue WrongCommand => exception
+        rescue WrongCommand
           cmd = commands[:view]
           action = cmd.send(:get_action, nil)
           return action.call(global_options, options, args)
@@ -155,8 +113,8 @@ command :show do |c|
       if args.length.positive?
         args.each do |arg|
           arg.split(/,/).each do |tag|
-                        tags.push(tag.strip.sub(/^@/, ''))
-                      end
+            tags.push(tag.strip.sub(/^@/, ''))
+          end
         end
       end
     else
@@ -169,13 +127,11 @@ command :show do |c|
     options[:times] = true if options[:totals]
 
     template = @settings['templates'][options[:config_template]].deep_merge({
-        'wrap_width' => @settings['wrap_width'] || 0,
-        'date_format' => @settings['default_date_format'],
-        'order' => @settings['order'] || 'asc',
-        'tags_color' => @settings['tags_color']
-      })
-
-    options[:case] = options[:case].normalize_case
+                                                    'wrap_width' => @settings['wrap_width'] || 0,
+                                                    'date_format' => @settings['default_date_format'],
+                                                    'order' => @settings['order']&.normalize_order || :asc,
+                                                    'tags_color' => @settings['tags_color']
+                                                  })
 
     if options[:search]
       search = options[:search]
@@ -188,7 +144,7 @@ command :show do |c|
     if tags.good?
       tag_filter = {
         'tags' => tags,
-        'bool' => options[:bool].normalize_bool
+        'bool' => options[:bool]
       }
     end
 
@@ -198,32 +154,30 @@ command :show do |c|
     items = @wwid.filter_items([], opt: options)
 
     if options[:menu]
+      Doing.logger.benchmark(:menu, :start)
       tag = @wwid.choose_tag(section, items: items, include_all: true)
       raise UserCancelled unless tag
 
-      # options[:bool] = :and unless tags.empty?
-
       tags = tag.split(/ +/).map { |t| t.strip.sub(/^@?/, '') } if tag =~ /^@/
       if tags.good?
         tag_filter = {
           'tags' => tags,
-          'bool' => options[:bool].normalize_bool
+          'bool' => options[:bool]
         }
         options[:tag_filter] = tag_filter
       end
+      Doing.logger.benchmark(:menu, :finish)
     end
 
     options[:age] ||= :newest
 
     opt = options.clone
-    opt[:age] = options[:age].normalize_age(:newest) if options[:age]
-    opt[:sort_tags] = options[:tag_sort] =~ /^n/i
+    opt[:sort_tags] = options[:tag_sort]
     opt[:count] = options[:count].to_i
     opt[:highlight] = true
     opt[:hilite] = options[:hilite]
-    opt[:order] = options[:sort].normalize_order
+    opt[:order] = options[:sort]
     opt[:tag] = nil
-    opt[:tag_order] = options[:tag_order].normalize_order
     opt[:tags_color] = template['tags_color']
 
     Doing::Pager.page @wwid.list_section(opt, items: items)

data/bin/commands/since.rb

@@ -21,10 +21,9 @@ command :since do |c|
   c.switch [:totals], default_value: false, negatable: false
 
   c.desc 'Sort tags by (name|time)'
-  default = 'time'
-  default = @settings['tag_sort'] || 'name'
+  default = @settings['tag_sort'].normalize_tag_sort || :name
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: REGEX_TAG_SORT, default_value: default, type: TagSortSymbol
 
   c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
   c.arg_name 'FORMAT'
@@ -56,7 +55,7 @@ command :since do |c|
     Doing.logger.debug('Interpreter:', "date interpreted as #{start} through the current time")
 
     options[:times] = true if options[:totals]
-    options[:sort_tags] = options[:tag_sort] =~ /^n/i
+    options[:sort_tags] = options[:tag_sort]
 
     Doing::Pager.page @wwid.list_date([start, finish], options[:section], options[:times], options[:output],
                         { template: options[:template], config_template: options[:config_template], duration: options[:duration], totals: options[:totals], sort_tags: options[:sort_tags] }).chomp

data/bin/commands/tag.rb

@@ -55,39 +55,12 @@ command :tag do |c|
   c.desc 'Autotag entries based on autotag configuration in ~/.config/doing/config.yml'
   c.switch %i[a autotag], negatable: false, default_value: false
 
-  c.desc 'Tag the last X entries containing TAG.
-  Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool. Wildcards allowed (*, ?).'
-  c.arg_name 'TAG'
-  c.flag [:tag], type: TagArray
-
-  c.desc 'Tag 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 'Tag 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 (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 'Select item(s) to tag 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
     # raise MissingArgument, 'You must specify at least one tag' if args.empty? && !options[:autotag]
@@ -130,9 +103,6 @@ command :tag do |c|
       count = options[:count].to_i
     end
 
-    options[:case] ||= :smart
-    options[:case] = options[:case].normalize_case
-
     if options[:search]
       search = options[:search]
       search.sub!(/^'?/, "'") if options[:exact]
@@ -143,7 +113,7 @@ command :tag do |c|
     options[:section] = section
     options[:tag] = search_tags
     options[:tags] = tags
-    options[:tag_bool] = options[:bool].normalize_bool
+    options[:tag_bool] = options[:bool]
 
     if count.zero? && !options[:force]
       matches = @wwid.filter_items([], opt: options).count