doing 2.1.22 → 2.1.26

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]
@@ -399,7 +399,7 @@ module Doing
 
     # outputs item in Doing file format, including leading tab
     def to_s
-      "\t- #{@date.strftime('%Y-%m-%d %H:%M')} | #{@title}#{@note.empty? ? '' : "\n#{@note}"}"
+      "\t- #{@date.strftime('%Y-%m-%d %H:%M')} | #{@title}#{@note.good? ? "\n#{@note}" : ''}"
     end
 
     ##
@@ -429,6 +429,10 @@ module Doing
       %(<Doing::Item @date=#{@date}>)
     end
 
+    def clone
+      Marshal.load(Marshal.dump(self))
+    end
+
     private
 
     def should?(key)
@@ -457,7 +461,7 @@ module Doing
     end
 
     def all_searches?(searches, case_type: :smart)
-      return true if searches.nil? || searches.empty?
+      return true unless searches.good?
 
       text = @title + @note.to_s
       searches.each do |s|
@@ -468,7 +472,7 @@ module Doing
     end
 
     def no_searches?(searches, case_type: :smart)
-      return true if searches.nil? || searches.empty?
+      return true unless searches.good?
 
       text = @title + @note.to_s
       searches.each do |s|
@@ -479,7 +483,7 @@ module Doing
     end
 
     def any_searches?(searches, case_type: :smart)
-      return true if searches.nil? || searches.empty?
+      return true unless searches.good?
 
       text = @title + @note.to_s
       searches.each do |s|
@@ -490,7 +494,7 @@ module Doing
     end
 
     def all_tags?(tags)
-      return true if tags.nil? || tags.empty?
+      return true unless tags.good?
 
       tags.each do |tag|
         return false unless @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
@@ -499,7 +503,7 @@ module Doing
     end
 
     def no_tags?(tags)
-      return true if tags.nil? || tags.empty?
+      return true unless tags.good?
 
       tags.each do |tag|
         return false if @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
@@ -508,7 +512,7 @@ module Doing
     end
 
     def any_tags?(tags)
-      return true if tags.nil? || tags.empty?
+      return true unless tags.good?
 
       tags.each do |tag|
         return true if @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
@@ -537,7 +541,7 @@ module Doing
     end
 
     def any_values?(queries)
-      return true if queries.nil? || queries.empty?
+      return true unless queries.good?
 
       queries.each do |q|
         parts = split_value_query(q)
@@ -547,7 +551,7 @@ module Doing
     end
 
     def all_values?(queries)
-      return true if queries.nil? || queries.empty?
+      return true unless queries.good?
 
       queries.each do |q|
         parts = split_value_query(q)
@@ -557,7 +561,7 @@ module Doing
     end
 
     def no_values?(queries)
-      return true if queries.nil? || queries.empty?
+      return true unless queries.good?
 
       queries.each do |q|
         parts = split_value_query(q)
@@ -612,29 +616,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/pager.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'pathname'
 
 module Doing

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

data/lib/doing/plugins/import/calendar_import.rb

@@ -89,7 +89,7 @@ module Doing
 
       wwid.content.concat(new_items)
 
-      new_items.map { |item| Hooks.trigger :post_entry_added, self, item.dup }
+      new_items.map { |item| Hooks.trigger :post_entry_added, self, item }
 
       Doing.logger.info(%(Imported #{new_items.count} items to #{section}))
     end

data/lib/doing/plugins/import/doing_import.rb

@@ -93,7 +93,7 @@ module Doing
         wwid.content.add_section(item.section) unless wwid.content.section?(item.section)
         Hooks.trigger :pre_entry_add, self, item
         wwid.content.push(item)
-        Hooks.trigger :post_entry_added, self, item.dup
+        Hooks.trigger :post_entry_added, self, item
       end
 
       Doing.logger.info('Imported:', "#{imported.count} items")

data/lib/doing/plugins/import/timing_import.rb

@@ -93,7 +93,7 @@ module Doing
 
       wwid.content.concat(new_items)
 
-      new_items.map { |item| Hooks.trigger :post_entry_added, self, item.dup }
+      new_items.map { |item| Hooks.trigger :post_entry_added, self, item }
 
       Doing.logger.info('Imported:', %(#{new_items.count} items to #{section}))
     end

data/lib/doing/prompt.rb

@@ -8,6 +8,14 @@ module Doing
 
       include Color
 
+      ##
+      ## Clear the terminal screen
+      ##
+      def clear_screen(msg = nil)
+        puts "\e[H\e[2J" if STDOUT.tty?
+        puts msg if msg.good?
+      end
+
       def force_answer
         @force_answer ||= nil
       end

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)
     ##
@@ -92,7 +108,7 @@ module Doing
         escapes = scan(/(\e\[[\d;]+m)[^\e]+@/)
         color = color.split(' ') unless color.is_a?(Array)
         tag_color = color.each_with_object([]) { |c, arr| arr << Doing::Color.send(c) }.join('')
-        last_color = if !escapes.empty?
+        last_color = if escapes.good?
                        (escapes.count > 1 ? escapes[-2..-1] : [escapes[-1]]).map { |v| v[0] }.join('')
                      else
                        Doing::Color.default
@@ -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,7 +136,7 @@ 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]
@@ -449,7 +458,7 @@ module Doing
     ## @return     [String] Regular expression string
     ##
     def wildcard_to_rx
-      gsub(/\?/, '\S').gsub(/\*/, '\S*?')
+      gsub(/\?/, '\S').gsub(/\*/, '\S*?').gsub(/\]\]/, '--')
     end
 
     ##

data/lib/doing/string_chronify.rb

@@ -173,7 +173,7 @@ 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)$/

data/lib/doing/template_string.rb

@@ -131,7 +131,7 @@ module Doing
 
         after = m['after']
 
-        if value.nil? || value.empty?
+        if !value.good?
           after
         else
           pad = m['width'].to_i
@@ -183,7 +183,7 @@ module Doing
                   '  '
                 else
                   line = l.gsub(/%/, '\%').strip.wrap(width, pad: pad, indent: indent, offset: 0, prefix: prefix, color: last_color, after: after, reset: reset, pad_first: true)
-                  line.highlight_tags!(tags_color, last_color: last_color) unless !tags_color || tags_color.nil? || tags_color.empty?
+                  line.highlight_tags!(tags_color, last_color: last_color) unless !tags_color || !tags_color.good?
                   "#{line}  "
                 end
               end.join("\n")

data/lib/doing/types.rb

@@ -14,10 +14,13 @@ module Doing
 
     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)
+    DateRangeOptionalString = Class.new(Array)
     DateIntervalString = Class.new(DateTime)
   end
 end

data/lib/doing/util.rb

@@ -19,7 +19,7 @@ module Doing
     ## @param      cli   [String] The name or path of the cli
     ##
     def exec_available(cli)
-      return false if cli.nil?
+      return false unless cli.good?
 
       !TTY::Which.which(cli).nil?
     end
@@ -27,11 +27,12 @@ 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
-      .find { |cmd| exec_available(cmd.split.first) }
+              .find { |cmd| exec_available(cmd.split.first) }
     end
 
     def merge_default_proc(target, overwrite)
@@ -55,7 +56,7 @@ module Doing
     # @param      [Hash] other_hash   The other hash
     #
     def deep_merge_hashes(master_hash, other_hash)
-      deep_merge_hashes!(master_hash.dup, other_hash)
+      deep_merge_hashes!(master_hash.clone, other_hash)
     end
 
     # Merges a master hash with another hash, recursively.
@@ -156,32 +157,32 @@ module Doing
     def find_default_editor(editor_for = 'default')
       # return nil unless $stdout.isatty || ENV['DOING_EDITOR_TEST']
 
-      if ENV['DOING_EDITOR_TEST']
-        return ENV['EDITOR']
-      end
+      return ENV['EDITOR'] if ENV['DOING_EDITOR_TEST']
 
       editor_config = Doing.config.settings['editors']
 
       if editor_config.is_a?(String)
-        Doing.logger.warn('Deprecated:', "Please update your configuration, 'editors' should be a mapping. Delete the key and run `doing config --update`.")
+        msg = "Please update your configuration, 'editors' should be a mapping."
+        msg << ' Delete the key and run `doing config --update`.'
+        Doing.logger.warn('Deprecated:', msg)
         return editor_config
       end
 
       if editor_config[editor_for]
         editor = editor_config[editor_for]
         # Doing.logger.debug('Editor:', "Using #{editor} from config 'editors->#{editor_for}'")
-        return editor unless editor.nil? || editor.empty?
+        return editor unless editor.good?
       end
 
       if editor_for != 'editor' && editor_config['default']
         editor = editor_config['default']
         # Doing.logger.debug('Editor:', "Using #{editor} from config: 'editors->default'")
-        return editor unless editor.nil? || editor.empty?
+        return editor unless editor.good?
       end
 
       editor ||= ENV['DOING_EDITOR'] || ENV['GIT_EDITOR'] || ENV['EDITOR']
 
-      unless editor.nil? || editor.empty?
+      unless editor.good?
         # Doing.logger.debug('Editor:', "Found editor in environment variables: #{editor}")
         return editor
       end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.22'
+  VERSION = '2.1.26'
 end