doing 1.0.87 → 1.0.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2540726a17efa50ef0cddc29353d8c14a4d921a89fb302711225053faacfbc4d
-  data.tar.gz: e4f59cf1e2feda50df653bbbd981e1ab4ad75d807eaf47a8afbad9d98032d27b
+  metadata.gz: cd3101f8217fd3af3a0aa5fa57b2b7daf72aeb15510f83a361971403338c293e
+  data.tar.gz: 9bfc051f1129c40db87ac8c31a1eb88d0e9f1b1bc96b6f697e42fdb5351e3d35
 SHA512:
-  metadata.gz: dabcbefd24a3d099d71eb14c03f71250067e509b385d573405219d3cfaea8a66f6ec526a32547401f249f0fdd82774415ed0da1c95e233aada2f54135de49558
-  data.tar.gz: 5b5a5d7800110de9aeaf636b6b6b4947c1923e55ce4f455d2316483c37fcfb30461b818df78c24097ef66f574ed57bdeebf50f77e4f806161212c4d36c86eabd
+  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.86<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.87<!--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

@@ -1324,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
 

data/lib/doing/version.rb

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

data/lib/doing/wwid.rb

@@ -2257,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.87
+  version: 1.0.88
 platform: ruby
 authors:
 - Brett Terpstra