doing 1.0.86 → 1.0.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2af84d93e54c8366719e285303dc11d966f9b83361ae4ac20ca172536465f4ee
-  data.tar.gz: 7fa72f0ec1ba1a18e45d80c1604910cabb00c8dad485b96d05bd8c3e33a5b4ae
+  metadata.gz: 2540726a17efa50ef0cddc29353d8c14a4d921a89fb302711225053faacfbc4d
+  data.tar.gz: e4f59cf1e2feda50df653bbbd981e1ab4ad75d807eaf47a8afbad9d98032d27b
 SHA512:
-  metadata.gz: 158707f75c6375fb5d684457d0b17c874fb2dc0f9b2e5318a24f055665ed246e69149211fb45487acac2174b2ca9db6ebd62b071af0c283377d5e2fa78f663c2
-  data.tar.gz: 80bf8ff4da513c0d911afdf5bbeb2589f6a08bf46eb746c5eb610f5ddac1bdc7d7469f1f3eb399e86c4a671358df704c98596841c2f8964d3f81ebe985de1435
+  metadata.gz: dabcbefd24a3d099d71eb14c03f71250067e509b385d573405219d3cfaea8a66f6ec526a32547401f249f0fdd82774415ed0da1c95e233aada2f54135de49558
+  data.tar.gz: 5b5a5d7800110de9aeaf636b6b6b4947c1923e55ce4f455d2316483c37fcfb30461b818df78c24097ef66f574ed57bdeebf50f77e4f806161212c4d36c86eabd

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.86<!--END VER-->.
 
     $ [sudo] gem install doing
 

data/bin/doing

@@ -896,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'
@@ -924,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
 
@@ -979,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])
@@ -993,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]
@@ -1030,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
@@ -1054,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],
@@ -1065,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]
     }
 
@@ -1142,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
 
@@ -1381,7 +1429,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 +1453,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 +1473,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 +1511,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 +1564,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.87'
 end

data/lib/doing/wwid.rb

@@ -1742,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
@@ -1969,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
 
@@ -2189,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
 
   ##

metadata

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