doing 2.1.12 → 2.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f9b0909f6932a364f723a8f58d8f2c0c77dc8d1d3c94e8821aa547bf86782d3
-  data.tar.gz: 648866be90f3bf9fab15917030816cbd69487b118adc52359e4bdac25c20fee3
+  metadata.gz: c12d0846431cd0468f217f3e1e9b80bcb9a86038fbee7ff057c1db8ad6c56bb3
+  data.tar.gz: a144f25b2798825ad042d690e21c1a798b83e06e49480c92be7acea752d37e48
 SHA512:
-  metadata.gz: 0af6520dd4912f0add0bc72c3b9b95d41515abac898a9f42c5f61bccef1634d462746b727b1498455dbe360435a6d63492cd9b83ca7654268ad76fda22bed73e
-  data.tar.gz: 7b831fa4e1b95ec65841bb1e6358b3bf1daef6208f185bc1d9b819d375365725eb76bba258f999927664bbfe77615718408a8d09ca9190de1f825055f518ca8a
+  metadata.gz: 66f76cd0588f4dca848c94313051bcb39bc776c4679b8bd9a648887dd764dcc3232d45e18bb260edb7500e3c398aef8a02216a11ce5a593b8822f89267c92214
+  data.tar.gz: bc852708998d6e670fe72c882f2e254f64bbec487cd56b659e75220bdd5a5c75b5495d1a9b4a734d56825a00563b1b3052bdcd2c4a93761479a2bbe9a2eb397d

data/.yardoc/checksums

@@ -1,25 +1,25 @@
 lib/doing/hash.rb c2960de9603dcf90be85ce423d9430de27f4f893
-lib/doing/item.rb fcf106fb43a1a979d5213c8ac47161d9f6d8635f
+lib/doing/item.rb 54cea2275eaa19a9285e358c51f8630a558730ee
 lib/doing/note.rb bbadd9e34e6dc43a2af1110a5107f46c39d2547f
 lib/doing/time.rb 4411af636082d3abf6f6402a7d6c9038d96a9ead
 lib/doing/util.rb 33ad79455893213a0f2993edec0e158526657f09
-lib/doing/wwid.rb bca76421c6d5f85fd6ff19063a79189b2accf255
+lib/doing/wwid.rb a6e14548e14219d46a6fdc1c9c9accb5f4277654
 lib/doing/array.rb a17004c4811d239932254f9ed94a6eb10456c8e8
-lib/doing/hooks.rb 00feacdbf24dc67951c49ca8c1ca9a568441920e
-lib/doing/items.rb 0860a0ac7269f59de994ae900c980e49359dc8d5
-lib/doing/pager.rb 230c10dea5e9c68b5709a0f4cb088c76970965e4
+lib/doing/hooks.rb acf6e0615ccf1949f84915c979297845242c1205
+lib/doing/items.rb 8cda7caaef10645893267262f5eee681e35046ce
+lib/doing/pager.rb b58e478b0cb8d400ddb97988ba741e3a127b53c3
 lib/doing/colors.rb 9a628d48c821313c502deedc5b61a046a2bf79ef
 lib/doing/errors.rb af07e482a5389924edc2337749c81cda501098f0
 lib/doing/prompt.rb a78b6f4488fe58b5653ce541a88d24559661459c
 lib/doing/string.rb 7cbe3e0bd136c52f7b12d4d6133afe20fe204be2
 lib/doing/symbol.rb 309799458a1bc715c2707307c9a62ab26086275e
 lib/doing/section.rb 206e119cf818f1e76798753e611180fe77bc299a
-lib/doing/version.rb 08de25ee059d2e8eae4b3e1b3dac66e0d48461e6
+lib/doing/version.rb d2b8ae34e7fd7354adae5386fe3ed84c88e5dc88
 lib/doing/cli_status.rb dbedd454c4cbbd0fed9ef30120f6ec85d18b9356
 lib/doing/completion.rb c658e7dc7898fb022a21b2bd77bedb958ca3b067
 lib/doing/log_adapter.rb 6cf0c9a405d17449643e54d35a04897b1da44eaf
-lib/doing/util_backup.rb 4441a22bdc81e7bba2eb259c522ef819d1b99616
-lib/doing/configuration.rb a9aad93aac92f4c5edcde3440654d9e836238364
+lib/doing/util_backup.rb c1bda6ee3acc9a5f649df47590e67ff8b1e90c50
+lib/doing/configuration.rb fc72d4343740a551988a7f56c426a62d51f85e65
 lib/doing/phrase_parser.rb 8f1789d7cf8326d8cc231b4a21505a93f8de20d2
 lib/doing/plugin_manager.rb cb16a82c3182ef7008359670ab96ff6b39270ccc
 lib/doing/string_chronify.rb ccbb08389d2139c7121203f8585864e3026d1526

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 2.1.13
+
+#### NEW
+
+- --val flag for all display commands, allows tag value queries. Tag values are contained in parenthesis after the tag, e.g. @progress(50). Queries look like `--val "done < two weeks ago"`, "project *= oracle" or "progress >= 50". Wildcards allowed in value, comparators can be <, >, <=, >=, ==, *= (contains), ^= (begins with), $= (ends with). Numeric and date comparisons are detected automatically. Text comparisons are case insensitive. --val can be used multiple times in a command and you can use --bool to specify AND, OR, or NOT (default AND)
+- `doing tag` now accepts a `--value` flag to define a value for a single tag, e.g. @tag(value)
+
+#### FIXED
+
+- `doing last --editor` errors
+
 ### 2.1.12
 
 #### NEW

data/Gemfile.lock

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

data/bin/doing

@@ -27,6 +27,7 @@ autocomplete_commands true
 
 REGEX_BOOL = /^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$/i
 REGEX_SORT_ORDER = /^(?:a(?:sc)?|d(?:esc)?)$/i
+REGEX_VALUE_QUERY = /^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$/
 
 InvalidExportType = Class.new(RuntimeError)
 MissingConfigFile = Class.new(RuntimeError)
@@ -110,7 +111,7 @@ switch %i[q quiet], default_value: false, negatable: false
 desc 'Verbose output'
 switch %i[debug], default_value: false, negatable: false
 
-desc 'Use a specific configuration file. Deprecated, set $DOING_CONFIG instead.'
+desc 'Use a specific configuration file. Deprecated, set $DOING_CONFIG instead'
 flag [:config_file], default_value: config.config_file
 
 desc 'Specify a different doing_file'
@@ -120,7 +121,7 @@ flag %i[f doing_file]
 
 # @@again @@resume
 desc 'Repeat last entry as new entry'
-long_desc 'This command is designed to allow multiple time intervals to be created for an entry by duplicating it with a new start (and end, eventually) time.'
+long_desc 'This command is designed to allow multiple time intervals to be created for an entry by duplicating it with a new start (and end, eventually) time'
 command %i[again resume] do |c|
   c.example 'doing resume', desc: 'Duplicate the most recent entry with a new start time, removing any @done tag'
   c.example 'doing again', desc: 'again is an alias for resume'
@@ -136,7 +137,7 @@ command %i[again resume] do |c|
   c.arg_name 'SECTION_NAME'
   c.flag [:in]
 
-  c.desc 'Repeat last entry matching tags. Combine multiple tags with a comma. Wildcards allowed (*, ?).'
+  c.desc 'Repeat last entry matching tags. Combine multiple tags with a comma. Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
   c.flag [:tag]
 
@@ -145,6 +146,10 @@ command %i[again resume] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -158,7 +163,7 @@ command %i[again resume] do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
-  c.desc 'Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans.'
+  c.desc 'Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -196,7 +201,7 @@ end
 
 # @@cancel
 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`.'
+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'
@@ -209,11 +214,11 @@ command :cancel do |c|
   c.arg_name 'NAME'
   c.flag %i[s section]
 
-  c.desc 'Cancel the last X entries containing TAG. Separate multiple tags with comma (--tag=tag1,tag2). Wildcards allowed (*, ?).'
+  c.desc 'Cancel the last X entries containing TAG. Separate multiple tags with comma (--tag=tag1,tag2). Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
   c.flag [:tag]
 
-  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans.'
+  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -221,6 +226,10 @@ command :cancel do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -285,7 +294,8 @@ command :cancel do |c|
       tag: tags,
       tag_bool: options[:bool].normalize_bool,
       tags: ['done'],
-      unfinished: options[:unfinished]
+      unfinished: options[:unfinished],
+      val: options[:val]
     }
 
     wwid.tag_last(opts)
@@ -293,7 +303,7 @@ command :cancel do |c|
 end
 
 # @@done @@did
-desc 'Add a completed item with @done(date). No argument finishes last entry.'
+desc 'Add a completed item with @done(date). No argument finishes last entry'
 long_desc 'Use this command to add an entry after you\'ve already finished it. It will be immediately marked as @done.
 You can modify the start and end times of the entry using the --back, --took, and --at flags, making it an easy
 way to add entries in post and maintain accurate (albeit manual) time tracking.'
@@ -535,6 +545,10 @@ command :finish do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -548,7 +562,7 @@ command :finish do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
-  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans.'
+  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -641,7 +655,8 @@ command :finish do |c|
       tag_bool: options[:bool].normalize_bool,
       tags: ['done'],
       took: options[:took],
-      unfinished: options[:unfinished]
+      unfinished: options[:unfinished],
+      val: options[:val]
     }
 
     wwid.tag_last(opts)
@@ -745,6 +760,10 @@ command %i[mark flag] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -758,7 +777,7 @@ command %i[mark flag] do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
-  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans.'
+  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -937,7 +956,7 @@ command :note do |c|
   c.desc "Replace/Remove last entry's note (default append)"
   c.switch %i[r remove], negatable: false, default_value: false
 
-  c.desc 'Add/remove note from last entry matching tag. Wildcards allowed (*, ?).'
+  c.desc 'Add/remove note from last entry matching tag. Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
   c.flag [:tag]
 
@@ -945,6 +964,10 @@ command :note do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -958,7 +981,7 @@ command :note do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
-  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans.'
+  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -1135,7 +1158,7 @@ command %i[reset begin] do |c|
   c.desc 'Resume entry (remove @done)'
   c.switch %i[r resume], default_value: true
 
-  c.desc 'Reset last entry matching tag. Wildcards allowed (*, ?).'
+  c.desc 'Reset last entry matching tag. Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
   c.flag [:tag]
 
@@ -1143,6 +1166,10 @@ command %i[reset begin] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -1156,7 +1183,7 @@ command %i[reset begin] do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
-  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
+  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -1258,11 +1285,15 @@ command :select do |c|
   c.arg_name 'QUERY'
   c.flag %i[q query search]
 
-  c.desc 'Select from entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.'
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
+  c.desc 'Select from entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
   c.arg_name 'DATE_STRING'
   c.flag [:before]
 
-  c.desc 'Select from entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.'
+  c.desc 'Select from entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
   c.arg_name 'DATE_STRING'
   c.flag [:after]
 
@@ -1287,7 +1318,7 @@ command :select do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
-  c.desc 'Use --no-menu to skip the interactive menu. Use with --query to filter items and act on results automatically. Test with `--output doing` to preview matches.'
+  c.desc 'Use --no-menu to skip the interactive menu. Use with --query to filter items and act on results automatically. Test with `--output doing` to preview matches'
   c.switch %i[menu], negatable: true, default_value: true
 
   c.desc 'Cancel selected items (add @done without timestamp)'
@@ -1305,7 +1336,7 @@ command :select do |c|
   c.desc 'Add flag to selected item(s)'
   c.switch %i[flag], negatable: false, default_value: false
 
-  c.desc 'Perform action without confirmation.'
+  c.desc 'Perform action without confirmation'
   c.switch %i[force], negatable: false, default_value: false
 
   c.desc 'Save selected entries to file using --output format'
@@ -1365,6 +1396,10 @@ command :tag do |c|
   c.arg_name 'ORIG_TAG'
   c.flag %i[rename]
 
+  c.desc 'Include a value, e.g. @tag(value)'
+  c.arg_name 'VALUE'
+  c.flag %i[v value]
+
   c.desc 'Don\'t ask permission to tag all entries when count is 0'
   c.switch %i[force], negatable: false, default_value: false
 
@@ -1392,6 +1427,10 @@ command :tag do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -1405,7 +1444,7 @@ command :tag do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
-  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans.'
+  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -1528,11 +1567,11 @@ command %i[grep search] do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc 'Search entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.'
+  c.desc 'Search entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
   c.arg_name 'DATE_STRING'
   c.flag [:before]
 
-  c.desc 'Search entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.'
+  c.desc 'Search entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
   c.arg_name 'DATE_STRING'
   c.flag [:after]
 
@@ -1591,6 +1630,13 @@ command %i[grep search] do |c|
   c.desc 'Display an interactive menu of results to perform further operations'
   c.switch %i[i interactive], default_value: false, negatable: false
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
+  c.desc 'Combine multiple tags or value queries using AND, OR, or NOT'
+  c.flag [:bool], must_match: REGEX_BOOL, default_value: 'AND'
+
   c.action do |_global_options, options, args|
     options[:fuzzy] = false
     raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
@@ -1601,6 +1647,7 @@ command %i[grep search] do |c|
     section = wwid.guess_section(options[:section]) if options[:section]
 
     options[:case] = options[:case].normalize_case
+    options[:bool] = options[:bool].normalize_bool
 
     search = args.join(' ')
     search.sub!(/^'?/, "'") if options[:exact]
@@ -1639,11 +1686,11 @@ command :last do |c|
   c.desc "Delete the last entry"
   c.switch %i[d delete], negatable: false, default_value: false
 
-  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?).'
+  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
   c.flag [:tag]
 
-  c.desc 'Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans.'
+  c.desc 'Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -1651,6 +1698,10 @@ command :last do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   c.desc 'Show elapsed time if entry is not tagged @done'
   c.switch [:duration]
 
@@ -1685,12 +1736,14 @@ command :last do |c|
     if options[:editor]
       wwid.edit_last(section: options[:section],
                      options: {
-                       search: search,
+                       search: options[:search],
                        fuzzy: options[:fuzzy],
                        case: options[:case],
-                       tag: tags,
+                       tag: options[:tag],
                        tag_bool: options[:bool],
-                       not: options[:not]
+                       not: options[:not],
+                       val: options[:val],
+                       bool: options[:bool]
                      })
     else
       last = wwid.last(times: true, section: options[:section],
@@ -1702,7 +1755,9 @@ command :last do |c|
                         negate: options[:not],
                         tag: options[:tag],
                         tag_bool: options[:bool],
-                        delete: options[:delete]
+                        delete: options[:delete],
+                        bool: options[:bool],
+                        val: options[:val]
                       })
       Doing::Pager::page last.strip if last
     end
@@ -1798,11 +1853,15 @@ command :show do |c|
   c.example 'doing show Ideas @doing --from "mon to fri"', desc: 'Show entries tagged @doing from the Ideas section added between monday and friday of the current week.'
   c.example 'doing show --interactive Later @doing', desc: 'Create a menu from entries from the Later section tagged @doing to perform batch actions'
 
-  c.desc 'Tag filter, combine multiple tags with a comma. Use `--tag pick` for a menu of available tags. Wildcards allowed (*, ?). Added for compatibility with other commands.'
+  c.desc 'Tag filter, combine multiple tags with a comma. Use `--tag pick` for a menu of available tags. Wildcards allowed (*, ?). Added for compatibility with other commands'
   c.arg_name 'TAG'
   c.flag [:tag]
 
-  c.desc 'Tag boolean (AND,OR,NOT). Use PATTERN to parse + and - as booleans.'
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
+  c.desc 'Tag boolean (AND,OR,NOT). Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag %i[b bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -1814,11 +1873,11 @@ command :show do |c|
   c.arg_name 'AGE'
   c.flag %i[a age], default_value: 'newest'
 
-  c.desc 'Show entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.'
+  c.desc 'Show entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
   c.arg_name 'DATE_STRING'
   c.flag [:before]
 
-  c.desc 'Show entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.'
+  c.desc 'Show entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
   c.arg_name 'DATE_STRING'
   c.flag [:after]
 
@@ -2012,7 +2071,7 @@ command :tags do |c|
   c.arg_name 'ORDER'
   c.flag %i[o order], must_match: REGEX_SORT_ORDER, default_value: 'asc'
 
-  c.desc 'Get tags for entries matching tags. Combine multiple tags with a comma. Wildcards allowed (*, ?).'
+  c.desc 'Get tags for entries matching tags. Combine multiple tags with a comma. Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
   c.flag [:tag]
 
@@ -2021,6 +2080,10 @@ command :tags do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -2034,7 +2097,7 @@ command :tags do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
-  c.desc 'Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans.'
+  c.desc 'Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -2291,11 +2354,15 @@ command :view do |c|
   c.desc 'Include colors in output'
   c.switch [:color], default_value: true, negatable: true
 
-  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?).'
+  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
   c.flag [:tag]
 
-  c.desc 'Tag boolean (AND,OR,NOT). Use PATTERN to parse + and - as booleans.'
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
+  c.desc 'Tag boolean (AND,OR,NOT). Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag %i[b bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -2324,11 +2391,11 @@ command :view do |c|
   c.arg_name 'DIRECTION'
   c.flag [:tag_order], must_match: REGEX_SORT_ORDER
 
-  c.desc 'View entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.'
+  c.desc 'View entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
   c.arg_name 'DATE_STRING'
   c.flag [:before]
 
-  c.desc 'View entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.'
+  c.desc 'View entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
   c.arg_name 'DATE_STRING'
   c.flag [:after]
 
@@ -2935,11 +3002,11 @@ command %i[archive move] do |c|
   c.desc 'Label moved items with @from(SECTION_NAME)'
   c.switch [:label], default_value: true, negatable: true
 
-  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?). Added for compatibility with other commands.'
+  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?). Added for compatibility with other commands'
   c.arg_name 'TAG'
   c.flag [:tag]
 
-  c.desc 'Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans.'
+  c.desc 'Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -2947,6 +3014,10 @@ command %i[archive move] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -3122,11 +3193,11 @@ command :rotate do |c|
   c.arg_name 'SECTION_NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?). Added for compatibility with other commands.'
+  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?). Added for compatibility with other commands'
   c.arg_name 'TAG'
   c.flag [:tag]
 
-  c.desc 'Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans.'
+  c.desc 'Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -3134,6 +3205,10 @@ command :rotate do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -3357,7 +3432,7 @@ command :undo do |c|
   c.arg_name 'COUNT'
   c.flag %i[p prune], type: Integer
 
-  c.desc 'Redo last undo. Note: you cannot undo a redo.'
+  c.desc 'Redo last undo. Note: you cannot undo a redo'
   c.switch %i[r redo]
 
   c.action do |_global_options, options, args|
@@ -3384,7 +3459,7 @@ command :undo do |c|
 end
 
 # @@redo
-long_desc 'Shortcut for `doing undo -r`, reverses the last undo command. You cannot undo a redo.'
+long_desc 'Shortcut for `doing undo -r`, reverses the last undo command. You cannot undo a redo'
 arg_name 'COUNT'
 command :redo do |c|
   c.desc 'Specify alternate doing file'

data/docs/doc/Array.html

@@ -540,7 +540,7 @@ with</p>
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 21 14:44:17 2021 by
+  Generated on Fri Jan 14 21:59:14 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.26 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/Clause.html

@@ -283,7 +283,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 21 14:44:17 2021 by
+  Generated on Fri Jan 14 21:59:14 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.26 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/Operator.html

@@ -162,7 +162,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 21 14:44:17 2021 by
+  Generated on Fri Jan 14 21:59:14 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.26 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/Query.html

@@ -407,7 +407,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 21 14:44:17 2021 by
+  Generated on Fri Jan 14 21:59:14 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.26 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/QueryParser.html

@@ -125,7 +125,7 @@ parser. In order to do that, a new "clause" node is added to the parse
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 21 14:44:17 2021 by
+  Generated on Fri Jan 14 21:59:14 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.26 (ruby-3.0.1).
 </div>