doing 2.0.3.pre → 2.0.5.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fa49c423dee61b9691c8b9c075d9f9dc366908783518e525ceda7c5aaad13d3
-  data.tar.gz: '08b1a46254fd97c5c3e39d0f8450bd651714ea6c68c2c7c921a4a5a4aa8603fc'
+  metadata.gz: 8b6463637877fecac4b70b4df2e26f5fed8d2fb948433c9fbb43f7ffb32d4c20
+  data.tar.gz: 68003a5d25dede906536a36a87f96ac772d5d1cefcec6f25b3be5e7db3cfce2e
 SHA512:
-  metadata.gz: c7efe2328eece13d03c13e62a86668229a110ceb0338145cf234cf9699c93070ccae0e52198c00b5c9789f50ac419a1f26952130a988a4594ddd4018ea217b50
-  data.tar.gz: a9d6e519be45123d1303210e9af0835d7ef61ca7378ded0f0afd8eb4ef09c4879ee568e35d2159c26448d4ff93d1ee02ecdc8bcdfb6a0513b79cfbc774c1025c
+  metadata.gz: 3b7fc79db4221f6e7a4d6d923ad845b26f234d03fd4c16940ad046d94dd33321b645dc7447707b962142b7b559b08583d0dda8aecbf35c77db00d24ded68db1f
+  data.tar.gz: 782b17f9a291872c46bf704ea77d028a86d05461e5fc378431d8b16a95a6d55e8727c596c6c6f8c7ac1e469c0d85455dd67f38ae4dae2e565ae24fea0166dfc1

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-### 2.0.2.pre
+### 2.0.5.pre
+
+#### NEW
+
+- Add 'timer_format' config with 'human' option for tag totals
+
+### 2.0.3.pre
 
 #### NEW
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.0.2.pre)
+    doing (2.0.5.pre)
       chronic (~> 0.10, >= 0.10.2)
       deep_merge (~> 1.2, >= 1.2.1)
       gli (~> 2.19, >= 2.19.2)

data/README.md

@@ -6,7 +6,7 @@ _If you're one of the rare people like me who find this useful, feel free to [bu
 
 <!--README-->
 
-The current version of `doing` is <!--VER-->2.0.0<!--END VER-->.
+The current version of `doing` is <!--VER-->2.0.2<!--END VER-->.
 
 Find all of the documentation in the [doing wiki](https://github.com/ttscoff/doing/wiki).
 

data/bin/doing

@@ -200,7 +200,7 @@ command %i[reset begin] do |c|
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'AND'
 
   c.desc 'Select from a menu of matching entries'
-  c.switch %i[i interactive]
+  c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |global_options, options, args|
     if options[:section]
@@ -271,7 +271,7 @@ command :note do |c|
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'AND'
 
   c.desc 'Select item for new note from a menu of matching entries'
-  c.switch %i[i interactive]
+  c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |_global_options, options, args|
     if options[:section]
@@ -774,7 +774,7 @@ command :cancel do |c|
   c.switch %i[u unfinished], negatable: false, default_value: false
 
   c.desc 'Select item(s) to cancel from a menu of matching entries'
-  c.switch %i[i interactive]
+  c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |_global_options, options, args|
     if options[:section]
@@ -867,7 +867,7 @@ command :finish do |c|
   c.flag %i[s section]
 
   c.desc 'Select item(s) to finish from a menu of matching entries'
-  c.switch %i[i interactive]
+  c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |_global_options, options, args|
     unless options[:auto]
@@ -963,7 +963,7 @@ command %i[again resume] do |c|
   c.flag %i[n note]
 
   c.desc 'Select item to resume from a menu of matching entries'
-  c.switch %i[i interactive]
+  c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |_global_options, options, _args|
     tags = options[:tag].nil? ? [] : options[:tag].to_tags
@@ -1042,7 +1042,7 @@ command :tag do |c|
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'AND'
 
   c.desc 'Select item(s) to tag from a menu of matching entries'
-  c.switch %i[i interactive]
+  c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |_global_options, options, args|
     raise Doing::Errors::MissingArgument, 'You must specify at least one tag' if args.empty? && !options[:a]
@@ -1170,7 +1170,7 @@ command [:mark, :flag] do |c|
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'AND'
 
   c.desc 'Select item(s) to flag from a menu of matching entries'
-  c.switch %i[i interactive]
+  c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |_global_options, options, _args|
     mark = settings['marker_tag'] || 'flagged'
@@ -1302,7 +1302,7 @@ command :show do |c|
   c.switch [:only_timed], default_value: false, negatable: false
 
   c.desc 'Select from a menu of matching entries to perform additional operations'
-  c.switch %i[i interactive]
+  c.switch %i[i interactive], negatable: false, default_value: false
 
   c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
   c.arg_name 'FORMAT'
@@ -1476,7 +1476,7 @@ command :recent do |c|
   c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
 
   c.desc 'Select from a menu of matching entries to perform additional operations'
-  c.switch %i[i interactive]
+  c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |global_options, options, args|
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
@@ -1923,7 +1923,7 @@ command :view do |c|
   c.switch [:only_timed], default_value: false, negatable: false
 
   c.desc 'Select from a menu of matching entries to perform additional operations'
-  c.switch %i[i interactive]
+  c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |_global_options, options, args|
     raise InvalidExportType, "Invalid export type: #{options[:output]}" if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)

data/doing.rdoc

@@ -2,7 +2,7 @@
 
 Doing uses a TaskPaper-like formatting to keep a plain text 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.0.2.pre
+v2.0.5.pre
 
 === Global Options
 === --config_file arg
@@ -128,7 +128,7 @@ Edit duplicated entry with vim before adding
 
 
 
-===== -i|--[no-]interactive
+===== -i|--interactive
 Select item to resume from a menu of matching entries
 
 
@@ -223,7 +223,7 @@ Archive entries
 
 
 
-===== -i|--[no-]interactive
+===== -i|--interactive
 Select item(s) to cancel from a menu of matching entries
 
 
@@ -439,7 +439,7 @@ Include date
 
 
 
-===== -i|--[no-]interactive
+===== -i|--interactive
 Select item(s) to finish from a menu of matching entries
 
 
@@ -721,7 +721,7 @@ Don't ask permission to flag all entries when count is 0
 
 
 
-===== -i|--[no-]interactive
+===== -i|--interactive
 Select item(s) to flag from a menu of matching entries
 
 
@@ -815,7 +815,7 @@ Edit entry with vim
 
 
 
-===== -i|--[no-]interactive
+===== -i|--interactive
 Select item for new note from a menu of matching entries
 
 
@@ -965,7 +965,7 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time)$)
 
 
-===== -i|--[no-]interactive
+===== -i|--interactive
 Select from a menu of matching entries to perform additional operations
 
 
@@ -1014,7 +1014,7 @@ Reset last entry matching tag
 [Default Value] None
 
 
-===== -i|--[no-]interactive
+===== -i|--interactive
 Select from a menu of matching entries
 
 
@@ -1281,7 +1281,7 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time))
 
 
-===== -i|--[no-]interactive
+===== -i|--interactive
 Select from a menu of matching entries to perform additional operations
 
 
@@ -1416,7 +1416,7 @@ Don't ask permission to tag all entries when count is 0
 
 
 
-===== -i|--[no-]interactive
+===== -i|--interactive
 Select item(s) to tag from a menu of matching entries
 
 
@@ -1605,7 +1605,7 @@ Include colors in output
 
 
 
-===== -i|--[no-]interactive
+===== -i|--interactive
 Select from a menu of matching entries to perform additional operations
 
 

data/example_plugin.rb

@@ -150,7 +150,7 @@ module Doing
           finished_at = i.end_date
           took += finished_at.strftime('%A %B %e at %I:%M%p')
 
-          d, h, m = wwid.fmt_time(interval)
+          d, h, m = wwid.format_time(interval)
           took += ' and it took'
           took += " #{d.to_i} days" if d.to_i.positive?
           took += " #{h.to_i} hours" if h.to_i.positive?

data/lib/doing/configuration.rb

@@ -31,6 +31,8 @@ module Doing
       'never_time' => [],
       'never_finish' => [],
 
+      'timer_format' => 'text',
+
       'templates' => {
         'default' => {
           'date_format' => '%Y-%m-%d %H:%M',

data/lib/doing/plugins/export/json_export.rb

@@ -56,7 +56,7 @@ module Doing
             end_date: end_date,
             title: title.strip, #+ " #{note}"
             note: note.instance_of?(Array) ? note.to_s : note,
-            time: '%02d:%02d:%02d' % wwid.fmt_time(interval),
+            time: '%02d:%02d:%02d' % wwid.format_time(interval),
             tags: tags
           }
 
@@ -68,7 +68,7 @@ module Doing
           new_item = {
             'id' => index + 1,
             'content' => title.strip, #+ " #{note}"
-            'title' => title.strip + " (#{'%02d:%02d:%02d' % wwid.fmt_time(interval)})",
+            'title' => title.strip + " (#{'%02d:%02d:%02d' % wwid.format_time(interval)})",
             'start' => i.date.strftime('%F %T'),
             'type' => 'box',
             'style' => 'color:#4c566b;background-color:#d8dee9;'

data/lib/doing/plugins/export/template_export.rb

@@ -132,7 +132,7 @@ module Doing
         out += "#{output}\n"
       end
       # Doing.logger.debug('Template Export:', "#{items.count} items output to template #{opt[:template]}")
-      out += wwid.tag_times(format: :text, sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) if opt[:totals]
+      out += wwid.tag_times(format: wwid.config['timer_format'].to_sym, sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) if opt[:totals]
       out
     end
 

data/lib/doing/string.rb

@@ -255,6 +255,7 @@ module Doing
       else
         add = tag
         add += "(#{value})" unless value.nil?
+        title.chomp!
         title += " @#{add}"
 
         title.dedup_tags!
@@ -262,7 +263,7 @@ module Doing
         # Doing.logger.debug('Added tag:', %(#{('@' + tag).cyan} to "#{title}"))
       end
 
-      title
+      title.gsub(/ +/, ' ')
     end
 
     ##

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.0.3.pre'
+  VERSION = '2.0.5.pre'
 end

data/lib/doing/wwid.rb

@@ -1178,6 +1178,7 @@ module Doing
             else
               old_title = item.title.dup
               should_date = opt[:date] && item.should_time?
+              item.title.tag!('done', remove: true) if tag =~ /done/ && !should_date
               item.title.tag!(tag, value: should_date ? done_date.strftime('%F %R') : nil)
               added << tag if old_title != item.title
             end
@@ -1997,7 +1998,7 @@ module Doing
 EOS
         sorted_tags_data.reverse.each do |k, v|
           if v > 0
-            output += "<tr><td style='text-align:left;'>#{k}</td><td style='text-align:left;'>#{'%02d:%02d:%02d' % fmt_time(v)}</td></tr>\n"
+            output += "<tr><td style='text-align:left;'>#{k}</td><td style='text-align:left;'>#{'%02d:%02d:%02d' % format_time(v)}</td></tr>\n"
           end
         end
         tail = <<EOS
@@ -2008,7 +2009,7 @@ EOS
         <tfoot>
         <tr>
           <td style="text-align:left;"><strong>Total</strong></td>
-          <td style="text-align:left;">#{'%02d:%02d:%02d' % fmt_time(total)}</td>
+          <td style="text-align:left;">#{'%02d:%02d:%02d' % format_time(total)}</td>
         </tr>
         </tfoot>
         </table>
@@ -2022,7 +2023,7 @@ EOS
         EOS
         sorted_tags_data.reverse.each do |k, v|
           if v > 0
-            output += "| #{' ' * (pad - k.length)}#{k} | #{'%02d:%02d:%02d' % fmt_time(v)} |\n"
+            output += "| #{' ' * (pad - k.length)}#{k} | #{'%02d:%02d:%02d' % format_time(v)} |\n"
           end
         end
         tail = "[Tag Totals]"
@@ -2030,7 +2031,7 @@ EOS
       when :json
         output = []
         sorted_tags_data.reverse.each do |k, v|
-          d, h, m = fmt_time(v)
+          d, h, m = format_time(v)
           output << {
             'tag' => k,
             'seconds' => v,
@@ -2038,6 +2039,39 @@ EOS
           }
         end
         output
+      when :human
+        output = []
+        sorted_tags_data.reverse.each do |k, v|
+          spacer = ''
+          (max - k.length).times do
+            spacer += ' '
+          end
+          d, h, m = format_time(v, human: true)
+          output.push("┃ #{spacer}#{k}:#{format('%<h> 4dh %<m>02dm', h: h, m: m)} ┃")
+        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")}"
+        d, h, m = format_time(total, human: true)
+        output += "\n#{divider}"
+        spacer = ''
+        (max - 6).times do
+          spacer += ' '
+        end
+        total = "┃ #{spacer}total: "
+        total += format('%<h> 4dh %<m>02dm', h: h, m: m)
+        total += ' ┃'
+        output += "\n#{total}"
+        output += "\n#{footer}"
+        output
       else
         output = []
         sorted_tags_data.reverse.each do |k, v|
@@ -2045,12 +2079,12 @@ EOS
           (max - k.length).times do
             spacer += ' '
           end
-          d, h, m = fmt_time(v)
+          d, h, m = format_time(v)
           output.push("#{k}:#{spacer}#{format('%<d>02d:%<h>02d:%<m>02d', d: d, h: h, m: m)}")
         end
 
         output = output.empty? ? '' : "\n--- Tag Totals ---\n#{output.join("\n")}"
-        d, h, m = fmt_time(total)
+        d, h, m = format_time(total)
         output += "\n\nTotal tracked: #{format('%<d>02d:%<h>02d:%<m>02d', d: d, h: h, m: m)}\n"
         output
       end
@@ -2076,7 +2110,7 @@ EOS
         record_tag_times(item, seconds) if record
         return seconds.positive? ? seconds : false unless formatted
 
-        return seconds.positive? ? format('%02d:%02d:%02d', *fmt_time(seconds)) : false
+        return seconds.positive? ? format('%02d:%02d:%02d', *format_time(seconds)) : false
       end
 
       false
@@ -2106,7 +2140,7 @@ EOS
     ##
     ## @param      seconds  The seconds
     ##
-    def fmt_time(seconds)
+    def format_time(seconds, human: false)
       return [0, 0, 0] if seconds.nil?
 
       if seconds.class == String && seconds =~ /(\d+):(\d+):(\d+)/
@@ -2117,10 +2151,15 @@ EOS
       end
       minutes = (seconds / 60).to_i
       hours = (minutes / 60).to_i
-      days = (hours / 24).to_i
-      hours = (hours % 24).to_i
-      minutes = (minutes % 60).to_i
-      [days, hours, minutes]
+      if human
+        minutes = (minutes % 60).to_i
+        [0, hours, minutes]
+      else
+        days = (hours / 24).to_i
+        hours = (hours % 24).to_i
+        minutes = (minutes % 60).to_i
+        [days, hours, minutes]
+      end
     end
 
     private

data/lib/examples/commands/wiki.rb

@@ -75,6 +75,7 @@ command :wiki do |c|
       File.open(File.join('doing_wiki', 'index.html'), 'w') do |f|
         f.puts index_out
       end
+      Doing.logger.warn("Wiki written to doing_wiki directory")
     end
   end
 end

data/lib/examples/plugins/say_export.rb

@@ -149,7 +149,7 @@ module Doing
           finished_at = i.end_date
           took += finished_at.strftime('%A %B %e at %I:%M%p')
 
-          d, h, m = wwid.fmt_time(interval)
+          d, h, m = wwid.format_time(interval)
           took += ' and it took'
           took += " #{d.to_i} days" if d.to_i.positive?
           took += " #{h.to_i} hours" if h.to_i.positive?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.0.3.pre
+  version: 2.0.5.pre
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml