doing 2.0.8.pre → 2.0.9.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 395218e7fd0178eb8d626e58c6b4ec078ff2631506829f98e7a41daacc7dd9bc
-  data.tar.gz: c7bda7d2e832b3f657f409c512f16bf71b8d0b247b776c4f3ce467c399482241
+  metadata.gz: f63df319758e6575ab75de3305ed9e44ac272d54b026e6873397970780115cca
+  data.tar.gz: e770a9679824aae9582ca1cedb23e783d0bb1070b1c740d7ce662d912124006d
 SHA512:
-  metadata.gz: 73d7cfcafe737b446a6fec46a8bb8ae41503137240546cd361b1f6f292ecbf6a37c361a4708aeb9a4efcfddf76e42515e580a6c03b86c5512082e90e2bd8b325
-  data.tar.gz: 4f5ccc666a48629fe674923dfece11a872b59b5af7329f7484c777b4cc6166bebb287df5f19ea2d802212e553d03a2ac4b853f31c1f41f4204b6293838cd2695
+  metadata.gz: 10bcf3f91db5636bb4133323b09a22f0978d3955e0e564931edef9cf8b9416aa4f7fa0480588dd85b95eab7cdb1f8952a843dce755bed6fc5dfd108ee60ea8ce
+  data.tar.gz: 23a73fa1f03cb28afaca764296a52140a6f7eb772add3db3220b255c51831cb5c2eb97a9f103000788fd06998bf8389dcac62618880a84fadfa5b209e1c718da

data/CHANGELOG.md

@@ -1,22 +1,14 @@
-### 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
-
-- Zsh completion not outputting results
-
-### 2.0.6.pre
+### 2.0.9.pre
 
 #### NEW
 
+- Add 'timer_format' config with 'human' option for tag totals
 - If `doing view` and `doing show` are confused, offer option to run the other command
 - `doing completion` to generate shell completion scripts for zsh, bash, and fish
+- --search and --not for cancel command
+- --case flag for commands with --search. Can be (c)ase-sensitive, (i)nsensitive, or (s)mart (default smart, case insensitive unless search string contains uppercase letters)
+- 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
 
 #### IMPROVED
 
@@ -27,16 +19,11 @@
 
 #### FIXED
 
+- Zsh completion not outputting results
 - Remove `--[no]` from non-negatable options
 - `doing plugins -t export -c` not outputting columns
 - View config not respecting tag_order setting
  
-### 2.0.5.pre
-
-#### NEW
-
-- Add 'timer_format' config with 'human' option for tag totals
-
 ### 2.0.3.pre
 
 #### NEW

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.0.8.pre)
+    doing (2.0.9.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.7<!--END VER-->.
+The current version of `doing` is <!--VER-->2.0.8<!--END VER-->.
 
 Find all of the documentation in the [doing wiki](https://github.com/ttscoff/doing/wiki).
 

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
@@ -201,6 +204,10 @@ command %i[reset begin] do |c|
   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'
@@ -213,7 +220,9 @@ 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]
@@ -261,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'
@@ -285,6 +299,10 @@ command :note do |c|
   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'
@@ -299,6 +317,8 @@ 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]
@@ -356,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]
@@ -422,12 +447,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
 
@@ -505,6 +530,10 @@ command :select do |c|
   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
 
@@ -542,6 +571,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
@@ -549,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
 
@@ -598,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
 
@@ -787,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
 
@@ -802,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
 
@@ -831,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,
@@ -852,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
 
@@ -882,6 +952,10 @@ command :finish do |c|
   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'
@@ -963,6 +1037,7 @@ command :finish do |c|
       count: count,
       date: options[:date],
       search: search,
+      case: options[:case].normalize_case,
       not: options[:not],
       section: options[:section],
       sequential: options[:auto],
@@ -1003,6 +1078,10 @@ command %i[again resume] do |c|
   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'
@@ -1020,6 +1099,8 @@ 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]
@@ -1103,6 +1184,10 @@ command :tag do |c|
   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'
@@ -1147,6 +1232,8 @@ 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]
@@ -1229,6 +1316,10 @@ command [:mark, :flag] do |c|
   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'
@@ -1260,6 +1351,8 @@ 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]
@@ -1346,6 +1439,10 @@ command :show do |c|
   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'
@@ -1450,6 +1547,8 @@ 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]
@@ -1521,12 +1620,13 @@ command %i[grep search] do |c|
   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 '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
 
@@ -1536,6 +1636,9 @@ 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]
+
+    options[:case] = options[:case].normalize_case
+
     search = args.join(' ')
     search.sub!(/^'?/, "'") if options[:exact]
 
@@ -1866,6 +1969,10 @@ command :last do |c|
   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 InvalidArgument, '--tag and --search can not be used together' if options[:tag] && options[:search]
 
@@ -1884,6 +1991,8 @@ command :last do |c|
 
     end
 
+    options[:case] = options[:case].normalize_case
+
     search = nil
 
     if options[:search]
@@ -1892,10 +2001,10 @@ command :last do |c|
     end
 
     if options[:editor]
-      wwid.edit_last(section: options[:s], options: { search: search, tag: tags, tag_bool: options[:bool], not: options[:not] })
+      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: search, negate: options[:not], 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
@@ -2059,6 +2168,10 @@ command :view do |c|
   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
@@ -2190,6 +2303,8 @@ command :view do |c|
         dates = [start, finish]
       end
 
+      options[:case] = options[:case].normalize_case
+
       search = nil
 
       if options[:search]
@@ -2197,7 +2312,7 @@ command :view do |c|
         search.sub!(/^'?/, "'") if options[:exact]
       end
 
-      opts = options
+      opts = options.dup
       opts[:search] = search
       opts[:output] = output_format
       opts[:count] = count
@@ -2277,6 +2392,10 @@ command %i[archive move] do |c|
   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'
@@ -2302,12 +2421,14 @@ command %i[archive move] do |c|
 
     search = nil
 
+    options[:case] = options[:case].normalize_case
+
     if options[:search]
       search = options[:search]
       search.sub!(/^'?/, "'") if options[:exact]
     end
 
-    opts = options
+    opts = options.dup
     opts[:search] = search
     opts[:bool] = options[:bool].normalize_bool
     opts[:destination] = options[:to]
@@ -2349,6 +2470,10 @@ command :rotate do |c|
   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'
@@ -2361,6 +2486,8 @@ command :rotate do |c|
 
     options[:bool] = options[:bool].normalize_bool
 
+    options[:case] = options[:case].normalize_case
+
     search = nil
 
     if options[:search]
@@ -2563,6 +2690,10 @@ command :import do |c|
   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
 
@@ -2620,6 +2751,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

data/doing.rdoc

@@ -1,8 +1,11 @@
 == doing - A CLI for a What Was I Doing system
 
-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.
+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.8.pre
+v2.0.9.pre
 
 === Global Options
 === --config_file arg
@@ -87,6 +90,14 @@ Boolean used to combine multiple tags
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
 
 
+===== --case TYPE
+
+Case sensitivity for search string matching [(c)ase-sensitive, (i)nsensitive, (s)mart]
+
+[Default Value] smart
+[Must Match] (?-mix:^[csi])
+
+
 ===== --in SECTION_NAME
 
 Add new entry to section (default: same section as repeated entry)
@@ -167,6 +178,14 @@ Tag boolean (AND|OR|NOT)
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
 
 
+===== --case TYPE
+
+Case sensitivity for search string matching [(c)ase-sensitive, (i)nsensitive, (s)mart]
+
+[Default Value] smart
+[Must Match] (?-mix:^[csi])
+
+
 ===== -k|--keep X
 
 How many items to keep (ignored if archiving by tag or search)
@@ -284,6 +303,14 @@ Boolean (AND|OR|NOT) with which to combine multiple tag filters
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
 
 
+===== --case TYPE
+
+Case sensitivity for search string matching [(c)ase-sensitive, (i)nsensitive, (s)mart]
+
+[Default Value] smart
+[Must Match] (?-mix:^[csi])
+
+
 ===== -s|--section NAME
 
 Section
@@ -291,6 +318,13 @@ Section
 [Default Value] None
 
 
+===== --search QUERY
+
+Cancel the last X entries matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("'query")
+
+[Default Value] None
+
+
 ===== --tag TAG
 
 Cancel the last X entries containing TAG. Separate multiple tags with comma (--tag=tag1,tag2)
@@ -308,11 +342,21 @@ Select item(s) to cancel from a menu of matching entries
 
 
 
+===== --not
+Finish items that *don't* match search/tag filters
+
+
+
 ===== -u|--unfinished
 Cancel last entry (or entries) not already marked @done
 
 
 
+===== -x|--exact
+Force exact search string matching (case sensitive)
+
+
+
 ==== Command: <tt>choose </tt>
 Select a section to display from a menu
 
@@ -493,6 +537,14 @@ Boolean (AND|OR|NOT) with which to combine multiple tag filters
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
 
 
+===== --case TYPE
+
+Case sensitivity for search string matching [(c)ase-sensitive, (i)nsensitive, (s)mart]
+
+[Default Value] smart
+[Must Match] (?-mix:^[csi])
+
+
 ===== -s|--section NAME
 
 Section
@@ -585,6 +637,14 @@ Constrain search to entries older than date
 [Default Value] None
 
 
+===== --case TYPE
+
+Case sensitivity for search string matching [(c)ase-sensitive, (i)nsensitive, (s)mart]
+
+[Default Value] smart
+[Must Match] (?-mix:^[csi])
+
+
 ===== -o|--output FORMAT
 
 Output to export format (csv|doing|html|markdown|say|taskpaper|template|timeline|wiki)
@@ -607,11 +667,6 @@ 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
 
@@ -671,6 +726,14 @@ Import entries older than date
 [Default Value] None
 
 
+===== --case TYPE
+
+Case sensitivity for search string matching [(c)ase-sensitive, (i)nsensitive, (s)mart]
+
+[Default Value] smart
+[Must Match] (?-mix:^[csi])
+
+
 ===== -f|--from DATE_OR_RANGE
 
 Date range to import. Date range argument should be quoted. Date specifications can be natural language.
@@ -753,6 +816,14 @@ Tag boolean
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
 
 
+===== --case TYPE
+
+Case sensitivity for search string matching [(c)ase-sensitive, (i)nsensitive, (s)mart]
+
+[Default Value] smart
+[Must Match] (?-mix:^[csi])
+
+
 ===== -s|--section NAME
 
 Specify a section
@@ -834,6 +905,14 @@ How many recent entries to tag (0 for all)
 [Must Match] (?-mix:^\d+$)
 
 
+===== --case TYPE
+
+Case sensitivity for search string matching [(c)ase-sensitive, (i)nsensitive, (s)mart]
+
+[Default Value] smart
+[Must Match] (?-mix:^[csi])
+
+
 ===== -s|--section SECTION_NAME
 
 Section
@@ -944,6 +1023,14 @@ Boolean (AND|OR|NOT) with which to combine multiple tag filters
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
 
 
+===== --case TYPE
+
+Case sensitivity for search string matching [(c)ase-sensitive, (i)nsensitive, (s)mart]
+
+[Default Value] smart
+[Must Match] (?-mix:^[csi])
+
+
 ===== -s|--section NAME
 
 Section
@@ -1158,6 +1245,14 @@ Boolean (AND|OR|NOT) with which to combine multiple tag filters
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
 
 
+===== --case TYPE
+
+Case sensitivity for search string matching [(c)ase-sensitive, (i)nsensitive, (s)mart]
+
+[Default Value] smart
+[Must Match] (?-mix:^[csi])
+
+
 ===== -s|--section NAME
 
 Limit search to section
@@ -1220,6 +1315,14 @@ Tag boolean (AND|OR|NOT)
 [Must Match] (?i-mx:^(?:and|all|any|or|not|none)$)
 
 
+===== --case TYPE
+
+Case sensitivity for search string matching [(c)ase-sensitive, (i)nsensitive, (s)mart]
+
+[Default Value] smart
+[Must Match] (?-mix:^[csi])
+
+
 ===== -k|--keep X
 
 How many items to keep in each section (most recent)
@@ -1278,6 +1381,14 @@ Multiple selections are allowed, hit tab to add the highlighted entry to the
 selection, and use ctrl-a to select all visible items. Return processes the
 selected entries.
 ===== Options
+===== --case TYPE
+
+Case sensitivity for search string matching [(c)ase-sensitive, (i)nsensitive, (s)mart]
+
+[Default Value] smart
+[Must Match] (?-mix:^[csi])
+
+
 ===== -m|--move SECTION
 
 Move selected items to section
@@ -1422,6 +1533,14 @@ Max count to show
 [Default Value] 0
 
 
+===== --case TYPE
+
+Case sensitivity for search string matching [(c)ase-sensitive, (i)nsensitive, (s)mart]
+
+[Default Value] smart
+[Must Match] (?-mix:^[csi])
+
+
 ===== -f|--from DATE_OR_RANGE
 
 Date range to show, or a single day to filter date on.
@@ -1577,6 +1696,14 @@ How many recent entries to tag (0 for all)
 [Must Match] (?-mix:^\d+$)
 
 
+===== --case TYPE
+
+Case sensitivity for search string matching [(c)ase-sensitive, (i)nsensitive, (s)mart]
+
+[Default Value] smart
+[Must Match] (?-mix:^[csi])
+
+
 ===== --rename ORIG_TAG
 
 Replace existing tag with tag argument, wildcards (*,?) allowed, or use with --regex
@@ -1655,9 +1782,7 @@ Force exact search string matching (case sensitive)
 Output HTML, CSS, and Markdown (ERB) templates for customization
 
 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.
 ===== Options
 ===== -c
 List in single column for completion
@@ -1771,6 +1896,14 @@ Count to display
 [Must Match] (?-mix:^\d+$)
 
 
+===== --case TYPE
+
+Case sensitivity for search string matching [(c)ase-sensitive, (i)nsensitive, (s)mart]
+
+[Default Value] smart
+[Must Match] (?-mix:^[csi])
+
+
 ===== -o|--output FORMAT
 
 Output to export format (csv|doing|html|markdown|say|taskpaper|template|timeline|wiki)

data/lib/doing/item.rb

@@ -75,7 +75,7 @@ module Doing
       negate ? !matches : matches
     end
 
-    def search(search, negate: false)
+    def search(search, negate: false, case_type: :smart)
       text = @title + @note.to_s
       pattern = case search.strip
                 when %r{^/.*?/$}
@@ -84,7 +84,12 @@ module Doing
                   case_sensitive = true
                   search.sub(/^'(.*?)'?$/, '\1')
                 else
-                  case_sensitive = true if search =~ /[A-Z]/
+                  if case_type == :smart
+                    case_sensitive = true if search =~ /[A-Z]/
+                  else
+                    case_sensitive = case_type == :sensitive
+                  end
+
                   search.split('').join('.{0,3}')
                 end
       rx = Regexp.new(pattern, !case_sensitive)

data/lib/doing/string.rb

@@ -164,6 +164,28 @@ module Doing
       end
     end
 
+    ##
+    ## @brief      Convert a case sensitivity string to a symbol
+    ##
+    ## @return     Symbol :smart, :sensitive, :insensitive
+    ##
+    def normalize_case!
+      replace normalize_case
+    end
+
+    def normalize_case(default = :smart)
+      case self
+      when /^c/i
+        :sensitive
+      when /^i/i
+        :insensitive
+      when /^s/i
+        :smart
+      else
+        default.is_a?(Symbol) ? default : default.normalize_case
+      end
+    end
+
     ##
     ## @brief      Convert a boolean string to a symbol
     ##

data/lib/doing/version.rb

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

data/lib/doing/wwid.rb

@@ -700,12 +700,17 @@ module Doing
         end
 
         if keep && opt[:search]
-          search_match = opt[:search].nil? || opt[:search].empty? ? true : item.search(opt[:search])
+          opt[:case] = opt[:case].normalize_case unless opt[:case].is_a?(Symbol)
+          search_match = if opt[:search].nil? || opt[:search].empty?
+                           true
+                         else
+                           item.search(opt[:search], case_type: opt[:case])
+                         end
+
           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]
@@ -773,14 +778,13 @@ module Doing
       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] })
+      items = filter_items([], opt: { section: section, search: opt[:search], case: opt[:case] })
 
       selection = choose_from_items(items, opt, include_section: section =~ /^all$/i)
 
@@ -957,7 +961,7 @@ module Doing
       if opt[:delete]
         res = opt[:force] ? true : yn("Delete #{items.size} items?", default_response: 'y')
         if res
-          items.each { |item| delete_item(item) }
+          items.each { |item| delete_item(item, single: items.count == 1) }
           write(@doing_file)
         end
         return
@@ -1015,7 +1019,7 @@ module Doing
           title = input_lines[0]&.strip
 
           if title.nil? || title =~ /^#{divider.strip}$/ || title.strip.empty?
-            delete_item(items[i])
+            delete_item(items[i], single: new_items.count == 1)
           else
             note = input_lines.length > 1 ? input_lines[1..-1] : []
 
@@ -1265,13 +1269,13 @@ module Doing
     ##
     ## @param      item  The item
     ##
-    def delete_item(item)
+    def delete_item(item, single: false)
       section = item.section
 
       section_items = @content[section][:items]
       deleted = section_items.delete(item)
       logger.count(:deleted)
-      logger.info('Entry deleted:', deleted.title)
+      logger.info('Entry deleted:', deleted.title) if single
     end
 
     ##
@@ -1897,6 +1901,7 @@ module Doing
       end
 
       opts[:search] = options[:search] if options[:search]
+      opts[:case] = options[:case]
       opts[:not] = options[:negate]
       list_section(opts)
     end
@@ -2070,7 +2075,7 @@ EOS
           (max - k.length).times do
             spacer += ' '
           end
-          d, h, m = format_time(v, human: true)
+          _d, h, m = format_time(v, human: true)
           output.push("┃ #{spacer}#{k}:#{format('%<h> 4dh %<m>02dm', h: h, m: m)} ┃")
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.0.8.pre
+  version: 2.0.9.pre
 platform: ruby
 authors:
 - Brett Terpstra