doing 2.1.18 → 2.1.23

data/lib/doing/string.rb

@@ -20,7 +20,9 @@ module Doing
     ## can be separated by up to *distance* characters in
     ## haystack, spaces indicate unlimited distance.
     ##
-    ## @example    `"this word".to_rx(2) => /t.{0,3}h.{0,3}i.{0,3}s.{0,3}.*?w.{0,3}o.{0,3}r.{0,3}d/`
+    ## @example
+    ##   "this word".to_rx(3)
+    ##   # => /t.{0,3}h.{0,3}i.{0,3}s.{0,3}.*?w.{0,3}o.{0,3}r.{0,3}d/
     ##
     ## @param      distance   [Integer] Allowed distance
     ##                        between characters
@@ -53,6 +55,20 @@ module Doing
       Regexp.new(pattern, !case_sensitive)
     end
 
+    def to_phrase_query
+      parser = PhraseParser::QueryParser.new
+      transformer = PhraseParser::QueryTransformer.new
+      parse_tree = parser.parse(self)
+      transformer.apply(parse_tree).to_elasticsearch
+    end
+
+    def to_query
+      parser = BooleanTermParser::QueryParser.new
+      transformer = BooleanTermParser::QueryTransformer.new
+      parse_tree = parser.parse(self)
+      transformer.apply(parse_tree).to_elasticsearch
+    end
+
     ##
     ## Test string for truthiness (0, "f", "false", "n", "no" all return false, case insensitive, otherwise true)
     ##
@@ -101,13 +117,6 @@ module Doing
       gsub(/(\s|m)(@[^ ("']+)/, "\\1#{tag_color}\\2#{last_color}")
     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 ignore_case(search, case_type)
       (case_type == :smart && search !~ /[A-Z]/) || case_type == :ignore
     end
@@ -127,13 +136,16 @@ module Doing
         rx = search.to_rx(distance: distance, case_type: case_type)
         out.gsub!(rx) { |m| m.bgyellow.black }
       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]
           query[:should] = []
         end
-        query[:must].concat(query[:should]).each do |s|
+        qs = []
+        qs.concat(query[:must]) if query[:must]
+        qs.concat(query[:should]) if query[:should]
+        qs.each do |s|
           rx = Regexp.new(s.wildcard_to_rx, ignore_case(s, case_type))
           out.gsub!(rx) { |m| m.bgyellow.black }
         end
@@ -446,7 +458,7 @@ module Doing
     ## @return     [String] Regular expression string
     ##
     def wildcard_to_rx
-      gsub(/\?/, '\S').gsub(/\*/, '\S*?')
+      gsub(/\?/, '\S').gsub(/\*/, '\S*?').gsub(/\]\]/, '--')
     end
 
     ##
@@ -455,7 +467,16 @@ module Doing
     ## @return     [String] @string
     ##
     def add_at
-      strip.sub(/^([+-]*)@/, '\1')
+      strip.sub(/^([+-]*)@?/, '\1@')
+    end
+
+    ##
+    ## Removes @ prefix if needed, maintains +/- prefix
+    ##
+    ## @return     [String] string without @ prefix
+    ##
+    def remove_at
+      strip.sub(/^([+-]*)@?/, '\1')
     end
 
     ##
@@ -682,6 +703,15 @@ module Doing
       end
     end
 
+    def to_bool
+      case self
+      when /^[yt1]/i
+        true
+      else
+        false
+      end
+    end
+
     ##
     ## Convert a string value to an appropriate type. If
     ## kind is not specified, '[one, two]' becomes an Array,
@@ -701,6 +731,8 @@ module Doing
           gsub(/^\[ *| *\]$/, '').split(/ *, */)
         when /^i/i
           to_i
+        when /^(fa|tr)/i
+          to_bool
         when /^f/i
           to_f
         when /^sy/i

data/lib/doing/string_chronify.rb

@@ -26,12 +26,12 @@ module Doing
     ##
     def chronify(**options)
       now = Time.now
-      raise InvalidTimeExpression, "Invalid time expression #{inspect}" if to_s.strip == ''
+      raise Errors::InvalidTimeExpression, "Invalid time expression #{inspect}" if to_s.strip == ''
 
       secs_ago = if match(/^(\d+)$/)
                    # plain number, assume minutes
                    Regexp.last_match(1).to_i * 60
-                 elsif (m = match(/^(?:(?<day>\d+)d)?(?:(?<hour>\d+)h)?(?:(?<min>\d+)m)?$/i))
+                 elsif (m = match(/^(?:(?<day>\d+)d)? *(?:(?<hour>\d+)h)? *(?:(?<min>\d+)m)?$/i))
                    # day/hour/minute format e.g. 1d2h30m
                    [[m['day'], 24 * 3600],
                     [m['hour'], 3600],
@@ -39,14 +39,23 @@ module Doing
                  end
 
       if secs_ago
-        now - secs_ago
+        res = now - secs_ago
+        Doing.logger.debug('Parser:', %(date/time string "#{self}" interpreted as #{res} (#{secs_ago} seconds ago)))
       else
-        Chronic.parse(self, {
-                        guess: options.fetch(:guess, :begin),
-                        context: options.fetch(:future, false) ? :future : :past,
-                        ambiguous_time_range: 8
-                      })
+        date_string = dup
+        date_string = 'today' if date_string.match(REGEX_DAY) && now.strftime('%a') =~ /^#{Regexp.last_match(1)}/i
+        date_string = "#{options[:context].to_s} #{date_string}" if date_string =~ REGEX_TIME && options[:context]
+
+        res = Chronic.parse(date_string, {
+                              guess: options.fetch(:guess, :begin),
+                              context: options.fetch(:future, false) ? :future : :past,
+                              ambiguous_time_range: 8
+                            })
+
+        Doing.logger.debug('Parser:', %(date/time string "#{self}" interpreted as #{res}))
       end
+
+      res
     end
 
     ##
@@ -152,6 +161,10 @@ module Doing
       end
     end
 
+    def is_range?
+      self =~ / (to|through|thru|(un)?til|-+) /
+    end
+
     ##
     ## Splits a range string and returns an array of
     ## DateTime objects as [start, end]. If only one date is
@@ -160,23 +173,48 @@ module Doing
     ## @return     [Array<DateTime>] Start and end dates as
     ##             array
     ## @example    Process a natural language date range
-    ## "mon 3pm to mon 5pm".split_date_range
+    ##   "mon 3pm to mon 5pm".split_date_range
     ##
     def split_date_range
+      time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/
+      range_rx = / (to|through|thru|(?:un)?til|-+) /
+
       date_string = dup
-      case date_string
-      when / (to|through|thru|(un)?til|-+) /
-        dates = date_string.split(/ (?:to|through|thru|(?:un)?til|-+) /)
-        start = dates[0].chronify(guess: :begin)
-        finish = dates[-1].chronify(guess: :end)
+
+      if date_string.is_range?
+        # Do we want to differentiate between "to" and "through"?
+        # inclusive = date_string =~ / (through|thru|-+) / ? true : false
+        inclusive = true
+
+        dates = date_string.split(range_rx)
+        if dates[0].strip =~ time_rx && dates[-1].strip =~ time_rx
+          start = dates[0].strip
+          finish = dates[-1].strip
+        else
+          start = dates[0].chronify(guess: :begin, future: false)
+          finish = dates[-1].chronify(guess: inclusive ? :end : :begin, future: false)
+        end
+
+        raise Errors::InvalidTimeExpression, 'Unrecognized date string' if start.nil? || finish.nil?
+
       else
-        start = date_string.chronify(guess: :begin)
-        finish = nil
+        if date_string.strip =~ time_rx
+          start = date_string.strip
+          finish = nil
+        else
+          start = date_string.strip.chronify(guess: :begin, future: false)
+          finish = date_string.strip.chronify(guess: :end)
+        end
+        raise Errors::InvalidTimeExpression, 'Unrecognized date string' unless start
+
       end
 
-      raise InvalidTimeExpression, 'Unrecognized date string' unless start
 
-      Doing.logger.debug('Parser:', "date range interpreted as #{start.strftime('%F %R')} -- #{finish ? finish.strftime('%F %R') : 'now'}")
+      if start.is_a? String
+        Doing.logger.debug('Parser:', "--from string interpreted as time span, from #{start || '12am'} to #{finish || '11:59pm'}")
+      else
+        Doing.logger.debug('Parser:', "date range interpreted as #{start.strftime('%F %R')} -- #{finish ? finish.strftime('%F %R') : 'now'}")
+      end
       [start, finish]
     end
   end

data/lib/doing/template_string.rb

@@ -146,6 +146,13 @@ module Doing
           end
           indent ||= placeholder =~ /^title/ ? '' : "\t"
           prefix = m['prefix']
+
+          if placeholder =~ /^tags/
+            prefix ||= ''
+            value = value.map { |t| "#{prefix}#{t.sub(/^#{prefix}?/, '')}" }.join(' ')
+            prefix = ''
+          end
+
           if placeholder =~ /^title/
             color = last_color + color
 

data/lib/doing/types.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Doing
+  module Types
+    REGEX_BOOL = /^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$/i.freeze
+    REGEX_SORT_ORDER = /^(?:a(?:sc)?|d(?:esc)?)$/i.freeze
+    REGEX_VALUE_QUERY = /^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$/.freeze
+    REGEX_CLOCK = '(?:\d{1,2}+(?::\d{1,2}+)?(?: *(?:am|pm))?|midnight|noon)'
+    REGEX_TIME = /^#{REGEX_CLOCK}$/i.freeze
+    REGEX_DAY = /^(mon|tue|wed|thur?|fri|sat|sun)(\w+(day)?)?$/i.freeze
+    REGEX_RANGE_INDICATOR = ' +(?:to|through|thru|(?:un)?til|-+) +'
+    REGEX_RANGE = /^\S+#{REGEX_RANGE_INDICATOR}+\S+/i.freeze
+    REGEX_TIME_RANGE = /^#{REGEX_CLOCK}#{REGEX_RANGE_INDICATOR}#{REGEX_CLOCK}$/i.freeze
+
+    InvalidExportType = Class.new(RuntimeError)
+    MissingConfigFile = Class.new(RuntimeError)
+
+    TagArray = Class.new(Array)
+    TemplateName = Class.new(String)
+    DateBeginString = Class.new(DateTime)
+    DateEndString = Class.new(DateTime)
+    DateRangeString = Class.new(Array)
+    DateIntervalString = Class.new(DateTime)
+  end
+end

data/lib/doing/util.rb

@@ -27,7 +27,8 @@ module Doing
     ##
     ## Return the first valid executable from a list of commands
     ##
-    ## @example `Doing::Util.first_available_exec('bat', 'less -Xr', 'more -r', 'cat')`
+    ## @example
+    ##   Doing::Util.first_available_exec('bat', 'less -Xr', 'more -r', 'cat')
     ##
     def first_available_exec(*commands)
       commands.compact.map(&:strip).reject(&:empty?).uniq

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.18'
+  VERSION = '2.1.23'
 end

data/lib/doing/wwid.rb

@@ -305,6 +305,28 @@ module Doing
       view
     end
 
+    def add_with_editor(**options)
+      raise MissingEditor, 'No EDITOR variable defined in environment' if Util.default_editor.nil?
+
+      input = options[:date].strftime('%F %R | ')
+      input += options[:title]
+      input += "\n#{options[:note]}" if options[:note]
+      input = fork_editor(input).strip
+
+      d, title, note = format_input(input)
+      raise EmptyInput, 'No content' if title.empty?
+
+      if options[:ask]
+        ask_note = Doing::Prompt.read_lines(prompt: 'Add a note')
+        note.add(ask_note) unless ask_note.empty?
+      end
+
+      date = d.nil? ? options[:date] : d
+      finish = options[:finish_last] || false
+      add_item(title.cap_first, options[:section], { note: note, back: date, timed: finish })
+      write(@doing_file)
+    end
+
     ##
     ## Adds an entry
     ##
@@ -356,7 +378,7 @@ module Doing
 
       @content.push(entry)
       # logger.count(:added, level: :debug)
-      logger.info('New entry:', %(added "#{entry.title}" to #{section}))
+      logger.info('New entry:', %(added "#{entry.date.relative_date}: #{entry.title}" to #{section}))
 
       Hooks.trigger :post_entry_added, self, entry.dup
     end
@@ -454,7 +476,8 @@ module Doing
       opt ||= {}
       if item.should_finish?
         if item.should_time?
-          item.title.tag!('done', value: Time.now.strftime('%F %R'))
+          finish_date = verify_duration(item.date, Time.now, title: item.title)
+          item.title.tag!('done', value: finish_date.strftime('%F %R'))
         else
           item.title.tag!('done')
         end
@@ -484,7 +507,7 @@ module Doing
       end
 
       # @content.update_item(original, item)
-      add_item(title, section, { note: note, back: opt[:date], timed: true })
+      add_item(title, section, { note: note, back: opt[:date], timed: false })
     end
 
     ##
@@ -633,42 +656,19 @@ module Doing
 
       opt[:time_filter] = [nil, nil]
       if opt[:from] && !opt[:date_filter]
-        date_string = opt[:from]
-        case date_string
-        when / (to|through|thru|(un)?til|-+) /
-          dates = date_string.split(/ (?:to|through|thru|(?:un)?til|-+) /)
-          if dates[0].strip =~ time_rx && dates[-1].strip =~ time_rx
-            time_start = dates[0].strip
-            time_end = dates[-1].strip
-          else
-            start = dates[0].chronify(guess: :begin)
-            finish = dates[-1].chronify(guess: :end)
-          end
-        when time_rx
-          time_start = date_string
-          time_end = nil
-        else
-          start = date_string.chronify(guess: :begin)
-          finish = false
-        end
-
-        if time_start
-          opt[:time_filter] = [time_start, time_end]
-          Doing.logger.debug('Parser:', "--from string interpreted as time span, from #{time_start ? time_start : '12am'} to #{time_end ? time_end : '11:59pm'}")
-        else
-          raise InvalidTimeExpression, 'Unrecognized date string' unless start
-
-          opt[:date_filter] = [start, finish]
-          Doing.logger.debug('Parser:', "--from string interpreted as #{start.strftime('%F %R')} -- #{finish ? finish.strftime('%F %R') : 'now'}")
+        if opt[:from][0].is_a?(String) && opt[:from][0] =~ time_rx
+          opt[:time_filter] = opt[:from]
+        elsif opt[:from][0].is_a?(Time)
+          opt[:date_filter] = opt[:from]
         end
       end
 
-      if opt[:before] =~ time_rx
+      if opt[:before].is_a?(String) && opt[:before] =~ time_rx
         opt[:time_filter][1] = opt[:before]
         opt[:before] = nil
       end
 
-      if opt[:after] =~ time_rx
+      if opt[:after].is_a?(String) && opt[:after] =~ time_rx
         opt[:time_filter][0] = opt[:after]
         opt[:after] = nil
       end
@@ -734,7 +734,7 @@ module Doing
           start_time = start_string.chronify(guess: :begin)
 
           end_string = if opt[:time_filter][1].nil?
-                         "#{item.date.next_day.strftime('%Y-%m-%d')} 12am"
+                         "#{item.date.to_datetime.next_day.strftime('%Y-%m-%d')} 12am"
                        else
                          "#{item.date.strftime('%Y-%m-%d')} #{opt[:time_filter][1]}"
                        end
@@ -753,22 +753,26 @@ module Doing
         end
 
         if keep && opt[:before]
-          time_string = opt[:before]
-          if time_string =~ time_rx
-            cutoff = "#{item.date.strftime('%Y-%m-%d')} #{time_string}".chronify(guess: :begin)
+          before = opt[:before]
+          if before =~ time_rx
+            cutoff = "#{item.date.strftime('%Y-%m-%d')} #{before}".chronify(guess: :begin)
+          elsif before.is_a?(String)
+            cutoff = before.chronify(guess: :begin)
           else
-            cutoff = time_string.chronify(guess: :begin)
+            cutoff = before
           end
           keep = cutoff && item.date <= cutoff
           keep = opt[:not] ? !keep : keep
         end
 
         if keep && opt[:after]
-          time_string = opt[:after]
-          if time_string =~ time_rx
-            cutoff = "#{item.date.strftime('%Y-%m-%d')} #{time_string}".chronify(guess: :end)
+          after = opt[:after]
+          if after =~ time_rx
+            cutoff = "#{item.date.strftime('%Y-%m-%d')} #{after}".chronify(guess: :end)
+          elsif after.is_a?(String)
+            cutoff = after.chronify(guess: :end)
           else
-            cutoff = time_string.chronify(guess: :end)
+            cutoff = after
           end
           keep = cutoff && item.date >= cutoff
           keep = opt[:not] ? !keep : keep
@@ -934,6 +938,7 @@ module Doing
         actions = [
           'add tag',
           'remove tag',
+          'autotag',
           'cancel',
           'delete',
           'finish',
@@ -960,6 +965,8 @@ module Doing
             opt[:resume] = true
           when /reset/
             opt[:reset] = true
+          when /autotag/
+            opt[:autotag] = true
           when /(add|remove) tag/
             type = action =~ /^add/ ? 'add' : 'remove'
             raise InvalidArgument, "'add tag' and 'remove tag' can not be used together" if opt[:tag]
@@ -1071,6 +1078,21 @@ module Doing
         end
       end
 
+      if opt[:autotag]
+        items.map! do |i|
+          new_title = autotag(i.title)
+          if new_title == i.title
+            logger.count(:skipped, level: :debug, message: '%count unchaged %items')
+            # logger.debug('Autotag:', 'No changes')
+          else
+            logger.count(:added_tags)
+            logger.write(items.count == 1 ? :info : :debug, 'Tagged:', new_title)
+            i.title = new_title
+            Hooks.trigger :post_entry_updated, self, i
+          end
+        end
+      end
+
       if opt[:tag]
         tag = opt[:tag]
         items.map! do |i|
@@ -1098,10 +1120,7 @@ module Doing
 
       return unless opt[:output]
 
-      items.map! do |i|
-        i.title = "#{i.title} @project(#{i.section})"
-        i
-      end
+      items.each { |i| i.title = "#{i.title} @section(#{i.section})" }
 
       export_items = Items.new
       export_items.concat(items)
@@ -1138,6 +1157,8 @@ module Doing
     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)
+      date = date.chronify(guess: :end, context: :today) if finish_date.is_a?(String)
+
       elapsed = finish_date - date
 
       if max_elapsed.positive? && (elapsed > max_elapsed)
@@ -1244,7 +1265,7 @@ module Doing
 
             tag = tag.strip
 
-            if tag =~ /^done$/
+            if tag =~ /^done$/ && opt[:date] && item.should_time?
               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
@@ -1316,7 +1337,7 @@ module Doing
     ##
     ## @return     [Item] the next chronological item in the index
     ##
-    def next_item(item, options)
+    def next_item(item, options = {})
       options ||= {}
       items = filter_items(Items.new, opt: options)
 
@@ -1595,6 +1616,7 @@ module Doing
                        'duration' => @config['duration'],
                        'interval_format' => @config['interval_format']
                      }, { extend_existing_arrays: true, sort_merged_arrays: true })
+
       opt[:duration] ||= cfg['duration'] || false
       opt[:interval_format] ||= cfg['interval_format'] || 'text'
       opt[:count] ||= 0
@@ -1640,9 +1662,9 @@ module Doing
         opt[:menu] = !opt[:force]
         opt[:query] = '' # opt[:search]
         opt[:multiple] = true
-        selected = Prompt.choose_from_items(items, include_section: opt[:section] =~ /^all$/i, **opt)
+        selected = Prompt.choose_from_items(items.reverse, include_section: opt[:section] =~ /^all$/i, **opt)
 
-        raise NoResults, 'no items selected' if selected.empty?
+        raise NoResults, 'no items selected' if selected.nil? || selected.empty?
 
         act_on(selected, opt)
         return
@@ -1697,7 +1719,7 @@ module Doing
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
 
-      cfg = @config['templates']['today'].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
+      cfg = @config['templates'][opt[:config_template]].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
         'order' => @config['order'] || 'asc',
@@ -1706,6 +1728,8 @@ module Doing
         'interval_format' => @config['interval_format']
       }, { extend_existing_arrays: true, sort_merged_arrays: true })
 
+      template = opt[:template] || cfg['template']
+
       opt[:duration] ||= cfg['duration'] || false
       opt[:interval_format] ||= cfg['interval_format'] || 'text'
 
@@ -1721,13 +1745,13 @@ module Doing
         output: output,
         section: opt[:section],
         sort_tags: opt[:sort_tags],
-        template: cfg['template'],
+        template: template,
         times: times,
         today: true,
         totals: opt[:totals],
         wrap_width: cfg['wrap_width'],
         tags_color: cfg['tags_color'],
-        config_template: 'today'
+        config_template: opt[:config_template]
       }
       list_section(options)
     end
@@ -1747,7 +1771,7 @@ module Doing
       opt[:sort_tags] ||= false
       section = guess_section(section)
       # :date_filter expects an array with start and end date
-      dates = [dates, dates] if dates.instance_of?(String)
+      dates = dates.split_date_range if dates.instance_of?(String)
 
       list_section({
                      section: section,
@@ -1759,7 +1783,8 @@ module Doing
                      totals: opt[:totals],
                      duration: opt[:duration],
                      sort_tags: opt[:sort_tags],
-                     config_template: 'default'
+                     template: opt[:template],
+                     config_template: opt[:config_template]
                    })
     end
 
@@ -1794,7 +1819,8 @@ module Doing
         times: times,
         totals: opt[:totals],
         yesterday: true,
-        config_template: 'today'
+        config_template: opt[:config_template] || 'today',
+        template: opt[:template]
       }
 
       list_section(options)
@@ -1813,7 +1839,7 @@ module Doing
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
 
-      cfg = @config['templates']['recent'].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
+      cfg = @config['templates'][opt[:config_template]].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
         'order' => @config['order'] || 'asc',
@@ -1831,10 +1857,9 @@ module Doing
       opt[:wrap_width] = cfg['wrap_width']
       opt[:count] = count
       opt[:format] = cfg['date_format']
-      opt[:template] = cfg['template']
+      opt[:template] = opt[:template] || cfg['template']
       opt[:order] = 'asc'
       opt[:times] = times
-      opt[:config_template] = 'recent'
 
       list_section(opt)
     end
@@ -1847,7 +1872,7 @@ module Doing
     ##
     def last(times: true, section: nil, options: {})
       section = section.nil? || section =~ /all/i ? 'All' : guess_section(section)
-      cfg = @config['templates']['last'].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
+      cfg = @config['templates'][options[:config_template]].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
         'order' => @config['order'] || 'asc',
@@ -1859,19 +1884,19 @@ module Doing
       options[:interval_format] ||= cfg['interval_format'] || 'text'
 
       opts = {
-        section: section,
-        wrap_width: cfg['wrap_width'],
+        case: options[:case],
+        config_template: 'last',
         count: 1,
-        format: cfg['date_format'],
-        template: cfg['template'],
-        times: times,
+        delete: options[:delete],
         duration: options[:duration],
+        format: cfg['date_format'],
         interval_format: options[:interval_format],
-        case: options[:case],
         not: options[:negate],
-        config_template: 'last',
-        delete: options[:delete],
-        val: options[:val]
+        section: section,
+        template: options[:template] || cfg['template'],
+        times: times,
+        val: options[:val],
+        wrap_width: cfg['wrap_width']
       }
 
       if options[:tag]
@@ -2280,7 +2305,6 @@ EOS
 
       section_items = @content.in_section(section)
       max = section_items.count - count.to_i
-      moved_items = []
 
       counter = 0
 

data/lib/doing.rb

@@ -23,7 +23,9 @@ require 'tty-markdown'
 require 'tty-reader'
 require 'tty-screen'
 
+require_relative 'doing/changelog'
 require_relative 'doing/hash'
+require_relative 'doing/types'
 require_relative 'doing/colors'
 require_relative 'doing/template_string'
 require_relative 'doing/string'