doing 1.0.37 → 1.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d00d66a9e4fa16bdc40697f2fa7b42685d87e64c757d6f5e0096dd8a07af4c37
-  data.tar.gz: d7624aefddb7eb42b1a86c97f140e0881cbf2d8a41b34109d1f2f3a31b82c9b3
+  metadata.gz: f715c083c72c609fb2e2fc8c730cca68b8391dccbc4ca2168333dd9b30df0887
+  data.tar.gz: 3d7df2ec9624ae8d2b6822ccceed402c42f82f2a5b2e010c639880c9cd95580f
 SHA512:
-  metadata.gz: a50d44f0db2756591fc7b7e276dd521a27f13fc893c91928386a504ffc874657bb3913cad123c59e5c86fbb858812aa91914082bd183652857a43d0455ee3047
-  data.tar.gz: bf9684307fbdf99a5f6846ae09ecc3c574eecba8be0d609ce0ce7f00c838470d39b434e065725c951a140d1be921910b61376c0793319be184997daa0d4b98e3
+  metadata.gz: 4287daf5a4821ff6e295c36275d2101ecebefdc0adc962faefe82c460bd52f2e9a1a69e767e3ad59f7d68074a86807496e3e1669dd7f6f68688da903fb370309
+  data.tar.gz: 4a62305048b02bac186c63f951a6e3a7985663dc826070801c3a333b8e9388147435639910ac0f1fe24b0ad5a90e15b61510c0799ce94cf84060ca8fad097f0b

data/bin/doing

@@ -604,6 +604,13 @@ command :show do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Sort tags by (name|time)'
+  default = 'time'
+  if wwid.config.has_key?('tag_sort')
+    default = wwid.config['tag_sort']
+  end
+  c.flag [:tag_sort], :default_value => default
+
   c.desc 'Only show items with recorded time intervals'
   c.default_value false
   c.switch [:only_timed], :default_value => false, :negatable => false
@@ -666,7 +673,9 @@ command :show do |c|
 
     options[:t] = true if options[:totals]
 
-    puts wwid.list_section({:section => section, :date_filter => dates, :count => options[:c].to_i, :tag_filter => tag_filter, :age => options[:a], :order => options[:s], :output => options[:output], :times => options[:t], :totals => options[:totals], :highlight => true, :only_timed => options[:only_timed]})
+    options[:sort_tags] = options[:tag_sort] =~ /^n/i
+
+    puts wwid.list_section({:section => section, :date_filter => dates, :count => options[:c].to_i, :tag_filter => tag_filter, :age => options[:a], :order => options[:s], :output => options[:output], :times => options[:t], :totals => options[:totals], :sort_tags => options[:sort_tags], :highlight => true, :only_timed => options[:only_timed]})
 
   end
 end
@@ -690,6 +699,13 @@ command [:grep,:search] do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Sort tags by (name|time)'
+  default = 'time'
+  if wwid.config.has_key?('tag_sort')
+    default = wwid.config['tag_sort']
+  end
+  c.flag [:tag_sort], :default_value => default
+
   c.desc 'Only show items with recorded time intervals'
   c.default_value false
   c.switch [:only_timed], :default_value => false, :negatable => false
@@ -699,8 +715,9 @@ command [:grep,:search] do |c|
     section = wwid.guess_section(options[:s]) if options[:s]
 
     options[:t] = true if options[:totals]
+    options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
-    puts wwid.list_section({:search => args.join(' '), :section => section, :output => options[:output], :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => options[:only_timed]})
+    puts wwid.list_section({:search => args.join(' '), :section => section, :output => options[:output], :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => options[:only_timed], :sort_tags => options[:sort_tags]})
 
   end
 end
@@ -721,6 +738,13 @@ command :recent do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Sort tags by (name|time)'
+  default = 'time'
+  if wwid.config.has_key?('tag_sort')
+    default = wwid.config['tag_sort']
+  end
+  c.flag [:tag_sort], :default_value => default
+
   c.action do |global_options,options,args|
 
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
@@ -732,8 +756,9 @@ command :recent do |c|
         count = 10
       end
       options[:t] = true if options[:totals]
+      options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
-      puts wwid.recent(count,section.cap_first,{ :times => options[:t], :totals => options[:totals] })
+      puts wwid.recent(count,section.cap_first,{ :times => options[:t], :totals => options[:totals], :sort_tags => options[:sort_tags] })
 
     end
   end
@@ -754,14 +779,22 @@ command :today do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Sort tags by (name|time)'
+  default = 'time'
+  if wwid.config.has_key?('tag_sort')
+    default = wwid.config['tag_sort']
+  end
+  c.flag [:tag_sort], :default_value => default
+
   c.desc 'Output to export format (csv|html|json)'
   c.flag [:o,:output]
 
   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]}).chomp
+    puts wwid.today(options[:t],options[:output],{:totals => options[:totals], :section => options[:s], :sort_tags => options[:sort_tags]}).chomp
 
   end
 end
@@ -783,6 +816,13 @@ command :on do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Sort tags by (name|time)'
+  default = 'time'
+  if wwid.config.has_key?('tag_sort')
+    default = wwid.config['tag_sort']
+  end
+  c.flag [:tag_sort], :default_value => default
+
   c.desc 'Output to export format (csv|html|json)'
   c.flag [:o,:output]
 
@@ -806,8 +846,9 @@ command :on do |c|
     wwid.results.push(message)
 
     options[:t] = true if options[:totals]
+    options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
-    puts wwid.list_date([start,finish],options[:s],options[:t],options[:output],{:totals => options[:totals]}).chomp
+    puts wwid.list_date([start, finish], options[:s], options[:t], options[:output], {:totals => options[:totals], :sort_tags => options[:sort_tags]}).chomp
 
   end
 end
@@ -830,8 +871,16 @@ command :yesterday do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Sort tags by (name|time)'
+  default = 'time'
+  if wwid.config.has_key?('tag_sort')
+    default = wwid.config['tag_sort']
+  end
+  c.flag [:tag_sort], :default_value => default
+
   c.action do |global_options, options,args|
-    puts wwid.yesterday(options[:s],options[:t],options[:o],{:totals => options[:totals]}).chomp
+    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
 
   end
 end
@@ -918,6 +967,13 @@ command :view do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Sort tags by (name|time)'
+  default = 'time'
+  if wwid.config.has_key?('tag_sort')
+    default = wwid.config['tag_sort']
+  end
+  c.flag [:tag_sort], :default_value => default
+
   c.desc 'Only show items with recorded time intervals'
   c.default_value false
   c.switch [:only_timed], :default_value => false, :negatable => true
@@ -963,9 +1019,12 @@ command :view do |c|
       count = options[:c] ? options[:c] : view.has_key?('count') ? view['count'] : 10
       section = options[:s] ? section : view.has_key?('section') ? view['section'] : wwid.current_section
       order = view.has_key?('order') ? view['order'] : "asc"
+
       options[:t] = true if options[:totals]
       options[:output].downcase! if options[:output]
-      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format, :order => order, :tag_filter => tag_filter, :output => options[:o], :tags_color => tags_color, :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => only_timed })
+      options[:sort_tags] = options[:tag_sort] =~ /^n/i
+
+      puts wwid.list_section({:section => section, :count => count, :template => template, :format => format, :order => order, :tag_filter => tag_filter, :output => options[:o], :tags_color => tags_color, :times => options[:t], :highlight => true, :totals => options[:totals], :only_timed => only_timed, :sort_tags => options[:sort_tags] })
     else
       if title.class == FalseClass
         exit_now! "Cancelled"

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.37'
+  VERSION = '1.0.42'
 end

data/lib/doing/wwid.rb

@@ -188,6 +188,7 @@ class WWID
     @config['marker_tag'] ||= 'flagged'
     @config['marker_color'] ||= 'red'
     @config['default_tags'] ||= []
+    @config['tag_sort'] ||= 'time'
 
     @current_section = config['current_section']
     @default_template = config['templates']['default']['template']
@@ -997,6 +998,7 @@ class WWID
     opt[:tags_color] ||= false
     opt[:times] ||= false
     opt[:totals] ||= false
+    opt[:sort_tags] ||= false
     opt[:search] ||= false
     opt[:only_timed] ||= false
     opt[:date_filter] ||= []
@@ -1123,7 +1125,6 @@ class WWID
       }
       out = output.join("")
     elsif opt[:output] == "json" || opt[:output] == "timeline"
-
       items_out = []
       max = items[-1]['date'].strftime('%F')
       min = items[0]['date'].strftime('%F')
@@ -1135,7 +1136,6 @@ class WWID
           title = i['title']
           note = i['note'].map { |line| line.strip } if i['note']
         end
-
         if i['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
           end_date = Time.parse($1)
           interval = get_interval(i,false)
@@ -1150,14 +1150,16 @@ class WWID
           tags.push(tag[0]) unless skip_tags.include?(tag[0])
         }
         if opt[:output] == "json"
+
           items_out << {
             :date => i['date'],
             :end_date => end_date,
             :title => title.strip, #+ " #{note}"
-            :note => note.class == Array ? note.join("\n") : note,
+            :note => note.class == Array ? note.map(&:strip).join("\n") : note,
             :time => "%02d:%02d:%02d" % fmt_time(interval),
             :tags => tags
           }
+
         elsif opt[:output] == "timeline"
           new_item = {
             'id' => index + 1,
@@ -1180,7 +1182,7 @@ class WWID
         out = {
           'section' => section,
           'items' => items_out,
-          'timers' => tag_times("json")
+          'timers' => tag_times("json", opt[:sort_tags])
         }.to_json
       elsif opt[:output] == "timeline"
                 template =<<EOTEMPLATE
@@ -1263,7 +1265,7 @@ EOTEMPLATE
         style = css_template
       end
 
-      totals = opt[:totals] ? tag_times("html") : ""
+      totals = opt[:totals] ? tag_times("html", opt[:sort_tags]) : ""
       engine = Haml::Engine.new(template)
       puts engine.render(Object.new, { :@items => items_out, :@page_title => page_title, :@style => style, :@totals => totals })
     else
@@ -1278,7 +1280,7 @@ EOTEMPLATE
         end
 
         if (item.has_key?('note') && !item['note'].empty?) && @config[:include_notes]
-          note_lines = item['note'].delete_if{|line| line =~ /^\s*$/ }.map{|line| "\t" + line.sub(/^\t*/,'') + "  " }
+          note_lines = item['note'].delete_if{|line| line =~ /^\s*$/ }.map{|line| "\t\t" + line.sub(/^\t*/,'').sub(/^-/, '—') + "  " }
           if opt[:wrap_width] && opt[:wrap_width] > 0
             width = opt[:wrap_width]
             note_lines.map! {|line|
@@ -1353,7 +1355,7 @@ EOTEMPLATE
 
         out += output + "\n"
       }
-      out += tag_times if opt[:totals]
+      out += tag_times("text", opt[:sort_tags]) if opt[:totals]
     end
     return out
   end
@@ -1526,8 +1528,10 @@ EOTEMPLATE
   ##
   def today(times=true,output=nil,opt={})
     opt[:totals] ||= false
+    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]})
+    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]})
   end
 
   ##
@@ -1541,13 +1545,14 @@ EOTEMPLATE
   ##
   def list_date(dates,section,times=nil,output=nil,opt={})
     opt[:totals] ||= false
+    opt[:sort_tags] ||= false
     section = guess_section(section)
     # :date_filter expects an array with start and end date
     if dates.class == String
       dates = [dates, dates]
     end
 
-    list_section({:section => section, :count => 0, :order => "asc", :date_filter => dates, :times => times, :output => output, :totals => opt[:totals] })
+    list_section({:section => section, :count => 0, :order => "asc", :date_filter => dates, :times => times, :output => output, :totals => opt[:totals], :sort_tags => opt[:sort_tags] })
   end
 
   ##
@@ -1560,8 +1565,9 @@ EOTEMPLATE
   ##
   def yesterday(section,times=nil,output=nil,opt={})
     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] })
+    list_section({:section => section, :count => 0, :order => "asc", :yesterday => true, :times => times, :output => output, :totals => opt[:totals], :sort_tags => opt[:sort_tags] })
   end
 
   ##
@@ -1574,10 +1580,12 @@ EOTEMPLATE
   def recent(count=10,section=nil,opt={})
     times = opt[:t] || true
     opt[:totals] ||= false
+    opt[:sort_tags] ||= false
+
     cfg = @config['templates']['recent']
     section ||= @current_section
     section = guess_section(section)
-    list_section({:section => section, :wrap_width => cfg['wrap_width'], :count => count, :format => cfg['date_format'], :template => cfg['template'], :order => "asc", :times => times, :totals => opt[:totals] })
+    list_section({:section => section, :wrap_width => cfg['wrap_width'], :count => count, :format => cfg['date_format'], :template => cfg['template'], :order => "asc", :times => times, :totals => opt[:totals], :sort_tags => opt[:sort_tags] })
   end
 
   ##
@@ -1598,14 +1606,20 @@ EOTEMPLATE
   ##
   ## @param      format  (String) return format (html, json, or text)
   ##
-  def tag_times(format="text")
-
+  def tag_times(format="text", sort_by_name = false)
     return "" if @timers.empty?
 
     max = @timers.keys.sort_by {|k| k.length }.reverse[0].length + 1
 
     total = @timers.delete("All")
 
+    tags_data = @timers.delete_if { |k,v| v == 0}
+    if sort_by_name
+      sorted_tags_data = tags_data.sort_by{|k,v| k }.reverse
+    else
+      sorted_tags_data = tags_data.sort_by{|k,v| v }
+    end
+
     if format == "html"
       output =<<EOS
         <table>
@@ -1622,9 +1636,7 @@ EOTEMPLATE
         </thead>
         <tbody>
 EOS
-      @timers.sort_by {|k,v|
-        v
-      }.reverse.each {|k,v|
+      sorted_tags_data.reverse.each {|k,v|
         output += "<tr><td style='text-align:left;'>#{k}</td><td style='text-align:left;'>#{"%02d:%02d:%02d" % fmt_time(v)}</td></tr>\n" if v > 0
       }
       tail =<<EOS
@@ -1643,7 +1655,7 @@ EOS
       output + tail
     elsif format == "json"
       output = []
-      @timers.delete_if { |k,v| v == 0}.sort_by{|k,v| v }.reverse.each {|k,v|
+      sorted_tags_data.reverse.each {|k,v|
         output << {
           'tag' => k,
           'seconds' => v,
@@ -1653,7 +1665,7 @@ EOS
       output
     else
       output = []
-      @timers.delete_if { |k,v| v == 0}.sort_by{|k,v| v }.reverse.each {|k,v|
+      sorted_tags_data.reverse.each {|k,v|
         spacer = ""
         (max - k.length).times do
           spacer += " "
@@ -1704,11 +1716,15 @@ EOS
           regex = Regexp.new('@' + rx + '\b')
 
           matches = text.scan(regex)
-
           matches.each {|m|
-            puts rx,r
-            new_tag = m[0].sub(Regexp.new(rx), r)
-            puts new_tag
+            new_tag = r
+            if m.kind_of?(Array)
+              index = 1
+              m.each {|v|
+                new_tag = new_tag.gsub('\\' + index.to_s, v)
+                index = index + 1
+              }
+            end
             tail_tags.push(new_tag)
           } if matches
         end
@@ -1782,6 +1798,10 @@ EOS
     if seconds.nil?
       return [0, 0, 0]
     end
+    if seconds =~ /(\d+):(\d+):(\d+)/
+      h, m, s = [$1, $2, $3]
+      seconds = (h.to_i * 60 * 60) + (m.to_i * 60) + s.to_i
+    end
     minutes =  (seconds / 60).to_i
     hours = (minutes / 60).to_i
     days = (hours / 24).to_i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.37
+  version: 1.0.42
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake