doing 2.1.22 → 2.1.23

data/lib/completion/doing.fish

@@ -139,7 +139,7 @@ complete -xc doing -n '__fish_doing_needs_command' -a 'again resume' -d Repeat\
 complete -xc doing -n '__fish_doing_needs_command' -a 'archive move' -d Move\ entries\ between\ sections
 complete -xc doing -n '__fish_doing_needs_command' -a 'autotag' -d Autotag\ last\ entry\ or\ filtered\ entries
 complete -xc doing -n '__fish_doing_needs_command' -a 'cancel' -d End\ last\ X\ entries\ with\ no\ time\ tracked
-complete -xc doing -n '__fish_doing_needs_command' -a 'changelog changes' -d List\ recent\ changes\ in\ Doing
+complete -xc doing -n '__fish_doing_needs_command' -a 'changes changelog' -d List\ recent\ changes\ in\ Doing
 complete -xc doing -n '__fish_doing_needs_command' -a 'choose' -d Select\ a\ section\ to\ display\ from\ a\ menu
 complete -xc doing -n '__fish_doing_needs_command' -a 'colors' -d List\ available\ color\ variables\ for\ configuration\ templates\ and\ views
 complete -xc doing -n '__fish_doing_needs_command' -a 'completion' -d Generate\ shell\ completion\ scripts
@@ -220,6 +220,9 @@ complete -c doing -l tag  -f -r -n '__fish_doing_using_command cancel' -d Cancel
 complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command cancel' -d Cancel\ last\ entry
 complete -c doing -l val  -f -r -n '__fish_doing_using_command cancel' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command cancel' -d Force\ exact\ search\ string\ matching
+complete -c doing -l all -s a -f  -n '__fish_doing_using_command changes changelog' -d Display\ all\ versions
+complete -c doing -l lookup -s l -f -r -n '__fish_doing_using_command changes changelog' -d Look\ up\ a\ specific\ version
+complete -c doing -l search -s s -f -r -n '__fish_doing_using_command changes changelog' -d Show\ changelogs\ matching\ search\ terms
 complete -c doing -l file -s f -f -r -n '__fish_doing_using_command completion' -d File\ to\ write\ output\ to
 complete -c doing -l type -s t -f -r -n '__fish_doing_using_command completion' -d Shell\ to\ generate\ for
 complete -c doing -l dump -s d -f  -n '__fish_doing_using_command config' -d DEPRECATED
@@ -257,6 +260,7 @@ complete -c doing -l after  -f -r -n '__fish_doing_using_command grep search' -d
 complete -c doing -l before  -f -r -n '__fish_doing_using_command grep search' -d Search\ entries\ older\ than\ date
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command grep search' -d Combine\ multiple\ tags\ or\ value\ queries\ using\ AND
 complete -c doing -l case  -f -r -n '__fish_doing_using_command grep search' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
+complete -c doing -l config_template  -f -r -n '__fish_doing_using_command grep search' -d Output\ using\ a\ template\ from\ configuration
 complete -c doing -l delete -s d -f  -n '__fish_doing_using_command grep search' -d Delete\ matching\ entries
 complete -c doing -l duration  -f  -n '__fish_doing_using_command grep search' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command grep search' -d Edit\ matching\ entries\ with\ vim
@@ -269,6 +273,7 @@ complete -c doing -l only_timed  -f  -n '__fish_doing_using_command grep search'
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command grep search' -d Section
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command grep search' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command grep search' -d Sort\ tags\ by
+complete -c doing -l template  -f -r -n '__fish_doing_using_command grep search' -d Override\ output\ format\ with\ a\ template\ string\ containing\ \%placeholders
 complete -c doing -l totals  -f  -n '__fish_doing_using_command grep search' -d Show\ intervals\ with\ totals\ at\ the\ end\ of\ output
 complete -c doing -l val  -f -r -n '__fish_doing_using_command grep search' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command grep search' -d Force\ exact\ string\ matching
@@ -289,6 +294,7 @@ complete -c doing -l type  -f -r -n '__fish_doing_using_command import' -d Impor
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command import' -d Force\ exact\ search\ string\ matching
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command last' -d Tag\ boolean
 complete -c doing -l case  -f -r -n '__fish_doing_using_command last' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
+complete -c doing -l config_template  -f -r -n '__fish_doing_using_command last' -d Output\ using\ a\ template\ from\ configuration
 complete -c doing -l delete -s d -f  -n '__fish_doing_using_command last' -d Delete\ the\ last\ entry
 complete -c doing -l duration  -f  -n '__fish_doing_using_command last' -d Show\ elapsed\ time\ if\ entry\ is\ not\ tagged\ @done
 complete -c doing -l editor -s e -f  -n '__fish_doing_using_command last' -d Edit\ entry\ with\ vim
@@ -297,6 +303,7 @@ complete -c doing -l not  -f  -n '__fish_doing_using_command last' -d Show\ item
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command last' -d Specify\ a\ section
 complete -c doing -l search  -f -r -n '__fish_doing_using_command last' -d Search\ filter
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command last' -d Tag\ filter
+complete -c doing -l template  -f -r -n '__fish_doing_using_command last' -d Override\ output\ format\ with\ a\ template\ string\ containing\ \%placeholders
 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
@@ -341,22 +348,26 @@ complete -c doing -l editor -s e -f  -n '__fish_doing_using_command now next' -d
 complete -c doing -l finish_last -s f -f  -n '__fish_doing_using_command now next' -d Timed\ entry
 complete -c doing -l note -s n -f -r -n '__fish_doing_using_command now next' -d Include\ a\ note
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command now next' -d Section
+complete -c doing -l config_template  -f -r -n '__fish_doing_using_command on' -d Output\ using\ a\ template\ from\ configuration
 complete -c doing -l duration  -f  -n '__fish_doing_using_command on' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command on' -d Output\ to\ export\ format
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command on' -d Section
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command on' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command on' -d Sort\ tags\ by
+complete -c doing -l template  -f -r -n '__fish_doing_using_command on' -d Override\ output\ format\ with\ a\ template\ string\ containing\ \%placeholders
 complete -c doing -l totals  -f  -n '__fish_doing_using_command on' -d Show\ time\ totals\ at\ the\ end\ of\ output
 complete -c doing -l app -s a -f -r -n '__fish_doing_using_command open' -d Open\ with\ app\ name
 complete -c doing -l bundle_id -s b -f -r -n '__fish_doing_using_command open' -d Open\ with\ app\ bundle\ id
 complete -c doing -l editor -s e -f -r -n '__fish_doing_using_command open' -d Open\ with\ editor\ command
 complete -c doing -l column -s c -f  -n '__fish_doing_using_command plugins' -d List\ in\ single\ column\ for\ completion
 complete -c doing -l type -s t -f -r -n '__fish_doing_using_command plugins' -d List\ plugins\ of\ type
+complete -c doing -l config_template  -f -r -n '__fish_doing_using_command recent' -d Output\ using\ a\ template\ from\ configuration
 complete -c doing -l duration  -f  -n '__fish_doing_using_command recent' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command recent' -d Select\ from\ a\ menu\ of\ matching\ entries\ to\ perform\ additional\ operations
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command recent' -d Section
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command recent' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command recent' -d Sort\ tags\ by
+complete -c doing -l template  -f -r -n '__fish_doing_using_command recent' -d Override\ output\ format\ with\ a\ template\ string\ containing\ \%placeholders
 complete -c doing -l totals  -f  -n '__fish_doing_using_command recent' -d Show\ intervals\ with\ totals\ at\ the\ end\ of\ output
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command reset begin' -d Boolean
 complete -c doing -l case  -f -r -n '__fish_doing_using_command reset begin' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
@@ -409,6 +420,7 @@ complete -c doing -l bool -s b -f -r -n '__fish_doing_using_command show' -d Tag
 complete -c doing -l before  -f -r -n '__fish_doing_using_command show' -d Show\ entries\ older\ than\ date
 complete -c doing -l count -s c -f -r -n '__fish_doing_using_command show' -d Max\ count\ to\ show
 complete -c doing -l case  -f -r -n '__fish_doing_using_command show' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
+complete -c doing -l config_template  -f -r -n '__fish_doing_using_command show' -d Output\ using\ a\ template\ from\ configuration
 complete -c doing -l duration  -f  -n '__fish_doing_using_command show' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
 complete -c doing -l from  -f -r -n '__fish_doing_using_command show' -d Date\ range\ to\ show
 complete -c doing -l hilite -s h -f  -n '__fish_doing_using_command show' -d Highlight\ search\ matches\ in\ output
@@ -423,14 +435,17 @@ complete -c doing -l times -s t -f  -n '__fish_doing_using_command show' -d Show
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command show' -d Tag\ filter
 complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command show' -d Tag\ sort\ direction
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command show' -d Sort\ tags\ by
+complete -c doing -l template  -f -r -n '__fish_doing_using_command show' -d Override\ output\ format\ with\ a\ template\ string\ containing\ \%placeholders
 complete -c doing -l totals  -f  -n '__fish_doing_using_command show' -d Show\ intervals\ with\ totals\ at\ the\ end\ of\ output
 complete -c doing -l val  -f -r -n '__fish_doing_using_command show' -d Perform\ a\ tag\ value\ query
 complete -c doing -l exact -s x -f  -n '__fish_doing_using_command show' -d Force\ exact\ search\ string\ matching
+complete -c doing -l config_template  -f -r -n '__fish_doing_using_command since' -d Output\ using\ a\ template\ from\ configuration
 complete -c doing -l duration  -f  -n '__fish_doing_using_command since' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command since' -d Output\ to\ export\ format
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command since' -d Section
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command since' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command since' -d Sort\ tags\ by
+complete -c doing -l template  -f -r -n '__fish_doing_using_command since' -d Override\ output\ format\ with\ a\ template\ string\ containing\ \%placeholders
 complete -c doing -l totals  -f  -n '__fish_doing_using_command since' -d Show\ time\ totals\ at\ the\ end\ of\ output
 complete -c doing -l autotag -s a -f  -n '__fish_doing_using_command tag' -d Autotag\ entries\ based\ on\ autotag\ configuration\ in\ \~/
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command tag' -d Boolean
@@ -455,6 +470,7 @@ complete -c doing -l bool  -f -r -n '__fish_doing_using_command tags' -d Boolean
 complete -c doing -l counts -s c -f  -n '__fish_doing_using_command tags' -d Show\ count\ of\ occurrences
 complete -c doing -l case  -f -r -n '__fish_doing_using_command tags' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command tags' -d Select\ items\ to\ scan\ from\ a\ menu\ of\ matching\ entries
+complete -c doing -l line -s l -f  -n '__fish_doing_using_command tags' -d Output\ in\ a\ single\ line\ with\ @\ symbols
 complete -c doing -l not  -f  -n '__fish_doing_using_command tags' -d Get\ tags\ from\ items\ that\ \*don\'t\*\ match\ search/tag\ filters
 complete -c doing -l order -s o -f -r -n '__fish_doing_using_command tags' -d Sort\ order
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command tags' -d Section
@@ -469,12 +485,14 @@ complete -c doing -l path -s p -f -r -n '__fish_doing_using_command template' -d
 complete -c doing -l save -s s -f  -n '__fish_doing_using_command template' -d Save\ template\ to\ file\ instead\ of\ STDOUT
 complete -c doing -l after  -f -r -n '__fish_doing_using_command today' -d View\ entries\ after\ specified\ time
 complete -c doing -l before  -f -r -n '__fish_doing_using_command today' -d View\ entries\ before\ specified\ time
+complete -c doing -l config_template  -f -r -n '__fish_doing_using_command today' -d Output\ using\ a\ template\ from\ configuration
 complete -c doing -l duration  -f  -n '__fish_doing_using_command today' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
 complete -c doing -l from  -f -r -n '__fish_doing_using_command today' -d Time\ range\ to\ show\ \`doing\ today\ --from\ \"12pm\ to\ 4pm\"\`
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command today' -d Output\ to\ export\ format
 complete -c doing -l section -s s -f -r -n '__fish_doing_using_command today' -d Specify\ a\ section
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command today' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command today' -d Sort\ tags\ by
+complete -c doing -l template  -f -r -n '__fish_doing_using_command today' -d Override\ output\ format\ with\ a\ template\ string\ containing\ \%placeholders
 complete -c doing -l totals  -f  -n '__fish_doing_using_command today' -d Show\ time\ totals\ at\ the\ end\ of\ output
 complete -c doing -l file -s f -f -r -n '__fish_doing_using_command undo' -d Specify\ alternate\ doing\ file
 complete -c doing -l interactive -s i -f  -n '__fish_doing_using_command undo' -d Select\ from\ recent\ backups
@@ -514,6 +532,7 @@ complete -c doing -l search  -f -r -n '__fish_doing_using_command wiki' -d Searc
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command wiki' -d Tag\ filter
 complete -c doing -l after  -f -r -n '__fish_doing_using_command yesterday' -d View\ entries\ after\ specified\ time
 complete -c doing -l before  -f -r -n '__fish_doing_using_command yesterday' -d View\ entries\ before\ specified\ time
+complete -c doing -l config_template  -f -r -n '__fish_doing_using_command yesterday' -d Output\ using\ a\ template\ from\ configuration
 complete -c doing -l duration  -f  -n '__fish_doing_using_command yesterday' -d Show\ elapsed\ time\ on\ entries\ without\ @done\ tag
 complete -c doing -l from  -f -r -n '__fish_doing_using_command yesterday' -d Time\ range\ to\ show
 complete -c doing -l output -s o -f -r -n '__fish_doing_using_command yesterday' -d Output\ to\ export\ format
@@ -521,6 +540,7 @@ complete -c doing -l section -s s -f -r -n '__fish_doing_using_command yesterday
 complete -c doing -l times -s t -f  -n '__fish_doing_using_command yesterday' -d Show\ time\ intervals\ on\ @done\ tasks
 complete -c doing -l tag_order  -f -r -n '__fish_doing_using_command yesterday' -d Tag\ sort\ direction
 complete -c doing -l tag_sort  -f -r -n '__fish_doing_using_command yesterday' -d Sort\ tags\ by
+complete -c doing -l template  -f -r -n '__fish_doing_using_command yesterday' -d Override\ output\ format\ with\ a\ template\ string\ containing\ \%placeholders
 complete -c doing -l totals  -f  -n '__fish_doing_using_command yesterday' -d Show\ time\ totals\ at\ the\ end\ of\ output
 complete -f -c doing -s o -l output -x -n '__fish_doing_using_command grep search on select show since today view yesterday' -a '(__fish_doing_export_plugin)'
 complete -f -c doing -s b -l bool -x -n '__fish_doing_using_command again resume archive move autotag cancel finish grep search last mark flag note reset begin rotate show tag tags view wiki' -a 'and or not pattern'

data/lib/doing/array.rb

@@ -19,8 +19,8 @@ module Doing
     # @return     [Array] Array of @tags
     #
     # @example
-    # ['one', '@two', 'three'].to_tags
-    # # => ['@one', '@two', '@three']
+    #   ['one', '@two', 'three'].to_tags
+    #   # => ['@one', '@two', '@three']
     def to_tags
       map(&:add_at)
     end

data/lib/doing/changelog/change.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+module Doing
+  # A single version's entries
+  class Change
+    attr_reader :version, :content
+
+    attr_accessor :entries
+
+    def initialize(version, content)
+      @version = Version.new(version)
+      @content = content
+      parse_entries
+    end
+
+    def parse_entries
+      @entries = []
+      types = @content.scan(/(?<=\n|\A)#### (NEW|IMPROVED|FIXED)(.*?)(?=\n####|\Z)/m)
+      types.each do |type|
+        type[1].scan(/\s*- +(.*?)$/).each do |entry|
+          @entries << Entry.new(entry[0].strip, type[0])
+        end
+      end
+    end
+
+    def search_entries(search_string)
+      case_type = :ignore
+
+      matches = []
+
+      if search_string.is_rx?
+        matches = @entries.select { |e| e.string =~ search_string.to_rx(distance: 2, case_type: case_type) }
+      else
+        query = search_string.gsub(/(-)?--/, '\1]]').to_phrase_query
+
+        if query[:must].nil? && query[:must_not].nil?
+          query[:must] = query[:should]
+          query[:should] = []
+        end
+
+        @entries.each do |entry|
+          m = no_searches?(entry.string, query[:must_not])
+          m &&= all_searches?(entry.string, query[:must])
+          m &&= any_searches?(entry.string, query[:should])
+          matches << entry if m
+        end
+      end
+
+      @entries = matches.count.positive? ? matches : nil
+    end
+
+    def to_h
+      { version: @version, content: @content }
+    end
+
+    def to_s
+      out = ["### #{@version}"]
+      items = {
+        new: [],
+        improved: [],
+        fixed: [],
+        other: []
+      }
+      @entries.each do |e|
+        type = e.type.downcase.to_sym
+        if items.key?(type)
+          items[type] << e
+        else
+          items[:other] << e
+        end
+      end
+
+      items.each do |type, members|
+        if members.count.positive?
+          out << "#### #{type.to_s.capitalize}"
+          out << members.map(&:to_s).join("\n")
+        end
+      end
+
+      out.join("\n\n")
+    end
+
+    private
+
+    def all_searches?(text, searches)
+      return true if searches.nil? || searches.empty?
+
+      searches.each do |s|
+        rx = Regexp.new(s.wildcard_to_rx, true)
+        return false unless text =~ rx
+      end
+      true
+    end
+
+    def no_searches?(text, searches)
+      return true if searches.nil? || searches.empty?
+
+      searches.each do |s|
+        rx = Regexp.new(s.wildcard_to_rx, true)
+        return false if text =~ rx
+      end
+      true
+    end
+
+    def any_searches?(text, searches)
+      return true if searches.nil? || searches.empty?
+
+      searches.each do |s|
+        rx = Regexp.new(s.wildcard_to_rx, true)
+        return true if text =~ rx
+      end
+      false
+    end
+  end
+end

data/lib/doing/changelog/changes.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Doing
+  # A collection of Changes
+  class Changes
+    attr_reader :changes
+
+    def initialize(lookup: nil, search: nil)
+      changelog = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'CHANGELOG.md'))
+      raise 'Error locating changelog' unless File.exist?(changelog)
+
+      @content = IO.read(changelog)
+      parse_changes(lookup, search)
+    end
+
+    def latest
+      @changes[0].to_s.force_encoding('utf-8')
+    end
+
+    def to_s
+      @changes.map(&:to_s).join("\n\n").force_encoding('utf-8')
+    end
+
+    private
+
+    def parse_changes(lookup, search)
+      change_rx = /(?<=\n|\A)### (\d+\.\d+\.\d+(?:\w+)?)(.*?)(?=\n### |\Z)/m
+      @changes = @content.scan(change_rx).each_with_object([]) do |m, a|
+        next if m[0].nil? || m[1].nil?
+
+        a << Change.new(m[0], m[1].strip)
+      end
+
+      lookup(lookup) unless lookup.nil?
+      search(search) unless search.nil?
+    end
+
+    def lookup(lookup_version)
+      range = []
+
+      if lookup_version =~ /([\d.]+) *-+ *([\d.]+)/
+        m = Regexp.last_match
+        lookup("> #{m[1]}")
+        lookup("< #{m[2]}")
+      elsif lookup_version.scan(/[<>]/).count > 1
+        params = lookup_version.scan(/[<>] [\d.]+/)
+        params.each { |query| lookup(query) }
+      else
+        comp = case lookup_version
+               when /(<|prior|before|older)/
+                 :older
+               when />|since|after|newer/
+                 :newer
+               else
+                 :equal
+               end
+        version = Version.new(lookup_version)
+
+        @changes.select! do |change|
+          change.version.compare(version, comp)
+        end
+      end
+    end
+
+    def search(query)
+      @changes.map do |c|
+        c.entries = c.search_entries(query)
+      end
+
+      @changes.delete_if { |c| c.nil? || c.entries.nil? }
+    end
+  end
+end

data/lib/doing/changelog/entry.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Doing
+  # An individual changelog item
+  class Entry
+    attr_reader :type, :string
+
+    def initialize(string, type)
+      @string = string
+      @type = type
+    end
+
+    def clean(string)
+      string.gsub(/\|/, '\|')
+    end
+
+    def to_s
+      "- #{clean(@string)}"
+    end
+  end
+end

data/lib/doing/changelog/version.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module Doing
+  # Semantic versioning
+  class Version
+    attr_reader :maj, :min, :patch
+
+    def initialize(string)
+      @maj, @min, @patch = version_to_a(string)
+    end
+
+    def version_to_a(string)
+      raise 'Version not a string' unless string.is_a?(String)
+
+      v = string.match(/(?<maj>\d+)(?:\.(?<min>[\d*?]+))?(?:\.(?<patch>[\d*?]+))?/)
+
+      raise 'Error parsing semantic version string' if v.nil?
+
+      maj = v['maj'].to_i
+      min = case v['min']
+            when /[*?]/
+              v['min'].sub(/(\d+)?[^\d]/, '\1\d+')
+            when /^[0-9]+$/
+              v['min'].to_i
+            end
+      pat = case v['patch']
+            when /[*?]/
+              v['patch'].sub(/(\d+)?[^\d]/, '\1\d+')
+            when /^[0-9]+$/
+              v['patch'].to_i
+            end
+      [maj, min, pat]
+    end
+
+    def wild?(val)
+      val.is_a?(String)
+    end
+
+
+    def compare(other, comp)
+      case comp
+      when :older
+        if @maj <= other.maj
+          if @maj < other.maj
+            true
+          elsif @maj == other.maj && (other.min.nil? || @min < other.min)
+            true
+          elsif @maj == other.maj && @min == other.min
+            other.patch.nil? ? false : @patch < other.patch
+          else
+            false
+          end
+        else
+          false
+        end
+      when :newer
+        if @maj >= other.maj
+          if @maj > other.maj
+            true
+          elsif @maj == other.maj && (other.min.nil? || @min > other.min)
+            true
+          elsif @maj == other.maj && @min == other.min
+            other.patch.nil? || @patch >= other.patch
+          else
+            false
+          end
+        else
+          false
+        end
+      when :equal
+        if @maj == other.maj
+          if other.min.nil?
+            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
+            else
+              false
+            end
+          end
+        end
+      end
+    end
+
+    def to_s
+      "#{@maj}.#{@min || 0}.#{@patch || 0}"
+    end
+  end
+end

data/lib/doing/changelog.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require_relative 'changelog/version'
+require_relative 'changelog/entry'
+require_relative 'changelog/change'
+require_relative 'changelog/changes'

data/lib/doing/configuration.rb

@@ -190,7 +190,7 @@ module Doing
     ##                      matched, first match wins)
     ## @return     [Array] ordered array of resolved keys
     ##
-    def resolve_key_path(keypath, create: false)
+    def resolve_key_path(keypath, create: false, distance: 2)
       cfg = @settings
       real_path = []
       unless keypath =~ /^[.*]?$/
@@ -198,16 +198,24 @@ module Doing
         while paths.length.positive? && !cfg.nil?
           path = paths.shift
           new_cfg = nil
-          cfg.each do |key, val|
-            next unless key =~ path.to_rx(distance: 4)
 
-            real_path << key
-            new_cfg = val
-            break
+          if cfg.is_a?(Hash)
+            matches = cfg.select { |key, val| key =~ path.to_rx(distance: distance) }
+            if matches.count.positive?
+              shortest = matches.keys.group_by(&:length).min.last[0]
+              real_path << shortest
+              new_cfg = matches[shortest]
+            end
+          else
+            new_cfg = cfg
           end
 
           if new_cfg.nil?
-            return nil unless create
+            if distance < 5 && !create
+              return resolve_key_path(keypath, create: false, distance: distance + 1)
+            else
+              return nil unless create
+            end
 
             resolved = real_path.count.positive? ? "Resolved #{real_path.join('->')}, but " : ''
             Doing.logger.log_now(:warn, "#{resolved}#{path} is unknown")

data/lib/doing/hash.rb

@@ -48,8 +48,9 @@ module Doing
 
     # Set a nested hash value using an array
     #
-    # @example `{}.deep_set(['one', 'two'], 'value')`
-    # @example `=> { 'one' => { 'two' => 'value' } }
+    # @example
+    #   {}.deep_set(['one', 'two'], 'value')
+    #   # => { 'one' => { 'two' => 'value' } }
     #
     # @param      path   [Array] key path
     # @param      value  The value

data/lib/doing/help_monkey_patch.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module GLI
+  module Commands
+    # Help Command Monkeypatch for paginated output
+    class Help < Command
+      def show_help(global_options,options,arguments,out,error)
+        Doing::Pager.paginate = true
+
+        command_finder = HelpModules::CommandFinder.new(@app,arguments,error)
+        if options[:c]
+          help_output = HelpModules::HelpCompletionFormat.new(@app,command_finder,arguments).format
+          out.puts help_output unless help_output.nil?
+        elsif arguments.empty? || options[:c]
+          Doing::Pager.page HelpModules::GlobalHelpFormat.new(@app,@sorter,@text_wrapping_class).format
+        else
+          name = arguments.shift
+          command = command_finder.find_command(name)
+          unless command.nil?
+            Doing::Pager.page HelpModules::CommandHelpFormat.new(
+              command,
+              @app,
+              @sorter,
+              @synopsis_formatter_class,
+              @text_wrapping_class).format
+          end
+        end
+      end
+    end
+  end
+end

data/lib/doing/hooks.rb

@@ -23,7 +23,11 @@ module Doing
 
     # register hook(s) to be called later, public API
     def self.register(event, priority: DEFAULT_PRIORITY, &block)
-      register_one(event, priority_value(priority), &block)
+      if event.is_a?(Array)
+        event.each { |ev| register_one(ev, priority_value(priority), &block) }
+      else
+        register_one(event, priority_value(priority), &block)
+      end
     end
 
     # Ensure the priority is a Fixnum

data/lib/doing/item.rb

@@ -125,11 +125,11 @@ module Doing
       return true if same_time?(item_b)
 
       start_a = date
-      interval = interval
-      end_a = interval ? start_a + interval.to_i : start_a
+      a_interval = interval
+      end_a = a_interval ? start_a + a_interval.to_i : start_a
       start_b = item_b.date
-      interval = item_b.interval
-      end_b = interval ? start_b + interval.to_i : start_b
+      b_interval = item_b.interval
+      end_b = b_interval ? start_b + b_interval.to_i : start_b
       (start_a >= start_b && start_a <= end_b) || (end_a >= start_b && end_a <= end_b) || (start_a < start_b && end_a > end_b)
     end
 
@@ -216,8 +216,8 @@ module Doing
     ##
     def tags?(tags, bool = :and, negate: false)
       if bool == :pattern
-        tags = tags.join(' ') if tags.is_a?(Array)
-        matches = tag_pattern?(tags.gsub(/ *, */, ' '))
+        tags = tags.to_tags.tags_to_array.join(' ')
+        matches = tag_pattern?(tags)
 
         return negate ? !matches : matches
       end
@@ -283,7 +283,7 @@ module Doing
         new_title = @title.gsub(rx) { |m| yellow(m) }
         new_note.add(@note.to_s.gsub(rx) { |m| yellow(m) })
       else
-        query = to_phrase_query(search.strip)
+        query = search.strip.to_phrase_query
 
         if query[:must].nil? && query[:must_not].nil?
           query[:must] = query[:should]
@@ -319,7 +319,7 @@ module Doing
       if search.is_rx? || matching == :fuzzy
         matches = @title + @note.to_s =~ search.to_rx(distance: distance, case_type: case_type)
       else
-        query = to_phrase_query(search.strip)
+        query = search.strip.to_phrase_query
 
         if query[:must].nil? && query[:must_not].nil?
           query[:must] = query[:should]
@@ -612,29 +612,14 @@ module Doing
       end
     end
 
-    def to_query(query)
-      parser = BooleanTermParser::QueryParser.new
-      transformer = BooleanTermParser::QueryTransformer.new
-      parse_tree = parser.parse(query)
-      transformer.apply(parse_tree).to_elasticsearch
-    end
-
-    def to_phrase_query(query)
-      parser = PhraseParser::QueryParser.new
-      transformer = PhraseParser::QueryTransformer.new
-      parse_tree = parser.parse(query)
-      transformer.apply(parse_tree).to_elasticsearch
-    end
-
     def tag_pattern?(tags)
-      query = to_query(tags)
+      query = tags.to_query
 
       no_tags?(query[:must_not]) && all_tags?(query[:must]) && any_tags?(query[:should])
     end
 
     def split_tags(tags)
-      tags = tags.to_tags if tags.is_a? String
-      tags.map(&:remove_at)
+      tags.to_tags.tags_to_array
     end
   end
 end

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

@@ -125,7 +125,7 @@ module Doing
 
         output.gsub!(/\\%/, '%')
 
-        output.highlight_search!(opt[:search]) if opt[:search] && !opt[:not] && opt[:hilite]
+        output.highlight_search!(opt[:search]) if opt[:template] =~ /^temp/ && opt[:search] && !opt[:not] && opt[:hilite]
 
         out += "#{output}\n"
       end