doing 2.1.55 → 2.1.56

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

@@ -216,7 +216,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu May 26 07:14:02 2022 by
+  Generated on Thu May 26 10:22:39 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/doing.rdoc

@@ -5,7 +5,7 @@ record of what you've been doing, complete with tag-based time tracking. The
 command line tool allows you to add entries, annotate with tags and notes, and
 view your entries with myriad options, with a focus on a "natural" language syntax.
 
-v2.1.55
+v2.1.56
 
 === Global Options
 === --config_file arg
@@ -531,14 +531,14 @@ Deprecated, specify shell as argument to subcommand
 ====== Command: <tt>generate  [zsh|bash|fish|all]</tt>
 Generate completion scripts, including custom plugins and command options
 
-Argument specifies which shell to install for: zsh, bash, fish, all
+Argument specifies which shell to generate for: zsh, bash, fish, all
 ======= Options
 ======= -f|--file PATH
 
 Alternative file to write output to
 
 [Default Value] None
-Argument specifies which shell to install for: zsh, bash, fish, all
+Argument specifies which shell to generate for: zsh, bash, fish, all
 
 ======= --stdout
 Output result to STDOUT only

data/lib/doing/item/query.rb

@@ -152,6 +152,133 @@ module Doing
       negate ? !matches : matches
     end
 
+    ##
+    ## Used by filter_items determine whether an item matches a set of criteria
+    ##
+    ## @param      opt   [Hash] filter parameters
+    ##
+    ## @return     [Boolean] whether the item matches all filter criteria
+    ##
+    def keep_item?(opt)
+      item = dup
+      time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/i
+
+      keep = true
+      if opt[:unfinished]
+        finished = item.tags?('done', :and)
+        finished = opt[:not] ? !finished : finished
+        keep = false if finished
+      end
+
+      if keep && opt[:val]&.count&.positive?
+        bool = opt[:bool].normalize_bool if opt[:bool]
+        bool ||= :and
+        bool = :and if bool == :pattern
+
+        val_match = opt[:val].nil? || opt[:val].empty? ? true : item.tag_values?(opt[:val], bool)
+        keep = false unless val_match
+        keep = opt[:not] ? !keep : keep
+      end
+
+      if keep && opt[:tag]
+        opt[:tag_bool] = opt[:bool].normalize_bool if opt[:bool]
+        opt[:tag_bool] ||= :and
+        tag_match = opt[:tag].nil? || opt[:tag].empty? ? true : item.tags?(opt[:tag], opt[:tag_bool])
+        keep = false unless tag_match
+        keep = opt[:not] ? !keep : keep
+      end
+
+      if keep && opt[:search]
+        search_match = if opt[:search].nil? || opt[:search].empty?
+                         true
+                       else
+                         item.search(opt[:search], case_type: opt[:case].normalize_case)
+                       end
+
+        keep = false unless search_match
+        keep = opt[:not] ? !keep : keep
+      end
+
+      if keep && opt[:date_filter]&.length == 2
+        start_date = opt[:date_filter][0]
+        end_date = opt[:date_filter][1]
+
+        in_date_range = if end_date
+                          item.date >= start_date && item.date <= end_date
+                        else
+                          item.date.strftime('%F') == start_date.strftime('%F')
+                        end
+        keep = false unless in_date_range
+        keep = opt[:not] ? !keep : keep
+      end
+
+      if keep && opt[:time_filter][0] || opt[:time_filter][1]
+        opt[:time_filter].map! { |v| v =~ /(12 *am|midnight)/i ? '00:00' : v }
+
+        start_string = if opt[:time_filter][0].nil?
+                         "#{item.date.strftime('%Y-%m-%d')} 00:00"
+                       else
+                         "#{item.date.strftime('%Y-%m-%d')} #{opt[:time_filter][0]}"
+                       end
+        start_time = start_string.chronify(guess: :begin)
+
+        end_string = if opt[:time_filter][1].nil?
+                       "#{item.date.to_datetime.next_day.strftime('%Y-%m-%d')} 00:00"
+                     else
+                       "#{item.date.strftime('%Y-%m-%d')} #{opt[:time_filter][1]}"
+                     end
+        end_time = end_string.chronify(guess: :end) || Time.now
+
+        in_time_range = item.date >= start_time && item.date <= end_time
+
+        keep = false unless in_time_range
+        keep = opt[:not] ? !keep : keep
+      end
+
+      keep = false if keep && opt[:only_timed] && !item.interval
+
+      if keep && opt[:tag_filter]
+        keep = item.tags?(opt[:tag_filter]['tags'], opt[:tag_filter]['bool'])
+        keep = opt[:not] ? !keep : keep
+      end
+
+      if keep && opt[:before]
+        before = opt[:before]
+        cutoff = if before =~ time_rx
+                   "#{item.date.strftime('%Y-%m-%d')} #{before}".chronify(guess: :begin)
+                 elsif before.is_a?(String)
+                   before.chronify(guess: :begin)
+                 else
+                   before
+                 end
+        keep = cutoff && item.date <= cutoff
+        keep = opt[:not] ? !keep : keep
+      end
+
+      if keep && opt[:after]
+        after = opt[:after]
+        cutoff = if after =~ time_rx
+                   "#{item.date.strftime('%Y-%m-%d')} #{after}".chronify(guess: :end)
+                 elsif after.is_a?(String)
+                   after.chronify(guess: :end)
+                 else
+                   after
+                 end
+        keep = cutoff && item.date >= cutoff
+        keep = opt[:not] ? !keep : keep
+      end
+
+      if keep && opt[:today]
+        keep = item.date >= Date.today.to_time && item.date < Date.today.next_day.to_time
+        keep = opt[:not] ? !keep : keep
+      elsif keep && opt[:yesterday]
+        keep = item.date >= Date.today.prev_day.to_time && item.date < Date.today.to_time
+        keep = opt[:not] ? !keep : keep
+      end
+
+      keep
+    end
+
     private
 
     def all_searches?(searches, case_type: :smart)
@@ -191,11 +318,9 @@ module Doing
       return true unless tags.good?
 
       tags.each do |tag|
-        if tag =~ /done/ && !should_finish?
-          next
-        else
-          return false unless @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
-        end
+        next if tag =~ /done/ && !should_finish?
+
+        return false unless @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
       end
       true
     end
@@ -204,11 +329,9 @@ module Doing
       return true unless tags.good?
 
       tags.each do |tag|
-        if tag =~ /done/ && !should_finish?
-          return false
-        else
-          return false if @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
-        end
+        return false if tag =~ /done/ && !should_finish?
+
+        return false if @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
       end
       true
     end
@@ -217,11 +340,9 @@ module Doing
       return true unless tags.good?
 
       tags.each do |tag|
-        if tag =~ /done/ && !should_finish?
-          return true
-        else
-          return true if @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
-        end
+        return true if tag =~ /done/ && !should_finish?
+
+        return true if @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
       end
       false
     end
@@ -393,7 +514,7 @@ module Doing
           return false if val.nil? || tag_val.nil?
 
           # Fail unless both values are of the same class (float or date)
-          return false unless val.class == tag_val.class
+          return false unless val.instance_of?(tag_val.class)
 
           is_match = value_number_matches?(tag_val, comp, val)
 

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

@@ -60,6 +60,7 @@ module Doing
         all_items << {
           date: i.date.strftime('%a %-I:%M%p'),
           shortdate: i.date.relative_date,
+          flagged: i.title =~ /(?<= |^)@#{Doing.setting('marker_tag')}/,
           done: done,
           note: note,
           section: i.section,

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.55'
+  VERSION = '2.1.56'
 end

data/lib/doing/wwid/display.rb

@@ -212,7 +212,7 @@ module Doing
     ##
     def recent(count = 10, section = nil, opt)
       opt ||= {}
-      times = opt[:t] || true
+      opt[:times] ||= false
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
 
@@ -236,7 +236,6 @@ module Doing
       opt[:format] = cfg['date_format']
       opt[:template] = opt[:template] || cfg['template']
       opt[:order] = :asc
-      opt[:times] = times
 
       list_section(opt)
     end

data/lib/doing/wwid/filter.rb

@@ -13,15 +13,19 @@ 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 { |item, idx| "#{item.title} #{item.note.join(' ')}".gsub(/[|*?!]/, '') + "|#{idx}" }.join("\n")
 
-      fzf_args = [
-        '--multi',
-        %(--filter="#{query.sub(/^'?/, "'")}"),
-        '--no-sort',
-        '-d "\|"',
-        '--nth=1'
-      ]
+      res = `echo #{Shellwords.escape(scannable)}|#{Prompt.fzf} #{fuzzy_filter_args(query, case_type).join(' ')}`
+      selected = Items.new
+      res.split(/\n/).each do |item|
+        idx = item.match(/\|(\d+)$/)[1].to_i
+        selected.push(items[idx])
+      end
+      selected
+    end
+
+    def fuzzy_filter_args(query, case_type)
+      fzf_args = ['--multi', %(--filter="#{query.sub(/^'?/, "'")}"), '--no-sort', '-d "\|"', '--nth=1']
       fzf_args << case case_type.normalize_case
                   when :smart
                     query =~ /[A-Z]/ ? '+i' : '-i'
@@ -30,16 +34,7 @@ module Doing
                   when :ignore
                     '-i'
                   end
-
-      # fzf_args << '-e' if opt[:exact]
-      # puts fzf_args.join(' ')
-      res = `echo #{Shellwords.escape(scannable)}|#{Prompt.fzf} #{fzf_args.join(' ')}`
-      selected = Items.new
-      res.split(/\n/).each do |item|
-        idx = item.match(/\|(\d+)$/)[1].to_i
-        selected.push(items[idx])
-      end
-      selected
+      fzf_args
     end
 
     ##
@@ -95,122 +90,8 @@ module Doing
 
       items.sort_by! { |item| [item.date, item.title.downcase] }.reverse
 
-      filtered_items = items.select do |item|
-        keep = true
-        if opt[:unfinished]
-          finished = item.tags?('done', :and)
-          finished = opt[:not] ? !finished : finished
-          keep = false if finished
-        end
-
-        if keep && opt[:val]&.count&.positive?
-          bool = opt[:bool].normalize_bool if opt[:bool]
-          bool ||= :and
-          bool = :and if bool == :pattern
-
-          val_match = opt[:val].nil? || opt[:val].empty? ? true : item.tag_values?(opt[:val], bool)
-          keep = false unless val_match
-          keep = opt[:not] ? !keep : keep
-        end
-
-        if keep && opt[:tag]
-          opt[:tag_bool] = opt[:bool].normalize_bool if opt[:bool]
-          opt[:tag_bool] ||= :and
-          tag_match = opt[:tag].nil? || opt[:tag].empty? ? true : item.tags?(opt[:tag], opt[:tag_bool])
-          keep = false unless tag_match
-          keep = opt[:not] ? !keep : keep
-        end
-
-        if keep && opt[:search]
-          search_match = if opt[:search].nil? || opt[:search].empty?
-                           true
-                         else
-                           item.search(opt[:search], case_type: opt[:case].normalize_case)
-                         end
+      filtered_items = items.select { |item| item.keep_item?(opt) }
 
-          keep = false unless search_match
-          keep = opt[:not] ? !keep : keep
-        end
-
-        if keep && opt[:date_filter]&.length == 2
-          start_date = opt[:date_filter][0]
-          end_date = opt[:date_filter][1]
-
-          in_date_range = if end_date
-                            item.date >= start_date && item.date <= end_date
-                          else
-                            item.date.strftime('%F') == start_date.strftime('%F')
-                          end
-          keep = false unless in_date_range
-          keep = opt[:not] ? !keep : keep
-        end
-
-        if keep && opt[:time_filter][0] || opt[:time_filter][1]
-          opt[:time_filter].map! { |v| v =~ /(12 *am|midnight)/i ? '00:00' : v }
-
-          start_string = if opt[:time_filter][0].nil?
-                           "#{item.date.strftime('%Y-%m-%d')} 00:00"
-                         else
-                           "#{item.date.strftime('%Y-%m-%d')} #{opt[:time_filter][0]}"
-                         end
-          start_time = start_string.chronify(guess: :begin)
-
-          end_string = if opt[:time_filter][1].nil?
-                         "#{item.date.to_datetime.next_day.strftime('%Y-%m-%d')} 00:00"
-                       else
-                         "#{item.date.strftime('%Y-%m-%d')} #{opt[:time_filter][1]}"
-                       end
-          end_time = end_string.chronify(guess: :end) || Time.now
-
-          in_time_range = item.date >= start_time && item.date <= end_time
-
-          keep = false unless in_time_range
-          keep = opt[:not] ? !keep : keep
-        end
-
-        keep = false if keep && opt[:only_timed] && !item.interval
-
-        if keep && opt[:tag_filter]
-          keep = item.tags?(opt[:tag_filter]['tags'], opt[:tag_filter]['bool'])
-          keep = opt[:not] ? !keep : keep
-        end
-
-        if keep && opt[:before]
-          before = opt[:before]
-          cutoff = if before =~ time_rx
-                     "#{item.date.strftime('%Y-%m-%d')} #{before}".chronify(guess: :begin)
-                   elsif before.is_a?(String)
-                     before.chronify(guess: :begin)
-                   else
-                     before
-                   end
-          keep = cutoff && item.date <= cutoff
-          keep = opt[:not] ? !keep : keep
-        end
-
-        if keep && opt[:after]
-          after = opt[:after]
-          cutoff = if after =~ time_rx
-                     "#{item.date.strftime('%Y-%m-%d')} #{after}".chronify(guess: :end)
-                   elsif after.is_a?(String)
-                     after.chronify(guess: :end)
-                   else
-                     after
-                   end
-          keep = cutoff && item.date >= cutoff
-          keep = opt[:not] ? !keep : keep
-        end
-
-        if keep && opt[:today]
-          keep = item.date >= Date.today.to_time && item.date < Date.today.next_day.to_time
-          keep = opt[:not] ? !keep : keep
-        elsif keep && opt[:yesterday]
-          keep = item.date >= Date.today.prev_day.to_time && item.date < Date.today.to_time
-          keep = opt[:not] ? !keep : keep
-        end
-
-        keep
-      end
       count = opt[:count].to_i&.positive? ? opt[:count].to_i : filtered_items.count
 
       output = Items.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.55
+  version: 2.1.56
 platform: ruby
 authors:
 - Brett Terpstra