doing 2.0.5.pre → 2.0.9.pre

data/bin/doing

@@ -57,12 +57,15 @@ config = Doing.config
 settings = config.settings
 wwid.config = settings
 
-if config.settings.dig('plugins', 'command_path')
-  commands_from File.expand_path(config.settings.dig('plugins', 'command_path'))
+if settings.dig('plugins', 'command_path')
+  commands_from File.expand_path(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
@@ -137,7 +140,7 @@ command %i[now next] do |c|
     if options[:back]
       date = wwid.chronify(options[:back], guess: :begin)
 
-      raise Doing::Errors::InvalidTimeExpression, 'Unable to parse date string' if date.nil?
+      raise InvalidTimeExpression.new('unable to parse date string', topic: 'Date parser:') if date.nil?
     else
       date = Time.now
     end
@@ -149,13 +152,13 @@ command %i[now next] do |c|
     end
 
     if options[:e] || (args.empty? && $stdin.stat.size.zero?)
-      raise Doing::Errors::MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
+      raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
 
       input = ''
       input += args.join(' ') unless args.empty?
       input = wwid.fork_editor(input).strip
 
-      raise Doing::Errors::EmptyInput, 'No content' if input.empty?
+      raise EmptyInput, 'No content' if input.empty?
 
       title, note = wwid.format_input(input)
       note.push(options[:n]) if options[:n]
@@ -173,14 +176,14 @@ command %i[now next] do |c|
       wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:f] })
       wwid.write(wwid.doing_file)
     else
-      raise Doing::Errors::EmptyInput, 'You must provide content when creating a new entry'
+      raise EmptyInput, 'You must provide content when creating a new entry'
     end
   end
 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,16 @@ command %i[reset begin] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  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)nsensitive, (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 +220,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 +270,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 +293,16 @@ command :note do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  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)nsensitive, (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 +317,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
@@ -291,7 +337,7 @@ command :note do |c|
     new_note = Doing::Note.new
 
     if options[:e] || (args.empty? && $stdin.stat.size.zero? && !options[:r])
-      raise Doing::Errors::MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
+      raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
 
       input = !args.empty? ? args.join(' ') : ''
 
@@ -312,7 +358,7 @@ command :note do |c|
     elsif $stdin.stat.size.positive?
       new_note.add($stdin.read)
     else
-      raise Doing::Errors::EmptyInput, 'You must provide content when adding a note' unless options[:remove]
+      raise EmptyInput, 'You must provide content when adding a note' unless options[:remove]
     end
 
     if last_note.equal?(new_note)
@@ -330,6 +376,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]
@@ -338,7 +389,7 @@ command :meanwhile do |c|
   c.switch %i[e editor], negatable: false, default_value: false
 
   c.desc 'Archive previous @meanwhile entry'
-  c.switch %i[a archive], default_value: false
+  c.switch %i[a archive], negatable: false, default_value: false
 
   c.desc 'Backdate start date for new entry to date string [4pm|20m|2h|yesterday noon]'
   c.arg_name 'DATE_STRING'
@@ -352,7 +403,7 @@ command :meanwhile do |c|
     if options[:back]
       date = wwid.chronify(options[:back], guess: :begin)
 
-      raise Doing::Errors::InvalidTimeExpression, 'Unable to parse date string' if date.nil?
+      raise InvalidTimeExpression, 'Unable to parse date string' if date.nil?
     else
       date = Time.now
     end
@@ -365,7 +416,7 @@ command :meanwhile do |c|
     input = ''
 
     if options[:e]
-      raise Doing::Errors::MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
+      raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
 
       input += args.join(' ') unless args.empty?
       input = wwid.fork_editor(input).strip
@@ -396,14 +447,14 @@ 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]
+  c.switch %i[l list], negatable: false
 
   c.desc 'List in single column for completion'
   c.switch %i[c]
@@ -424,7 +475,7 @@ command :template do |c|
       type = args[0]
     end
 
-    raise Doing::Errors::InvalidPluginType, "No type specified, use `doing template [#{Doing::Plugins.plugin_templates.join('|')}]`" unless type
+    raise InvalidPluginType, "No type specified, use `doing template [#{Doing::Plugins.plugin_templates.join('|')}]`" unless type
 
     $stdout.puts Doing::Plugins.template_for_trigger(type)
 
@@ -473,6 +524,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)nsensitive, (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
 
@@ -503,12 +564,14 @@ command :select do |c|
   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.switch %i[again resume]
+  c.switch %i[again resume], negatable: false, default_value: false
 
   c.action do |_global_options, options, args|
-    raise InvalidExportType, "Invalid export type: #{options[:output]}" if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+    raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
-    raise Doing::Errors::InvalidArgument, '--no-menu requires --query' if !options[:menu] && !options[:query]
+    raise InvalidArgument, '--no-menu requires --query' if !options[:menu] && !options[:query]
+
+    options[:case] = options[:case].normalize_case
 
     wwid.interactive(options)
   end
@@ -517,6 +580,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
 
@@ -531,17 +597,17 @@ command :later do |c|
   c.action do |_global_options, options, args|
     if options[:back]
       date = wwid.chronify(options[:back], guess: :begin)
-      raise Doing::Errors::InvalidTimeExpression, 'Unable to parse date string' if date.nil?
+      raise InvalidTimeExpression, 'Unable to parse date string' if date.nil?
     else
       date = Time.now
     end
 
     if options[:editor] || (args.empty? && $stdin.stat.size.zero?)
-      raise Doing::Errors::MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
+      raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
 
       input = args.empty? ? '' : args.join(' ')
       input = wwid.fork_editor(input).strip
-      raise Doing::Errors::EmptyInput, 'No content' unless input && !input.empty?
+      raise EmptyInput, 'No content' unless input && !input.empty?
 
       title, note = wwid.format_input(input)
       note.push(options[:n]) if options[:n]
@@ -558,7 +624,7 @@ command :later do |c|
       wwid.add_item(title.cap_first, 'Later', { note: note, back: date })
       wwid.write(wwid.doing_file)
     else
-      raise Doing::Errors::EmptyInput, 'You must provide content when creating a new entry'
+      raise EmptyInput, 'You must provide content when creating a new entry'
     end
   end
 end
@@ -566,6 +632,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
 
@@ -614,19 +685,19 @@ command %i[done did] do |c|
 
     if options[:took]
       took = wwid.chronify_qty(options[:took])
-      raise Doing::Errors::InvalidTimeExpression, 'Unable to parse date string for --took' if took.nil?
+      raise InvalidTimeExpression, 'Unable to parse date string for --took' if took.nil?
     end
 
     if options[:back]
       date = wwid.chronify(options[:back], guess: :begin)
-      raise Doing::Errors::InvalidTimeExpression, 'Unable to parse date string for --back' if date.nil?
+      raise InvalidTimeExpression, 'Unable to parse date string for --back' if date.nil?
     else
       date = options[:took] ? Time.now - took : Time.now
     end
 
     if options[:at]
       finish_date = wwid.chronify(options[:at], guess: :begin)
-      raise Doing::Errors::InvalidTimeExpression, 'Unable to parse date string for --at' if finish_date.nil?
+      raise InvalidTimeExpression, 'Unable to parse date string for --at' if finish_date.nil?
 
       date = options[:took] ? finish_date - took : finish_date
     elsif options[:took]
@@ -651,7 +722,7 @@ command %i[done did] do |c|
     note.add(options[:note]) if options[:note]
 
     if options[:editor]
-      raise Doing::Errors::MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
+      raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
       is_new = false
 
       if args.empty?
@@ -659,7 +730,7 @@ command %i[done did] do |c|
 
         unless last_entry
           Doing.logger.debug('Skipped:', options[:unfinished] ? 'No unfinished entry' : 'Last entry already @done')
-          raise Doing::Errors::NoResults, 'No results'
+          raise NoResults, 'No results'
         end
 
         old_entry = last_entry.dup
@@ -671,7 +742,7 @@ command %i[done did] do |c|
       end
 
       input = wwid.fork_editor(input).strip
-      raise Doing::Errors::EmptyInput, 'No content' unless input && !input.empty?
+      raise EmptyInput, 'No content' unless input && !input.empty?
 
       title, note = wwid.format_input(input)
       new_entry = Doing::Item.new(date, title, section, note)
@@ -746,7 +817,7 @@ command %i[done did] do |c|
       wwid.write(wwid.doing_file)
       Doing.logger.info('Entry Added:', new_entry.title)
     else
-      raise Doing::Errors::EmptyInput, 'You must provide content when creating a new entry'
+      raise EmptyInput, 'You must provide content when creating a new entry'
     end
   end
 end
@@ -755,6 +826,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 +844,20 @@ 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 '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)nsensitive, (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
 
@@ -789,9 +877,9 @@ command :cancel do |c|
       tags = options[:tag].to_tags
     end
 
-    raise Doing::Errors::InvalidArgument, 'Only one argument allowed' if args.length > 1
+    raise InvalidArgument, 'Only one argument allowed' if args.length > 1
 
-    raise Doing::Errors::InvalidArgument, 'Invalid argument (specify number of recent items to mark @done)' unless args.empty? || args[0] =~ /\d+/
+    raise InvalidArgument, 'Invalid argument (specify number of recent items to mark @done)' unless args.empty? || args[0] =~ /\d+/
 
     if options[:interactive]
       count = 0
@@ -799,7 +887,17 @@ 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 = {
+      search: search,
+      case: options[:case].normalize_case,
+      not: options[:not],
       archive: options[:a],
       count: count,
       date: false,
@@ -820,6 +918,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 +946,16 @@ command :finish do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  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)nsensitive, (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'
@@ -873,22 +985,22 @@ command :finish do |c|
     unless options[:auto]
       if options[:took]
         took = wwid.chronify_qty(options[:took])
-        raise Doing::Errors::InvalidTimeExpression, 'Unable to parse date string for --took' if took.nil?
+        raise InvalidTimeExpression, 'Unable to parse date string for --took' if took.nil?
       end
 
-      raise Doing::Errors::InvalidArgument, '--back and --took can not be used together' if options[:back] && options[:took]
+      raise InvalidArgument, '--back and --took can not be used together' if options[:back] && options[:took]
 
-      raise Doing::Errors::InvalidArgument, '--search and --tag can not be used together' if options[:search] && options[:tag]
+      raise InvalidArgument, '--search and --tag can not be used together' if options[:search] && options[:tag]
 
       if options[:at]
         finish_date = wwid.chronify(options[:at], guess: :begin)
-        raise Doing::Errors::InvalidTimeExpression, 'Unable to parse date string for --at' if finish_date.nil?
+        raise InvalidTimeExpression, 'Unable to parse date string for --at' if finish_date.nil?
 
         date = options[:took] ? finish_date - took : finish_date
       elsif options[:back]
         date = wwid.chronify(options[:back])
 
-        raise Doing::Errors::InvalidTimeExpression, 'Unable to parse date string' if date.nil?
+        raise InvalidTimeExpression, 'Unable to parse date string' if date.nil?
       elsif options[:took]
         date = wwid.chronify_qty(options[:took])
       else
@@ -902,9 +1014,9 @@ command :finish do |c|
       tags = options[:tag].to_tags
     end
 
-    raise Doing::Errors::InvalidArgument, 'Only one argument allowed' if args.length > 1
+    raise InvalidArgument, 'Only one argument allowed' if args.length > 1
 
-    raise Doing::Errors::InvalidArgument, 'Invalid argument (specify number of recent items to mark @done)' unless args.length == 0 || args[0] =~ /\d+/
+    raise InvalidArgument, 'Invalid argument (specify number of recent items to mark @done)' unless args.length == 0 || args[0] =~ /\d+/
 
     if options[:interactive]
       count = 0
@@ -912,12 +1024,21 @@ 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,
       count: count,
       date: options[:date],
-      search: options[:search],
+      search: search,
+      case: options[:case].normalize_case,
+      not: options[:not],
       section: options[:section],
       sequential: options[:auto],
       tag: tags,
@@ -951,6 +1072,16 @@ command %i[again resume] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  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)nsensitive, (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 +1098,17 @@ command %i[again resume] do |c|
 
   c.action do |_global_options, options, _args|
     tags = options[:tag].nil? ? [] : options[:tag].to_tags
+
+    options[:case] = options[:case].normalize_case
+
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+      options[:search] = search
+    end
+
     opts = options
+
     opts[:tag] = tags
     opts[:tag_bool] = options[:bool].normalize_bool
     opts[:interactive] = options[:interactive]
@@ -1037,6 +1178,16 @@ command :tag do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  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)nsensitive, (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'
@@ -1045,9 +1196,9 @@ command :tag do |c|
   c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |_global_options, options, args|
-    raise Doing::Errors::MissingArgument, 'You must specify at least one tag' if args.empty? && !options[:a]
+    raise MissingArgument, 'You must specify at least one tag' if args.empty? && !options[:autotag]
 
-    raise Doing::Errors::InvalidArgument, '--search and --tag can not be used together' if options[:search] && options[:tag]
+    raise InvalidArgument, '--search and --tag can not be used together' if options[:search] && options[:tag]
 
     section = 'All'
 
@@ -1081,6 +1232,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 +1262,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
@@ -1117,19 +1275,6 @@ command :tag do |c|
   end
 end
 
-# desc 'Autotag last X entries'
-# arg_name 'COUNT'
-# command :autotag do |c|
-#   c.action do |global_options, options, args|
-#     options = {
-#       autotag: true,
-#       count: args[0].to_i
-#     }
-#     cmd = commands[:tag]
-#     cmd.action.(global_options, options, [])
-#   end
-# end
-
 desc 'Mark last entry as flagged'
 command [:mark, :flag] do |c|
   c.example 'doing flag', desc: 'Add @flagged to the last entry created'
@@ -1165,6 +1310,16 @@ command [:mark, :flag] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  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)nsensitive, (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'
@@ -1175,7 +1330,7 @@ command [:mark, :flag] do |c|
   c.action do |_global_options, options, _args|
     mark = settings['marker_tag'] || 'flagged'
 
-    raise Doing::Errors::InvalidArgument, '--search and --tag can not be used together' if options[:search] && options[:tag]
+    raise InvalidArgument, '--search and --tag can not be used together' if options[:search] && options[:tag]
 
     section = 'All'
 
@@ -1196,6 +1351,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'
@@ -1270,6 +1433,16 @@ command :show do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  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)nsensitive, (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'
@@ -1307,8 +1480,8 @@ 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]
-  c.action do |_global_options, options, args|
-    raise InvalidExportType, "Invalid export type: #{options[:output]}" if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+  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)
 
     tag_filter = false
     tags = []
@@ -1323,8 +1496,15 @@ command :show do |c|
       when /^@/
         section = 'All'
       else
-        section = wwid.guess_section(args[0])
-        raise Doing::Errors::InvalidSection, "No such section: #{args[0]}" unless section
+        begin
+          section = wwid.guess_section(args[0])
+        rescue WrongCommand => exception
+          cmd = commands[:view]
+          action = cmd.send(:get_action, nil)
+          return action.call(global_options, options, args)
+        end
+
+        raise InvalidSection, "No such section: #{args[0]}" unless section
 
         args.shift
       end
@@ -1359,7 +1539,7 @@ command :show do |c|
         start = wwid.chronify(date_string, guess: :begin)
         finish = false
       end
-      raise Doing::Errors::InvalidTimeExpression, 'Unrecognized date string' unless start
+      raise InvalidTimeExpression, 'Unrecognized date string' unless start
       dates = [start, finish]
     end
 
@@ -1367,6 +1547,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
@@ -1429,20 +1617,35 @@ 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 '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)nsensitive, (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
 
   c.action do |_global_options, options, args|
-    raise InvalidExportType, "Invalid export type: #{options[:output]}" if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+    raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
     tags_color = settings.key?('tags_color') ? settings['tags_color'] : nil
 
     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
 
@@ -1548,7 +1751,7 @@ command :today do |c|
   c.flag [:after]
 
   c.action do |_global_options, options, _args|
-    raise InvalidExportType, "Invalid export type: #{options[:output]}" if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+    raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
     options[:t] = true if options[:totals]
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
@@ -1595,9 +1798,9 @@ command :on do |c|
   c.flag %i[o output]
 
   c.action do |_global_options, options, args|
-    raise InvalidExportType, "Invalid export type: #{options[:output]}" if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+    raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
-    raise Doing::Errors::MissingArgument, 'Missing date argument' if args.empty?
+    raise MissingArgument, 'Missing date argument' if args.empty?
 
     date_string = args.join(' ')
 
@@ -1610,7 +1813,7 @@ command :on do |c|
       finish = false
     end
 
-    raise Doing::Errors::InvalidTimeExpression, 'Unrecognized date string' unless start
+    raise InvalidTimeExpression, 'Unrecognized date string' unless start
 
     message = "Date interpreted as #{start}"
     message += " to #{finish}" if finish
@@ -1653,9 +1856,9 @@ command :since do |c|
   c.flag %i[o output]
 
   c.action do |_global_options, options, args|
-    raise InvalidExportType, "Invalid export type: #{options[:output]}" if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+    raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
-    raise Doing::Errors::MissingArgument, 'Missing date argument' if args.empty?
+    raise MissingArgument, 'Missing date argument' if args.empty?
 
     date_string = args.join(' ')
 
@@ -1665,7 +1868,7 @@ command :since do |c|
     start = wwid.chronify(date_string, guess: :begin)
     finish = Time.now
 
-    raise Doing::Errors::InvalidTimeExpression, 'Unrecognized date string' unless start
+    raise InvalidTimeExpression, 'Unrecognized date string' unless start
 
     Doing.logger.debug("Date interpreted as #{start} through the current time")
 
@@ -1698,7 +1901,6 @@ command :yesterday do |c|
   c.switch [:totals], default_value: false, negatable: false
 
   c.desc 'Sort tags by (name|time)'
-  default = 'time'
   default = settings['tag_sort'] || 'name'
   c.arg_name 'KEY'
   c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
@@ -1716,7 +1918,7 @@ command :yesterday do |c|
   c.flag [:tag_order], must_match: REGEX_SORT_ORDER, default_value: 'asc'
 
   c.action do |_global_options, options, _args|
-    raise InvalidExportType, "Invalid export type: #{options[:output]}" if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+    raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
@@ -1761,8 +1963,18 @@ command :last do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  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)nsensitive, (s)mart]'
+  c.arg_name 'TYPE'
+  c.flag [:case], must_match: /^[csi]/, default_value: 'smart'
+
   c.action do |global_options, options, _args|
-    raise Doing::Errors::InvalidArgument, '--tag and --search can not be used together' if options[:tag] && options[:search]
+    raise InvalidArgument, '--tag and --search can not be used together' if options[:tag] && options[:search]
 
     if options[:tag].nil?
       tags = []
@@ -1779,11 +1991,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, 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, case: options[:case], negate: options[:not], tag: tags, tag_bool: options[:bool] }).strip
     end
   end
 end
@@ -1791,7 +2012,7 @@ end
 desc 'List sections'
 command :sections do |c|
   c.desc 'List in single column'
-  c.switch %i[c column], default_value: false
+  c.switch %i[c column], negatable: false, default_value: false
 
   c.action do |_global_options, options, _args|
     joiner = options[:c] ? "\n" : "\t"
@@ -1814,7 +2035,7 @@ command :add_section do |c|
   c.example 'doing add_section Ideas', desc: 'Add a section called Ideas to the doing file'
 
   c.action do |_global_options, _options, args|
-    raise Doing::Errors::InvalidArgument, "Section #{args[0]} already exists" if wwid.sections.include?(args[0])
+    raise InvalidArgument, "Section #{args[0]} already exists" if wwid.sections.include?(args[0])
 
     wwid.add_section(args.join(' ').cap_first)
     wwid.write(wwid.doing_file)
@@ -1853,16 +2074,54 @@ command :plugins do |c|
 
   c.desc 'List plugins of type (import, export)'
   c.arg_name 'TYPE'
-  c.flag %i[t type], must_match: /^[iea].*$/i, default_value: 'all'
+  c.flag %i[t type], must_match: /^(?:[iea].*)$/i, default_value: 'all'
 
   c.desc 'List in single column for completion'
-  c.switch %i[c column], default_value: false
+  c.switch %i[c column], negatable: false, default_value: false
 
   c.action do |_global_options, options, _args|
     Doing::Plugins.list_plugins(options)
   end
 end
 
+desc 'Generate shell completion scripts'
+command :completion do |c|
+  c.example 'doing completion', desc: 'Output zsh (default) to STDOUT'
+  c.example 'doing completion --type zsh --file ~/.zsh-completions/_doing.zsh', desc: 'Output zsh completions to file'
+  c.example 'doing completion --type fish --file ~/.config/fish/completions/doing.fish', desc: 'Output fish completions to file'
+  c.example 'doing completion --type bash --file ~/.bash_it/completion/enabled/doing.bash', desc: 'Output bash completions to file'
+
+  c.desc 'Shell to generate for (bash, zsh, fish)'
+  c.arg_name 'SHELL'
+  c.flag %i[t type], must_match: /^[bzf](?:[ai]?sh)?$/i, default_value: 'zsh'
+
+  c.desc 'File to write output to'
+  c.arg_name 'PATH'
+  c.flag %i[f file], default_value: 'stdout'
+
+  c.action do |_global_options, options, _args|
+    script_dir = File.join(File.dirname(__FILE__), '..', 'scripts')
+
+    case options[:type]
+    when /^b/
+      result = `ruby #{File.join(script_dir, 'generate_bash_completions.rb')}`
+    when /^z/
+      result = `ruby #{File.join(script_dir, 'generate_zsh_completions.rb')}`
+    when /^f/
+      result = `ruby #{File.join(script_dir, 'generate_fish_completions.rb')}`
+    end
+
+    if options[:file] =~ /^stdout$/i
+      $stdout.puts result
+    else
+      File.open(File.expand_path(options[:file]), 'w') do |f|
+        f.puts result
+      end
+      Doing.logger.warn('File written:', "#{options[:type]} completions written to #{options[:file]}")
+    end
+  end
+end
+
 desc 'Display a user-created view'
 long_desc 'Command line options override view configuration'
 arg_name 'VIEW_NAME'
@@ -1903,6 +2162,16 @@ command :view do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  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)nsensitive, (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
@@ -1925,15 +2194,22 @@ command :view do |c|
   c.desc 'Select from a menu of matching entries to perform additional operations'
   c.switch %i[i interactive], negatable: false, default_value: false
 
-  c.action do |_global_options, options, args|
-    raise InvalidExportType, "Invalid export type: #{options[:output]}" if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+  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)
 
-    raise Doing::Errors::InvalidArgument, '--tag and --search can not be used together' if options[:tag] && options[:search]
+    raise InvalidArgument, '--tag and --search can not be used together' if options[:tag] && options[:search]
 
     title = if args.empty?
               wwid.choose_view
             else
-              wwid.guess_view(args[0])
+              begin
+                wwid.guess_view(args[0])
+              rescue WrongCommand => exception
+                cmd = commands[:show]
+                options[:sort] = 'asc'
+                action = cmd.send(:get_action, nil)
+                return action.call(global_options, options, args)
+              end
             end
 
     if options[:section]
@@ -2023,11 +2299,21 @@ command :view do |c|
           start = wwid.chronify(date_string, guess: :begin)
           finish = false
         end
-        raise Doing::Errors::InvalidTimeExpression, 'Unrecognized date string' unless start
+        raise InvalidTimeExpression, 'Unrecognized date string' unless start
         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
@@ -2046,9 +2332,9 @@ command :view do |c|
 
       Doing::Pager.page wwid.list_section(opts)
     elsif title.instance_of?(FalseClass)
-      exit_now! 'Cancelled'
+      raise UserCancelled, 'Cancelled' unless res
     else
-      raise Doing::Errors::InvalidView, "View #{title} not found in config"
+      raise InvalidView, "View #{title} not found in config"
     end
   end
 end
@@ -2100,6 +2386,16 @@ command %i[archive move] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  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)nsensitive, (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'
@@ -2119,11 +2415,21 @@ command %i[archive move] do |c|
       tags = args.length > 1 ? args[1..].map { |t| t.sub(/^@/, '').strip } : []
     end
 
-    raise Doing::Errors::InvalidArgument, '--keep and --count can not be used together' if options[:keep] && options[:count]
+    raise InvalidArgument, '--keep and --count can not be used together' if options[:keep] && options[:count]
 
     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
@@ -2158,6 +2464,16 @@ command :rotate do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  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)nsensitive, (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'
@@ -2170,6 +2486,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
@@ -2208,7 +2534,7 @@ command :open do |c|
         system %(open "#{File.expand_path(wwid.doing_file)}")
       end
     else
-      raise Doing::Errors::MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
+      raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
 
       system %(#{Doing::Util.default_editor} "#{File.expand_path(wwid.doing_file)}")
     end
@@ -2236,7 +2562,7 @@ command :config do |c|
   c.flag %i[e editor], default_value: nil
 
   c.desc 'Show a config key value based on arguments. Separate key paths with colons or dots, e.g. "export_templates.html". Empty arguments outputs the entire config.'
-  c.switch %i[d dump]
+  c.switch %i[d dump], negatable: false
 
   c.desc 'Format for --dump (json|yaml|raw)'
   c.arg_name 'FORMAT'
@@ -2261,7 +2587,6 @@ command :config do |c|
   c.action do |_global_options, options, args|
     if options[:update]
       config.configure({rewrite: true, ignore_local: true})
-      # Doing.logger.warn("Config file rewritten: #{config.config_file}")
       return
     end
 
@@ -2276,7 +2601,6 @@ command :config do |c|
                      when /^r/
                        cfg
                      else
-                       # cfg = { last_key => cfg } unless last_key.nil?
                        YAML.dump(cfg)
                      end
       else
@@ -2291,7 +2615,7 @@ command :config do |c|
       choices.concat(config.additional_configs)
       res = wwid.choose_from(choices.uniq.sort.reverse, sorted: false, prompt: 'Local configs found, select which to edit > ')
 
-      raise Doing::Errors::UserCancelled, 'Cancelled' unless res
+      raise UserCancelled, 'Cancelled' unless res
 
       config_file = res.strip || config.config_file
     else
@@ -2308,7 +2632,7 @@ command :config do |c|
             `open -a "#{editor}" "#{config_file}"`
           end
         else
-          raise Doing::Errors::InvalidArgument, 'No viable editor found in config or environment.'
+          raise InvalidArgument, 'No viable editor found in config or environment.'
         end
       elsif options[:a] || options[:b]
         if options[:a]
@@ -2319,7 +2643,7 @@ command :config do |c|
       else
         editor = options[:e] || Doing::Util.find_default_editor('config')
 
-        raise Doing::Errors::MissingEditor, 'No viable editor defined in config or environment' unless editor
+        raise MissingEditor, 'No viable editor defined in config or environment' unless editor
 
         if Doing::Util.exec_available(editor)
           system %(#{editor} "#{config_file}")
@@ -2329,7 +2653,7 @@ command :config do |c|
       end
     else
       editor = options[:e] || Doing::Util.default_editor
-      raise Doing::Errors::MissingEditor, 'No EDITOR variable defined in environment' unless editor && Doing::Util.exec_available(editor)
+      raise MissingEditor, 'No EDITOR variable defined in environment' unless editor && Doing::Util.exec_available(editor)
 
       system %(#{editor} "#{config_file}")
     end
@@ -2360,6 +2684,16 @@ command :import do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  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)nsensitive, (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
 
@@ -2413,17 +2747,19 @@ command :import do |c|
         start = wwid.chronify(date_string, guess: :begin)
         finish = false
       end
-      raise Doing::Errors::InvalidTimeExpression, 'Unrecognized date string' unless start
+      raise InvalidTimeExpression, 'Unrecognized date string' unless start
       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
       wwid.import(args, options)
       wwid.write(wwid.doing_file)
     else
-      raise Doing::Errors::InvalidPluginType, "Invalid import type: #{options[:type]}"
+      raise InvalidPluginType, "Invalid import type: #{options[:type]}"
     end
   end
 end
@@ -2448,14 +2784,13 @@ pre do |global, _command, _options, _args|
 end
 
 on_error do |exception|
-  # if exception.kind_of?(SystemExit)
-  #   false
-  # else
-  #   p exception.inspect
-  #   Doing.logger.output_results
-  #   true
-  # end
-  false
+  if exception.kind_of?(SystemExit)
+    false
+  else
+    # Doing.logger.error('Fatal:', exception)
+    Doing.logger.output_results
+    true
+  end
 end
 
 post do |global, _command, _options, _args|