doing 1.0.84 → 1.0.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c11e6c75768b8dc2db3a36c5cdd572ad03eb884e118848ebbe413df2988a53df
-  data.tar.gz: a3f45b396e4c6b06bab65d24007f0437e72687c6811f559ece8f6c5ca2e7bbba
+  metadata.gz: cd3101f8217fd3af3a0aa5fa57b2b7daf72aeb15510f83a361971403338c293e
+  data.tar.gz: 9bfc051f1129c40db87ac8c31a1eb88d0e9f1b1bc96b6f697e42fdb5351e3d35
 SHA512:
-  metadata.gz: 7be6844f9f6caa072014afeded310cbaddf2a15380fde5498aea0f980dd5e8448ca44f5c5d9692a2075818f632bbbd19cce93e0db338c621a487abed8259f555
-  data.tar.gz: d0af857fee4113e2055af031059901b56e2ff94e849f9d3a0d167d8edde0519e4d6a6ebdeef55050ee313ed628ba6fa2fbd17e73cfc66143e57e7a2c42f93c8f
+  metadata.gz: 3f7f0fe38daa1f63757dd4b3fb9b6c8a8d55415d47d74c58b2f4450327954381020279e353a44a790142da3802ffc2f6ce1b828ace7fbf3b0042a050674b7084
+  data.tar.gz: c36980be8fb2b8ae10fa750965eb2faa0c3ba4a0230e2e68a12cf09195b4fa16e70851521e0437d5e744fd954b9d1f50b39e7e31c6704592d03d51786be80a99

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.83<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.87<!--END VER-->.
 
     $ [sudo] gem install doing
 
@@ -92,6 +92,7 @@ A basic configuration looks like this:
         date_format: '%_I:%M%P'
         template: '%date > %title%odnote'
         wrap_width: 50
+        count: 10
     autotag:
       whitelist:
       - coding
@@ -239,6 +240,8 @@ and output my recent entries like this:
 
     $ 
 
+The recent template can include a `count` key to specify the number of entries shown when run without an argument. Default is 10.
+
 ### Custom views
 
 You can create your own "views" in the `~/.doingrc` file and view them with `doing view view_name`. Just add a section like this:
@@ -542,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

@@ -333,10 +333,6 @@ command :later do |c|
   c.desc "Edit entry with #{ENV['EDITOR']}"
   c.switch %i[e editor], negatable: false, default_value: false
 
-  c.desc 'Edit entry with specified app'
-  c.arg_name 'APP'
-  c.flag %i[a app]
-
   c.desc 'Backdate start time to date string [4pm|20m|2h|yesterday noon]'
   c.arg_name 'DATE_STRING'
   c.flag %i[b back]
@@ -353,7 +349,7 @@ command :later do |c|
       date = Time.now
     end
 
-    if options[:e] || (args.empty? && $stdin.stat.size.zero?)
+    if options[:editor] || (args.empty? && $stdin.stat.size.zero?)
       exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
       input = args.empty? ? '' : args.join(' ')
@@ -456,7 +452,7 @@ command %i[done did] do |c|
       section = wwid.config['current_section']
     end
 
-    if options[:e]
+    if options[:editor]
       exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
       input = ''
@@ -900,10 +896,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'
@@ -928,6 +936,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
 
@@ -983,8 +995,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])
@@ -997,22 +1009,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]
@@ -1034,6 +1055,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
@@ -1058,10 +1087,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],
@@ -1069,7 +1100,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]
     }
 
@@ -1101,7 +1132,12 @@ command :recent do |c|
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
 
     unless global_options[:version]
-      count = args.empty? ? 10 : args[0].to_i
+      if wwid.config['templates']['recent'].key?('count')
+        config_count = wwid.config['templates']['recent']['count'].to_i
+      else
+        config_count = 10
+      end
+      count = args.empty? ? config_count : args[0].to_i
       options[:t] = true if options[:totals]
       options[:sort_tags] = options[:tag_sort] =~ /^n/i
       tags_color = wwid.config.key?('tags_color') ? wwid.config['tags_color'] : nil
@@ -1141,12 +1177,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
 
@@ -1275,10 +1324,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
 
@@ -1321,7 +1393,7 @@ command :last do |c|
 
     end
 
-    if options[:e]
+    if options[:editor]
       wwid.edit_last(section: options[:s], options: { search: options[:search], tag: tags, tag_bool: options[:bool] })
     else
       puts wwid.last(times: true, section: options[:s],
@@ -1380,7 +1452,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'
@@ -1404,6 +1476,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
@@ -1412,10 +1496,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
@@ -1440,7 +1534,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)
@@ -1489,14 +1587,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,
@@ -1554,6 +1655,11 @@ command :archive do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  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'
+  c.flag [:before]
+
   c.action do |_global_options, options, args|
     if args.empty?
       section = wwid.current_section
@@ -1583,6 +1689,7 @@ command :archive do |c|
                       'AND'
                      end
     opts = {
+      before: options[:before],
       bool: options[:bool],
       destination: options[:to],
       keep: options[:keep],
@@ -1615,6 +1722,11 @@ command :rotate do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  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'
+  c.flag [:before]
+
   c.action do |_global_options, options, args|
     if options[:section] && options[:section] !~ /^all$/i
       options[:section] = wwid.guess_section(options[:section])
@@ -1641,11 +1753,11 @@ command :open do |c|
   if `uname` =~ /Darwin/
     c.desc 'Open with app name'
     c.arg_name 'APP_NAME'
-    c.flag [:a]
+    c.flag %i[a app]
 
     c.desc 'Open with app bundle id'
     c.arg_name 'BUNDLE_ID'
-    c.flag [:b]
+    c.flag %i[b bundle_id]
   end
   c.desc "Open with $EDITOR (#{ENV['EDITOR']})"
   c.switch %i[e editor], negatable: false, default_value: false
@@ -1656,11 +1768,11 @@ command :open do |c|
       k.instance_of?(String) || v.nil? || v == false
     end
     if `uname` =~ /Darwin/
-      if options[:a]
+      if options[:app]
         system %(open -a "#{options[:a]}" "#{File.expand_path(wwid.doing_file)}")
-      elsif options[:b]
+      elsif options[:bundle_id]
         system %(open -b "#{options[:b]}" "#{File.expand_path(wwid.doing_file)}")
-      elsif options[:e]
+      elsif options[:editor]
         exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
         system %($EDITOR "#{File.expand_path(wwid.doing_file)}")

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.84'
+  VERSION = '1.0.88'
 end

data/lib/doing/wwid.rb

@@ -124,7 +124,8 @@ class WWID
     @config['templates']['recent'] ||= {
       'date_format' => '%_I:%M%P',
       'template' => '%shortdate: %title (%section)',
-      'wrap_width' => 88
+      'wrap_width' => 88,
+      'count' => 10
     }
     @config['views'] ||= {
       'done' => {
@@ -1100,7 +1101,6 @@ class WWID
         items = @content[section]['items'].dup.sort_by { |item| item['date'] }.reverse
         idx = 0
         done_date = Time.now
-        next_start = Time.now
         count = (opt[:count]).zero? ? items.length : opt[:count]
         items.map! do |item|
           break if idx == count
@@ -1119,8 +1119,8 @@ class WWID
               end
             else
               if opt[:sequential]
-                done_date = next_start - 1
-                next_start = item['date']
+                next_entry = next_item(item)
+                done_date = next_entry['date'] - 60 if next_entry
               elsif opt[:took]
                 if item['date'] + opt[:took] > Time.now
                   item['date'] = Time.now - opt[:took]
@@ -1209,6 +1209,24 @@ class WWID
     return new_item
   end
 
+  ##
+  ## @brief      Get next item in the index
+  ##
+  ## @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)
+
+    if section_items.size > idx
+      section_items[idx + 1]
+    else
+      nil
+    end
+  end
+
   ##
   ## @brief      Delete an item from the index
   ##
@@ -1478,7 +1496,7 @@ class WWID
   ##
   ## @param      file  (String) The filepath to write to
   ##
-  def write(file = nil)
+  def write(file = nil, backup: true)
     output = @other_content_top ? "#{@other_content_top.join("\n")}\n" : ''
 
     @content.each do |title, section|
@@ -1490,7 +1508,7 @@ class WWID
       $stdout.puts output
     else
       file = File.expand_path(file)
-      if File.exist?(file)
+      if File.exist?(file) && backup
         # Create a backup copy for the undo command
         FileUtils.cp(file, "#{file}~")
       end
@@ -1549,9 +1567,15 @@ class WWID
       new_content[section]['items'] = []
 
       moved_items = []
-      if !tags.empty? || opt[:search]
+      if !tags.empty? || opt[:search] || opt[:before]
+        if opt[:before]
+          time_string = opt[:before]
+          time_string += ' 12am' if time_string !~ /(\d+:\d+|\d+[ap])/
+          cutoff = chronify(time_string)
+        end
+
         items.delete_if do |item|
-          if ((!tags.empty? && item.has_tags?(tags, bool)) || (opt[:search] && item.matches_search?(opt[:search].to_s)))
+          if ((!tags.empty? && item.has_tags?(tags, bool)) || (opt[:search] && item.matches_search?(opt[:search].to_s)) || (opt[:before] && item['date'] < cutoff))
             moved_items.push(item)
             counter += 1
             true
@@ -1587,10 +1611,15 @@ class WWID
 
     write(@doing_file)
 
-    file = @doing_file.sub(/(\.\w+)$/, "_#{Time.now.strftime('%Y-%m-%d%H:%M')}\\1")
-    @content = new_content
+    file = @doing_file.sub(/(\.\w+)$/, "_#{Time.now.strftime('%Y-%m-%d')}\\1")
+    if File.exist?(file)
+      init_doing_file(file)
+      @content.deep_merge(new_content)
+    else
+      @content = new_content
+    end
 
-    write(file)
+    write(file, backup: false)
   end
 
   ##
@@ -1713,6 +1742,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
@@ -1940,13 +1987,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
 
@@ -2012,7 +2059,7 @@ class WWID
     destination = guess_section(destination)
 
     if sections.include?(destination) && (sections.include?(section) || archive_all)
-      do_archive(section, destination, { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label] })
+      do_archive(section, destination, { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label], before: options[:before] })
       write(doing_file)
     else
       exit_now! 'Either source or destination does not exist'
@@ -2045,9 +2092,15 @@ class WWID
       items = @content[section]['items'].dup
 
       moved_items = []
-      if !tags.empty? || opt[:search]
+      if !tags.empty? || opt[:search] || opt[:before]
+        if opt[:before]
+          time_string = opt[:before]
+          time_string += ' 12am' if time_string !~ /(\d+:\d+|\d+[ap])/
+          cutoff = chronify(time_string)
+        end
+
         items.delete_if do |item|
-          if (!tags.empty? && item.has_tags?(tags, bool) || (opt[:search] && item.matches_search?(opt[:search].to_s)))
+          if ((!tags.empty? && item.has_tags?(tags, bool)) || (opt[:search] && item.matches_search?(opt[:search].to_s)) || (opt[:before] && item['date'] < cutoff))
             moved_items.push(item)
             counter += 1
             true
@@ -2154,8 +2207,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
 
   ##
@@ -2190,8 +2257,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.84
+  version: 1.0.88
 platform: ruby
 authors:
 - Brett Terpstra