doing 2.1.89 → 2.1.91

data/lib/doing/wwid/editor.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'English'
 module Doing
   class WWID
     ##
@@ -37,7 +38,7 @@ module Doing
       Process.wait(pid)
 
       begin
-        if $?.exitstatus == 0
+        if $CHILD_STATUS.exitstatus.zero?
           input = IO.read(tmpfile.path)
         else
           exit_now! 'Cancelled'
@@ -84,7 +85,7 @@ module Doing
       end
 
       note = Note.new
-      note.add(input_lines[1..-1]) if input_lines.length > 1
+      note.add(input_lines[1..]) if input_lines.length > 1
       # If title line ends in a parenthetical, use that as the note
       if note.empty? && title =~ /\s+\(.*?\)$/
         title.sub!(/\s+\((?<note>.*?)\)$/) do
@@ -123,24 +124,24 @@ module Doing
     end
 
     def edit_items(items)
-      items.sort_by! { |i| i.date }
+      items.sort_by!(&:date)
       editable_items = []
 
       items.each do |i|
         editable = "#{i.date.strftime('%F %R')} | #{i.title}"
-        old_note = i.note ? i.note.strip_lines.join("\n") : nil
+        old_note = i.note&.strip_lines&.join("\n")
         editable += "\n#{old_note}" unless old_note.nil?
         editable_items << editable
       end
-      divider = "-----------"
-      notice =<<~EONOTICE
+      divider = '-----------'
+      notice = <<~EONOTICE
 
-      # - You may delete entries, but leave all divider lines (---) in place.
-      # - Start and @done dates replaced with a time string (yesterday 3pm) will
-      #   be parsed automatically. Do not delete the pipe (|) between start date
-      #   and entry title.
+        # - You may delete entries, but leave all divider lines (---) in place.
+        # - Start and @done dates replaced with a time string (yesterday 3pm) will
+        #   be parsed automatically. Do not delete the pipe (|) between start date
+        #   and entry title.
       EONOTICE
-      input =  "#{editable_items.map(&:strip).join("\n#{divider}\n")}\n"
+      input = "#{editable_items.map(&:strip).join("\n#{divider}\n")}\n"
 
       new_items = fork_editor(input, message: notice).split(/^#{divider}/).map(&:strip)
 
@@ -162,7 +163,7 @@ module Doing
           item.date = date || items[i].date
           item.title = title
           item.note = note
-          if (item.equal?(old_item))
+          if item.equal?(old_item)
             Doing.logger.count(:skipped, level: :debug)
           else
             Doing.logger.count(:updated)

data/lib/doing/wwid/filetools.rb

@@ -8,7 +8,7 @@ module Doing
     ## @param      path  [String] Override path to a doing file, optional
     ##
     def init_doing_file(path = nil)
-      @doing_file =  File.expand_path(Doing.setting('doing_file'))
+      @doing_file = File.expand_path(Doing.setting('doing_file'))
 
       if path.nil?
         create(@doing_file) unless File.exist?(@doing_file)
@@ -107,7 +107,7 @@ module Doing
       keep = opt[:keep] || 0
       tags = []
       tags.concat(opt[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }) if opt[:tag]
-      bool  = opt[:bool] || :and
+      bool = opt[:bool] || :and
 
       sect = opt[:section] !~ /^all$/i ? guess_section(opt[:section]) : 'all'
 
@@ -121,27 +121,29 @@ module Doing
 
       section_items.each do |item|
         break if counter >= max
+
         if opt[:before]
           time_string = opt[:before]
           cutoff = time_string.chronify(guess: :begin)
         end
 
-        unless ((!tags.empty? && !item.tags?(tags, bool)) || (opt[:search] && !item.search(opt[:search].to_s)) || (opt[:before] && item.date >= cutoff))
-          new_item = @content.delete(item)
-          Hooks.trigger :post_entry_removed, self, item.clone
-          raise DoingRuntimeError, "Error deleting item: #{item}" if new_item.nil?
+        next if (!tags.empty? && !item.tags?(tags,
+                                             bool)) || (opt[:search] && !item.search(opt[:search].to_s)) || (opt[:before] && item.date >= cutoff)
 
-          new_content.add_section(new_item.section, log: false)
-          new_content.push(new_item)
-          counter += 1
-        end
+        new_item = @content.delete(item)
+        Hooks.trigger :post_entry_removed, self, item.clone
+        raise DoingRuntimeError, "Error deleting item: #{item}" if new_item.nil?
+
+        new_content.add_section(new_item.section, log: false)
+        new_content.push(new_item)
+        counter += 1
       end
 
       if counter.positive?
         logger.count(:rotated,
                      level: :info,
                      count: counter,
-                     message: "Rotated %count %items")
+                     message: 'Rotated %count %items')
       else
         logger.info('Skipped:', 'No items were rotated')
       end

data/lib/doing/wwid/filter.rb

@@ -13,7 +13,9 @@ module Doing
     # @return     [Items] Filtered Items array
     #
     def fuzzy_filter_items(items, query, case_type: :smart)
-      scannable = items.map.with_index { |item, idx| "#{item.title} #{item.note.join(' ')}".gsub(/[|*?!]/, '') + "|#{idx}" }.join("\n")
+      scannable = items.map.with_index do |item, idx|
+        "#{item.title} #{item.note.join(' ')}".gsub(/[|*?!]/, '') + "|#{idx}"
+      end.join("\n")
 
       res = `echo #{Shellwords.escape(scannable)}|#{Prompt.fzf} #{fuzzy_filter_args(query, case_type).join(' ')}`
       selected = Items.new
@@ -59,59 +61,58 @@ module Doing
     ## @option opt [Array] :val (nil) Array of tag value queries
     ##
     def filter_items(items = Items.new, opt: {})
-      logger.benchmark(:filter_items, :start)
-      time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/i
+      logger.measure(:filter_items) do
+        time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/i
 
-      if items.nil? || items.empty?
-        section = !opt[:section] || opt[:section].empty? ? 'All' : guess_section(opt[:section])
-        if section.is_a?(Array)
-          section.each do |s|
-            s = s[0] if s.is_a?(Array)
-            items.concat(s =~ /^all$/i ? @content.clone : @content.in_section(s))
+        if items.nil? || items.empty?
+          section = !opt[:section] || opt[:section].empty? ? 'All' : guess_section(opt[:section])
+          if section.is_a?(Array)
+            section.each do |s|
+              s = s[0] if s.is_a?(Array)
+              items.concat(s =~ /^all$/i ? @content.clone : @content.in_section(s))
+            end
+          else
+            items = section =~ /^all$/i ? @content.clone : @content.in_section(section)
           end
-        else
-          items = section =~ /^all$/i ? @content.clone : @content.in_section(section)
         end
-      end
 
-      unless opt[:time_filter]
-        opt[:time_filter] = [nil, nil]
-        if opt[:from] && !opt[:date_filter]
-          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]
+        unless opt[:time_filter]
+          opt[:time_filter] = [nil, nil]
+          if opt[:from] && !opt[:date_filter]
+            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
         end
-      end
 
-      if opt[:before].is_a?(String) && opt[:before] =~ time_rx
-        opt[:time_filter][1] = opt[:before]
-        opt[:before] = nil
-      end
-
-      if opt[:after].is_a?(String) && opt[:after] =~ time_rx
-        opt[:time_filter][0] = opt[:after]
-        opt[:after] = nil
-      end
+        if opt[:before].is_a?(String) && opt[:before] =~ time_rx
+          opt[:time_filter][1] = opt[:before]
+          opt[:before] = nil
+        end
 
-      items.sort_by! { |item| [item.date, item.title.downcase] }.reverse
+        if opt[:after].is_a?(String) && opt[:after] =~ time_rx
+          opt[:time_filter][0] = opt[:after]
+          opt[:after] = nil
+        end
 
-      filtered_items = items.select { |item| item.keep_item?(opt) }
+        items.sort_by! { |item| [item.date, item.title.downcase] }.reverse
 
-      count = opt[:count].to_i&.positive? ? opt[:count].to_i : filtered_items.count
+        filtered_items = items.select { |item| item.keep_item?(opt) }
 
-      output = Items.new
+        count = opt[:count].to_i&.positive? ? opt[:count].to_i : filtered_items.count
 
-      if opt[:age] && opt[:age].normalize_age == :oldest
-        output.concat(filtered_items.slice(0, count).reverse)
-      else
-        output.concat(filtered_items.reverse.slice(0, count))
-      end
+        output = Items.new
 
-      logger.benchmark(:filter_items, :finish)
+        if opt[:age] && opt[:age].normalize_age == :oldest
+          output.concat(filtered_items.slice(0, count).reverse)
+        else
+          output.concat(filtered_items.reverse.slice(0, count))
+        end
 
-      output
+        output
+      end
     end
   end
 end

data/lib/doing/wwid/guess.rb

@@ -9,9 +9,7 @@ module Doing
     ## @param      guessed  [Boolean] already guessed and failed
     ##
     def guess_section(frag, guessed: false, suggest: false)
-      if frag.is_a?(Array) && frag.count == 1
-        frag = frag[0]
-      end
+      frag = frag[0] if frag.is_a?(Array) && frag.count == 1
 
       frag = frag.split(/ *, */).map(&:strip) if frag.is_a?(String) && frag =~ /,/
 
@@ -25,7 +23,7 @@ module Doing
 
       found = @content.guess_section(frag, distance: 2)
 
-      section = found ? found.title : nil
+      section = found&.title
 
       if section && suggest
         Doing.logger.debug('Match:', %(Assuming "#{section}" from "#{frag}"))
@@ -38,12 +36,12 @@ module Doing
           prompt = Color.template("{bw}Did you mean `{xy}doing {by}view {xy}#{alt}`{bw}?{x}")
           meant_view = Prompt.yn(prompt, default_response: 'n')
 
-          msg = format('%<y>srun with `%<w>sdoing view %<alt>s%<y>s`', w: boldwhite, y: yellow, alt: alt)
+          msg = format('%<y>srun with `%<w>sdoing view %<alt>s%<y>s`', w: Color.boldwhite, y: Color.yellow, alt: alt)
           raise Errors::WrongCommand.new(msg, topic: 'Try again:') if meant_view
 
         end
 
-        res = Prompt.yn("#{boldwhite}Section #{frag.yellow}#{boldwhite} not found, create it", default_response: 'n')
+        res = Prompt.yn("#{Color.boldwhite}Section #{Color.yellow(frag)}#{Color.boldwhite} not found, create it", default_response: 'n')
 
         if res
           @content.add_section(frag.cap_first, log: true)
@@ -53,7 +51,7 @@ module Doing
 
         raise Errors::InvalidSection.new("unknown section #{frag.bold.white}", topic: 'Missing:')
       end
-      section ? section.cap_first : nil
+      section&.cap_first
     end
 
     ##
@@ -82,7 +80,7 @@ module Doing
         meant_view = Prompt.yn(prompt, default_response: 'n')
 
         if meant_view
-          msg = format('%<y>srun with `%<w>sdoing show %<alt>s%<y>s`', w: boldwhite, y: yellow, alt: alt)
+          msg = format('%<y>srun with `%<w>sdoing show %<alt>s%<y>s`', w: Color.boldwhite, y: Color.yellow, alt: alt)
           raise Errors::WrongCommand.new(msg, topic: 'Try again:')
 
         end

data/lib/doing/wwid/interactive.rb

@@ -25,14 +25,14 @@ module Doing
       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 val].each_with_object({}) {
+      filter_options = %i[after before case date_filter from fuzzy not search section val].each_with_object({}) do
         |k, hsh| hsh[k] = opt[k]
-      }
+      end
       items = filter_items(Items.new, opt: filter_options)
 
-      menu_options = %i[search query exact multiple show_if_single menu sort case].each_with_object({}) {
-        |k, hsh| hsh[k] = opt[k]
-      }
+      menu_options = %i[search query exact multiple show_if_single menu sort case].each_with_object({}) do |k, hsh|
+        hsh[k] = opt[k]
+      end
       include_section = (opt[:section].is_a?(Array) && opt[:section][0] =~ /^all$/i) || (opt[:section].is_a?(String) && opt[:section] =~ /^all$/i)
 
       selection = Prompt.choose_from_items(items, include_section: include_section, **menu_options)
@@ -118,7 +118,7 @@ module Doing
             tags = type == 'add' ? all_tags(@content) : all_tags(items)
 
             add_msg = type == 'add' ? ', include values with tag(value)' : ''
-            puts "#{yellow}Separate multiple tags with spaces, hit tab to complete known tags#{add_msg}"
+            puts "#{Color.yellow}Separate multiple tags with spaces, hit tab to complete known tags#{add_msg}"
             puts "#{boldgreen}Available tags: #{boldwhite}#{tags.sort.map(&:add_at).join(', ')}" if type == 'remove'
             tag = Prompt.read_line(prompt: "Tags to #{type}", completions: tags)
 
@@ -255,8 +255,8 @@ module Doing
 
       if opt[:editor]
         sleep 2 # This seems to be necessary between running fzf
-                # and forking the editor, otherwise vim gets all
-                # screwy and I can't figure out why
+        # and forking the editor, otherwise vim gets all
+        # screwy and I can't figure out why
         edit_items(items) # hooked
 
         write(@doing_file)
@@ -365,9 +365,9 @@ module Doing
       elapsed = finish_date - date
 
       if max_elapsed.positive? && (elapsed > max_elapsed)
-        puts boldwhite(title) if title
+        puts Color.boldwhite(title) if title
         human = elapsed.time_string(format: :natural)
-        res = Prompt.yn(yellow("Did this entry actually take #{human}"), default_response: true)
+        res = Prompt.yn(Color.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?

data/lib/doing/wwid/modify.rb

@@ -19,7 +19,7 @@ module Doing
       opt ||= {}
       section ||= Doing.setting('current_section')
       @content.add_section(section, log: false)
-      opt[:back] ||= opt[:date] ? opt[:date] : Time.now
+      opt[:back] ||= opt[:date] || Time.now
       opt[:date] ||= Time.now
       note = Note.new
       opt[:timed] ||= false
@@ -78,8 +78,8 @@ module Doing
       if finish_date
         item.tag('done', remove: true)
         item.tag('done', value: finish_date.strftime('%F %R'))
-      else
-        item.tag('done', remove: true) if resume
+      elsif resume
+        item.tag('done', remove: true)
       end
       logger.info('Reset:', %(Reset #{resume ? 'and resumed ' : ''} "#{item.title}" in #{item.section}))
       item
@@ -118,7 +118,7 @@ module Doing
       note = opt[:note] || Note.new
 
       if opt[:editor]
-        start = opt[:date] ? opt[:date] : Time.now
+        start = opt[:date] || Time.now
         to_edit = "#{start.strftime('%F %R')} | #{title}"
         to_edit += "\n#{note.strip_lines.join("\n")}" unless note.empty?
         new_item = fork_editor(to_edit)
@@ -168,7 +168,8 @@ module Doing
     ##
     ## @see        #filter_items
     ##
-    def tag_last(opt) # hooked
+    # hooked
+    def tag_last(opt)
       opt ||= {}
       opt[:count] ||= 1
       opt[:archive] ||= false
@@ -186,11 +187,11 @@ module Doing
 
       if opt[:interactive]
         items = Prompt.choose_from_items(items, include_section: opt[:section] =~ /^all$/i, menu: true,
-                                    header: '',
-                                    prompt: 'Select entries to tag > ',
-                                    multiple: true,
-                                    sort: true,
-                                    show_if_single: true)
+                                                header: '',
+                                                prompt: 'Select entries to tag > ',
+                                                multiple: true,
+                                                sort: true,
+                                                show_if_single: true)
 
         raise NoResults, 'no items selected' if items.empty?
 
@@ -201,9 +202,9 @@ module Doing
       if opt[:tags].empty? && !opt[:autotag]
         completions = opt[:remove] ? all_tags(items) : all_tags(@content)
         if opt[:remove]
-          puts "#{yellow}Available tags: #{boldwhite}#{completions.map(&:add_at).join(', ')}"
+          puts "#{Color.yellow}Available tags: #{Color.boldwhite}#{completions.map(&:add_at).join(', ')}"
         else
-          puts "#{yellow}Use tab to complete known tags"
+          puts "#{Color.yellow}Use tab to complete known tags"
         end
         opt[:tags] = Doing::Prompt.read_line(prompt: "Enter tag(s) to #{opt[:remove] ? 'remove' : 'add'}",
                                              completions: completions,
@@ -265,12 +266,12 @@ module Doing
               elapsed = done_date - item.date
 
               if max_elapsed.positive? && (elapsed > max_elapsed) && !opt[:took]
-                puts boldwhite(item.title)
+                puts Color.boldwhite(item.title)
                 human = elapsed.time_string(format: :natural)
-                res = Prompt.yn(yellow("Did this actually take #{human}"), default_response: true)
+                res = Prompt.yn(Color.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
+                  raise InvalidTimeExpression, 'Unrecognized time span entry' unless new_elapsed.positive?
 
                   opt[:took] = new_elapsed
                   done_date = item.calculate_end_date(opt) if opt[:took]
@@ -289,7 +290,8 @@ module Doing
               end
               old_title = item.title.dup
               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)
+              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
@@ -310,7 +312,7 @@ module Doing
 
         item.note.add(opt[:note]) if opt[:note]
 
-        if opt[:archive] && opt[:section] != 'Archive' && (opt[:count]).positive?
+        if opt[:archive] && opt[:section] != 'Archive' && opt[:count].positive?
           item.move_to('Archive', label: true)
         elsif opt[:archive] && opt[:count].zero?
           logger.warn('Skipped:', 'Archiving is skipped when operating on all entries')
@@ -376,7 +378,6 @@ module Doing
         Hooks.trigger :post_entry_updated, self, item, old_item
       end
 
-
       logger.debug('Skipped:', "No active @#{tag} tasks found.") if found_items.zero?
 
       if opt[:new_item]
@@ -398,7 +399,7 @@ module Doing
     ##
     def delete_items(items, force: false)
       items.slice(0, 5).each { |i| puts i.to_pretty } unless force
-      puts softpurple("+ #{items.size - 5} additional #{'item'.to_p(items.size - 5)}") if items.size > 5 && !force
+      puts Color.softpurple("+ #{items.size - 5} additional #{'item'.to_p(items.size - 5)}") if items.size > 5 && !force
 
       res = force ? true : Prompt.yn("Delete #{items.size} #{'item'.to_p(items.size)}?", default_response: 'y')
       return unless res
@@ -431,12 +432,13 @@ module Doing
 
       destination = guess_section(destination)
 
-      if @content.section?(destination) && (@content.section?(section) || archive_all)
-        do_archive(section, destination, { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label], before: options[:before], after: options[:after], from: options[:from] })
-        write(doing_file)
-      else
+      unless @content.section?(destination) && (@content.section?(section) || archive_all)
         raise InvalidArgument, 'Either source or destination does not exist'
       end
+
+      do_archive(section, destination,
+                 { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label], before: options[:before], after: options[:after], from: options[:from] })
+      write(doing_file)
     end
 
     ##
@@ -483,43 +485,41 @@ module Doing
         end
       end
 
-      if Doing.setting('autotag.transform')
-        Doing.setting('autotag.transform').each do |tag|
-          next unless tag =~ /\S+:\S+/
+      Doing.setting('autotag.transform')&.each do |tag|
+        next unless tag =~ /\S+:\S+/
 
-          if tag =~ /::/
-            rx, r = tag.split(/::/)
-          else
-            rx, r = tag.split(/:/)
-          end
+        if tag =~ /::/
+          rx, r = tag.split(/::/)
+        else
+          rx, r = tag.split(/:/)
+        end
 
-          flag_rx = %r{/([r]+)$}
-          if r =~ flag_rx
-            flags = r.match(flag_rx)[1].split(//)
-            r.sub!(flag_rx, '')
-          end
-          r.gsub!(/\$/, '\\')
-          rx.sub!(/^@?/, '@')
-          regex = Regexp.new("(?<= |\\A)#{rx}(?= |\\Z)")
+        flag_rx = %r{/(r+)$}
+        if r =~ flag_rx
+          flags = r.match(flag_rx)[1].split(//)
+          r.sub!(flag_rx, '')
+        end
+        r.gsub!(/\$/, '\\')
+        rx.sub!(/^@?/, '@')
+        regex = Regexp.new("(?<= |\\A)#{rx}(?= |\\Z)")
 
-          text.sub!(regex) do
-            m = Regexp.last_match
-            new_tag = r
+        text.sub!(regex) do
+          m = Regexp.last_match
+          new_tag = r
 
-            m.to_a.slice(1, m.length - 1).each_with_index do |v, idx|
-              next if v.nil?
+          m.to_a.slice(1, m.length - 1).each_with_index do |v, idx|
+            next if v.nil?
 
-              new_tag.gsub!("\\#{idx + 1}", v)
-            end
-            # Replace original tag if /r
-            if flags&.include?('r')
-              tagged[:replaced].concat(new_tag.split(/ /).map { |t| t.sub(/^@/, '') })
-              new_tag.split(/ /).map { |t| t.sub(/^@?/, '@') }.join(' ')
-            else
-              tagged[:transformed].concat(new_tag.split(/ /).map { |t| t.sub(/^@/, '') })
-              tagged[:transformed] = tagged[:transformed].uniq
-              m[0]
-            end
+            new_tag.gsub!("\\#{idx + 1}", v)
+          end
+          # Replace original tag if /r
+          if flags&.include?('r')
+            tagged[:replaced].concat(new_tag.split(/ /).map { |t| t.sub(/^@/, '') })
+            new_tag.split(/ /).map { |t| t.sub(/^@?/, '@') }.join(' ')
+          else
+            tagged[:transformed].concat(new_tag.split(/ /).map { |t| t.sub(/^@/, '') })
+            tagged[:transformed] = tagged[:transformed].uniq
+            m[0]
           end
         end
       end

data/lib/doing/wwid/timers.rb

@@ -69,13 +69,11 @@ EOTAIL
         pad = sorted_tags_data.map { |k, _| k }.group_by(&:size).max.last[0].length
         pad = 7 if pad < 7
         output = <<~EOHEADER
-  | #{' ' * (pad - 7)}project | time     |
-  | #{'-' * (pad - 1)}: | :------- |
+          | #{' ' * (pad - 7)}project | time     |
+          | #{'-' * (pad - 1)}: | :------- |
         EOHEADER
         sorted_tags_data.reverse.each do |k, v|
-          if v.positive?
-            output += "| #{' ' * (pad - k.length)}#{k} | #{v.time_string(format: :clock)} |\n"
-          end
+          output += "| #{' ' * (pad - k.length)}#{k} | #{v.time_string(format: :clock)} |\n" if v.positive?
         end
         tail = '[Tag Totals]'
         output + tail
@@ -173,6 +171,7 @@ EOTAIL
     def record_tag_times(item, seconds)
       item_hash = "#{item.date.strftime('%s')}#{item.title}#{item.section}"
       return if @recorded_items.include?(item_hash)
+
       item.title.scan(/(?mi)@(\S+?)(\(.*\))?(?=\s|$)/).each do |m|
         k = m[0] == 'done' ? 'All' : m[0].downcase
         if @timers.key?(k)

data/lib/doing/wwid/wwidutil.rb

@@ -32,7 +32,7 @@ module Doing
     ##
     def import(paths, opt)
       opt ||= {}
-      Plugins.plugins[:import].each do |_, options|
+      Plugins.plugins[:import].each_value do |options|
         next unless opt[:type] =~ /^(#{options[:trigger].normalize_trigger})$/i
 
         if paths.count.positive?
@@ -54,17 +54,15 @@ module Doing
     ##                       alternative config file
     ##
     def configure(filename = nil)
-      logger.benchmark(:configure, :start)
+      logger.measure(:configure) do
+        if filename
+          Doing.config_with(filename, { ignore_local: true })
+        elsif ENV['DOING_CONFIG']
+          Doing.config_with(ENV['DOING_CONFIG'], { ignore_local: true })
+        end
 
-      if filename
-        Doing.config_with(filename, { ignore_local: true })
-      elsif ENV['DOING_CONFIG']
-        Doing.config_with(ENV['DOING_CONFIG'], { ignore_local: true })
+        Doing.set('backup_dir', ENV['DOING_BACKUP_DIR']) if ENV['DOING_BACKUP_DIR']
       end
-
-      logger.benchmark(:configure, :finish)
-
-      Doing.set('backup_dir', ENV['DOING_BACKUP_DIR']) if ENV['DOING_BACKUP_DIR']
     end
 
     ##

data/lib/examples/commands/wiki.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 desc 'Output a tag wiki'
 command :wiki do |c|
   c.desc 'Section to rotate'

data/lib/examples/plugins/capture_thing_import.rb

@@ -50,7 +50,7 @@ module Doing
       new_items = wwid.filter_items(new_items, opt: options)
 
       skipped = total - new_items.count
-      Doing.logger.debug('Skipped:' , %(#{skipped} items that didn't match filter criteria)) if skipped.positive?
+      Doing.logger.debug('Skipped:', %(#{skipped} items that didn't match filter criteria)) if skipped.positive?
 
       imported = []
 

data/lib/examples/plugins/say_export.rb

@@ -81,7 +81,6 @@ module Doing
       }
     end
 
-
     #-------------------------------------------------------
     ## Output a template. Only required if template(s) are
     ## included in settings. The method should return a
@@ -100,10 +99,10 @@ module Doing
     ##
     def self.template(trigger)
       return unless trigger =~ /^say(it)?$/
+
       'On %date, you were %title, recorded in section %section%took'
     end
 
-
     ##
     ## Render data received from an output
     ##             command