doing 2.1.89 → 2.1.91

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

@@ -6,7 +6,7 @@
 <title>
   Top Level Namespace
   
-    &mdash; Documentation by YARD 0.9.36
+    &mdash; Documentation by YARD 0.9.37
   
 </title>
 
@@ -216,9 +216,9 @@
 </div>
 
       <div id="footer">
-  Generated on Mon May 19 04:38:00 2025 by
+  Generated on Fri Dec  5 16:12:00 2025 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.36 (ruby-3.4.4).
+  0.9.37 (ruby-3.4.4).
 </div>
 
     </div>

data/doing.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Ensure we require the local version and not one we might have installed already
 require './lib/doing/version'
 Gem::Specification.new do |s|

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.89
+v2.1.91
 
 === Global Options
 === --config_file arg
@@ -1289,35 +1289,6 @@ Force exact search string matching (case sensitive)
 
 
 
-==== Command: <tt>later  ENTRY</tt>
-Add an item to the Later section
-
-
-===== Options
-===== -b|--back|--started DATE_STRING
-
-Backdate start time to date string [4pm|20m|2h|yesterday noon]
-
-[Default Value] None
-
-
-===== -n|--note TEXT
-
-Note
-
-[Default Value] None
-
-
-===== --ask
-Prompt for note via multi-line input
-
-
-
-===== -e|--editor
-Edit entry with vim
-
-
-
 ==== Command: <tt>mark|flag </tt>
 Mark last entry as flagged
 

data/example_plugin.rb

@@ -83,7 +83,6 @@ module Doing
       }
     end
 
-
     #-------------------------------------------------------
     ## Output a template. Only required if template(s) are
     ## included in settings. The method should return a
@@ -106,7 +105,6 @@ module Doing
       'On %date, you were %title, recorded in section %section%took'
     end
 
-
     ##
     ## Render data received from an output
     ##             command
@@ -122,7 +120,7 @@ module Doing
     ##
     ## @return     [String] Rendered output
     ##
-    def self.render(wwid, items, variables: {})
+    def self.render(_wwid, items, variables: {})
       return unless items.good?
 
       config = Doing.config.settings
@@ -154,7 +152,6 @@ module Doing
           finished_at = i.end_date
           took += finished_at.strftime('%A %B %e at %I:%M%p')
 
-
           took += ' and it took'
           took += interval.time_string(format: :natural)
         end

data/lib/completion/_doing.zsh

@@ -27,7 +27,6 @@ function _doing() {
                   'help:Shows a list of commands or help for one command'
                   'import:Import entries from an external source'
                   'last:Show the last entry'
-                  'later:Add an item to the Later section'
                   'mark:Mark last entry as flagged'
                   'flag:Mark last entry as flagged'
                   'meanwhile:Finish any running @meanwhile tasks and optionally create a new one'
@@ -128,9 +127,6 @@ function _doing() {
             last) 
                 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:" {'(--delete)-d','(-d)--delete'}"[Delete the last entry]" "--duration[Show elapsed time if entry is not tagged @done]" {'(--editor)-e','(-e)--editor'}"[Edit entry with vim]" {'(--hilite)-h','(-h)--hilite'}"[Highlight search matches in output]" "--not[Show items that *don't* match search/tag filters]" {'(--output)-o','(-o)--output'}"[Output to export format]:FORMAT:" {'(--section)-s','(-s)--section'}"[Specify a section]:NAME:" "--save[Save all current command line options as a new view]:VIEW_NAME:" "--search[Filter entries using a search query]:QUERY:" "--tag[Filter entries by tag]:TAG:" "--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:" "--val[Perform a tag value query]:QUERY:" {'(--exact)-x','(-x)--exact'}"[Force exact search string matching]" )
             ;;
-            later) 
-                args=( "--ask[Prompt for note via multi-line input]" "--started[Backdate start time to date string [4pm|20m|2h|yesterday noon]]:DATE_STRING:" {'(--editor)-e','(-e)--editor'}"[Edit entry with vim]" {'(--note)-n','(-n)--note'}"[Note]:TEXT:" )
-            ;;
             mark) 
                 args=( "--bool[Boolean used to combine multiple tags]:BOOLEAN:" {'(--count)-c','(-c)--count'}"[How many recent entries to tag]:COUNT:" "--case[Case sensitivity for search string matching [(c)ase-sensitive]:TYPE:" {'(--date)-d','(-d)--date'}"[Include current date/time with tag]" "--force[Don't ask permission to flag all entries when count is 0]" {'(--interactive)-i','(-i)--interactive'}"[Select item(s) to flag from a menu of matching entries]" "--not[Flag items that *don't* match search/tag filters]" {'(--remove)-r','(-r)--remove'}"[Remove flag]" {'(--section)-s','(-s)--section'}"[Section]:SECTION_NAME:" "--search[Filter entries using a search query]:QUERY:" "--tag[Filter entries by tag]:TAG:" {'(--unfinished)-u','(-u)--unfinished'}"[Flag last entry]" "--val[Perform a tag value query]:QUERY:" {'(--exact)-x','(-x)--exact'}"[Force exact search string matching]" )
             ;;

data/lib/completion/doing.bash

@@ -148,16 +148,6 @@ _doing_last() {
   fi
 }
 
-_doing_later() {
-  
-  if [[ "$token" == --* ]]; then
-    COMPREPLY=( $( compgen -W '--ask --started --editor --note' -- $token ) )
-  elif [[ "$token" == -* ]]; then
-    COMPREPLY=( $( compgen -W '-e -n --ask --started --editor --note' -- $token ) )
-  
-  fi
-}
-
 _doing_mark() {
   
   if [[ "$token" == --* ]]; then
@@ -476,7 +466,6 @@ _doing()
     elif [[ $last =~ (help) ]]; then _doing_help
     elif [[ $last =~ (import) ]]; then _doing_import
     elif [[ $last =~ (last) ]]; then _doing_last
-    elif [[ $last =~ (later) ]]; then _doing_later
     elif [[ $last =~ (mark|flag) ]]; then _doing_mark
     elif [[ $last =~ (meanwhile) ]]; then _doing_meanwhile
     elif [[ $last =~ (note) ]]; then _doing_note

data/lib/completion/doing.fish

@@ -150,7 +150,6 @@ complete -xc doing -n '__fish_doing_needs_command' -a 'grep search' -d Search\ f
 complete -xc doing -n '__fish_doing_needs_command' -a 'help' -d Shows\ a\ list\ of\ commands\ or\ help\ for\ one\ command
 complete -xc doing -n '__fish_doing_needs_command' -a 'import' -d Import\ entries\ from\ an\ external\ source
 complete -xc doing -n '__fish_doing_needs_command' -a 'last' -d Show\ the\ last\ entry
-complete -xc doing -n '__fish_doing_needs_command' -a 'later' -d Add\ an\ item\ to\ the\ Later\ section
 complete -xc doing -n '__fish_doing_needs_command' -a 'mark flag' -d Mark\ last\ entry\ as\ flagged
 complete -xc doing -n '__fish_doing_needs_command' -a 'meanwhile' -d Finish\ any\ running\ @meanwhile\ tasks\ and\ optionally\ create\ a\ new\ one
 complete -xc doing -n '__fish_doing_needs_command' -a 'note' -d Add\ a\ note\ to\ the\ last\ entry
@@ -328,10 +327,6 @@ complete -c doing -l template  -f -r -n '__fish_doing_using_command last' -d Ove
 complete -c doing -l title  -f -r -n '__fish_doing_using_command last' -d Title\ string\ to\ be\ used\ for\ output\ formats\ that\ require\ it
 complete -c doing -l val  -f -r -n '__fish_doing_using_command last' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command last' -d Force\ exact\ search\ string\ matching
-complete -c doing -l ask  -f  -n '__fish_doing_using_command later' -d Prompt\ for\ note\ via\ multi-line\ input
-complete -c doing -l started  -f -r -n '__fish_doing_using_command later' -d Backdate\ start\ time\ to\ date\ string\ \[4pm\|20m\|2h\|yesterday\ noon\]
-complete -c doing -l editor -s e -f  -n '__fish_doing_using_command later' -d Edit\ entry\ with\ vim
-complete -c doing -l note -s n -f -r -n '__fish_doing_using_command later' -d Note
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command mark flag' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l count -s c -f -r -n '__fish_doing_using_command mark flag' -d How\ many\ recent\ entries\ to\ tag
 complete -c doing -l case  -f -r -n '__fish_doing_using_command mark flag' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive

data/lib/completion/doing.ts

@@ -2023,46 +2023,6 @@ const completionSpec: Fig.Spec = {
 
     },
 
-    {
-      name: "later",
-      description: "Add an item to the Later section",
-      options: [
-          {
-            name: ["--ask"],
-            description: "Prompt for note via multi-line input",
-            
-          },
-
-          {
-            name: ["--started"],
-            description: "Backdate start time to date string [4pm|20m|2h|yesterday noon]",
-            args: {
-                  name: "DATE_STRING",
-                  description: "DATE_STRING",
-            },
-
-          },
-
-          {
-            name: ["-e", "--editor"],
-            description: "Edit entry with vim",
-            
-          },
-
-          {
-            name: ["-n", "--note"],
-            description: "Note",
-            args: {
-                  name: "TEXT",
-                  description: "TEXT",
-            },
-
-          },
-
-        ],
-
-    },
-
     {
       name: "mark",
       description: "Mark last entry as flagged",

data/lib/doing/add_options.rb

@@ -45,7 +45,7 @@ def add_options(type, cmd, default_template: 'default')
     cmd.arg_name 'FORMAT'
     cmd.flag %i[o output], type: ExportTemplate
 
-    cmd.desc "Output using a template from configuration"
+    cmd.desc 'Output using a template from configuration'
     cmd.arg_name 'TEMPLATE_KEY'
     cmd.flag [:config_template], type: TemplateName, default_value: default_template
 
@@ -57,7 +57,7 @@ def add_options(type, cmd, default_template: 'default')
     cmd.arg_name 'FORMAT'
     cmd.flag %i[o output]
 
-    cmd.desc "Output using a template from configuration"
+    cmd.desc 'Output using a template from configuration'
     cmd.arg_name 'TEMPLATE_KEY'
     cmd.flag [:config_template], type: TemplateName
 

data/lib/doing/array/cleanup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doing
   module ArrayCleanup
     ##

data/lib/doing/array/nested_hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Doing
   ##
   ## Array helpers

data/lib/doing/boolean_term_parser.rb

@@ -15,10 +15,10 @@ module BooleanTermParser
   end
 
   class QueryTransformer < Parslet::Transform
-    rule(:clause => subtree(:clause)) do
+    rule(clause: subtree(:clause)) do
       Clause.new(clause[:operator]&.to_s, clause[:term].to_s)
     end
-    rule(:query => sequence(:clauses)) { Query.new(clauses) }
+    rule(query: sequence(:clauses)) { Query.new(clauses) }
   end
 
   class Operator
@@ -49,7 +49,7 @@ module BooleanTermParser
     attr_accessor :should_terms, :must_not_terms, :must_terms
 
     def initialize(clauses)
-      grouped = clauses.chunk { |c| c.operator }.to_h
+      grouped = clauses.chunk(&:operator).to_h
       self.should_terms = grouped.fetch(:should, []).map(&:term)
       self.must_not_terms = grouped.fetch(:must_not, []).map(&:term)
       self.must_terms = grouped.fetch(:must, []).map(&:term)

data/lib/doing/changelog/changes.rb

@@ -6,7 +6,8 @@ module Doing
     attr_reader :changes
     attr_writer :changes_only
 
-    def initialize(lookup: nil, search: nil, changes: false, sort: :desc, prefix: false, only: %i[changed new improved fixed])
+    def initialize(lookup: nil, search: nil, changes: false, sort: :desc, prefix: false,
+                   only: %i[changed new improved fixed])
       @changes_only = changes
       @prefix = prefix
       @only = only
@@ -28,7 +29,7 @@ module Doing
     end
 
     def versions
-      @changes.select { |change| change.entries&.count > 0 }.map { |change| change.version }
+      @changes.select { |change| change.entries&.count&.> 0 }.map(&:version)
     end
 
     def interactive
@@ -45,7 +46,7 @@ module Doing
 
     def to_s
       if @changes_only
-        @changes.map(&:changes_only).delete_if(&:empty?).join().gsub(/\n+/, "\n").force_encoding('utf-8')
+        @changes.map(&:changes_only).delete_if(&:empty?).join.gsub(/\n+/, "\n").force_encoding('utf-8')
       else
         @changes.map(&:to_s).join("\n\n").force_encoding('utf-8')
       end
@@ -67,8 +68,6 @@ module Doing
     end
 
     def lookup(lookup_version)
-      range = []
-
       if lookup_version =~ /([\d.]+) *(?:-|to)+ *([\d.]+)/
         m = Regexp.last_match
         lookup("> #{m[1]}")

data/lib/doing/changelog/version.rb

@@ -36,7 +36,6 @@ module Doing
       val.is_a?(String)
     end
 
-
     def compare(other, comp, inclusive: false)
       case comp
       when :older
@@ -81,18 +80,16 @@ module Doing
             true
           elsif wild?(other.min)
             @min.to_s =~ /^#{other.min}/ ? true : false
-          else
-            if @min == other.min
-              if other.patch.nil?
-                true
-              elsif wild?(other.patch)
-                @patch.to_s =~ /^#{other.patch}/ ? true : false
-              else
-                @patch == other.patch
-              end
+          elsif @min == other.min
+            if other.patch.nil?
+              true
+            elsif wild?(other.patch)
+              @patch.to_s =~ /^#{other.patch}/ ? true : false
             else
-              false
+              @patch == other.patch
             end
+          else
+            false
           end
         end
       end

data/lib/doing/chronify/array.rb

@@ -9,12 +9,12 @@ module Doing
 
       if d.zero? && h > 24
         d = (h / 24).floor
-        h = h % 24
+        h %= 24
       end
 
       if d > 365
         y = (d / 365).floor
-        d = d % 365
+        d %= 365
       else
         y = 0
       end
@@ -41,7 +41,7 @@ module Doing
 
         if d.zero? && h > 24
           d = (h / 24).floor
-          h = h % 24
+          h %= 24
         end
       end
 
@@ -68,7 +68,7 @@ module Doing
       when :clock
         if d.zero? && h > 24
           d = (h / 24).floor
-          h = h % 24
+          h %= 24
         end
         format('%<d>02d:%<h>02d:%<m>02d', d: d, h: h, m: m)
       when :hmclock

data/lib/doing/chronify/string.rb

@@ -43,8 +43,10 @@ module Doing
         Doing.logger.debug('Parser:', %(date/time string "#{self}" interpreted as #{res} (#{secs_ago} seconds ago)))
       else
         date_string = dup
-        date_string = 'today' if date_string.match(Types::REGEX_DAY) && now.strftime('%a') =~ /^#{Regexp.last_match(1)}/i
-        date_string = "#{options[:context].to_s} #{date_string}" if date_string =~ Types::REGEX_TIME && options[:context]
+        if date_string.match(Types::REGEX_DAY) && now.strftime('%a') =~ /^#{Regexp.last_match(1)}/i
+          date_string = 'today'
+        end
+        date_string = "#{options[:context]} #{date_string}" if date_string =~ Types::REGEX_TIME && options[:context]
 
         res = Chronic.parse(date_string, {
                               guess: options.fetch(:guess, :begin),
@@ -69,7 +71,7 @@ module Doing
     ##
     def chronify_qty
       minutes = 0
-      case self.strip
+      case strip
       when /^(\d+):(\d\d)$/
         minutes += Regexp.last_match(1).to_i * 60
         minutes += Regexp.last_match(2).to_i
@@ -212,7 +214,6 @@ module Doing
 
       end
 
-
       if start.is_a? String
         Doing.logger.debug('Parser:',
                            "--from string interpreted as time span, from #{start || '12am'} to #{finish || '11:59pm'}")

data/lib/doing/cli_status.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Status
   def cols
     @cols ||= `tput cols`.strip.to_i
@@ -11,11 +13,14 @@ module Status
       tail = tail.join(', ')
     end
     tail.ltrunc!(max_width)
-    $stderr.print format("#{esc['kill']}#{esc['boldyellow']}> #{esc['boldgreen']}%s #{esc['white']}[#{esc['boldwhite']}%#{@commands.count.to_s.length}d#{esc['boldblack']}/#{esc['boldyellow']}%d#{esc['white']}]: #{esc['boldcyan']}%s#{esc['default']}\r", msg, idx, total, tail)
+    $stderr.print format(
+      "#{esc['kill']}#{esc['boldyellow']}> #{esc['boldgreen']}%s #{esc['white']}[#{esc['boldwhite']}%#{@commands.count.to_s.length}d#{esc['boldblack']}/#{esc['boldyellow']}%d#{esc['white']}]: #{esc['boldcyan']}%s#{esc['default']}\r", msg, idx, total, tail
+    )
   end
 
   def status(msg, reset: true, end_char: "\n")
-    $stderr.print format("#{esc['kill']}#{esc['boldyellow']}> #{esc['whiteboard']}%s#{esc['default']}%s", msg, reset ? "\r" : end_char)
+    $stderr.print format("#{esc['kill']}#{esc['boldyellow']}> #{esc['whiteboard']}%s#{esc['default']}%s", msg,
+                         reset ? "\r" : end_char)
   end
 
   def msg(msg, reset: true, color: 'green', end_char: "\n")

data/lib/doing/colors.rb

@@ -4,7 +4,7 @@
 module Doing
   # Terminal output color functions.
   module Color
-    ESCAPE_REGEX = /(?<=\[)(?:(?:(?:[349]|10)[0-9]|[0-9])?;?)+(?=m)/.freeze
+    ESCAPE_REGEX = /\e\[[0-9;]*m/.freeze
     # All available color names. Available as methods and string extensions.
     #
     # @example Use a color as a method. Color reset will be added to end of string.
@@ -110,7 +110,9 @@ module Doing
         compiled = ''
         normalize_color.split('').each do |char|
           compiled += char
-          valid_color = compiled if Color.attributes.include?(compiled.to_sym) || compiled =~ /^([fb]g?)?#([a-f0-9]{6})$/i
+          if Color.attributes.include?(compiled.to_sym) || compiled =~ /^([fb]g?)?#([a-f0-9]{6})$/i
+            valid_color = compiled
+          end
         end
 
         valid_color
@@ -182,13 +184,49 @@ module Doing
         escape += "\e[#{rgbf}m" if rgbf
         escape + "\e[#{[fg, bg].delete_if(&:nil?).join(';')}m"
       end
+
+      # Define string extension methods for all color attributes
+      ATTRIBUTES.each do |c, v|
+        new_method = <<-EOSCRIPT
+          def #{c}
+            result = ''
+            result << "\e[#{v}m" if Doing::Color.coloring?
+            result << self
+            result << "\e[0m" if Doing::Color.coloring?
+            result
+          end
+        EOSCRIPT
+
+        class_eval(new_method)
+
+        next unless c =~ /bold/
+
+        # Accept brightwhite in addition to boldwhite
+        new_method = <<-EOSCRIPT
+          def #{c.to_s.sub(/bold/, 'bright')}
+            result = ''
+            result << "\e[#{v}m" if Doing::Color.coloring?
+            result << self
+            result << "\e[0m" if Doing::Color.coloring?
+            result
+          end
+        EOSCRIPT
+
+        class_eval(new_method)
+      end
+
+      # Returns an uncolored version of the string, that is all
+      # ANSI-sequences are stripped from the string.
+      def uncolor
+        gsub(ESCAPE_REGEX, '')
+      end
     end
 
     class << self
       # Returns true if the coloring function of this module
       # is switched on, false otherwise.
       def coloring?
-        @coloring
+        @coloring.nil? ? true : @coloring
       end
 
       attr_writer :coloring
@@ -236,51 +274,62 @@ module Doing
 
         fmt.empty? ? input : format(fmt, colors)
       end
-    end
 
-    ATTRIBUTES.each do |c, v|
-      new_method = <<-EOSCRIPT
-        def #{c}(string = nil)
-          result = ''
-          result << "\e[#{v}m" if Doing::Color.coloring?
-          if block_given?
-            result << yield
-          elsif string.respond_to?(:to_str)
-            result << string.to_str
-          elsif respond_to?(:to_str)
-            result << to_str
-          else
-            return result #only switch on
+      ATTRIBUTES.each do |c, v|
+        new_method = <<-EOSCRIPT
+          def #{c}(string = nil)
+            result = ''
+            result << "\e[#{v}m" if Doing::Color.coloring?
+            if block_given?
+              result << yield
+            elsif string.respond_to?(:to_str)
+              result << string.to_str
+            elsif respond_to?(:to_str)
+              result << to_str
+            else
+              return result #only switch on
+            end
+            result << "\e[0m" if Doing::Color.coloring?
+            result
           end
-          result << "\e[0m" if Doing::Color.coloring?
-          result
-        end
-      EOSCRIPT
-
-      module_eval(new_method)
-
-      next unless c =~ /bold/
-
-      # Accept brightwhite in addition to boldwhite
-      new_method = <<-EOSCRIPT
-        def #{c.to_s.sub(/bold/, 'bright')}(string = nil)
-          result = ''
-          result << "\e[#{v}m" if Doing::Color.coloring?
-          if block_given?
-            result << yield
-          elsif string.respond_to?(:to_str)
-            result << string.to_str
-          elsif respond_to?(:to_str)
-            result << to_str
-          else
-            return result #only switch on
+        EOSCRIPT
+
+        module_eval(new_method)
+
+        next unless c =~ /bold/
+
+        # Accept brightwhite in addition to boldwhite
+        new_method = <<-EOSCRIPT
+          def #{c.to_s.sub(/bold/, 'bright')}(string = nil)
+            result = ''
+            result << "\e[#{v}m" if Doing::Color.coloring?
+            if block_given?
+              result << yield
+            elsif string.respond_to?(:to_str)
+              result << string.to_str
+            elsif respond_to?(:to_str)
+              result << to_str
+            else
+              return result #only switch on
+            end
+            result << "\e[0m" if Doing::Color.coloring?
+            result
           end
-          result << "\e[0m" if Doing::Color.coloring?
-          result
-        end
-      EOSCRIPT
+        EOSCRIPT
+
+        module_eval(new_method)
+      end
+
+      # Returns an array of all Doing::Color attributes as symbols.
+      def attributes
+        ATTRIBUTE_NAMES
+      end
 
-      module_eval(new_method)
+      # Returns an uncolored version of the string, that is all
+      # ANSI-sequences are stripped from the string.
+      def uncolor(string)
+        string.to_str.gsub(ESCAPE_REGEX, '')
+      end
     end
 
     def rgb(hex)
@@ -292,7 +341,6 @@ module Doing
       %w[r g b].each do |e|
         t << parts[e].hex
       end
-      color =
       "\e[#{is_bg ? '48' : '38'};2;#{t.join(';')}m"
     end
 
@@ -309,11 +357,5 @@ module Doing
         ''
       end
     end
-
-    # Returns an array of all Doing::Color attributes as symbols.
-    def attributes
-      ATTRIBUTE_NAMES
-    end
-    extend self
   end
 end