doing 2.1.11 → 2.1.15

data/lib/doing/wwid.rb

@@ -185,34 +185,9 @@ module Doing
 
       date = nil
       iso_rx = /\d{4}-\d\d-\d\d \d\d:\d\d/
-      watch_tags = [
-        'start(?:ed)?',
-        'beg[ia]n',
-        'done',
-        'finished',
-        'completed?',
-        'waiting',
-        'defer(?:red)?'
-      ]
-      if @config['date_tags']
-        date_tags = @config['date_tags']
-        date_tags = date_tags.split(/ *, */) if date_tags.is_a?(String)
-        date_tags.map! do |tag|
-          tag.sub(/^@/, '').gsub(/\((?!\?:)(.*?)\)/, '(?:\1)').strip
-        end
-        watch_tags.concat(date_tags).uniq!
-      end
-
-      done_rx = /(?<=^| )@(?<tag>#{watch_tags.join('|')})\((?<date>.*?)\)/i
       date_rx = /^(?:\s*- )?(?<date>.*?) \| (?=\S)/
 
-      title.gsub!(done_rx) do
-        m = Regexp.last_match
-        t = m['tag']
-        d = m['date']
-        parsed_date = d =~ date_rx ? Time.parse(d) : d.chronify(guess: :begin)
-        parsed_date.nil? ? m[0] : "@#{t}(#{parsed_date.strftime('%F %R')})"
-      end
+      title.expand_date_tags(@config['date_tags'])
 
       if title =~ date_rx
         m = title.match(date_rx)
@@ -369,7 +344,8 @@ module Doing
         items.each_with_index do |i, x|
           next if i.title =~ / @done/
 
-          items[x].title = "#{i.title} @done(#{opt[:back].strftime('%F %R')})"
+          finish_date = verify_duration(i.date, opt[:back], title: i.title)
+          items[x].tag('done', value: finish_date.strftime('%F %R'))
           break
         end
       end
@@ -384,10 +360,13 @@ module Doing
     end
 
     ##
-    ## Remove items from a list that already exist in @content
+    ## Remove items from an array that already exist in
+    ## @content based on start and end times
     ##
-    ## @param      items       [Array] The items to deduplicate
-    ## @param      no_overlap  [Boolean] Remove items with overlapping time spans
+    ## @param      items       [Array] The items to
+    ##                         deduplicate
+    ## @param      no_overlap  [Boolean] Remove items with
+    ##                         overlapping time spans
     ##
     def dedup(items, no_overlap: false)
       items.delete_if do |item|
@@ -640,6 +619,7 @@ module Doing
     ## @option opt [Boolean] :yesterday (false) limit to entries from yesterday
     ## @option opt [Number] :count (0) max entries to return
     ## @option opt [String] :age (new) 'old' or 'new'
+    ## @option opt [Array] :val (nil) Array of tag value queries
     ##
     def filter_items(items = Items.new, opt: {})
       time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/
@@ -701,6 +681,16 @@ module Doing
           keep = false if finished
         end
 
+        if keep && opt[:val]&.count&.positive?
+          bool = opt[:bool].normalize_bool if opt[:bool]
+          bool ||= :and
+          bool = :and if bool == :pattern
+
+          val_match = opt[:val].nil? || opt[:val].empty? ? true : item.tag_values?(opt[:val], bool)
+          keep = false unless val_match
+          keep = opt[:not] ? !keep : keep
+        end
+
         if keep && opt[:tag]
           opt[:tag_bool] = opt[:bool].normalize_bool if opt[:bool]
           opt[:tag_bool] ||= :and
@@ -883,11 +873,11 @@ module Doing
         opt[:search] = search
       end
 
-      opt[:query] = opt[:search] if opt[:search] && !opt[:query]
-      opt[:query] = "!#{opt[:query]}" if opt[:not]
+      # opt[:query] = opt[:search] if opt[:search] && !opt[:query]
+      opt[:query] = "!#{opt[:query]}" if opt[:query] && opt[:not]
       opt[:multiple] = true
       opt[:show_if_single] = true
-      filter_options = %i[after before case date_filter from fuzzy not search section].each_with_object({}) {
+      filter_options = %i[after before case date_filter from fuzzy not search section val].each_with_object({}) {
         |k, hsh| hsh[k] = opt[k]
       }
       items = filter_items(Items.new, opt: filter_options)
@@ -987,7 +977,7 @@ module Doing
                                                  '--no-sort',
                                                  '--info=hidden'
                                                ])
-            next if tag =~ /^ *$/
+            next if output_format =~ /^ *$/
 
             raise UserCancelled unless output_format
 
@@ -1075,6 +1065,7 @@ module Doing
         tag = opt[:tag]
         items.map! do |i|
           i.tag(tag, date: false, remove: opt[:remove], single: single)
+          i.expand_date_tags(@config['date_tags'])
           Hooks.trigger :post_entry_updated, self, i
         end
       end
@@ -1134,6 +1125,26 @@ module Doing
       end
     end
 
+    def verify_duration(date, finish_date, title: nil)
+      max_elapsed = @config.dig('interaction', 'confirm_longer_than') || 0
+      max_elapsed = max_elapsed.chronify_qty if max_elapsed.is_a?(String)
+      elapsed = finish_date - date
+
+      if max_elapsed.positive? && (elapsed > max_elapsed)
+        puts boldwhite(title) if title
+        human = elapsed.time_string(format: :natural)
+        res = Prompt.yn(yellow("Did this entry actually take #{human}"), default_response: true)
+        unless res
+          new_elapsed = Prompt.enter_text('How long did it take?').chronify_qty
+          raise InvalidTimeExpression, 'Unrecognized time span entry' unless new_elapsed.positive?
+
+          finish_date = date + new_elapsed if new_elapsed
+        end
+      end
+
+      finish_date
+    end
+
     ##
     ## Tag the last entry or X entries
     ##
@@ -1195,21 +1206,8 @@ module Doing
                         else
                           next_entry.date - 60
                         end
-          elsif opt[:took]
-            if item.date + opt[:took] > Time.now
-              item.date = Time.now - opt[:took]
-              done_date = Time.now
-            else
-              done_date = item.date + opt[:took]
-            end
-          elsif opt[:back]
-            done_date = if opt[:back].is_a? Integer
-                          item.date + opt[:back]
-                        else
-                          item.date + (opt[:back] - item.date)
-                        end
           else
-            done_date = Time.now
+            done_date = item.calculate_end_date(opt)
           end
 
           opt[:tags].each do |tag|
@@ -1220,15 +1218,39 @@ module Doing
               next
             end
 
+
             tag = tag.strip
-            if opt[:remove] || opt[:rename]
+
+            if tag =~ /^done$/
+              max_elapsed = @config.dig('interaction', 'confirm_longer_than') || 0
+              max_elapsed = max_elapsed.chronify_qty if max_elapsed.is_a?(String)
+              elapsed = done_date - item.date
+
+              if max_elapsed.positive? && (elapsed > max_elapsed) && !opt[:took]
+                puts boldwhite(item.title)
+                human = elapsed.time_string(format: :natural)
+                res = Prompt.yn(yellow("Did this actually take #{human}"), default_response: true)
+                unless res
+                  new_elapsed = Prompt.enter_text('How long did it take?').chronify_qty
+                  raise InvalidTimeExpression, 'Unrecognized time span entry' unless new_elapsed > 0
+
+                  opt[:took] = new_elapsed
+                  done_date = item.calculate_end_date(opt) if opt[:took]
+                end
+              end
+            end
+
+            if opt[:remove] || opt[:rename] || opt[:value]
               rename_to = nil
-              if opt[:rename]
+              if opt[:value]
+                rename_to = tag
+              elsif opt[:rename]
                 rename_to = tag
                 tag = opt[:rename]
               end
               old_title = item.title.dup
-              item.title.tag!(tag, remove: opt[:remove], rename_to: rename_to, regex: opt[:regex])
+              force = opt[:value].nil? ? false : true
+              item.title.tag!(tag, remove: opt[:remove], rename_to: rename_to, regex: opt[:regex], value: opt[:value], force: force)
               if old_title != item.title
                 removed << tag
                 added << rename_to if rename_to
@@ -1255,6 +1277,7 @@ module Doing
           logger.warn('Skipped:', 'Archiving is skipped when operating on all entries')
         end
 
+        item.expand_date_tags(@config['date_tags'])
         Hooks.trigger :post_entry_updated, self, item
       end
 
@@ -1823,7 +1846,8 @@ module Doing
         case: options[:case],
         not: options[:negate],
         config_template: 'last',
-        delete: options[:delete]
+        delete: options[:delete],
+        val: options[:val]
       }
 
       if options[:tag]
@@ -1987,7 +2011,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' % format_time(v)}</td></tr>\n"
+            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 = <<EOS
@@ -1998,7 +2022,7 @@ EOS
         <tfoot>
         <tr>
           <td style="text-align:left;"><strong>Total</strong></td>
-          <td style="text-align:left;">#{'%02d:%02d:%02d' % format_time(total)}</td>
+          <td style="text-align:left;">#{total.time_string(format: :clock)}</td>
         </tr>
         </tfoot>
         </table>
@@ -2013,7 +2037,7 @@ EOS
         EOS
         sorted_tags_data.reverse.each do |k, v|
           if v > 0
-            output += "| #{' ' * (pad - k.length)}#{k} | #{'%02d:%02d:%02d' % format_time(v)} |\n"
+            output += "| #{' ' * (pad - k.length)}#{k} | #{v.time_string(format: :clock)} |\n"
           end
         end
         tail = "[Tag Totals]"
@@ -2021,11 +2045,10 @@ EOS
       when :json
         output = []
         sorted_tags_data.reverse.each do |k, v|
-          d, h, m = format_time(v)
           output << {
             'tag' => k,
             'seconds' => v,
-            'formatted' => format('%<d>02d:%<h>02d:%<m>02d', d: d, h: h, m: m)
+            'formatted' => v.time_string(format: :clock)
           }
         end
         output
@@ -2036,8 +2059,7 @@ EOS
           (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)} ┃")
+          output.push("┃ #{spacer}#{k}:#{v.time_string(format: :hm)} ┃")
         end
 
         header = '┏━━ Tag Totals '
@@ -2050,14 +2072,14 @@ EOS
         (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_time = total.time_string(format: :hm)
         total = "┃ #{spacer}total: "
-        total += format('%<h> 4dh %<m>02dm', h: h, m: m)
+        total += total_time
         total += ' ┃'
         output += "\n#{total}"
         output += "\n#{footer}"
@@ -2069,13 +2091,11 @@ EOS
           (max - k.length).times do
             spacer += ' '
           end
-          d, h, m = format_time(v)
-          output.push("#{k}:#{spacer}#{format('%<d>02d:%<h>02d:%<m>02d', d: d, h: h, m: m)}")
+          output.push("#{k}:#{spacer}#{v.time_string(format: :clock)}")
         end
 
         output = output.empty? ? '' : "\n--- Tag Totals ---\n#{output.join("\n")}"
-        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 += "\n\nTotal tracked: #{total.time_string(format: :clock)}\n"
         output
       end
     end
@@ -2100,39 +2120,12 @@ EOS
         record_tag_times(item, seconds) if record
         return seconds.positive? ? seconds : false unless formatted
 
-        return seconds.positive? ? format('%02d:%02d:%02d', *format_time(seconds)) : false
+        return seconds.positive? ? seconds.time_string(format: :clock) : false
       end
 
       false
     end
 
-    ##
-    ## Format human readable time from seconds
-    ##
-    ## @param      seconds  [Integer] Seconds
-    ##
-    def format_time(seconds, human: false)
-      return [0, 0, 0] if seconds.nil?
-
-      if seconds.instance_of?(String) && seconds =~ /(\d+):(\d+):(\d+)/
-        h = Regexp.last_match(1)
-        m = Regexp.last_match(2)
-        s = Regexp.last_match(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
-      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
-
     def configure(filename = nil)
       if filename
         Doing.config_with(filename, { ignore_local: true })
@@ -2212,6 +2205,8 @@ EOS
         break
       end
 
+      logger.debug('Output:', "#{items.count} #{items.count == 1 ? 'item' : 'items'} shown")
+
       out
     end
 

data/lib/doing.rb

@@ -9,42 +9,46 @@ require 'csv'
 require 'tempfile'
 require 'zlib'
 require 'base64'
+require 'plist'
 
 require 'chronic'
 require 'tty-link'
 require 'tty-which'
 require 'tty-markdown'
-require 'plist'
-# require 'amatch'
+require 'tty-reader'
+require 'tty-screen'
 require 'haml'
 require 'json'
 require 'logger'
 require 'safe_yaml/load'
-require 'doing/hash'
-require 'doing/colors'
-require 'doing/template_string'
-require 'doing/string'
-require 'doing/string_chronify'
-require 'doing/time'
-require 'doing/array'
-require 'doing/symbol'
-require 'doing/util'
-require 'doing/util_backup'
-require 'doing/configuration'
-require 'doing/section'
-require 'doing/items'
-require 'doing/note'
-require 'doing/item'
-require 'doing/wwid'
-require 'doing/log_adapter'
-require 'doing/prompt'
-require 'doing/errors'
-require 'doing/hooks'
-require 'doing/plugin_manager'
-require 'doing/pager'
-require 'doing/completion'
-require 'doing/boolean_term_parser'
-require 'doing/phrase_parser'
+
+require_relative 'doing/hash'
+require_relative 'doing/colors'
+require_relative 'doing/template_string'
+require_relative 'doing/string'
+require_relative 'doing/time'
+require_relative 'doing/array'
+require_relative 'doing/symbol'
+require_relative 'doing/util'
+require_relative 'doing/util_backup'
+require_relative 'doing/configuration'
+require_relative 'doing/section'
+require_relative 'doing/items'
+require_relative 'doing/note'
+require_relative 'doing/item'
+require_relative 'doing/wwid'
+require_relative 'doing/log_adapter'
+require_relative 'doing/prompt'
+require_relative 'doing/errors'
+require_relative 'doing/hooks'
+require_relative 'doing/plugin_manager'
+require_relative 'doing/pager'
+require_relative 'doing/completion'
+require_relative 'doing/boolean_term_parser'
+require_relative 'doing/phrase_parser'
+require_relative 'doing/array_chronify'
+require_relative 'doing/numeric_chronify'
+require_relative 'doing/string_chronify'
 # require 'doing/markdown_document_listener'
 
 # Main doing module

data/lib/examples/plugins/say_export.rb

@@ -149,11 +149,8 @@ module Doing
           finished_at = i.end_date
           took += finished_at.strftime('%A %B %e at %I:%M%p')
 
-          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?
-          took += " #{m.to_i} minutes" if m.to_i.positive?
+          took += interval.time_string(format: :natural)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.11
+  version: 2.1.15
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -346,6 +346,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: tty-reader
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: tty-screen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -396,6 +436,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- ".irbrc"
 - ".yardoc/checksums"
 - ".yardoc/complete"
 - ".yardoc/object_types"
@@ -457,6 +498,7 @@ files:
 - docs/doc/GLI/Commands.html
 - docs/doc/GLI/Commands/MarkdownDocumentListener.html
 - docs/doc/Hash.html
+- docs/doc/Numeric.html
 - docs/doc/PhraseParser.html
 - docs/doc/PhraseParser/Operator.html
 - docs/doc/PhraseParser/PhraseClause.html
@@ -495,6 +537,7 @@ files:
 - lib/completion/doing.fish
 - lib/doing.rb
 - lib/doing/array.rb
+- lib/doing/array_chronify.rb
 - lib/doing/boolean_term_parser.rb
 - lib/doing/cli_status.rb
 - lib/doing/colors.rb
@@ -512,6 +555,7 @@ files:
 - lib/doing/log_adapter.rb
 - lib/doing/markdown_document_listener.rb
 - lib/doing/note.rb
+- lib/doing/numeric_chronify.rb
 - lib/doing/pager.rb
 - lib/doing/phrase_parser.rb
 - lib/doing/plugin_manager.rb