doing 2.0.6.pre → 2.0.10

data/bin/doing

@@ -62,7 +62,10 @@ if settings.dig('plugins', 'command_path')
 end
 
 program_desc 'A CLI for a What Was I Doing system'
-program_long_desc %(Doing uses a TaskPaper-like formatting to keep a plain text record of what you've been doing, complete with tag-based time tracking. The command line tool allows you to add entries, annotate with tags and notes, and view your entries with myriad options, with a focus on a "natural" language syntax.)
+program_long_desc %(Doing uses a TaskPaper-like formatting to keep a plain text
+record of what you've been doing, complete with tag-based time tracking. The
+command line tool allows you to add entries, annotate with tags and notes, and
+view your entries with myriad options, with a focus on a "natural" language syntax.)
 
 default_command :recent
 # sort_help :manually
@@ -180,7 +183,7 @@ end
 
 desc 'Reset the start time of an entry'
 command %i[reset begin] do |c|
-  c.desc 'Set the start date of an item to now'
+  c.desc 'Limit search to section'
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
@@ -195,6 +198,19 @@ command %i[reset begin] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc '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: false, negatable: false
+
+  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: 'smart'
+
   c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'AND'
@@ -207,7 +223,16 @@ command %i[reset begin] do |c|
       options[:section] = wwid.guess_section(options[:section]) || options[:section].cap_first
     end
 
-    options[:tag_bool] = options[:bool].normalize_bool
+    options[:bool] = options[:bool].normalize_bool
+
+    options[:case] = options[:case].normalize_case
+
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+      options[:search] = search
+    end
+
 
     items = wwid.filter_items([], opt: options)
 
@@ -248,6 +273,11 @@ long_desc %(
 )
 arg_name 'NOTE_TEXT'
 command :note do |c|
+  c.example 'doing note', desc: 'Open the last entry in $EDITOR to append a note'
+  c.example 'doing note "Just a quick annotation"', desc: 'Add a quick note to the last entry'
+  c.example 'doing note --tag done "Keeping it real or something"', desc: 'Add a note to the last item tagged @done'
+  c.example 'doing note --search "late night" -e', desc: 'Open $EDITOR to add a note to the last item containing "late night" (fuzzy matched)'
+
   c.desc 'Section'
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
@@ -266,6 +296,19 @@ command :note do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc '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: false, negatable: false
+
+  c.desc 'Add note to item that *doesn\'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: 'smart'
+
   c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'AND'
@@ -280,6 +323,15 @@ command :note do |c|
 
     options[:tag_bool] = options[:bool].normalize_bool
 
+    options[:case] = options[:case].normalize_case
+
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+      options[:search] = search
+    end
+
+
     last_entry = wwid.last_entry(options)
 
     unless last_entry
@@ -330,6 +382,11 @@ end
 desc 'Finish any running @meanwhile tasks and optionally create a new one'
 arg_name 'ENTRY'
 command :meanwhile do |c|
+  c.example 'doing meanwhile "Long task that will have others after it before it\'s done"', desc: 'Add a new long-running entry, completing any current @meanwhile entry'
+  c.example 'doing meanwhile', desc: 'Finish any open @meanwhile entry'
+  c.example 'doing meanwhile --archive', desc: 'Finish any open @meanwhile entry and archive it'
+  c.example 'doing meanwhile --back 2h "Something I\'ve been working on for a while', desc: 'Add a @meanwhile entry with a start date 2 hours ago'
+
   c.desc 'Section'
   c.arg_name 'NAME'
   c.flag %i[s section]
@@ -396,12 +453,12 @@ end
 desc 'Output HTML, CSS, and Markdown (ERB) templates for customization'
 long_desc %(
   Templates are printed to STDOUT for piping to a file.
-  Save them and use them in the configuration file under html_template.
-
-  Example `doing template haml > ~/styles/my_doing.haml`
+  Save them and use them in the configuration file under export_templates.
 )
 arg_name 'TYPE', must_match: Doing::Plugins.template_regex
 command :template do |c|
+  c.example 'doing template haml > ~/styles/my_doing.haml', desc: 'Output the haml template and save it to a file'
+
   c.desc 'List all available templates'
   c.switch %i[l list], negatable: false
 
@@ -473,6 +530,16 @@ command :select do |c|
   c.arg_name 'QUERY'
   c.flag %i[q query search]
 
+  c.desc 'Force exact search string matching (case sensitive)'
+  c.switch %i[x exact], default_value: false, negatable: false
+
+  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: 'smart'
+
   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
 
@@ -510,6 +577,8 @@ command :select do |c|
 
     raise InvalidArgument, '--no-menu requires --query' if !options[:menu] && !options[:query]
 
+    options[:case] = options[:case].normalize_case
+
     wwid.interactive(options)
   end
 end
@@ -517,6 +586,9 @@ end
 desc 'Add an item to the Later section'
 arg_name 'ENTRY'
 command :later do |c|
+  c.example 'doing later "Something I\'ll think about tomorrow"', desc: 'Add an entry to the Later section'
+  c.example 'doing later -e', desc: 'Open $EDITOR to create an entry and optional note'
+
   c.desc "Edit entry with #{Doing::Util.default_editor}"
   c.switch %i[e editor], negatable: false, default_value: false
 
@@ -566,6 +638,11 @@ end
 desc 'Add a completed item with @done(date). No argument finishes last entry.'
 arg_name 'ENTRY'
 command %i[done did] do |c|
+  c.example 'doing done', desc: 'Tag the last entry @done'
+  c.example 'doing done I already finished this', desc: 'Add a new entry and immediately mark it @done'
+  c.example 'doing done --back 30m This took me half an hour', desc: 'Add an entry with a start date 30 minutes ago and a @done date of right now'
+  c.example 'doing done --at 3pm --took 1h Started and finished this afternoon', desc: 'Add an entry with a @done date of 3pm and a start date of 2pm (3pm - 1h)'
+
   c.desc 'Remove @done tag'
   c.switch %i[r remove], negatable: false, default_value: false
 
@@ -755,6 +832,9 @@ 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`.'
 arg_name 'COUNT'
 command :cancel do |c|
+  c.example 'doing cancel', desc: 'Cancel the last entry'
+  c.example 'doing cancel --tag project1 -u 5', desc: 'Cancel the last 5 unfinished entries containing @project1'
+
   c.desc 'Archive entries'
   c.switch %i[a archive], negatable: false, default_value: false
 
@@ -770,6 +850,23 @@ command :cancel do |c|
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'AND'
 
+  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 '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: false, negatable: false
+
+  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: 'smart'
+
   c.desc 'Cancel last entry (or entries) not already marked @done'
   c.switch %i[u unfinished], negatable: false, default_value: false
 
@@ -799,17 +896,28 @@ command :cancel do |c|
       count = args[0] ? args[0].to_i : 1
     end
 
+    search = nil
+
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+    end
+
     opts = {
       archive: options[:a],
+      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],
-      interactive: options[:interactive]
+      unfinished: options[:unfinished]
     }
 
     wwid.tag_last(opts)
@@ -820,6 +928,10 @@ desc 'Mark last X entries as @done'
 long_desc 'Marks the last X entries with a @done tag and current date. Does not alter already completed entries.'
 arg_name 'COUNT'
 command :finish do |c|
+  c.example 'doing finish', desc: 'Mark the last entry @done'
+  c.example 'doing finish --auto --section Later 10', desc: 'Add @done to any unfinished entries in the last 10 in Later, setting the finish time based on the start time of the task after it'
+  c.example 'doing finish --search "a specific entry" --at "yesterday 3pm"', desc: 'Search for an entry containing string and set its @done time to yesterday at 3pm'
+
   c.desc 'Include date'
   c.switch [:date], negatable: true, default_value: true
 
@@ -844,6 +956,19 @@ command :finish do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc '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: false, negatable: false
+
+  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: 'smart'
+
   c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'AND'
@@ -912,20 +1037,30 @@ command :finish do |c|
       count = args[0] ? args[0].to_i : 1
     end
 
+    search = nil
+
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+    end
+
     opts = {
       archive: options[:archive],
       back: date,
+      case: options[:case].normalize_case,
       count: count,
       date: options[:date],
-      search: options[:search],
+      fuzzy: options[:fuzzy],
+      interactive: options[:interactive],
+      not: options[:not],
+      remove: options[:remove],
+      search: search,
       section: options[:section],
       sequential: options[:auto],
       tag: tags,
       tag_bool: options[:bool].normalize_bool,
       tags: ['done'],
-      unfinished: options[:unfinished],
-      remove: options[:remove],
-      interactive: options[:interactive]
+      unfinished: options[:unfinished]
     }
 
     wwid.tag_last(opts)
@@ -951,6 +1086,19 @@ command %i[again resume] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc '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: false, negatable: false
+
+  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: 'smart'
+
   c.desc 'Boolean used to combine multiple tags'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'AND'
@@ -967,7 +1115,17 @@ command %i[again resume] do |c|
 
   c.action do |_global_options, options, _args|
     tags = options[:tag].nil? ? [] : options[:tag].to_tags
-    opts = options
+
+    options[:case] = options[:case].normalize_case
+
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+      options[:search] = search
+    end
+
+    opts = options.dup
+
     opts[:tag] = tags
     opts[:tag_bool] = options[:bool].normalize_bool
     opts[:interactive] = options[:interactive]
@@ -1037,6 +1195,19 @@ command :tag do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc '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: false, negatable: false
+
+  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: 'smart'
+
   c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'AND'
@@ -1081,6 +1252,13 @@ command :tag do |c|
       count = options[:count].to_i
     end
 
+    options[:case] = options[:case].normalize_case
+
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+      options[:search] = search
+    end
 
     if count.zero? && !options[:force]
       if options[:search]
@@ -1104,7 +1282,7 @@ command :tag do |c|
 
       res = wwid.yn(question, default_response: false)
 
-      exit_now! 'Cancelled' unless res
+      raise UserCancelled unless res
     end
 
     options[:count] = count
@@ -1152,6 +1330,19 @@ command [:mark, :flag] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc '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: false, negatable: false
+
+  c.desc 'Flag 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: 'smart'
+
   c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'AND'
@@ -1183,6 +1374,14 @@ command [:mark, :flag] do |c|
       count = options[:count].to_i
     end
 
+    options[:case] = options[:case].normalize_case
+
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+      options[:search] = search
+    end
+
     if count.zero? && !options[:force]
       if options[:search]
         section_q = ' matching your search terms'
@@ -1226,7 +1425,9 @@ command :show do |c|
   c.example 'doing show Currently', desc: 'Show entries in the Currently section'
   c.example 'doing show @project1', desc: 'Show entries tagged @project1'
   c.example 'doing show Later @doing', desc: 'Show entries from the Later section tagged @doing'
-  c.example 'doing show Ideas --from "mon to fri" --tag doing', desc: 'Show entries tagged @doing from the Ideas section added between monday and friday of the current week.'
+  c.example 'doing show @oracle @writing --bool and', desc: 'Show entries tagged both @oracle and @writing'
+  c.example 'doing show Currently @devo --bool not', desc: 'Show entries in Currently NOT tagged @devo'
+  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. Added for compatibility with other commands.'
@@ -1257,6 +1458,19 @@ command :show do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc '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: false, negatable: false
+
+  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: 'smart'
+
   c.desc 'Sort order (asc/desc)'
   c.arg_name 'ORDER'
   c.flag %i[s sort], must_match: REGEX_SORT_ORDER, default_value: 'asc'
@@ -1361,6 +1575,14 @@ command :show do |c|
 
     tags_color = settings.key?('tags_color') ? settings['tags_color'] : nil
 
+    options[:case] = options[:case].normalize_case
+
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+      options[:search] = search
+    end
+
     opt = options.dup
 
     opt[:sort_tags] = options[:tag_sort] =~ /^n/i
@@ -1423,6 +1645,19 @@ command %i[grep search] do |c|
   c.desc 'Only show items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: false
 
+  c.desc 'Use alternative fuzzy matching for search string'
+  c.switch [:fuzzy], default_value: false, negatable: false
+
+  c.desc 'Force exact string matching (case sensitive)'
+  c.switch %i[x exact], default_value: false, negatable: false
+
+  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: 'smart'
+
   c.desc 'Display an interactive menu of results to perform further operations'
   c.switch %i[i interactive], default_value: false, negatable: false
 
@@ -1433,10 +1668,15 @@ command %i[grep search] do |c|
 
     section = wwid.guess_section(options[:section]) if options[:section]
 
+    options[:case] = options[:case].normalize_case
+
+    search = args.join(' ')
+    search.sub!(/^'?/, "'") if options[:exact]
+
     options[:times] = true if options[:totals]
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
     options[:highlight] = true
-    options[:search] = args.join(' ')
+    options[:search] = search
     options[:section] = section
     options[:tags_color] = tags_color
 
@@ -1754,6 +1994,19 @@ command :last do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc '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: false, negatable: false
+
+  c.desc 'Show 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: 'smart'
+
   c.action do |global_options, options, _args|
     raise InvalidArgument, '--tag and --search can not be used together' if options[:tag] && options[:search]
 
@@ -1772,11 +2025,20 @@ command :last do |c|
 
     end
 
+    options[:case] = options[:case].normalize_case
+
+    search = nil
+
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+    end
+
     if options[:editor]
-      wwid.edit_last(section: options[:s], options: { search: options[:search], tag: tags, tag_bool: options[:bool] })
+      wwid.edit_last(section: options[:s], options: { search: search, fuzzy: options[:fuzzy], case: options[:case], tag: tags, tag_bool: options[:bool], not: options[:not] })
     else
       Doing::Pager::page wwid.last(times: true, section: options[:s],
-                     options: { search: options[:search], tag: tags, tag_bool: options[:bool] }).strip
+                     options: { search: search, fuzzy: options[:fuzzy], case: options[:case], negate: options[:not], tag: tags, tag_bool: options[:bool] }).strip
     end
   end
 end
@@ -1934,6 +2196,19 @@ command :view do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc '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: false, negatable: false
+
+  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: 'smart'
+
   c.desc 'Sort tags by (name|time)'
   c.arg_name 'KEY'
   c.flag [:tag_sort], must_match: /^(?:name|time)$/i
@@ -2065,7 +2340,17 @@ command :view do |c|
         dates = [start, finish]
       end
 
-      opts = options
+      options[:case] = options[:case].normalize_case
+
+      search = nil
+
+      if options[:search]
+        search = options[:search]
+        search.sub!(/^'?/, "'") if options[:exact]
+      end
+
+      opts = options.dup
+      opts[:search] = search
       opts[:output] = output_format
       opts[:count] = count
       opts[:format] = date_format
@@ -2138,6 +2423,19 @@ command %i[archive move] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc '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: false, negatable: false
+
+  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: 'smart'
+
   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'
@@ -2161,7 +2459,17 @@ command %i[archive move] do |c|
 
     tags.concat(options[:tag].to_tags) if options[:tag]
 
-    opts = options
+    search = nil
+
+    options[:case] = options[:case].normalize_case
+
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+    end
+
+    opts = options.dup
+    opts[:search] = search
     opts[:bool] = options[:bool].normalize_bool
     opts[:destination] = options[:to]
     opts[:tags] = tags
@@ -2196,6 +2504,19 @@ command :rotate do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc '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: false, negatable: false
+
+  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: 'smart'
+
   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'
@@ -2208,6 +2529,16 @@ command :rotate do |c|
 
     options[:bool] = options[:bool].normalize_bool
 
+    options[:case] = options[:case].normalize_case
+
+    search = nil
+
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+      options[:search] = search
+    end
+
     wwid.rotate(options)
   end
 end
@@ -2311,7 +2642,7 @@ command :config do |c|
                      when /^j/
                        JSON.pretty_generate(cfg)
                      when /^r/
-                       cfg
+                       cfg.map {|k, v| v.to_s }
                      else
                        YAML.dump(cfg)
                      end
@@ -2396,6 +2727,19 @@ command :import do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc '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: false, negatable: false
+
+  c.desc 'Import 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: 'smart'
+
   c.desc 'Only import items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: false
 
@@ -2453,6 +2797,8 @@ command :import do |c|
       dates = [start, finish]
     end
 
+    options[:case] = options[:case].normalize_case
+
     if options[:type] =~ Doing::Plugins.plugin_regex(type: :import)
       options[:no_overlap] = !options[:overlap]
       options[:date_filter] = dates