doing 2.0.7.pre → 2.0.8.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc54a9b143b7a97dcd2ad9867a5166b06cfe52e4631f7658c65aa76ea9e07c19
-  data.tar.gz: 5c60bc065b3b25cd450403dbf42089f30f5367416fee6b88f9baaf43b4ede04e
+  metadata.gz: 395218e7fd0178eb8d626e58c6b4ec078ff2631506829f98e7a41daacc7dd9bc
+  data.tar.gz: c7bda7d2e832b3f657f409c512f16bf71b8d0b247b776c4f3ce467c399482241
 SHA512:
-  metadata.gz: 7ef6e317026dae9f46a8abdaa3c0a4c8a7ef29598e192c223e4158510c65e8deac0a87719d0cbcc634c8d7c654cab7239e95d88369819fb1f7f9c6b1da027485
-  data.tar.gz: eb8c1115272cd4c23d158719f15a1f0af81a1e091af25a0e436c0832b4e21046bc8dd393d47e62214de59628a1e1e582a8c68533d8ce39b33d1ce2ee856a1971
+  metadata.gz: 73d7cfcafe737b446a6fec46a8bb8ae41503137240546cd361b1f6f292ecbf6a37c361a4708aeb9a4efcfddf76e42515e580a6c03b86c5512082e90e2bd8b325
+  data.tar.gz: 4f5ccc666a48629fe674923dfece11a872b59b5af7329f7484c777b4cc6166bebb287df5f19ea2d802212e553d03a2ac4b853f31c1f41f4204b6293838cd2695

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 2.0.8.pre
+
+#### NEW
+
+- Add `--exact` flag to all commands with `--search` flag to force exact matching without requiring single quote prefix
+- Add `--not` flag to all commands with filters (--tag, --search, --before, etc.) to negate the filter and return entries NOT matched
+
 ### 2.0.7.pre
 
 #### FIXED

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.0.7.pre)
+    doing (2.0.8.pre)
       chronic (~> 0.10, >= 0.10.2)
       deep_merge (~> 1.2, >= 1.2.1)
       gli (~> 2.19, >= 2.19.2)

data/README.md

@@ -6,7 +6,7 @@ _If you're one of the rare people like me who find this useful, feel free to [bu
 
 <!--README-->
 
-The current version of `doing` is <!--VER-->2.0.6<!--END VER-->.
+The current version of `doing` is <!--VER-->2.0.7<!--END VER-->.
 
 Find all of the documentation in the [doing wiki](https://github.com/ttscoff/doing/wiki).
 

data/bin/doing

@@ -180,7 +180,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 +195,12 @@ 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 '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'
@@ -209,6 +215,13 @@ command %i[reset begin] do |c|
 
     options[:tag_bool] = options[:bool].normalize_bool
 
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+      options[:search] = search
+    end
+
+
     items = wwid.filter_items([], opt: options)
 
     if options[:interactive]
@@ -266,6 +279,12 @@ 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 '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 +299,13 @@ command :note do |c|
 
     options[:tag_bool] = options[:bool].normalize_bool
 
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+      options[:search] = search
+    end
+
+
     last_entry = wwid.last_entry(options)
 
     unless last_entry
@@ -473,6 +499,12 @@ 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 '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
 
@@ -844,6 +876,12 @@ 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 '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,12 +950,20 @@ 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,
+      not: options[:not],
       section: options[:section],
       sequential: options[:auto],
       tag: tags,
@@ -951,6 +997,12 @@ 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 'Boolean used to combine multiple tags'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'AND'
@@ -967,7 +1019,15 @@ command %i[again resume] do |c|
 
   c.action do |_global_options, options, _args|
     tags = options[:tag].nil? ? [] : options[:tag].to_tags
+
+    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 +1097,12 @@ 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 '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 +1147,11 @@ command :tag do |c|
       count = options[:count].to_i
     end
 
+    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 +1175,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 +1223,12 @@ 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 '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 +1260,12 @@ command [:mark, :flag] do |c|
       count = options[:count].to_i
     end
 
+    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'
@@ -1257,6 +1340,12 @@ 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 'Sort order (asc/desc)'
   c.arg_name 'ORDER'
   c.flag %i[s sort], must_match: REGEX_SORT_ORDER, default_value: 'asc'
@@ -1361,6 +1450,12 @@ command :show do |c|
 
     tags_color = settings.key?('tags_color') ? settings['tags_color'] : nil
 
+    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 +1518,15 @@ 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 'Force case sensitive matching'
+  c.switch %i[case]
+
+  c.desc 'Show items that *don\'t* match search string'
+  c.switch [:not], default_value: false, negatable: false
+
   c.desc 'Display an interactive menu of results to perform further operations'
   c.switch %i[i interactive], default_value: false, negatable: false
 
@@ -1432,11 +1536,13 @@ command %i[grep search] do |c|
     tags_color = settings.key?('tags_color') ? settings['tags_color'] : nil
 
     section = wwid.guess_section(options[:section]) if options[:section]
+    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 +1860,12 @@ 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.action do |global_options, options, _args|
     raise InvalidArgument, '--tag and --search can not be used together' if options[:tag] && options[:search]
 
@@ -1772,11 +1884,18 @@ command :last do |c|
 
     end
 
+    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, 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, negate: options[:not], tag: tags, tag_bool: options[:bool] }).strip
     end
   end
 end
@@ -1934,6 +2053,12 @@ 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 'Sort tags by (name|time)'
   c.arg_name 'KEY'
   c.flag [:tag_sort], must_match: /^(?:name|time)$/i
@@ -2065,7 +2190,15 @@ command :view do |c|
         dates = [start, finish]
       end
 
+      search = nil
+
+      if options[:search]
+        search = options[:search]
+        search.sub!(/^'?/, "'") if options[:exact]
+      end
+
       opts = options
+      opts[:search] = search
       opts[:output] = output_format
       opts[:count] = count
       opts[:format] = date_format
@@ -2138,6 +2271,12 @@ 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 '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 +2300,15 @@ command %i[archive move] do |c|
 
     tags.concat(options[:tag].to_tags) if options[:tag]
 
+    search = nil
+
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+    end
+
     opts = options
+    opts[:search] = search
     opts[:bool] = options[:bool].normalize_bool
     opts[:destination] = options[:to]
     opts[:tags] = tags
@@ -2196,6 +2343,12 @@ 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 '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 +2361,14 @@ command :rotate do |c|
 
     options[:bool] = options[:bool].normalize_bool
 
+    search = nil
+
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+      options[:search] = search
+    end
+
     wwid.rotate(options)
   end
 end
@@ -2396,6 +2557,12 @@ 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 'Only import items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: false
 

data/doing.rdoc

@@ -2,7 +2,7 @@
 
 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.
 
-v2.0.7.pre
+v2.0.8.pre
 
 === Global Options
 === --config_file arg
@@ -133,6 +133,16 @@ Select item to resume from a menu of matching entries
 
 
 
+===== --not
+Resume items that *don't* match search/tag filters
+
+
+
+===== -x|--exact
+Force exact search string matching (case sensitive)
+
+
+
 ==== Command: <tt>archive|move  SECTION_OR_TAG</tt>
 Move entries between sections
 
@@ -191,6 +201,16 @@ Label moved items with @from(SECTION_NAME)
 
 
 
+===== --not
+Show items that *don't* match search string
+
+
+
+===== -x|--exact
+Force exact search string matching (case sensitive)
+
+
+
 ==== Command: <tt>autotag </tt>
 Autotag last entry or filtered entries
 
@@ -524,6 +544,11 @@ Select item(s) to finish from a menu of matching entries
 
 
 
+===== --not
+Finish items that *don't* match search/tag filters
+
+
+
 ===== -r|--remove
 Remove done tag
 
@@ -534,6 +559,11 @@ Finish last entry (or entries) not already marked @done
 
 
 
+===== -x|--exact
+Force exact search string matching (case sensitive)
+
+
+
 ==== Command: <tt>grep|search  SEARCH_PATTERN</tt>
 Search for entries
 
@@ -577,11 +607,21 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time)$)
 
 
+===== --[no-]case
+Force case sensitive matching
+
+
+
 ===== -i|--interactive
 Display an interactive menu of results to perform further operations
 
 
 
+===== --not
+Show items that *don't* match search string
+
+
+
 ===== --only_timed
 Only show items with recorded time intervals
 
@@ -597,6 +637,11 @@ Show intervals with totals at the end of output
 
 
 
+===== -x|--exact
+Force exact string matching (case sensitive)
+
+
+
 ==== Command: <tt>help  command</tt>
 Shows a list of commands or help for one command
 
@@ -675,6 +720,11 @@ Autotag entries
 
 
 
+===== --not
+Import items that *don't* match search/tag/date filters
+
+
+
 ===== --only_timed
 Only import items with recorded time intervals
 
@@ -685,6 +735,11 @@ Allow entries that overlap existing times
 
 
 
+===== -x|--exact
+Force exact search string matching (case sensitive)
+
+
+
 ==== Command: <tt>last </tt>
 Show the last entry, optionally edit
 
@@ -724,6 +779,16 @@ Edit entry with vim
 
 
 
+===== --not
+Show items that *don't* match search string or tag filter
+
+
+
+===== -x|--exact
+Force exact search string matching (case sensitive)
+
+
+
 ==== Command: <tt>later  ENTRY</tt>
 Add an item to the Later section
 
@@ -806,6 +871,11 @@ Select item(s) to flag from a menu of matching entries
 
 
 
+===== --not
+Flag items that *don't* match search/tag/date filters
+
+
+
 ===== -r|--remove
 Remove flag
 
@@ -816,6 +886,11 @@ Flag last entry (or entries) not marked @done
 
 
 
+===== -x|--exact
+Force exact search string matching (case sensitive)
+
+
+
 ==== Command: <tt>meanwhile  ENTRY</tt>
 Finish any running @meanwhile tasks and optionally create a new one
 
@@ -900,11 +975,21 @@ Select item for new note from a menu of matching entries
 
 
 
+===== --not
+Add note to item that *doesn't* match search/tag filters
+
+
+
 ===== -r|--remove
 Replace/Remove last entry's note (default append)
 
 
 
+===== -x|--exact
+Force exact search string matching (case sensitive)
+
+
+
 ==== Command: <tt>now|next  ENTRY</tt>
 Add an entry
 
@@ -1075,7 +1160,7 @@ Boolean (AND|OR|NOT) with which to combine multiple tag filters
 
 ===== -s|--section NAME
 
-Set the start date of an item to now
+Limit search to section
 
 [Default Value] All
 
@@ -1099,11 +1184,21 @@ Select from a menu of matching entries
 
 
 
+===== --not
+Reset items that *don't* match search/tag filters
+
+
+
 ===== -r|--[no-]resume
 Resume entry (remove @done)
 
 
 
+===== -x|--exact
+Force exact search string matching (case sensitive)
+
+
+
 ==== Command: <tt>rotate </tt>
 Move entries to archive file
 
@@ -1154,6 +1249,16 @@ Tag filter, combine multiple tags with a comma. Added for compatibility with oth
 [Default Value] None
 
 
+===== --not
+Rotate items that *don't* match search string or tag filter
+
+
+
+===== -x|--exact
+Force exact search string matching (case sensitive)
+
+
+
 ==== Command: <tt>sections </tt>
 List sections
 
@@ -1260,11 +1365,21 @@ Use --no-menu to skip the interactive menu. Use with --query to filter items and
 
 
 
+===== --not
+Select items that *don't* match search/tag filters
+
+
+
 ===== -r|--remove
 Reverse -c, -f, --flag, and -t (remove instead of adding)
 
 
 
+===== -x|--exact
+Force exact search string matching (case sensitive)
+
+
+
 ==== Command: <tt>show  [SECTION|@TAGS]</tt>
 List all entries
 
@@ -1366,6 +1481,11 @@ Select from a menu of matching entries to perform additional operations
 
 
 
+===== --not
+Show items that *don't* match search/tag/date filters
+
+
+
 ===== --only_timed
 Only show items with recorded time intervals
 
@@ -1381,6 +1501,11 @@ Show intervals with totals at the end of output
 
 
 
+===== -x|--exact
+Force exact search string matching (case sensitive)
+
+
+
 ==== Command: <tt>since  DATE_STRING</tt>
 List entries since a date
 
@@ -1501,6 +1626,11 @@ Select item(s) to tag from a menu of matching entries
 
 
 
+===== --not
+Tag items that *don't* match search/tag filters
+
+
+
 ===== -r|--remove
 Remove given tag(s)
 
@@ -1516,6 +1646,11 @@ Tag last entry (or entries) not marked @done
 
 
 
+===== -x|--exact
+Force exact search string matching (case sensitive)
+
+
+
 ==== Command: <tt>template  TYPE</tt>
 Output HTML, CSS, and Markdown (ERB) templates for customization
 
@@ -1690,6 +1825,11 @@ Select from a menu of matching entries to perform additional operations
 
 
 
+===== --not
+Show items that *don't* match search string
+
+
+
 ===== --only_timed
 Only show items with recorded time intervals (override view settings)
 
@@ -1705,6 +1845,11 @@ Show intervals with totals at the end of output
 
 
 
+===== -x|--exact
+Force exact search string matching (case sensitive)
+
+
+
 ==== Command: <tt>views </tt>
 List available custom views
 

data/lib/doing/errors.rb

@@ -27,7 +27,7 @@ module Doing
     end
 
     class WrongCommand < ::StandardError
-      def initialize(msg = 'wrong command', topic = 'Error:')
+      def initialize(msg = 'wrong command', topic: 'Error:')
         Doing.logger.warn(topic, msg)
 
         super(msg)

data/lib/doing/item.rb

@@ -60,21 +60,22 @@ module Doing
       @title.scan(/(?<= |\A)@([^\s(]+)/).map {|tag| tag[0]}.sort.uniq
     end
 
-    def tags?(tags, bool = :and)
+    def tags?(tags, bool = :and, negate: false)
       tags = split_tags(tags)
       bool = bool.normalize_bool
 
-      case bool
-      when :and
-        all_tags?(tags)
-      when :not
-        no_tags?(tags)
-      else
-        any_tags?(tags)
-      end
+      matches = case bool
+                when :and
+                  all_tags?(tags)
+                when :not
+                  no_tags?(tags)
+                else
+                  any_tags?(tags)
+                end
+      negate ? !matches : matches
     end
 
-    def search(search)
+    def search(search, negate: false)
       text = @title + @note.to_s
       pattern = case search.strip
                 when %r{^/.*?/$}
@@ -88,7 +89,7 @@ module Doing
                 end
       rx = Regexp.new(pattern, !case_sensitive)
 
-      text =~ rx
+      negate ? text !~ rx : text =~ rx
     end
 
     def should_finish?

data/lib/doing/plugins/import/calendar_import.rb

@@ -64,9 +64,15 @@ module Doing
         new_items.push(new_entry)
       end
       total = new_items.count
+
+      new_items = wwid.filter_items(new_items, opt: options)
+      filtered = total - new_items.count
+      Doing.logger.debug('Skipped:' , %(#{filtered} items that didn't match filter criteria)) if filtered.positive?
+
       new_items = wwid.dedup(new_items, options[:no_overlap])
-      dups = total - new_items.count
+      dups = filtered - new_items.count
       Doing.logger.info(%(Skipped #{dups} items with overlapping times)) if dups.positive?
+
       wwid.content[section][:items].concat(new_items)
       Doing.logger.info(%(Imported #{new_items.count} items to #{section}))
     end

data/lib/doing/plugins/import/doing_import.rb

@@ -40,13 +40,13 @@ module Doing
 
       new_items = read_doing_file(path)
 
-      if options[:date_filter]
-        new_items = wwid.filter_items(new_items, opt: { count: 0, date_filter: options[:date_filter] })
-      end
+      total = new_items.count
 
-      if options[:before] || options[:after]
-        new_items = wwid.filter_items(new_items, opt: { count: 0, before: options[:before], after: options[:after] })
-      end
+      options[:count] = 0
+      new_items = wwid.filter_items(new_items, opt: options)
+
+      skipped = total - new_items.count
+      Doing.logger.debug('Skipped:' , %(#{skipped} items that didn't match filter criteria)) if skipped.positive?
 
       imported = []
 

data/lib/doing/plugins/import/timing_import.rb

@@ -66,9 +66,15 @@ module Doing
       total = new_items.count
       skipped = data.count - total
       Doing.logger.debug('Skipped:' , %(#{skipped} items, invalid type or no time interval)) if skipped.positive?
+
+      new_items = wwid.filter_items(new_items, opt: options)
+      filtered = skipped - new_items.count
+      Doing.logger.debug('Skipped:' , %(#{filtered} items that didn't match filter criteria)) if filtered.positive?
+
       new_items = wwid.dedup(new_items, options[:no_overlap])
-      dups = total - new_items.count
+      dups = filtered - new_items.count
       Doing.logger.debug('Skipped:' , %(#{dups} items with overlapping times)) if dups.positive?
+
       wwid.content[section][:items].concat(new_items)
       Doing.logger.info('Imported:', %(#{new_items.count} items to #{section}))
     end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.0.7.pre'
+  VERSION = '2.0.8.pre'
 end

data/lib/doing/wwid.rb

@@ -473,7 +473,7 @@ module Doing
           duped = no_overlap ? item.overlapping_time?(comp) : item.same_time?(comp)
           break if duped
         end
-        logger.count(:skipped, level: :debug, message: 'overlapping %item') if duped
+        logger.count(:skipped, level: :debug, message: '%count overlapping %items') if duped
         # logger.log_now(:debug, 'Skipped:', "overlapping entry: #{item.title}") if duped
         duped
       end
@@ -686,20 +686,26 @@ module Doing
       items.sort_by! { |item| [item.date, item.title.downcase] }.reverse
       filtered_items = items.select do |item|
         keep = true
-        finished = opt[:unfinished] && item.tags?('done', :and)
-        keep = false if finished
+        if opt[:unfinished]
+          finished = item.tags?('done', :and)
+          finished = opt[:not] ? !finished : finished
+          keep = false if finished
+        end
 
         if keep && opt[:tag]
           opt[:tag_bool] ||= :and
           tag_match = opt[:tag].nil? || opt[:tag].empty? ? true : item.tags?(opt[:tag], opt[:tag_bool])
           keep = false unless tag_match
+          keep = opt[:not] ? !keep : keep
         end
 
         if keep && opt[:search]
           search_match = opt[:search].nil? || opt[:search].empty? ? true : item.search(opt[:search])
           keep = false unless search_match
+          keep = opt[:not] ? !keep : keep
         end
 
+
         if keep && opt[:date_filter]&.length == 2
           start_date = opt[:date_filter][0]
           end_date = opt[:date_filter][1]
@@ -710,30 +716,36 @@ module Doing
                             item.date.strftime('%F') == start_date.strftime('%F')
                           end
           keep = false unless in_date_range
+          keep = opt[:not] ? !keep : keep
         end
 
         keep = false if keep && opt[:only_timed] && !item.interval
 
         if keep && opt[:tag_filter] && !opt[:tag_filter]['tags'].empty?
           keep = item.tags?(opt[:tag_filter]['tags'], opt[:tag_filter]['bool'])
+          keep = opt[:not] ? !keep : keep
         end
 
         if keep && opt[:before]
           time_string = opt[:before]
           cutoff = chronify(time_string, guess: :begin)
           keep = cutoff && item.date <= cutoff
+          keep = opt[:not] ? !keep : keep
         end
 
         if keep && opt[:after]
           time_string = opt[:after]
           cutoff = chronify(time_string, guess: :end)
           keep = cutoff && item.date >= cutoff
+          keep = opt[:not] ? !keep : keep
         end
 
         if keep && opt[:today]
           keep = item.date >= Date.today.to_time && item.date < Date.today.next_day.to_time
+          keep = opt[:not] ? !keep : keep
         elsif keep && opt[:yesterday]
           keep = item.date >= Date.today.prev_day.to_time && item.date < Date.today.to_time
+          keep = opt[:not] ? !keep : keep
         end
 
         keep
@@ -755,7 +767,18 @@ module Doing
     ##
     def interactive(opt = {})
       section = opt[:section] ? guess_section(opt[:section]) : 'All'
+
+      search = nil
+
+      if opt[:search]
+        search = opt[:search]
+        search.sub!(/^'?/, "'") if opt[:exact]
+        search.downcase! if opt[:case] == false
+        opt[:search] = search
+      end
+
       opt[:query] = opt[:search] if opt[:search] && !opt[:query]
+      opt[:query] = "!#{opt[:query]}" if opt[:not]
       opt[:multiple] = true
       items = filter_items([], opt: { section: section, search: opt[:search] })
 
@@ -1564,7 +1587,6 @@ module Doing
 
       items.reverse! if opt[:order] =~ /^d/i
 
-
       if opt[:interactive]
         opt[:menu] = !opt[:force]
         opt[:query] = '' # opt[:search]
@@ -1875,7 +1897,7 @@ module Doing
       end
 
       opts[:search] = options[:search] if options[:search]
-
+      opts[:not] = options[:negate]
       list_section(opts)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.0.7.pre
+  version: 2.0.8.pre
 platform: ruby
 authors:
 - Brett Terpstra
@@ -231,10 +231,10 @@ files:
 - lib/examples/commands/wiki.rb
 - lib/examples/plugins/hooks.rb
 - lib/examples/plugins/say_export.rb
-- lib/examples/plugins/templates/wiki.css
-- lib/examples/plugins/templates/wiki.haml
-- lib/examples/plugins/templates/wiki_index.haml
-- lib/examples/plugins/wiki_export.rb
+- lib/examples/plugins/wiki_export/templates/wiki.css
+- lib/examples/plugins/wiki_export/templates/wiki.haml
+- lib/examples/plugins/wiki_export/templates/wiki_index.haml
+- lib/examples/plugins/wiki_export/wiki_export.rb
 - lib/helpers/fuzzyfilefinder
 - lib/templates/doing-markdown.erb
 - lib/templates/doing.css