doing 1.0.37 → 1.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d00d66a9e4fa16bdc40697f2fa7b42685d87e64c757d6f5e0096dd8a07af4c37
-  data.tar.gz: d7624aefddb7eb42b1a86c97f140e0881cbf2d8a41b34109d1f2f3a31b82c9b3
+  metadata.gz: 9638a33587192a9a5146ace1e3d8e6937efb34922b7b93c71ba088880f136ed4
+  data.tar.gz: 07bc825013ac19e6b4a1b4ef3103ac0f04ce186575ec65c724e55664b74087d6
 SHA512:
-  metadata.gz: a50d44f0db2756591fc7b7e276dd521a27f13fc893c91928386a504ffc874657bb3913cad123c59e5c86fbb858812aa91914082bd183652857a43d0455ee3047
-  data.tar.gz: bf9684307fbdf99a5f6846ae09ecc3c574eecba8be0d609ce0ce7f00c838470d39b434e065725c951a140d1be921910b61376c0793319be184997daa0d4b98e3
+  metadata.gz: '087fa6df46f96bb25ddb7904505e10669a5bb28104e0652b890a497067ed8255ec2d6ce9e3e54018372efdf86b7272bd4a81c09b1a93b99e8f90e09ed86af381'
+  data.tar.gz: e395fd115d20f77cd522d086fa19b1bde92a51ea7785cf3f8b16ae39004f490ebc918be798d70e3ce133effcc15948c774493ddf84e541fd0b3a3e83271e0d90

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

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.37'
+  VERSION = '1.0.38'
 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] ||= []
@@ -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
@@ -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
@@ -1598,7 +1600,7 @@ 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?
 
@@ -1606,6 +1608,13 @@ EOTEMPLATE
 
     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 +1631,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 +1650,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 +1660,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 += " "

metadata

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