doing 2.1.57 → 2.1.61

data/docs/doc/top-level-namespace.html

@@ -216,7 +216,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu May 26 11:23:25 2022 by
+  Generated on Wed Jun 29 05:57:08 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/doing.rdoc

@@ -5,7 +5,7 @@ record of what you've been doing, complete with tag-based time tracking. The
 command line tool allows you to add entries, annotate with tags and notes, and
 view your entries with myriad options, with a focus on a "natural" language syntax.
 
-v2.1.57
+v2.1.61
 
 === Global Options
 === --config_file arg
@@ -2333,12 +2333,11 @@ Output to export format (csv|dayone|dayone-days|dayone-entries|doing|html|json|m
 [Default Value] None
 
 
-===== -s|--sort ORDER
+===== -s|--section NAME
 
-Sort order (asc/desc)
+Only show entries within section
 
-[Default Value] asc
-[Must Match] (?i-mx:^(?:a(?:sc)?|d(?:esc)?)$)
+[Default Value] None
 
 
 ===== --save VIEW_NAME
@@ -2356,6 +2355,14 @@ Filter entries using a search query, surround with slashes for regex (e.g. "/que
 [Default Value] None
 
 
+===== --sort ORDER
+
+Sort order (asc/desc)
+
+[Default Value] asc
+[Must Match] (?i-mx:^(?:a(?:sc)?|d(?:esc)?)$)
+
+
 ===== --tag TAG
 
 Filter entries by tag. Combine multiple tags with a comma. Wildcards allowed (*, ?)
@@ -3002,6 +3009,16 @@ Redo last undo. Note: you cannot undo a redo
 
 
 
+==== Command: <tt>update </tt>
+Update doing to the latest version
+
+Checks for the latest available version of doing and updates your local install if needed.
+===== Options
+===== -p|--pre|--beta
+Check for pre-release version
+
+
+
 ==== Command: <tt>view  VIEW_NAME</tt>
 Display a user-created view
 

data/lib/completion/_doing.zsh

@@ -52,6 +52,7 @@ function _doing() {
                   'test:Test Stuff'
                   'today:List entries from today'
                   'undo:Undo the last X changes to the Doing file'
+                  'update:Update doing to the latest version'
                   'view:Display a user-created view'
                   'views:List available custom views'
                   'wiki:Output a tag wiki'
@@ -174,7 +175,7 @@ function _doing() {
                 args=( {'(--archive)-a','(-a)--archive'}"[Archive selected items]" "--after[Select entries newer than date]:DATE_STRING:" "--resume[Copy selection as a new entry with current time and no @done tag]" "--before[Select entries older than date]:DATE_STRING:" {'(--cancel)-c','(-c)--cancel'}"[Cancel selected items]" "--case[Case sensitivity for search string matching [(c)ase-sensitive]:TYPE:" {'(--delete)-d','(-d)--delete'}"[Delete selected items]" {'(--editor)-e','(-e)--editor'}"[Edit selected item(s)]" {'(--finish)-f','(-f)--finish'}"[Add @done with current time to selected item(s)]" "--flag[Add flag to selected item(s)]" "--force[Perform action without confirmation]" "--from[Date range]:DATE_OR_RANGE:" {'(--move)-m','(-m)--move'}"[Move selected items to section]:SECTION:" "--menu[Use --no-menu to skip the interactive menu]" "--not[Select items that *don't* match search/tag filters]" {'(--output)-o','(-o)--output'}"[Output entries to format]:FORMAT:" {'(--query)-q','(-q)--query'}"[Initial search query for filtering]:QUERY:" {'(--remove)-r','(-r)--remove'}"[Reverse -c]" {'(--section)-s','(-s)--section'}"[Select from a specific section]:SECTION:" "--save_to[Save selected entries to file using --output format]:FILE:" "--search[Filter entries using a search query]:QUERY:" {'(--tag)-t','(-t)--tag'}"[Tag selected entries]:TAG:" "--val[Perform a tag value query]:QUERY:" {'(--exact)-x','(-x)--exact'}"[Force exact search string matching]" )
             ;;
             show) 
-                args=( {'(--age)-a','(-a)--age'}"[Age]:AGE:" "--after[Show entries newer than date]:DATE_STRING:" "--before[Show entries older than date]:DATE_STRING:" "--bool[Boolean used to combine multiple tags]:BOOLEAN:" {'(--count)-c','(-c)--count'}"[Max count to show]:MAX:" "--case[Case sensitivity for search string matching [(c)ase-sensitive]:TYPE:" "--config_template[Output using a template from configuration]:TEMPLATE_KEY:" "--duration[Show elapsed time on entries without @done tag]" {'(--editor)-e','(-e)--editor'}"[Edit matching entries with vim]" "--from[Date range]:DATE_OR_RANGE:" {'(--hilite)-h','(-h)--hilite'}"[Highlight search matches in output]" {'(--interactive)-i','(-i)--interactive'}"[Select from a menu of matching entries to perform additional operations]" {'(--menu)-m','(-m)--menu'}"[Select section or tag to display from a menu]" "--not[Show items that *don't* match search/tag filters]" {'(--output)-o','(-o)--output'}"[Output to export format]:FORMAT:" "--only_timed[Only show items with recorded time intervals]" {'(--sort)-s','(-s)--sort'}"[Sort order]:ORDER:" "--save[Save all current command line options as a new view]:VIEW_NAME:" "--search[Filter entries using a search query]:QUERY:" {'(--times)-t','(-t)--times'}"[Show time intervals on @done tasks]" "--tag[Filter entries by tag]:TAG:" "--tag_order[Tag sort direction]:DIRECTION:" "--tag_sort[Sort tags by]:KEY:" "--template[Override output format with a template string containing %placeholders]:TEMPLATE_STRING:" "--title[Title string to be used for output formats that require it]:TITLE:" "--totals[Show time totals at the end of output]" "--val[Perform a tag value query]:QUERY:" {'(--exact)-x','(-x)--exact'}"[Force exact search string matching]" )
+                args=( {'(--age)-a','(-a)--age'}"[Age]:AGE:" "--after[Show entries newer than date]:DATE_STRING:" "--before[Show entries older than date]:DATE_STRING:" "--bool[Boolean used to combine multiple tags]:BOOLEAN:" {'(--count)-c','(-c)--count'}"[Max count to show]:MAX:" "--case[Case sensitivity for search string matching [(c)ase-sensitive]:TYPE:" "--config_template[Output using a template from configuration]:TEMPLATE_KEY:" "--duration[Show elapsed time on entries without @done tag]" {'(--editor)-e','(-e)--editor'}"[Edit matching entries with vim]" "--from[Date range]:DATE_OR_RANGE:" {'(--hilite)-h','(-h)--hilite'}"[Highlight search matches in output]" {'(--interactive)-i','(-i)--interactive'}"[Select from a menu of matching entries to perform additional operations]" {'(--menu)-m','(-m)--menu'}"[Select section or tag to display from a menu]" "--not[Show items that *don't* match search/tag filters]" {'(--output)-o','(-o)--output'}"[Output to export format]:FORMAT:" "--only_timed[Only show items with recorded time intervals]" {'(--section)-s','(-s)--section'}"[Only show entries within section]:NAME:" "--save[Save all current command line options as a new view]:VIEW_NAME:" "--search[Filter entries using a search query]:QUERY:" "--sort[Sort order]:ORDER:" {'(--times)-t','(-t)--times'}"[Show time intervals on @done tasks]" "--tag[Filter entries by tag]:TAG:" "--tag_order[Tag sort direction]:DIRECTION:" "--tag_sort[Sort tags by]:KEY:" "--template[Override output format with a template string containing %placeholders]:TEMPLATE_STRING:" "--title[Title string to be used for output formats that require it]:TITLE:" "--totals[Show time totals at the end of output]" "--val[Perform a tag value query]:QUERY:" {'(--exact)-x','(-x)--exact'}"[Force exact search string matching]" )
             ;;
             since) 
                 args=( "--bool[Boolean used to combine multiple tags]:BOOLEAN:" "--case[Case sensitivity for search string matching [(c)ase-sensitive]:TYPE:" "--config_template[Output using a template from configuration]:TEMPLATE_KEY:" "--duration[Show elapsed time on entries without @done tag]" "--not[Since items that *don't* match search/tag filters]" {'(--output)-o','(-o)--output'}"[Output to export format]:FORMAT:" "--only_timed[Only show items with recorded time intervals]" {'(--section)-s','(-s)--section'}"[Section]:NAME:" "--save[Save all current command line options as a new view]:VIEW_NAME:" "--search[Filter entries using a search query]:QUERY:" {'(--times)-t','(-t)--times'}"[Show time intervals on @done tasks]" "--tag[Filter entries by tag]:TAG:" "--tag_order[Tag sort direction]:DIRECTION:" "--tag_sort[Sort tags by]:KEY:" "--template[Override output format with a template string containing %placeholders]:TEMPLATE_STRING:" "--title[Title string to be used for output formats that require it]:TITLE:" "--totals[Show time totals at the end of output]" "--val[Perform a tag value query]:QUERY:" {'(--exact)-x','(-x)--exact'}"[Force exact search string matching]" )
@@ -200,6 +201,9 @@ function _doing() {
             undo) 
                 args=( {'(--file)-f','(-f)--file'}"[Specify alternate doing file]:PATH:" {'(--interactive)-i','(-i)--interactive'}"[Select from recent backups]" {'(--prune)-p','(-p)--prune'}"[Remove old backups]:COUNT:" {'(--redo)-r','(-r)--redo'}"[Redo last undo]" )
             ;;
+            update) 
+                args=( "--beta[Check for pre-release version]" )
+            ;;
             view) 
                 args=( "--after[Show entries newer than date]:DATE_STRING:" "--age[Age]:AGE:" "--before[Show entries older than date]:DATE_STRING:" "--bool[Boolean used to combine multiple tags]:BOOLEAN:" {'(--count)-c','(-c)--count'}"[Count to display]:COUNT:" "--case[Case sensitivity for search string matching [(c)ase-sensitive]:TYPE:" "--color[Include colors in output]" "--config_template[Output using a template from configuration]:TEMPLATE_KEY:" "--duration[Show elapsed time on entries without @done tag]" "--from[Date range]:DATE_OR_RANGE:" {'(--hilite)-h','(-h)--hilite'}"[Highlight search matches in output]" {'(--interactive)-i','(-i)--interactive'}"[Select from a menu of matching entries to perform additional operations]" "--not[Show items that *don't* match search/tag filters]" {'(--output)-o','(-o)--output'}"[Output to export format]:FORMAT:" "--only_timed[Only show items with recorded time intervals]" {'(--section)-s','(-s)--section'}"[Section]:NAME:" "--search[Filter entries using a search query]:QUERY:" {'(--times)-t','(-t)--times'}"[Show time intervals on @done tasks]" "--tag[Filter entries by tag]:TAG:" "--tag_order[Tag sort direction]:DIRECTION:" "--tag_sort[Sort tags by]:KEY:" "--template[Override output format with a template string containing %placeholders]:TEMPLATE_STRING:" "--totals[Show intervals with totals at the end of output]" "--val[Perform a tag value query]:QUERY:" {'(--exact)-x','(-x)--exact'}"[Force exact search string matching]" )
             ;;

data/lib/completion/doing.bash

@@ -276,9 +276,9 @@ local words=$(doing sections)
 IFS="$OLD_IFS"
 
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--age --after --before --bool --count --case --config_template --duration --editor --from --hilite --interactive --menu --not --output --only_timed --sort --save --search --times --tag --tag_order --tag_sort --template --title --totals --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--age --after --before --bool --count --case --config_template --duration --editor --from --hilite --interactive --menu --not --output --only_timed --section --save --search --sort --times --tag --tag_order --tag_sort --template --title --totals --val --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -c -e -h -i -m -o -s -t -x --age --after --before --bool --count --case --config_template --duration --editor --from --hilite --interactive --menu --not --output --only_timed --sort --save --search --times --tag --tag_order --tag_sort --template --title --totals --val --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -c -e -h -i -m -o -s -t -x --age --after --before --bool --count --case --config_template --duration --editor --from --hilite --interactive --menu --not --output --only_timed --section --save --search --sort --times --tag --tag_order --tag_sort --template --title --totals --val --exact' -- $token ) )
   else
   local nocasematchWasOff=0
   shopt nocasematch >/dev/null || nocasematchWasOff=1
@@ -368,6 +368,16 @@ _doing_undo() {
   fi
 }
 
+_doing_update() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--beta' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W ' --beta' -- $token ) )
+  
+  fi
+}
+
 _doing_view() {
   OLD_IFS="$IFS"
 local token=${COMP_WORDS[$COMP_CWORD]}
@@ -466,6 +476,7 @@ _doing()
     elif [[ $last =~ (template) ]]; then _doing_template
     elif [[ $last =~ (today) ]]; then _doing_today
     elif [[ $last =~ (undo) ]]; then _doing_undo
+    elif [[ $last =~ (update) ]]; then _doing_update
     elif [[ $last =~ (view) ]]; then _doing_view
     elif [[ $last =~ (views) ]]; then _doing_views
     elif [[ $last =~ (wiki) ]]; then _doing_wiki

data/lib/completion/doing.fish

@@ -172,6 +172,7 @@ complete -xc doing -n '__fish_doing_needs_command' -a 'template' -d Output\ HTML
 complete -xc doing -n '__fish_doing_needs_command' -a 'test' -d Test\ Stuff
 complete -xc doing -n '__fish_doing_needs_command' -a 'today' -d List\ entries\ from\ today
 complete -xc doing -n '__fish_doing_needs_command' -a 'undo' -d Undo\ the\ last\ X\ changes\ to\ the\ Doing\ file
+complete -xc doing -n '__fish_doing_needs_command' -a 'update' -d Update\ doing\ to\ the\ latest\ version
 complete -xc doing -n '__fish_doing_needs_command' -a 'view' -d Display\ a\ user-created\ view
 complete -xc doing -n '__fish_doing_needs_command' -a 'views' -d List\ available\ custom\ views
 complete -xc doing -n '__fish_doing_needs_command' -a 'wiki' -d Output\ a\ tag\ wiki
@@ -470,9 +471,10 @@ complete -c doing -l menu -s m -f  -n '__fish_doing_using_command show' -d Selec
 complete -c doing -l not  -f  -n '__fish_doing_using_command show' -d Show\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command show' -d Output\ to\ export\ format
 complete -c doing -l only_timed  -f  -n '__fish_doing_using_command show' -d Only\ show\ items\ with\ recorded\ time\ intervals
-complete -c doing -l sort -s s -f -r -n '__fish_doing_using_command show' -d Sort\ order
+complete -c doing -l section -s s -f -r -n '__fish_doing_using_command show' -d Only\ show\ entries\ within\ section
 complete -c doing -l save  -f -r -n '__fish_doing_using_command show' -d Save\ all\ current\ command\ line\ options\ as\ a\ new\ view
 complete -c doing -l search  -f -r -n '__fish_doing_using_command show' -d Filter\ entries\ using\ a\ search\ query
+complete -c doing -l sort  -f -r -n '__fish_doing_using_command show' -d Sort\ order
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command show' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command show' -d Filter\ entries\ by\ tag
 complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command show' -d Tag\ sort\ direction
@@ -558,6 +560,7 @@ complete -c doing -l file -s f -f -r -n '__fish_doing_using_command undo' -d Spe
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command undo' -d Select\ from\ recent\ backups
 complete -c doing -l prune -s p -f -r -n '__fish_doing_using_command undo' -d Remove\ old\ backups
 complete -c doing -l redo -s r -f  -n '__fish_doing_using_command undo' -d Redo\ last\ undo
+complete -c doing -l beta  -f  -n '__fish_doing_using_command update' -d Check\ for\ pre-release\ version
 complete -c doing -l after  -f -r -n '__fish_doing_using_command view' -d Show\ entries\ newer\ than\ date
 complete -c doing -l age  -f -r -n '__fish_doing_using_command view' -d Age
 complete -c doing -l before  -f -r -n '__fish_doing_using_command view' -d Show\ entries\ older\ than\ date
@@ -617,4 +620,4 @@ complete -f -c doing -l sort -x -n '__fish_doing_using_command changes changelog
 complete -f -c doing -l tag_sort -x -n '__fish_doing_using_command grep search on recent show since today view yesterday' -a 'name time'
 complete -f -c doing -l tag_order -x -n '__fish_doing_using_command grep search on recent show since today view yesterday' -a 'asc desc'
 complete -f -c doing -s a -l age -x -n '__fish_doing_using_command show view' -a 'oldest newest'
-complete -f -c doing -s s -l section -x -n '__fish_doing_using_command again resume autotag cancel done did finish grep search import last mark flag meanwhile note now next on recent reset begin rotate select since tag tags today view wiki yesterday' -a '(__fish_doing_complete_sections)'
+complete -f -c doing -s s -l section -x -n '__fish_doing_using_command again resume autotag cancel done did finish grep search import last mark flag meanwhile note now next on recent reset begin rotate select show since tag tags today view wiki yesterday' -a '(__fish_doing_complete_sections)'

data/lib/completion/doing.ts

@@ -3648,11 +3648,11 @@ const completionSpec: Fig.Spec = {
           },
 
           {
-            name: ["-s", "--sort"],
-            description: "Sort order",
+            name: ["-s", "--section"],
+            description: "Only show entries within section",
             args: {
-                  name: "ORDER",
-                  description: "ORDER",
+                  name: "NAME",
+                  description: "NAME",
             },
 
           },
@@ -3677,6 +3677,16 @@ const completionSpec: Fig.Spec = {
 
           },
 
+          {
+            name: ["--sort"],
+            description: "Sort order",
+            args: {
+                  name: "ORDER",
+                  description: "ORDER",
+            },
+
+          },
+
           {
             name: ["-t", "--times"],
             description: "Show time intervals on @done tasks",
@@ -4453,6 +4463,20 @@ const completionSpec: Fig.Spec = {
 
     },
 
+    {
+      name: "update",
+      description: "Update doing to the latest version",
+      options: [
+          {
+            name: ["--beta"],
+            description: "Check for pre-release version",
+            
+          },
+
+        ],
+
+    },
+
     {
       name: "view",
       description: "Display a user-created view",

data/lib/doing/colors.rb

@@ -109,7 +109,7 @@ module Doing
         compiled = ''
         normalize_color.split('').each do |char|
           compiled += char
-          valid_color = compiled if Color.attributes.include?(compiled.to_sym)
+          valid_color = compiled if Color.attributes.include?(compiled.to_sym) || compiled =~ /^([fb]g?)?#([a-f0-9]{6})$/i
         end
 
         valid_color
@@ -225,6 +225,19 @@ module Doing
       module_eval(new_method)
     end
 
+    def rgb(hex)
+      is_bg = hex.match(/^bg?#/) ? true : false
+      hex_string = hex.sub(/^([fb]g?)?#/, '')
+
+      parts = hex_string.match(/(?<r>..)(?<g>..)(?<b>..)/)
+      t = []
+      %w[r g b].each do |e|
+        t << parts[e].hex
+      end
+      color =
+      "\e[#{is_bg ? '48' : '38'};2;#{t.join(';')}m"
+    end
+
     # Regular expression that is used to scan for ANSI-sequences while
     # uncoloring strings.
     COLORED_REGEXP = /\e\[(?:(?:[349]|10)[0-7]|[0-9])?m/.freeze

data/lib/doing/completion/completion_string.rb

@@ -1,10 +1,21 @@
 module Doing
   module Completion
     module StringUtils
+
+      ##
+      ## Get short description for command completion
+      ##
+      ## @return     [String] Short description
+      ##
       def short_desc
         split(/[,.]/)[0].sub(/ \(.*?\)?$/, '').strip
       end
 
+      ##
+      ## Truncate string from left
+      ##
+      ## @param      max   The maximum number of characters
+      ##
       def ltrunc(max)
         if length > max
           sub(/^.*?(.{#{max - 3}})$/, '...\1')

data/lib/doing/hash.rb

@@ -70,6 +70,12 @@ module Doing
       end
     end
 
+    ##
+    ## Turn all non-numeric values into strings
+    ##
+    ## @return     [Hash] a copy of the hash where all
+    ##             non-numeric values are strings
+    ##
     def stringify_values
       transform_values do |v|
         if v.is_a?(Hash)

data/lib/doing/logger.rb

@@ -258,7 +258,7 @@ module Doing
       results = @results.select { |msg| write_message?(msg[:level]) }.uniq
 
       if @logdev == $stdout
-        $stdout.print results.map {|res| res[:message].uncolor }.join("\n")
+        $stdout.print results.map { |res| res[:message].uncolor }.join("\n")
         $stdout.puts
       else
         results.each do |msg|
@@ -324,7 +324,6 @@ module Doing
       end
     end
 
-
     def log_change(tags_added: [], tags_removed: [], count: 1, item: nil, single: false)
       if tags_added.empty? && tags_removed.empty?
         count(:skipped, level: :debug, message: '%count %items with no change', count: count)
@@ -348,9 +347,9 @@ module Doing
         if tags_removed.empty?
           count(:skipped, level: :debug, message: 'no tags removed from %count %items')
         elsif single && item
-          added = tags_added.log_tags
+          removed = tags_removed.log_tags
           info('Untagged:',
-               %(removed #{tags_removed.count == 1 ? 'tag' : 'tags'} #{added} from #{item.title}))
+               %(removed #{tags_removed.count == 1 ? 'tag' : 'tags'} #{removed} from #{item.title}))
         else
           count(:removed_tags, level: :info, tag: tags_removed, message: '%tags removed from %count %items')
         end

data/lib/doing/string/query.rb

@@ -85,6 +85,11 @@ module Doing
       Regexp.new(pattern, !case_sensitive)
     end
 
+    ##
+    ## Returns a phrase query (elastic search) representation of the object as a phrase parser.
+    ##
+    ## @return     Phrase query representation of the object.
+    ##
     def to_phrase_query
       parser = PhraseParser::QueryParser.new
       transformer = PhraseParser::QueryTransformer.new
@@ -92,6 +97,11 @@ module Doing
       transformer.apply(parse_tree).to_elasticsearch
     end
 
+    ##
+    ## Returns a query (elastic search) representation of the object as a boolean term parser.
+    ##
+    ## @return     Query representation of the object.
+    ##
     def to_query
       parser = BooleanTermParser::QueryParser.new
       transformer = BooleanTermParser::QueryTransformer.new

data/lib/doing/template_string.rb

@@ -65,12 +65,13 @@ module Doing
       working = dup
       color_array = []
 
-      scan(/(?<!\\)(%([a-z]+))/).each do |color|
+      scan(/(?<!\\)(%((?:[fb]g?)?#[a-fA-F0-9]{6}|[a-z]+))/).each do |color|
         valid_color = color[1].validate_color
         next unless valid_color
 
         idx = working.match(/(?<!\\)%#{valid_color}/).begin(0)
-        color_array.push({ name: valid_color, color: Color.send(valid_color), index: idx })
+        color = Color.attributes.include?(valid_color.to_sym) ? Color.send(valid_color) : Color.rgb(valid_color)
+        color_array.push({ name: valid_color, color: color, index: idx })
         working.sub!(/(?<!\\)%#{valid_color}/, '')
       end
 

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.57'
+  VERSION = '2.1.61'
 end

data/lib/doing/wwid/modify.rb

@@ -159,7 +159,6 @@ module Doing
       write(@doing_file)
     end
 
-
     ##
     ## Tag the last entry or X entries
     ##
@@ -281,6 +280,7 @@ module Doing
 
             if opt[:remove] || opt[:rename] || opt[:value]
               rename_to = nil
+
               if opt[:value]
                 rename_to = tag
               elsif opt[:rename]

data/lib/doing/wwid/timers.rb

@@ -14,162 +14,7 @@ module Doing
     def tag_times(format: :text, sort_by: :time, sort_order: :asc)
       return '' if @timers.empty?
 
-      max = @timers.keys.sort_by(&:length).reverse[0].length + 1
-
-      total = @timers.delete('All')
-
-      tags_data = @timers.delete_if { |_k, v| v.zero? }
-      sorted_tags_data = if sort_by.normalize_tag_sort == :name
-                           tags_data.sort_by { |k, _v| k }
-                         else
-                           tags_data.sort_by { |_k, v| v }
-                         end
-
-      sorted_tags_data.reverse! if sort_order.normalize_order == :asc
-      case format
-      when :html
-
-        output = <<EOHEAD
-          <table>
-          <caption id="tagtotals">Tag Totals</caption>
-          <colgroup>
-          <col style="text-align:left;"/>
-          <col style="text-align:left;"/>
-          </colgroup>
-          <thead>
-          <tr>
-            <th style="text-align:left;">project</th>
-            <th style="text-align:left;">time</th>
-          </tr>
-          </thead>
-          <tbody>
-EOHEAD
-        sorted_tags_data.reverse.each do |k, v|
-          if v.positive?
-            output += "<tr><td style='text-align:left;'>#{k}</td><td style='text-align:left;'>#{v.time_string(format: :clock)}</td></tr>\n"
-          end
-        end
-        tail = <<EOTAIL
-        <tr>
-          <td style="text-align:left;" colspan="2"></td>
-        </tr>
-        </tbody>
-        <tfoot>
-        <tr>
-          <td style="text-align:left;"><strong>Total</strong></td>
-          <td style="text-align:left;">#{total.time_string(format: :clock)}</td>
-        </tr>
-        </tfoot>
-        </table>
-EOTAIL
-        output + tail
-      when :markdown
-        pad = sorted_tags_data.map { |k, _| k }.group_by(&:size).max.last[0].length
-        pad = 7 if pad < 7
-        output = <<~EOHEADER
-  | #{' ' * (pad - 7)}project | time     |
-  | #{'-' * (pad - 1)}: | :------- |
-        EOHEADER
-        sorted_tags_data.reverse.each do |k, v|
-          if v.positive?
-            output += "| #{' ' * (pad - k.length)}#{k} | #{v.time_string(format: :clock)} |\n"
-          end
-        end
-        tail = '[Tag Totals]'
-        output + tail
-      when :json
-        output = []
-        sorted_tags_data.reverse.each do |k, v|
-          output << {
-            'tag' => k,
-            'seconds' => v,
-            'formatted' => v.time_string(format: :clock)
-          }
-        end
-        output
-      when :human
-        output = []
-        sorted_tags_data.reverse.each do |k, v|
-          spacer = ''
-          (max - k.length).times do
-            spacer += ' '
-          end
-          output.push("┃ #{spacer}#{k}:#{v.time_string(format: :hm)} ┃")
-        end
-
-        header = '┏━━ Tag Totals '
-        (max - 2).times { header += '━' }
-        header += '┓'
-        footer = '┗'
-        (max + 12).times { footer += '━' }
-        footer += '┛'
-        divider = '┣'
-        (max + 12).times { divider += '━' }
-        divider += '┫'
-        output = output.empty? ? '' : "\n#{header}\n#{output.join("\n")}"
-        output += "\n#{divider}"
-        spacer = ''
-        (max - 6).times do
-          spacer += ' '
-        end
-        total_time = total.time_string(format: :hm)
-        total = "┃ #{spacer}total: "
-        total += total_time
-        total += ' ┃'
-        output += "\n#{total}"
-        output += "\n#{footer}"
-        output
-      else
-        output = []
-        sorted_tags_data.reverse.each do |k, v|
-          spacer = ''
-          (max - k.length).times do
-            spacer += ' '
-          end
-          output.push("#{k}:#{spacer}#{v.time_string(format: :clock)}")
-        end
-
-        output = output.empty? ? '' : "\n--- Tag Totals ---\n#{output.join("\n")}"
-        output += "\n\nTotal tracked: #{total.time_string(format: :clock)}\n"
-        output
-      end
-    end
-
-    ##
-    ## Gets the interval between entry's start
-    ##             date and @done date
-    ##
-    ## @param      item       [Item] The entry
-    ## @param      formatted  [Boolean] Return human readable
-    ##                        time (default seconds)
-    ## @param      record     [Boolean] Add the interval to the
-    ##                        total for each tag
-    ##
-    ## @return     Interval in seconds, or [d, h, m] array if
-    ##             formatted is true. False if no end date or
-    ##             interval is 0
-    ##
-    def get_interval(item, formatted: true, record: true)
-      if item.interval
-        seconds = item.interval
-        record_tag_times(item, seconds) if record
-        return seconds.positive? ? seconds : false unless formatted
-
-        return seconds.positive? ? seconds.time_string(format: :clock) : false
-      end
-
-      false
-    end##
-    ## Get total elapsed time for all tags in
-    ##             selection
-    ##
-    ## @param      format        [String] return format (html,
-    ##                           json, or text)
-    ## @param      sort_by       [Symbol] Sort by :name or :time
-    ## @param      sort_order    [Symbol] The sort order (:asc or :desc)
-    ##
-    def tag_times(format: :text, sort_by: :time, sort_order: :asc)
-      return '' if @timers.empty?
+      @timers.delete('meanwhile')
 
       max = @timers.keys.sort_by(&:length).reverse[0].length + 1
 

data/lib/templates/doing.css

@@ -50,7 +50,7 @@ article > ul > li:hover {
 .date {
   color: #7d9ca2;
   font-size: 17px;
-  padding: 15px 1ch 0 0;
+  padding: 3px 1ch 0 0;
   text-align: right;
   white-space: nowrap;
   transition: color .2s ease-in-out;
@@ -59,7 +59,7 @@ article > ul > li:hover {
 .entry {
   border-left: solid 1px #ccc;
   line-height: 1.2;
-  padding: 10px 10px 10px 3ch;
+  padding: 2px 10px 2px 3ch;
   text-indent: -2ch;
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.57
+  version: 2.1.61
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-26 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
@@ -470,6 +470,7 @@ files:
 - bin/commands/template.rb
 - bin/commands/today.rb
 - bin/commands/undo.rb
+- bin/commands/update.rb
 - bin/commands/view.rb
 - bin/commands/views.rb
 - bin/commands/yesterday.rb