doing 2.1.1pre → 2.1.2pre

data/doc/top-level-namespace.html

@@ -102,7 +102,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Nov 27 13:57:12 2021 by
+  Generated on Sun Nov 28 05:27:33 2021 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.26 (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.1pre
+v2.1.2pre
 
 === Global Options
 === --config_file arg
@@ -145,7 +145,7 @@ Repeat last entry matching tags. Combine multiple tags with a comma.
 
 
 ===== -e|--editor
-Edit duplicated entry with emacs -nw before adding
+Edit duplicated entry with vim before adding
 
 
 
@@ -541,7 +541,7 @@ Include date
 
 
 ===== -e|--editor
-Edit entry with emacs -nw (with no arguments, edits the last entry)
+Edit entry with vim (with no arguments, edits the last entry)
 
 
 
@@ -724,6 +724,11 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time)$)
 
 
+===== --[no-]duration
+Show elapsed time on entries without @done tag
+
+
+
 ===== -i|--interactive
 Display an interactive menu of results to perform further operations
 
@@ -902,8 +907,13 @@ Tag filter, combine multiple tags with a comma.
 [Default Value] None
 
 
+===== --[no-]duration
+Show elapsed time if entry is not tagged @done
+
+
+
 ===== -e|--editor
-Edit entry with emacs -nw
+Edit entry with vim
 
 
 
@@ -937,7 +947,7 @@ Note
 
 
 ===== -e|--editor
-Edit entry with emacs -nw
+Edit entry with vim
 
 
 
@@ -1059,7 +1069,7 @@ Archive previous @meanwhile entry
 
 
 ===== -e|--editor
-Edit entry with emacs -nw
+Edit entry with vim
 
 
 
@@ -1110,7 +1120,7 @@ Add/remove note from last entry matching tag
 
 
 ===== -e|--editor
-Edit entry with emacs -nw
+Edit entry with vim
 
 
 
@@ -1141,7 +1151,7 @@ Record what you're starting now, or backdate the start time using natural langua
 
 A parenthetical at the end of the entry will be converted to a note.
 
-Run with no argument to create a new entry using emacs -nw.
+Run with no argument to create a new entry using vim.
 ===== Options
 ===== -b|--back|--started DATE_STRING
 
@@ -1165,7 +1175,7 @@ Section
 
 
 ===== -e|--editor
-Edit entry with emacs -nw
+Edit entry with vim
 
 
 
@@ -1203,6 +1213,11 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time)$)
 
 
+===== --[no-]duration
+Show elapsed time on entries without @done tag
+
+
+
 ===== -t|--[no-]times
 Show time intervals on @done tasks
 
@@ -1281,6 +1296,11 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time)$)
 
 
+===== --[no-]duration
+Show elapsed time on entries without @done tag
+
+
+
 ===== -i|--interactive
 Select from a menu of matching entries to perform additional operations
 
@@ -1688,6 +1708,11 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time))
 
 
+===== --[no-]duration
+Show elapsed time on entries without @done tag
+
+
+
 ===== -i|--interactive
 Select from a menu of matching entries to perform additional operations
 
@@ -1746,6 +1771,11 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time)$)
 
 
+===== --[no-]duration
+Show elapsed time on entries without @done tag
+
+
+
 ===== -t|--[no-]times
 Show time intervals on @done tasks
 
@@ -1939,6 +1969,11 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time)$)
 
 
+===== --[no-]duration
+Show elapsed time on entries without @done tag
+
+
+
 ===== -t|--[no-]times
 Show time intervals on @done tasks
 
@@ -2065,6 +2100,11 @@ Include colors in output
 
 
 
+===== --[no-]duration
+Show elapsed time on entries without @done tag
+
+
+
 ===== -i|--interactive
 Select from a menu of matching entries to perform additional operations
 
@@ -2223,6 +2263,11 @@ Sort tags by (name|time)
 [Must Match] (?i-mx:^(?:name|time)$)
 
 
+===== --[no-]duration
+Show elapsed time on entries without @done tag
+
+
+
 ===== -t|--[no-]times
 Show time intervals on @done tasks
 

data/lib/completion/doing.bash

@@ -101,9 +101,9 @@ _doing_finish() {
 _doing_grep() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--after --before --case --from --interactive --not --output --only_timed --section --times --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--after --before --case --duration --from --interactive --not --output --only_timed --section --times --tag_sort --totals --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-i -o -s -t -x --after --before --case --from --interactive --not --output --only_timed --section --times --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-i -o -s -t -x --after --before --case --duration --from --interactive --not --output --only_timed --section --times --tag_sort --totals --exact' -- $token ) )
   
   fi
 }
@@ -131,9 +131,9 @@ _doing_import() {
 _doing_last() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--bool --case --editor --not --section --search --tag --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--bool --case --duration --editor --not --section --search --tag --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-e -s -x --bool --case --editor --not --section --search --tag --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-e -s -x --bool --case --duration --editor --not --section --search --tag --exact' -- $token ) )
   
   fi
 }
@@ -191,9 +191,9 @@ _doing_now() {
 _doing_on() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--output --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '--duration --output --section --times --tag_sort --totals' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-o -s -t --output --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '-o -s -t --duration --output --section --times --tag_sort --totals' -- $token ) )
   
   fi
 }
@@ -221,9 +221,9 @@ _doing_plugins() {
 _doing_recent() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--interactive --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '--duration --interactive --section --times --tag_sort --totals' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-i -s -t --interactive --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '-i -s -t --duration --interactive --section --times --tag_sort --totals' -- $token ) )
   
   fi
 }
@@ -276,9 +276,9 @@ local words=$(doing sections)
 IFS="$OLD_IFS"
 
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--age --after --bool --before --count --case --from --interactive --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--age --after --bool --before --count --case --duration --from --interactive --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-a -b -c -i -o -s -t -x --age --after --bool --before --count --case --from --interactive --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-a -b -c -i -o -s -t -x --age --after --bool --before --count --case --duration --from --interactive --not --output --only_timed --sort --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
   else
   local nocasematchWasOff=0
   shopt nocasematch >/dev/null || nocasematchWasOff=1
@@ -301,9 +301,9 @@ IFS="$OLD_IFS"
 _doing_since() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--output --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '--duration --output --section --times --tag_sort --totals' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-o -s -t --output --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '-o -s -t --duration --output --section --times --tag_sort --totals' -- $token ) )
   
   fi
 }
@@ -331,9 +331,9 @@ _doing_template() {
 _doing_today() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--after --before --from --output --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '--after --before --duration --from --output --section --times --tag_sort --totals' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-o -s -t --after --before --from --output --section --times --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '-o -s -t --after --before --duration --from --output --section --times --tag_sort --totals' -- $token ) )
   
   fi
 }
@@ -356,9 +356,9 @@ local words=$(doing views)
 IFS="$OLD_IFS"
 
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--after --bool --before --count --case --color --from --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '--after --bool --before --count --case --color --duration --from --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-b -c -i -o -s -t -x --after --bool --before --count --case --color --from --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
+    COMPREPLY=( $( compgen -W '-b -c -i -o -s -t -x --after --bool --before --count --case --color --duration --from --interactive --not --output --only_timed --section --search --times --tag --tag_order --tag_sort --totals --exact' -- $token ) )
   else
   local nocasematchWasOff=0
   shopt nocasematch >/dev/null || nocasematchWasOff=1
@@ -401,9 +401,9 @@ _doing_wiki() {
 _doing_yesterday() {
   
   if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--after --before --from --output --section --times --tag_order --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '--after --before --duration --from --output --section --times --tag_order --tag_sort --totals' -- $token ) )
   elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-o -s -t --after --before --from --output --section --times --tag_order --tag_sort --totals' -- $token ) )
+    COMPREPLY=( $( compgen -W '-o -s -t --after --before --duration --from --output --section --times --tag_order --tag_sort --totals' -- $token ) )
   
   fi
 }

data/lib/doing/configuration.rb

@@ -32,28 +32,29 @@ module Doing
       'never_finish' => [],
 
       'timer_format' => 'text',
+      'interval_format' => 'text',
 
       'templates' => {
         'default' => {
           'date_format' => '%Y-%m-%d %H:%M',
-          'template' => '%date | %title%note',
+          'template' => '%date | %title %interval%duration%note',
           'wrap_width' => 0,
           'order' => 'asc'
         },
         'today' => {
           'date_format' => '%_I:%M%P',
-          'template' => '%date: %title %interval%note',
+          'template' => '%date: %title %interval%duration%note',
           'wrap_width' => 0,
           'order' => 'asc'
         },
         'last' => {
           'date_format' => '%-I:%M%P on %a',
-          'template' => '%title (at %date)%odnote',
+          'template' => '%title (at %date) %interval%duration%odnote',
           'wrap_width' => 88
         },
         'recent' => {
           'date_format' => '%_I:%M%P',
-          'template' => '%shortdate: %title (%section)',
+          'template' => '%shortdate: %title (%section) %interval%duration%note',
           'wrap_width' => 88,
           'count' => 10,
           'order' => 'asc'
@@ -153,7 +154,7 @@ module Doing
     ##                      matched, first match wins)
     ## @return     [Array] ordered array of resolved keys
     ##
-    def resolve_key_path(keypath)
+    def resolve_key_path(keypath, create: false)
       cfg = @settings
       real_path = []
       unless keypath =~ /^[.*]?$/
@@ -170,8 +171,18 @@ module Doing
           end
 
           if new_cfg.nil?
-            Doing.logger.error("Key match not found: #{path}")
-            break
+            return nil unless create
+
+            resolved = real_path.count.positive? ? "Resolved #{real_path.join('->')}, but " : ''
+            Doing.logger.log_now(:warn, "#{resolved}#{path} is unknown")
+            new_path = [*real_path, path, *paths].join('->')
+            Doing.logger.log_now(:warn, "Continuing will create the path #{new_path}")
+            res = Prompt.yn('Key path not found, create it?', default_response: true)
+            raise InvalidArgument, 'Invalid key path' unless res
+
+            real_path.push(path).concat(paths)
+            Doing.logger.debug('Config:', "translated key path #{keypath} to #{real_path.join('.')}")
+            return real_path
           end
           cfg = new_cfg
         end
@@ -194,7 +205,7 @@ module Doing
       cfg = @settings
       real_path = ['config']
       unless keypath =~ /^[.*]?$/
-        real_path = resolve_key_path(keypath)
+        real_path = resolve_key_path(keypath, create: false)
         return nil unless real_path&.count&.positive?
 
         cfg = cfg.dig(*real_path)

data/lib/doing/item.rb

@@ -31,6 +31,13 @@ module Doing
     #   @date = new_date.is_a?(Time) ? new_date : Time.parse(new_date)
     # end
 
+    ## If the entry doesn't have a @done date, return the elapsed time
+    def duration
+      return nil if @title =~ /(?<=^| )@done\b/
+
+      return Time.now - @date
+    end
+
     ##
     ## Get the difference between the item's start date and
     ## the value of its @done tag (if present)

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

@@ -58,11 +58,35 @@ module Doing
           format("%#{pad}s", item.date.strftime(opt[:format]))
         end
 
-        interval = wwid.get_interval(item, record: true) if opt[:times]
+        interval = wwid.get_interval(item, record: true, formatted: false) if opt[:times]
+        if interval
+          case opt[:interval_format].to_sym
+          when :human
+            _d, h, m = wwid.format_time(interval, human: true)
+            interval = format('%<h> 4dh %<m>02dm', h: h, m: m)
+          else
+            d, h, m = wwid.format_time(interval)
+            interval = format('%<d>02d:%<h>02d:%<m>02d', d: d, h: h, m: m)
+          end
+        end
 
         interval ||= ''
         output.sub!(/%interval/, interval)
 
+        duration = item.duration if opt[:duration]
+        if duration
+          case opt[:interval_format].to_sym
+          when :human
+            _d, h, m = wwid.format_time(duration, human: true)
+            duration = format('%<h> 4dh %<m>02dm', h: h, m: m)
+          else
+            d, h, m = wwid.format_time(duration)
+            duration = format('%<d>02d:%<h>02d:%<m>02d', d: d, h: h, m: m)
+          end
+        end
+        duration ||= ''
+        output.sub!(/%duration/, duration)
+
         output.sub!(/%(\d+)?shortdate/) do
           pad = Regexp.last_match(1) || 13
           format("%#{pad}s", item.date.relative_date)

data/lib/doing/prompt.rb

@@ -110,10 +110,12 @@ module Doing
         return nil unless $stdout.isatty
 
         # fzf_args << '-1' # User is expecting a menu, and even if only one it seves as confirmation
-        fzf_args << %(--prompt "#{prompt}")
+        fzf_args << %(--prompt="#{prompt}")
+        fzf_args << "--height=#{options.count + 2}"
+        fzf_args << '--info=inline'
         fzf_args << '--multi' if multiple
         header = "esc: cancel,#{multiple ? ' tab: multi-select, ctrl-a: select all,' : ''} return: confirm"
-        fzf_args << %(--header "#{header}")
+        fzf_args << %(--header="#{header}")
         options.sort! if sorted
         res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}`
         return false if res.strip.size.zero?

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.1pre'
+  VERSION = '2.1.2pre'
 end

data/lib/doing/wwid.rb

@@ -1429,20 +1429,23 @@ module Doing
     ##
     def list_section(opt = {})
       opt[:config_template] ||= 'default'
-      cfg = @config.dig('templates', opt[:config_template]).deep_merge({
-        'wrap_width' => @config['wrap_width'] || 0,
-        'date_format' => @config['default_date_format'],
-        'order' => @config['order'] || 'asc',
-        'tags_color' => @config['tags_color']
-      })
+      cfg = @config.dig('templates',
+                        opt[:config_template]).deep_merge({
+                                                            'wrap_width' => @config['wrap_width'] || 0,
+                                                            'date_format' => @config['default_date_format'],
+                                                            'order' => @config['order'] || 'asc',
+                                                            'tags_color' => @config['tags_color'],
+                                                            'duration' => @config['duration'],
+                                                            'interval_format' => @config['interval_format']
+                                                          })
+      opt[:duration] ||= cfg['duration'] || false
+      opt[:interval_format] ||= cfg['interval_format'] || 'text'
       opt[:count] ||= 0
       opt[:age] ||= 'newest'
       opt[:format] ||= cfg['date_format']
       opt[:order] ||= cfg['order'] || 'asc'
       opt[:tag_order] ||= 'asc'
-      if opt[:tags_color].nil?
-        opt[:tags_color] = cfg['tags_color'] || false
-      end
+      opt[:tags_color] = cfg['tags_color'] || false if opt[:tags_color].nil?
       opt[:template] ||= cfg['template']
 
       # opt[:highlight] ||= true
@@ -1452,17 +1455,17 @@ module Doing
         opt[:section] = choose_section
         title = opt[:section]
       elsif opt[:section].instance_of?(String)
-        if opt[:section] =~ /^all$/i
-          title = if opt[:page_title]
+        title = if opt[:section] =~ /^all$/i
+                  if opt[:page_title]
                     opt[:page_title]
                   elsif opt[:tag_filter] && opt[:tag_filter]['bool'].normalize_bool != :not
                     opt[:tag_filter]['tags'].map { |tag| "@#{tag}" }.join(' + ')
                   else
                     'doing'
                   end
-        else
-          title = guess_section(opt[:section])
-        end
+                else
+                  guess_section(opt[:section])
+                end
       end
 
       items = filter_items(Items.new, opt: opt).reverse
@@ -1531,15 +1534,22 @@ module Doing
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
         'order' => @config['order'] || 'asc',
-        'tags_color' => @config['tags_color']
+        'tags_color' => @config['tags_color'],
+        'duration' => @config['duration'],
+        'interval_format' => @config['interval_format']
       })
 
+      opt[:duration] ||= cfg['duration'] || false
+      opt[:interval_format] ||= cfg['interval_format'] || 'text'
+
       options = {
         after: opt[:after],
         before: opt[:before],
         count: 0,
+        duration: opt[:duration],
         from: opt[:from],
         format: cfg['date_format'],
+        interval_format: opt[:interval_format],
         order: cfg['order'] || 'asc',
         output: output,
         section: opt[:section],
@@ -1571,8 +1581,18 @@ module Doing
       # :date_filter expects an array with start and end date
       dates = [dates, dates] if dates.instance_of?(String)
 
-      list_section({ section: section, count: 0, order: 'asc', date_filter: dates, times: times,
-                     output: output, totals: opt[:totals], sort_tags: opt[:sort_tags], config_template: 'default' })
+      list_section({
+                     section: section,
+                     count: 0,
+                     order: 'asc',
+                     date_filter: dates,
+                     times: times,
+                     output: output,
+                     totals: opt[:totals],
+                     duration: opt[:duration],
+                     sort_tags: opt[:sort_tags],
+                     config_template: 'default'
+                   })
     end
 
     ##
@@ -1595,6 +1615,7 @@ module Doing
         after: opt[:after],
         before: opt[:before],
         count: 0,
+        duration: opt[:duration],
         from: opt[:from],
         order: opt[:order],
         output: output,
@@ -1626,8 +1647,13 @@ module Doing
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
         'order' => @config['order'] || 'asc',
-        'tags_color' => @config['tags_color']
+        'tags_color' => @config['tags_color'],
+        'duration' => @config['duration'],
+        'interval_format' => @config['interval_format']
       })
+      opt[:duration] ||= cfg['duration'] || false
+      opt[:interval_format] ||= cfg['interval_format'] || 'text'
+
       section ||= @config['current_section']
       section = guess_section(section)
 
@@ -1649,8 +1675,12 @@ module Doing
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
         'order' => @config['order'] || 'asc',
-        'tags_color' => @config['tags_color']
+        'tags_color' => @config['tags_color'],
+        'duration' => @config['duration'],
+        'interval_format' => @config['interval_format']
       })
+      options[:duration] ||= cfg['duration'] || false
+      options[:interval_format] ||= cfg['interval_format'] || 'text'
 
       opts = {
         section: section,
@@ -1658,7 +1688,12 @@ module Doing
         count: 1,
         format: cfg['date_format'],
         template: cfg['template'],
-        times: times
+        times: times,
+        duration: options[:duration],
+        interval_format: options[:interval_format],
+        case: options[:case],
+        not: options[:negate],
+        config_template: 'last'
       }
 
       if options[:tag]
@@ -1669,9 +1704,7 @@ module Doing
       end
 
       opts[:search] = options[:search] if options[:search]
-      opts[:case] = options[:case]
-      opts[:not] = options[:negate]
-      opts[:config_template] = 'last'
+
       list_section(opts)
     end
 

metadata

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