doing 1.0.82 → 1.0.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 146bc31206860d02e7f7e3d3d04b12cd84ecf794171af8f25ca679f49c6a98d0
-  data.tar.gz: 994568054f7f905bbe6a1982b00be636a68bac2719b4f6740ce04bf5cbcb208a
+  metadata.gz: fb85f27f305f246d4ab182268c9e5188da67f22fde46d3ee4ae716996c78b2c3
+  data.tar.gz: 7b302748d9837511adc77679fd619c6daf85b2f7e15f541d530c8cc211e0aac3
 SHA512:
-  metadata.gz: d3c606a1bf94fc65241841ca4e9899488f8271569492fb33d4ecf49c46007bb1f678c5d6995656a17fbd003d387942bf43b0575b09d9a78bfc64852504224586
-  data.tar.gz: 5032b06cc50cc867e29f99973b6f03e4256f746f5643db7275a17621252db5e825fb1aa1b07439c0a3f087a2cfe96f6bc3a9966c98693f8a3a994880c81b6857
+  metadata.gz: dbf5e04626a97e5287c2417cf5afffd6516860a1fa5f3ed64e93fe15bdc62b85f045d0a54adc08c774b4d711add29f02799cf3d4a2c22853e1273a691d0a9f00
+  data.tar.gz: 87bf6eac2e770b161c8ae4fd2fee4adea5ed261b828f2142997858393a627e0d36788981fe52a4c66486f442da2de349ce1ac157732d824b0ef633e4dcbdc703

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.79<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.82<!--END VER-->.
 
     $ [sudo] gem install doing
 
@@ -245,7 +245,7 @@ You can create your own "views" in the `~/.doingrc` file and view them with `doi
 
     views:
       old:
-        section: Old
+        section: Archive
         count: 5
         wrap_width: 0
         date_format: '%F %_I:%M%P'
@@ -253,6 +253,10 @@ You can create your own "views" in the `~/.doingrc` file and view them with `doi
         order: asc
         tags: done finished cancelled
         tags_bool: ANY
+        only_timed: false
+        tag_sort: time
+        tag_order: asc
+        totals: true
 
 You can add additional custom views. Just nest them under the `views` key (indented two spaces from the edge). Multiple views would look like this:
 
@@ -276,7 +280,9 @@ You can add new sections with `doing add_section section_name`. You can also cre
 
 The `tags` and `tags_bool` keys allow you to specify tags that the view is filtered by. You can list multiple tags separated by spaces, and then use `tags_bool` to specify `ALL`, `ANY`, or `NONE` to determine how it handles the multiple tags.
 
-The `order` key defines the sort order of the output. This is applied _after_ the tasks are retrieved and cut off at the maximum number specified in `count`.
+The `order` key defines the sort order of the output (asc or desc). This is applied _after_ the tasks are retrieved and cut off at the maximum number specified in `count`.
+
+You can include tag timers and totals in the output with `totals: true`. Control tag output using `tag_sort` (name or title) and `tag_order` (asc or desc). You can also output only timed entries using `only_timed: true`. All of these options can be overridden using flags on the `doing view` command.
 
 Regarding colors, you can use them to create very nice displays if you're outputting to a color terminal. Example:
 
@@ -291,7 +297,7 @@ Outputs:
 
 ![](http://ckyp.us/XKpj+)
 
-You can also specify a default output format for a view. Most of the optional output formats override the template specification (`html`, `csv`, `json`). If the `view` command is used with the `-o` flag, it will override what's specified in the file.
+You can also specify a default output format for a view. Most of the optional output formats override the template specification (`html`, `csv`, `json`). If the `view` command is used with the `-o` flag, it will override what's specified for the view in the config.
 
 ### Colors
 

data/bin/doing

@@ -1344,13 +1344,14 @@ command :colors do |c|
 end
 
 desc 'Display a user-created view'
+long_desc 'Command line options override associated view settings'
 arg_name 'VIEW_NAME'
 command :view do |c|
-  c.desc 'Section (override view settings)'
+  c.desc 'Section'
   c.arg_name 'NAME'
   c.flag %i[s section]
 
-  c.desc 'Count to display (override view settings)'
+  c.desc 'Count to display'
   c.arg_name 'COUNT'
   c.flag %i[c count], must_match: /^\d+$/, type: Integer
 
@@ -1368,12 +1369,14 @@ command :view do |c|
   c.switch [:color], default_value: true, negatable: true
 
   c.desc 'Sort tags by (name|time)'
-  default = 'time'
-  default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: /^(?:name|time)$/i
 
-  c.desc 'Only show items with recorded time intervals'
+  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 (override view settings)'
   c.switch [:only_timed], default_value: false, negatable: false
 
   c.action do |_global_options, options, args|
@@ -1422,10 +1425,31 @@ command :view do |c|
                 end
       order = view.key?('order') ? view['order'] : 'asc'
 
-      options[:t] = true if options[:totals]
+      totals = if options[:totals]
+                 true
+               else
+                 view.key?('totals') ? view['totals'] : false
+               end
+
+      options[:t] = true if totals
       options[:output]&.downcase!
-      options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
+      options[:sort_tags] = if options[:tag_sort]
+                              options[:tag_sort] =~ /^n/i ? true : false
+                            elsif view.key?('tag_sort')
+                              view['tag_sort'] =~ /^n/i ? true : false
+                            else
+                              false
+                            end
+
+      tag_order = if options[:tag_order]
+                    options[:tag_order] =~ /^d/i ? 'desc' : 'asc'
+                  elsif view.key?('tag_order')
+                    view['tag_order'] =~ /^d/i ? 'desc' : 'asc'
+                  else
+                    'asc'
+                  end
+      warn "TAG ORDER: #{options[:tag_order]}"
       opts = {
         count: count,
         format: format,
@@ -1436,10 +1460,11 @@ command :view do |c|
         section: section,
         sort_tags: options[:sort_tags],
         tag_filter: tag_filter,
+        tag_order: tag_order,
         tags_color: tags_color,
         template: template,
         times: options[:t],
-        totals: options[:totals]
+        totals: totals
       }
 
       puts wwid.list_section(opts)

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.82'
+  VERSION = '1.0.83'
 end

data/lib/doing/wwid.rb

@@ -84,6 +84,7 @@ class WWID
   ##
   def configure(opt = {})
     @timers = {}
+    @recorded_items = []
     opt[:ignore_local] ||= false
 
     @config_file ||= File.join(@user_home, @default_config_file)
@@ -583,17 +584,17 @@ class WWID
   end
 
   def same_time?(item_a, item_b)
-    item_a['date'] == item_b['date'] ? get_interval(item_a, false) == get_interval(item_b, false) : false
+    item_a['date'] == item_b['date'] ? get_interval(item_a, formatted: false, record: false) == get_interval(item_b,  formatted: false, record: false) : false
   end
 
   def overlapping_time?(item_a, item_b)
     return true if same_time?(item_a, item_b)
 
     start_a = item_a['date']
-    interval = get_interval(item_a, false)
+    interval = get_interval(item_a, formatted: false, record: false)
     end_a = interval ? start_a + interval.to_i : start_a
     start_b = item_b['date']
-    interval = get_interval(item_b, false)
+    interval = get_interval(item_b,  formatted: false, record: false)
     end_b = interval ? start_b + interval.to_i : start_b
     (start_a >= start_b && start_a <= end_b) || (end_a >= start_b && end_a <= end_b) || (start_a < start_b && end_a > end_b)
   end
@@ -1569,20 +1570,21 @@ class WWID
   def list_section(opt = {})
     opt[:count] ||= 0
     count = opt[:count] - 1
-    opt[:section] ||= nil
-    opt[:format] ||= @default_date_format
-    opt[:template] ||= @default_template
     opt[:age] ||= 'newest'
+    opt[:date_filter] ||= []
+    opt[:format] ||= @default_date_format
+    opt[:only_timed] ||= false
     opt[:order] ||= 'desc'
-    opt[:today] ||= false
+    opt[:search] ||= false
+    opt[:section] ||= nil
+    opt[:sort_tags] ||= false
     opt[:tag_filter] ||= false
+    opt[:tag_order] ||= 'asc'
     opt[:tags_color] ||= false
+    opt[:template] ||= @default_template
     opt[:times] ||= false
+    opt[:today] ||= false
     opt[:totals] ||= false
-    opt[:sort_tags] ||= false
-    opt[:search] ||= false
-    opt[:only_timed] ||= false
-    opt[:date_filter] ||= []
 
     # opt[:highlight] ||= true
     section = ''
@@ -1635,7 +1637,7 @@ class WWID
 
     if opt[:only_timed]
       items.delete_if do |item|
-        get_interval(item) == false
+        get_interval(item, record: false) == false
       end
     end
 
@@ -1670,7 +1672,7 @@ class WWID
           arr = i['note'].map { |line| line.strip }.delete_if { |e| e =~ /^\s*$/ }
           note = arr.join("\n") unless arr.nil?
         end
-        interval = get_interval(i, false) if i['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
+        interval = get_interval(i, formatted: false) if i['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
         interval ||= 0
         output.push(CSV.generate_line([i['date'], i['title'], note, interval, i['section']]))
       end
@@ -1689,7 +1691,7 @@ class WWID
         end
         if i['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
           end_date = Time.parse(Regexp.last_match(1))
-          interval = get_interval(i, false)
+          interval = get_interval(i, formatted: false)
         end
         end_date ||= ''
         interval ||= 0
@@ -1738,7 +1740,7 @@ class WWID
         out = {
           'section' => section,
           'items' => items_out,
-          'timers' => tag_times('json', opt[:sort_tags])
+          'timers' => tag_times(format: 'json', sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order])
         }.to_json
       elsif opt[:output] == 'timeline'
         template = <<~EOTEMPLATE
@@ -1819,7 +1821,7 @@ class WWID
                 css_template
               end
 
-      totals = opt[:totals] ? tag_times('html', opt[:sort_tags]) : ''
+      totals = opt[:totals] ? tag_times(format: 'html', sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) : ''
       engine = Haml::Engine.new(template)
       out = engine.render(Object.new,
                          { :@items => items_out, :@page_title => page_title, :@style => style, :@totals => totals })
@@ -1860,7 +1862,7 @@ class WWID
 
         output.sub!(/%date/, item['date'].strftime(opt[:format]))
 
-        interval = get_interval(item) if item['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
+        interval = get_interval(item, record: true) if item['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
         interval ||= ''
         output.sub!(/%interval/, interval)
 
@@ -1910,7 +1912,8 @@ class WWID
 
         out += "#{output}\n"
       end
-      out += tag_times('text', opt[:sort_tags]) if opt[:totals]
+
+      out += tag_times(format: 'text', sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) if opt[:totals]
     end
     out
   end
@@ -2173,11 +2176,15 @@ class WWID
   end
 
   ##
-  ## @brief      Get total elapsed time for all tags in selection
+  ## @brief      Get total elapsed time for all tags in
+  ##             selection
   ##
-  ## @param      format  (String) return format (html, json, or text)
+  ## @param      format        (String) return format (html,
+  ##                           json, or text)
+  ## @param      sort_by_name  (Boolean) Sort by name if true, otherwise by time
+  ## @param      sort_order    (String) The sort order (asc or desc)
   ##
-  def tag_times(format = 'text', sort_by_name = false)
+  def tag_times(format: 'text', sort_by_name: false, sort_order: 'asc')
     return '' if @timers.empty?
 
     max = @timers.keys.sort_by { |k| k.length }.reverse[0].length + 1
@@ -2186,11 +2193,13 @@ class WWID
 
     tags_data = @timers.delete_if { |_k, v| v == 0 }
     sorted_tags_data = if sort_by_name
-                         tags_data.sort_by { |k, _v| k }.reverse
+                         tags_data.sort_by { |k, _v| k }
                        else
                          tags_data.sort_by { |_k, v| v }
                        end
 
+    sorted_tags_data.reverse! if sort_order =~ /^asc/i
+
     if format == 'html'
       output = <<EOS
         <table>
@@ -2324,19 +2333,20 @@ EOS
   ## @param      item       (Hash) The entry
   ## @param      formatted  (Bool) Return human readable time (default seconds)
   ##
-  def get_interval(item, formatted = true)
+  def get_interval(item, formatted: true, record: true)
     done = nil
     start = nil
 
     if @interval_cache.keys.include? item['title']
       seconds = @interval_cache[item['title']]
+      record_tag_times(item, seconds) if record
       return seconds > 0 ? '%02d:%02d:%02d' % fmt_time(seconds) : false
     end
 
     if item['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/
       done = Time.parse(Regexp.last_match(1))
     else
-      return nil
+      return false
     end
 
     start = if item['title'] =~ /@start\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/
@@ -2347,20 +2357,34 @@ EOS
 
     seconds = (done - start).to_i
 
+    if record
+      record_tag_times(item, seconds)
+    end
+
+    @interval_cache[item['title']] = seconds
+
+    return seconds > 0 ? seconds : false unless formatted
+
+    seconds > 0 ? '%02d:%02d:%02d' % fmt_time(seconds) : false
+  end
+
+  ##
+  ## @brief      Record times for item tags
+  ##
+  ## @param      item  The item
+  ##
+  def record_tag_times(item, seconds)
+    return if @recorded_items.include?(item)
+
     item['title'].scan(/(?mi)@(\S+?)(\(.*\))?(?=\s|$)/).each do |m|
       k = m[0] == 'done' ? 'All' : m[0].downcase
-      if @timers.has_key?(k)
+      if @timers.key?(k)
         @timers[k] += seconds
       else
         @timers[k] = seconds
       end
+      @recorded_items.push(item)
     end
-
-    @interval_cache[item['title']] = seconds
-
-    return seconds unless formatted
-
-    seconds > 0 ? '%02d:%02d:%02d' % fmt_time(seconds) : false
   end
 
   ##

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.82
+  version: 1.0.83
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-26 00:00:00.000000000 Z
+date: 2021-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake