doing 2.1.79 → 2.1.81

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

@@ -6,7 +6,7 @@
 <title>
   Top Level Namespace
   
-    &mdash; Documentation by YARD 0.9.28
+    &mdash; Documentation by YARD 0.9.34
   
 </title>
 
@@ -216,9 +216,9 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Mar 11 10:27:41 2023 by
+  Generated on Wed May 31 15:49:41 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.28 (ruby-3.0.1).
+  0.9.34 (ruby-3.2.0).
 </div>
 
     </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.79
+v2.1.81
 
 === Global Options
 === --config_file arg
@@ -889,7 +889,7 @@ Force exact search string matching (case sensitive)
 ==== Command: <tt>grep|search  SEARCH_PATTERN</tt>
 Search for entries
 
-Search all sections (or limit to a single section) for entries matching text or regular expression. Normal strings are fuzzy matched.
+Search all sections (or limit to a specific sections) for entries matching text or regular expression. Normal strings are fuzzy matched.
 
 To search with regular expressions, single quote the string and surround with slashes: `doing search '/m.*?x/'`
 ===== Options

data/lib/doing/array/array.rb

@@ -22,5 +22,14 @@ module Doing
         self
       end
     end
+
+    ##
+    ## Capitalize first letter of each element
+    ##
+    ## @return     [Array] capitalized items
+    ##
+    def cap_first
+      map(&:cap_first)
+    end
   end
 end

data/lib/doing/colors.rb

@@ -296,19 +296,15 @@ module Doing
       "\e[#{is_bg ? '48' : '38'};2;#{t.join(';')}m"
     end
 
-    # Regular expression that is used to scan for ANSI-sequences while
-    # uncoloring strings.
-    COLORED_REGEXP = /\e\[(?:(?:[349]|10)[0-7]|[0-9])?m/.freeze
-
     # Returns an uncolored version of the string, that is all
     # ANSI-sequences are stripped from the string.
     def uncolor(string = nil) # :yields:
       if block_given?
-        yield.to_str.gsub(COLORED_REGEXP, '')
+        yield.to_str.gsub(ESCAPE_REGEX, '')
       elsif string.respond_to?(:to_str)
-        string.to_str.gsub(COLORED_REGEXP, '')
+        string.to_str.gsub(ESCAPE_REGEX, '')
       elsif respond_to?(:to_str)
-        to_str.gsub(COLORED_REGEXP, '')
+        to_str.gsub(ESCAPE_REGEX, '')
       else
         ''
       end

data/lib/doing/item/query.rb

@@ -244,7 +244,7 @@ module Doing
 
       if keep && opt[:before]
         before = opt[:before]
-        cutoff = if before =~ time_rx
+        cutoff = if before.is_a?(String) && before =~ time_rx
                    "#{item.date.strftime('%Y-%m-%d')} #{before}".chronify(guess: :begin)
                  elsif before.is_a?(String)
                    before.chronify(guess: :begin)
@@ -257,7 +257,7 @@ module Doing
 
       if keep && opt[:after]
         after = opt[:after]
-        cutoff = if after =~ time_rx
+        cutoff = if after.is_a?(String) && after =~ time_rx
                    "#{item.date.strftime('%Y-%m-%d')} #{after}".chronify(guess: :end)
                  elsif after.is_a?(String)
                    after.chronify(guess: :end)
@@ -342,7 +342,7 @@ module Doing
       tags.each do |tag|
         return true if tag =~ /done/ && !should_finish?
 
-        return true if @title =~ /@#{tag.wildcard_to_rx}(?= |\(|\Z)/i
+        return true if @title =~ /@#{Regexp.escape(tag.wildcard_to_rx)}(?= |\(|\Z)/i
       end
       false
     end

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

@@ -46,10 +46,12 @@ module Doing
       days.each do |day, day_items|
         first = day_items.slice!(0, 1)[0]
         interval = wwid.get_interval(first, formatted: true) || '00:00:00'
-        out << "{wd}|{xm}#{day}{wd}|{xbw}#{first.title.tag('done', remove: true).trunc(width - 2).ljust(width)}{wd}|{xy}#{interval}{wd}|{x}"
+        title = first.title.tag('done', remove: true).trunc(width - 2).ljust(width)
+        out << "{wd}|{xm}#{day}{wd}|{xbw}#{title}{wd}|{xy}#{interval}{wd}|{x}"
         day_items.each do |item|
           interval = wwid.get_interval(item, formatted: true) || '00:00:00'
-          out << "{wd}|          |{xbw}#{item.title.tag('done', remove: true).trunc(width - 2).ljust(width)}{wd}|{xy}#{interval}{wd}|{x}"
+          title = item.title.tag('done', remove: true).trunc(width - 2).ljust(width)
+          out << "{wd}|          |{xbw}#{title}{wd}|{xy}#{interval}{wd}|{x}"
         end
         day_total = "Total: #{totals[day].time_string(format: :clock)}"
         out << divider
@@ -57,10 +59,9 @@ module Doing
         out << divider
       end
       all_total = "Grand Total: #{total.time_string(format: :clock)}"
-      out << divider
       out << "{wd}|{xrb}#{all_total.rjust(width + 20)}{wd}|{x}"
       out << divider
-      Doing::Pager.page Doing::Color.template(out.join("\n"))
+      Doing::Color.template(out.join("\n"))
     end
 
     Doing::Plugins.register 'byday', :export, self

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.79'
+  VERSION = '2.1.81'
 end

data/lib/doing/wwid/display.rb

@@ -46,7 +46,9 @@ module Doing
       if opt[:section].nil?
         opt[:section] = choose_section
         title = opt[:section]
-      elsif opt[:section].instance_of?(String)
+      elsif opt[:section].is_a?(Array)
+        title = opt[:section].join(', ')
+      elsif opt[:section].is_a?(String)
         title = if opt[:section] =~ /^all$/i
                   if opt[:page_title]
                     opt[:page_title]
@@ -137,14 +139,21 @@ module Doing
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
 
-      cfg = Doing.setting('templates').deep_merge(Doing.setting('templates.default'), { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
-        'wrap_width' => Doing.setting('wrap_width') || 0,
-        'date_format' => Doing.setting('default_date_format'),
-        'order' => Doing.setting('order') || :asc,
-        'tags_color' => Doing.setting('tags_color'),
-        'duration' => Doing.setting('duration'),
-        'interval_format' => Doing.setting('interval_format')
-      }, { extend_existing_arrays: true, sort_merged_arrays: true })
+      cfg = Doing.setting('templates')
+                 .deep_merge(Doing.setting('templates.default'), {
+                               extend_existing_arrays: true,
+                               sort_merged_arrays: true
+                             }).deep_merge({
+                                             'wrap_width' => Doing.setting('wrap_width') || 0,
+                                             'date_format' => Doing.setting('default_date_format'),
+                                             'order' => Doing.setting('order') || :asc,
+                                             'tags_color' => Doing.setting('tags_color'),
+                                             'duration' => Doing.setting('duration'),
+                                             'interval_format' => Doing.setting('interval_format')
+                                           }, {
+                                             extend_existing_arrays: true,
+                                             sort_merged_arrays: true
+                                           })
 
       template = opt[:template] || cfg['template']
 
@@ -247,7 +256,8 @@ module Doing
     ## @param      section  [String] Section to pull from, default Currently
     ##
     def last(times: true, section: nil, options: {})
-      section = section.nil? || section =~ /all/i ? 'All' : guess_section(section)
+      section = section[0] if section.is_a?(Array) && section.count == 1
+      section = section.nil? ? 'All' : guess_section(section)
       cfg = Doing.setting(['templates', options[:config_template]]).deep_merge(Doing.setting('templates.default'), { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
         'wrap_width' => Doing.setting('wrap_width', 0),
         'date_format' => Doing.setting('default_date_format'),

data/lib/doing/wwid/filetools.rb

@@ -108,6 +108,7 @@ module Doing
       tags = []
       tags.concat(opt[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }) if opt[:tag]
       bool  = opt[:bool] || :and
+
       sect = opt[:section] !~ /^all$/i ? guess_section(opt[:section]) : 'all'
 
       section = guess_section(sect)

data/lib/doing/wwid/filter.rb

@@ -63,8 +63,15 @@ module Doing
       time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/i
 
       if items.nil? || items.empty?
-        section = opt[:section] ? guess_section(opt[:section]) : 'All'
-        items = section =~ /^all$/i ? @content.clone : @content.in_section(section)
+        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
       end
 
       unless opt[:time_filter]

data/lib/doing/wwid/guess.rb

@@ -9,7 +9,15 @@ module Doing
     ## @param      guessed  [Boolean] already guessed and failed
     ##
     def guess_section(frag, guessed: false, suggest: false)
-      return 'All' if frag =~ /^all$/i
+      if frag.is_a?(Array) && frag.count == 1
+        frag = frag[0]
+      end
+
+      frag = frag.split(/ *, */).map(&:strip) if frag.is_a?(String) && frag =~ /,/
+
+      return frag.map { |s| guess_section(s, guessed: guessed, suggest: suggest) } if frag.is_a?(Array)
+
+      return 'All' if frag.empty? || frag.nil? || frag =~ /^all$/i
 
       frag ||= Doing.setting('current_section')
 
@@ -19,7 +27,10 @@ module Doing
 
       section = found ? found.title : nil
 
-      return section if suggest
+      if suggest
+        Doing.logger.debug('Match:', %(Assuming "#{sect.title}" from "#{frag}"))
+        return section
+      end
 
       unless section || guessed
         alt = guess_view(frag, guessed: true, suggest: true)

data/lib/doing/wwid/interactive.rb

@@ -33,8 +33,9 @@ module Doing
       menu_options = %i[search query exact multiple show_if_single menu sort case].each_with_object({}) {
         |k, hsh| hsh[k] = opt[k]
       }
+      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: opt[:section] =~ /^all$/i, **menu_options)
+      selection = Prompt.choose_from_items(items, include_section: include_section, **menu_options)
 
       raise NoResults, 'no items selected' if selection.nil? || selection.empty?
 

data/lib/doing/wwid/modify.rb

@@ -421,7 +421,8 @@ module Doing
       tags        = options[:tags] || []
       bool        = options[:bool] || :and
 
-      section = choose_section if section.nil? || section =~ /choose/i
+      section = section[0] if section.is_a?(Array) && section.count == 1
+      section = choose_section if section.nil? || section.empty? || section.is_a?(String) && section =~ /choose/i
       archive_all = section =~ /^all$/i # && !(tags.nil? || tags.empty?)
       section = guess_section(section) unless archive_all
 

data/lib/doing.rb

@@ -4,7 +4,6 @@ require 'doing/version'
 require 'time'
 require 'date'
 require 'yaml'
-require 'pp'
 require 'csv'
 require 'tempfile'
 require 'zlib'
@@ -14,9 +13,9 @@ require 'readline'
 require 'haml'
 require 'json'
 require 'logger'
-require 'safe_yaml/load'
 require 'fcntl'
 require 'digest'
+require 'safe_yaml/load'
 
 require 'chronic'
 require 'tty-link'
@@ -59,6 +58,7 @@ require_relative 'doing/chronify/chronify'
 module Doing
   class << self
     attr_accessor :auto_tag
+
     #
     # Fetch the logger
     #

data/lib/examples/commands/autotag.rb

@@ -8,7 +8,7 @@ command :autotag do |c|
   # to tag command.
   c.desc 'Section'
   c.arg_name 'SECTION_NAME'
-  c.flag %i[s section], default_value: 'All'
+  c.flag %i[s section], default_value: 'All', multiple: true
 
   c.desc 'How many recent entries to autotag (0 for all)'
   c.arg_name 'COUNT'

data/lib/examples/commands/wiki.rb

@@ -2,7 +2,7 @@ desc 'Output a tag wiki'
 command :wiki do |c|
   c.desc 'Section to rotate'
   c.arg_name 'SECTION_NAME'
-  c.flag %i[s section], default_value: 'All'
+  c.flag %i[s section], default_value: 'All', multiple: true
 
   c.desc 'Tag filter, combine multiple tags with a comma, use with --bool'
   c.arg_name 'TAG'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.79
+  version: 2.1.81
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-11 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
@@ -865,7 +865,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: A command line tool for managing What Was I Doing reminders