doing 1.0.86 → 1.0.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2af84d93e54c8366719e285303dc11d966f9b83361ae4ac20ca172536465f4ee
-  data.tar.gz: 7fa72f0ec1ba1a18e45d80c1604910cabb00c8dad485b96d05bd8c3e33a5b4ae
+  metadata.gz: ce98503c379e1c769b36a26ed4f2efc9d1871c60abd67a18152db3862e1664c4
+  data.tar.gz: a4783a52a345f7676e08b53d9a06e4b5170ab5ff0f0d52e2ac45bcf7d6dc87f9
 SHA512:
-  metadata.gz: 158707f75c6375fb5d684457d0b17c874fb2dc0f9b2e5318a24f055665ed246e69149211fb45487acac2174b2ca9db6ebd62b071af0c283377d5e2fa78f663c2
-  data.tar.gz: 80bf8ff4da513c0d911afdf5bbeb2589f6a08bf46eb746c5eb610f5ddac1bdc7d7469f1f3eb399e86c4a671358df704c98596841c2f8964d3f81ebe985de1435
+  metadata.gz: e2166477e4557597bbc5ad81bb94b73a2ec6c1c4ebdb98ac3d7ef860ddb9e6baf1998dd61accc9d336bd59003a77f7486b31edd1c818bab24b9e9ddb44608c7f
+  data.tar.gz: bfba29c14482747cf3150d31d44ccf43038e41c40876b37ebbb2c8c5e1aeb0dc3c0365125c0ef6a53e79d790893c4670a97e55051b06b3292ec4d2040799f15f

data/README.md

@@ -27,7 +27,7 @@ If there's something I want to look at later but doesn't need to be added to a t
 
 ## Installation
 
-The current version of `doing` is <!--VER-->1.0.85<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.89<!--END VER-->.
 
     $ [sudo] gem install doing
 
@@ -545,6 +545,8 @@ If you have a use for it, you can use `-o csv` on the show or view commands to o
 
 `doing yesterday` is great for stand-ups (thanks to [Sean Collins](https://github.com/sc68cal) for that!). Note that you can show yesterday's activity from an alternate section by using the section name as an argument (e.g. `doing yesterday archive`).
 
+All of the display commands (view, show, today, yesterday, search) support date ranges in addition to other filtering options. Results can be narrowed to a date/time span using `--before DATE` and `--after DATE`. The `DATE` accepts a natural language string but works best in formats like `10/20/21` or `2021-05-13 3pm` (or shortened to just `5/13 3pm`). For the `today` and `yesterday` commands the `DATE` should just be a time, e.g. `12pm` or `15:00`, and results will be filtered within the timespan for just that day. Both flags are optional, and you can use just `--before` to get everything older than a certain date, or use just `--after` to get everything newer.
+
 `doing on` allows for full date ranges and filtering. `doing on saturday`, or `doing on one month to today` will give you ranges. You can use the same terms with the `show` command by adding the `-f` or `--from` flag. `doing show @done --from "monday to friday"` will give you all of your completed items for the last week (assuming it's the weekend). There's also `doing since` a simple alias for `doing on PAST_DATE to now`, e.g. `doing since monday`.
 
 You can also show entries matching a search string with `doing grep` (synonym `doing search`). If you want to search with regular expressions or for an exact match, surround your search query with forward slashes, e.g. `doing search /project name/`. If you pass a search string without slashes, it's treated as a fuzzy search string, meaning matches can be found as long as the characters in the search string are in order and with no more than three other characters between each. By default searches are across all sections, but you can limit it to one with the `-s SECTION_NAME` flag. Searches can be displayed with the default template, or output as HTML, CSV, or JSON.

data/bin/doing

@@ -292,10 +292,13 @@ command :select do |c|
   c.arg_name 'SECTION'
   c.flag %i[m move]
 
-  c.desc 'Initial search query for filtering'
+  c.desc 'Initial search query for filtering. Matching is fuzzy. For exact matching, start query with a single quote, e.g. `--query "\'search"'
   c.arg_name 'QUERY'
   c.flag %i[q query]
 
+  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)'
   c.switch %i[c cancel], negatable: false, default_value: false
 
@@ -311,7 +314,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'
@@ -323,6 +326,8 @@ command :select do |c|
   c.flag %i[o output], must_match: /^(?:doing|taskpaper|html|csv|json|template|timeline)$/i
 
   c.action do |_global_options, options, args|
+    exit_now! "--no-menu requires --query" if !options[:menu] && !options[:query]
+
     wwid.interactive(options)
   end
 end
@@ -599,7 +604,7 @@ command :finish do |c|
   c.switch %i[u unfinished], negatable: false, default_value: false
 
   c.desc %(Auto-generate finish dates from next entry's start time.
-  Automatically generate completion dates 1 minute before next start date.
+  Automatically generate completion dates 1 minute before next item (in any section) began.
   --auto overrides the --date and --back parameters.)
   c.switch [:auto], negatable: false, default_value: false
 
@@ -896,10 +901,22 @@ command :show do |c|
   c.arg_name 'MAX'
   c.flag %i[c count], default_value: 0
 
-  c.desc 'Age (oldest/newest)'
+  c.desc 'Age (oldest|newest)'
   c.arg_name 'AGE'
   c.flag %i[a age], default_value: 'newest'
 
+  c.desc 'View entries older than date'
+  c.arg_name 'DATE_STRING'
+  c.flag [:before]
+
+  c.desc 'View entries newer than date'
+  c.arg_name 'DATE_STRING'
+  c.flag [:after]
+
+  c.desc 'Search filter, surround with slashes for regex (/query/)'
+  c.arg_name 'QUERY'
+  c.flag [:search]
+
   c.desc 'Sort order (asc/desc)'
   c.arg_name 'ORDER'
   c.flag %i[s sort], must_match: /^[ad].*/i, default_value: 'ASC'
@@ -924,6 +941,10 @@ command :show do |c|
   c.arg_name 'KEY'
   c.flag [:tag_sort], must_match: /^(?:name|time)/i, default_value: default
 
+  c.desc 'Tag sort direction (asc|desc)'
+  c.arg_name 'DIRECTION'
+  c.flag [:tag_order], must_match: /^(?:a(?:sc)?|d(?:esc)?)$/i
+
   c.desc 'Only show items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: false
 
@@ -979,8 +1000,8 @@ command :show do |c|
       }
     end
 
-    if options[:f]
-      date_string = options[:f]
+    if options[:from]
+      date_string = options[:from]
       if date_string =~ / (to|through|thru|(un)?til|-+) /
         dates = date_string.split(/ (to|through|thru|(un)?til|-+) /)
         start = wwid.chronify(dates[0])
@@ -993,22 +1014,31 @@ command :show do |c|
       dates = [start, finish]
     end
 
-    options[:t] = true if options[:totals]
+    options[:times] = true if options[:totals]
 
     tags_color = wwid.config.key?('tags_color') ? wwid.config['tags_color'] : nil
 
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
+    tag_order = if options[:tag_order]
+                  options[:tag_order] =~ /^d/i ? 'desc' : 'asc'
+                else
+                  'asc'
+                end
     opts = {
-      age: options[:a],
+      after: options[:after],
+      age: options[:age],
+      before: options[:before],
       count: options[:c].to_i,
       date_filter: dates,
       highlight: true,
       only_timed: options[:only_timed],
       order: options[:s],
       output: options[:output],
+      search: options[:search],
       section: section,
       sort_tags: options[:sort_tags],
       tag_filter: tag_filter,
+      tag_order: tag_order,
       tags_color: tags_color,
       times: options[:t],
       totals: options[:totals]
@@ -1030,6 +1060,14 @@ command [:grep, :search] do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
+  c.desc 'Constrain search to entries older than date'
+  c.arg_name 'DATE_STRING'
+  c.flag [:before]
+
+  c.desc 'Constrain search to entries newer than date'
+  c.arg_name 'DATE_STRING'
+  c.flag [:after]
+
   c.desc 'Output to export format (csv|html|json|template|timeline)'
   c.arg_name 'FORMAT'
   c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
@@ -1054,10 +1092,12 @@ command [:grep, :search] do |c|
 
     section = wwid.guess_section(options[:s]) if options[:s]
 
-    options[:t] = true if options[:totals]
+    options[:times] = true if options[:totals]
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
     opts = {
+      after: options[:after],
+      before: options[:before],
       highlight: true,
       only_timed: options[:only_timed],
       output: options[:output],
@@ -1065,7 +1105,7 @@ command [:grep, :search] do |c|
       section: section,
       sort_tags: options[:sort_tags],
       tags_color: tags_color,
-      times: options[:t],
+      times: options[:times],
       totals: options[:totals]
     }
 
@@ -1142,12 +1182,25 @@ command :today do |c|
   c.arg_name 'FORMAT'
   c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
 
+  c.desc 'View entries before specified time (e.g. 8am, 12:30pm, 15:00)'
+  c.arg_name 'TIME_STRING'
+  c.flag [:before]
+
+  c.desc 'View entries after specified time (e.g. 8am, 12:30pm, 15:00)'
+  c.arg_name 'TIME_STRING'
+  c.flag [:after]
+
   c.action do |_global_options, options, _args|
     options[:t] = true if options[:totals]
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
-
-    puts wwid.today(options[:t], options[:output],
-                    { totals: options[:totals], section: options[:s], sort_tags: options[:sort_tags] }).chomp
+    opt = {
+      after: options[:after],
+      before: options[:before],
+      section: options[:section],
+      sort_tags: options[:sort_tags],
+      totals: options[:totals]
+    }
+    puts wwid.today(options[:times], options[:output], opt).chomp
   end
 end
 
@@ -1276,10 +1329,33 @@ command :yesterday do |c|
   c.arg_name 'KEY'
   c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
+  c.desc 'View entries before specified time (e.g. 8am, 12:30pm, 15:00)'
+  c.arg_name 'TIME_STRING'
+  c.flag [:before]
+
+  c.desc 'View entries after specified time (e.g. 8am, 12:30pm, 15:00)'
+  c.arg_name 'TIME_STRING'
+  c.flag [:after]
+
+  c.desc 'Tag sort direction (asc|desc)'
+  c.arg_name 'DIRECTION'
+  c.flag [:tag_order], must_match: /^(?:a(?:sc)?|d(?:esc)?)$/i
+
   c.action do |_global_options, options, _args|
+    tag_order = if options[:tag_order]
+                  options[:tag_order] =~ /^d/i ? 'desc' : 'asc'
+                else
+                  'asc'
+                end
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
-    puts wwid.yesterday(options[:s], options[:t], options[:o],
-                        { totals: options[:totals], sort_tags: options[:sort_tags] }).chomp
+    opt = {
+      after: options[:after],
+      before: options[:before],
+      sort_tags: options[:sort_tags],
+      tag_order: options[:tag_order],
+      totals: options[:totals]
+    }
+    puts wwid.yesterday(options[:section], options[:times], options[:output], opt).chomp
   end
 end
 
@@ -1381,7 +1457,7 @@ command :colors do |c|
 end
 
 desc 'Display a user-created view'
-long_desc 'Command line options override associated view settings'
+long_desc 'Command line options override view configuration'
 arg_name 'VIEW_NAME'
 command :view do |c|
   c.desc 'Section'
@@ -1405,6 +1481,18 @@ 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.'
+  c.arg_name 'TAG'
+  c.flag [:tag]
+
+  c.desc 'Tag boolean (AND,OR,NOT)'
+  c.arg_name 'BOOLEAN'
+  c.flag %i[b bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'OR'
+
+  c.desc 'Search filter, surround with slashes for regex (/query/)'
+  c.arg_name 'QUERY'
+  c.flag [:search]
+
   c.desc 'Sort tags by (name|time)'
   c.arg_name 'KEY'
   c.flag [:tag_sort], must_match: /^(?:name|time)$/i
@@ -1413,10 +1501,20 @@ command :view do |c|
   c.arg_name 'DIRECTION'
   c.flag [:tag_order], must_match: /^(?:a(?:sc)?|d(?:esc)?)$/i
 
+  c.desc 'View entries older than date'
+  c.arg_name 'DATE_STRING'
+  c.flag [:before]
+
+  c.desc 'View entries newer than date'
+  c.arg_name 'DATE_STRING'
+  c.flag [:after]
+
   c.desc 'Only show items with recorded time intervals (override view settings)'
   c.switch [:only_timed], default_value: false, negatable: false
 
   c.action do |_global_options, options, args|
+    exit_now! '--tag and --search cannot be used together' if options[:tag] && options[:search]
+
     title = if args.empty?
               wwid.choose_view
             else
@@ -1441,7 +1539,11 @@ command :view do |c|
       format = view.key?('date_format') ? view['date_format'] : nil
       tags_color = view.key?('tags_color') ? view['tags_color'] : nil
       tag_filter = false
-      if view.key?('tags') && !(view['tags'].nil? || view['tags'].empty?)
+      if options[:tag]
+        tag_filter = { 'tags' => [], 'bool' => 'OR' }
+        tag_filter['tags'] = options[:tag].gsub(/[, ]+/, ' ').split(' ').map(&:strip)
+        tag_filter['bool'] = options[:bool].normalize_bool
+      elsif view.key?('tags') && !(view['tags'].nil? || view['tags'].empty?)
         tag_filter = { 'tags' => [], 'bool' => 'OR' }
         tag_filter['tags'] = if view['tags'].instance_of?(Array)
                                view['tags'].map(&:strip)
@@ -1490,14 +1592,17 @@ command :view do |c|
                   else
                     'asc'
                   end
-      warn "TAG ORDER: #{options[:tag_order]}"
+
       opts = {
+        after: options[:after],
+        before: options[:before],
         count: count,
         format: format,
         highlight: options[:color],
         only_timed: only_timed,
         order: order,
-        output: options[:o],
+        output: options[:output],
+        search: options[:search],
         section: section,
         sort_tags: options[:sort_tags],
         tag_filter: tag_filter,

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.86'
+  VERSION = '1.0.90'
 end

data/lib/doing/wwid.rb

@@ -817,7 +817,7 @@ class WWID
         ' | ',
         item['title']
       ]
-      if opt[:section] =~ /^all/i
+      if section =~ /^all/i
         out.concat([
           ' (',
           item['section'],
@@ -834,6 +834,12 @@ class WWID
       '--bind ctrl-a:select-all',
       %(-q "#{opt[:query]}")
     ]
+    if !opt[:menu]
+      exit_now! "Can't skip menu when no query is provided" unless opt[:query]
+
+      fzf_args.concat([%(--filter="#{opt[:query]}"), '--no-sort'])
+    end
+
     res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}`
     selected = []
     res.split(/\n/).each do |item|
@@ -879,8 +885,7 @@ class WWID
         when /(add|remove) tag/
           type = action =~ /^add/ ? 'add' : 'remove'
           if opt[:tag]
-            warn "'add tag' and 'remove tag' can not be used together"
-            Process.exit 1
+            exit_now! "'add tag' and 'remove tag' can not be used together"
           end
           print "#{colors['yellow']}Tag to #{type}: #{colors['reset']}"
           tag = STDIN.gets
@@ -1120,7 +1125,12 @@ class WWID
             else
               if opt[:sequential]
                 next_entry = next_item(item)
-                done_date = next_entry['date'] - 60 if next_entry
+
+                if next_entry.nil?
+                  done_date = Time.now
+                else
+                  done_date = next_entry['date'] - 60
+                end
               elsif opt[:took]
                 if item['date'] + opt[:took] > Time.now
                   item['date'] = Time.now - opt[:took]
@@ -1215,13 +1225,15 @@ class WWID
   ## @param      old_item
   ##
   def next_item(old_item)
-    section = old_item['section']
-
-    section_items = @content[section]['items'].sort_by { |entry| entry['date'] }
-    idx = section_items.index(old_item)
+    combined = { 'items' => [] }
+    @content.each do |_k, v|
+      combined['items'] += v['items']
+    end
+    items = combined['items'].dup.sort_by { |item| item['date'] }.reverse
+    idx = items.index(old_item)
 
-    if section_items.size > idx
-      section_items[idx + 1]
+    if idx > 0
+      items[idx - 1]
     else
       nil
     end
@@ -1742,6 +1754,24 @@ class WWID
       end
     end
 
+    if opt[:before]
+      time_string = opt[:before]
+      time_string += ' 12am' if time_string !~ /(\d+:\d+|\d+[ap])/
+      cutoff = chronify(time_string)
+      if cutoff
+        items.delete_if { |item| item['date'] >= cutoff }
+      end
+    end
+
+    if opt[:after]
+      time_string = opt[:after]
+      time_string += ' 11:59pm' if time_string !~ /(\d+:\d+|\d+[ap])/
+      cutoff = chronify(time_string)
+      if cutoff
+        items.delete_if { |item| item['date'] <= cutoff }
+      end
+    end
+
     if opt[:today]
       items.delete_if do |item|
         item['date'] < Date.today.to_time
@@ -1838,11 +1868,11 @@ class WWID
         end
       end
       if opt[:output] == 'json'
-        out = {
+        puts JSON.pretty_generate({
           'section' => section,
           'items' => items_out,
           'timers' => tag_times(format: 'json', sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order])
-        }.to_json
+        })
       elsif opt[:output] == 'timeline'
         template = <<~EOTEMPLATE
                     <!doctype html>
@@ -1969,13 +1999,13 @@ class WWID
 
         output.sub!(/%shortdate/) do
           if item['date'] > Date.today.to_time
-            item['date'].strftime('%_I:%M%P')
-          elsif item['date'] > (Date.today - 7).to_time
-            item['date'].strftime('%a %-I:%M%P')
+            item['date'].strftime('    %_I:%M%P')
+          elsif item['date'] > (Date.today - 6).to_time
+            item['date'].strftime('%a %_I:%M%P')
           elsif item['date'].year == Date.today.year
-            item['date'].strftime('%b %d, %-I:%M%P')
+            item['date'].strftime('%m/%d %_I:%M%P')
           else
-            item['date'].strftime('%b %d %Y, %-I:%M%P')
+            item['date'].strftime('%m/%d/%Y %_I:%M%P')
           end
         end
 
@@ -2189,8 +2219,22 @@ class WWID
     opt[:sort_tags] ||= false
 
     cfg = @config['templates']['today']
-    list_section({ section: opt[:section], wrap_width: cfg['wrap_width'], count: 0,
-                   format: cfg['date_format'], template: cfg['template'], order: 'asc', today: true, times: times, output: output, totals: opt[:totals], sort_tags: opt[:sort_tags] })
+    options = {
+      after: opt[:after],
+      before: opt[:before],
+      count: 0,
+      format: cfg['date_format'],
+      order: 'asc',
+      output: output,
+      section: opt[:section],
+      sort_tags: opt[:sort_tags],
+      template: cfg['template'],
+      times: times,
+      today: true,
+      totals: opt[:totals],
+      wrap_width: cfg['wrap_width']
+    }
+    list_section(options)
   end
 
   ##
@@ -2225,8 +2269,25 @@ class WWID
     opt[:totals] ||= false
     opt[:sort_tags] ||= false
     section = guess_section(section)
-    list_section({ section: section, count: 0, order: 'asc', yesterday: true, times: times,
-                   output: output, totals: opt[:totals], sort_tags: opt[:sort_tags] })
+    y = (Time.now - (60 * 60 * 24)).strftime('%Y-%m-%d')
+    opt[:after] = "#{y} #{opt[:after]}" if opt[:after]
+    opt[:before] = "#{y} #{opt[:before]}" if opt[:before]
+
+    options = {
+      after: opt[:after],
+      before: opt[:before],
+      count: 0,
+      order: 'asc',
+      output: output,
+      section: section,
+      sort_tags: opt[:sort_tags],
+      tag_order: opt[:tag_order],
+      times: times,
+      totals: opt[:totals],
+      yesterday: true
+    }
+
+    list_section(options)
   end
 
   ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.86
+  version: 1.0.90
 platform: ruby
 authors:
 - Brett Terpstra