doing 2.1.60 → 2.1.63

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

@@ -216,7 +216,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Jun 29 02:09:35 2022 by
+  Generated on Thu Jul 21 07:15:19 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.gemspec

@@ -44,5 +44,6 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency('tty-reader', '~> 0.9', '>= 0.9.0')
   s.add_runtime_dependency('tty-screen', '~> 0.8', '>= 0.8.1')
   s.add_runtime_dependency('tty-which', '~> 0.5', '>= 0.5.0')
+
   # s.add_runtime_dependency('amatch', '~> 0.4', '>= 0.4.0')
 end

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.60
+v2.1.63
 
 === Global Options
 === --config_file arg
@@ -1055,7 +1055,7 @@ List commands one per line, to assist with shell completion
 ==== Command: <tt>import  PATH</tt>
 Import entries from an external source
 
-Imports entries from other sources. Available plugins: calendar, capturething, doing, json, timing
+Imports entries from other sources. Available plugins: calendar, doing, json, timing
 ===== Options
 ===== --after DATE_STRING
 
@@ -1123,7 +1123,7 @@ Tag all imported entries
 
 ===== --type TYPE
 
-Import type (calendar|capturething|doing|json|timing)
+Import type (calendar|doing|json|timing)
 
 [Default Value] doing
 

data/lib/doing/colors.rb

@@ -4,6 +4,7 @@
 module Doing
   # Terminal output color functions.
   module Color
+    ESCAPE_REGEX = /(?<=\[)(?:(?:(?:[349]|10)[0-9]|[0-9])?;?)+(?=m)/.freeze
     # All available color names. Available as methods and string extensions.
     #
     # @example Use a color as a method. Color reset will be added to end of string.
@@ -125,6 +126,62 @@ module Doing
       def normalize_color
         gsub(/_/, '').sub(/bright/i, 'bold').sub(/bgbold/, 'boldbg')
       end
+
+      # Get the calculated ANSI color at the end of the
+      # string
+      #
+      # @return     ANSI escape sequence to match color
+      #
+      def last_color_code
+        m = scan(ESCAPE_REGEX)
+
+        em = ['0']
+        fg = nil
+        bg = nil
+        rgbf = nil
+        rgbb = nil
+
+        m.each do |c|
+          case c
+          when '0'
+            em = ['0']
+            fg, bg, rgbf, rgbb = nil
+          when /^[34]8/
+            case c
+            when /^3/
+              fg = nil
+              rgbf = c
+            when /^4/
+              bg = nil
+              rgbb = c
+            end
+          else
+            c.split(/;/).each do |i|
+              x = i.to_i
+              if x <= 9
+                em << x
+              elsif x >= 30 && x <= 39
+                rgbf = nil
+                fg = x
+              elsif x >= 40 && x <= 49
+                rgbb = nil
+                bg = x
+              elsif x >= 90 && x <= 97
+                rgbf = nil
+                fg = x
+              elsif x >= 100 && x <= 107
+                rgbb = nil
+                bg = x
+              end
+            end
+          end
+        end
+
+        escape = "\e[#{em.join(';')}m"
+        escape += "\e[#{rgbb}m" if rgbb
+        escape += "\e[#{rgbf}m" if rgbf
+        escape + "\e[#{[fg, bg].delete_if(&:nil?).join(';')}m"
+      end
     end
 
     class << self

data/lib/doing/item/state.rb

@@ -46,9 +46,11 @@ module Doing
       return true unless config[key].is_a?(Array)
 
       config[key].each do |tag|
+        next if tag.nil?
+
         if tag =~ /^@/
           return false if tags?(tag.sub(/^@/, '').downcase)
-        elsif section.downcase == tag.downcase
+        elsif section&.downcase == tag.downcase
           return false
         end
       end

data/lib/doing/plugin_manager.rb

@@ -32,6 +32,17 @@ module Doing
           end
         end
 
+        Gem.find_latest_files('doing-plugin-*', true).sort.each do |plugin|
+          load plugin
+        end
+
+        # Gem.path.each do |path|
+        #   $LOAD_PATH.unshift path
+        #   Dir.glob(File.join(path, 'gems', 'doing-plugin-*', 'lib', '*.rb')).sort.each do |plugin|
+        #     require plugin.sub(%r{#{path}/gems/(.*?)-[\d.]+$}, '\1')
+        #   end
+        # end
+
         plugins
       end
 

data/lib/doing/string/highlight.rb

@@ -17,14 +17,9 @@ module Doing
     ##
     def highlight_tags(color = 'yellow', last_color: nil)
       unless last_color
-        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.good?
-                       (escapes.count > 1 ? escapes[-2..-1] : [escapes[-1]]).map { |v| v[0] }.join('')
-                     else
-                       Doing::Color.default
-                     end
+        last_color = last_color_code
       end
       gsub(/(\s|m)(@[^ ("']+)/, "\\1#{tag_color}\\2#{last_color}")
     end
@@ -54,7 +49,11 @@ module Doing
         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 }
+          out.gsub!(rx) do
+            m = Regexp.last_match
+            last = m.pre_match.last_color_code
+            "#{m[0].bgyellow.black}#{last}"
+          end
         end
       end
       out

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.60'
+  VERSION = '2.1.63'
 end

data/lib/doing/wwid/timers.rb

@@ -14,162 +14,7 @@ module Doing
     def tag_times(format: :text, sort_by: :time, sort_order: :asc)
       return '' if @timers.empty?
 
-      max = @timers.keys.sort_by(&:length).reverse[0].length + 1
-
-      total = @timers.delete('All')
-
-      tags_data = @timers.delete_if { |_k, v| v.zero? }
-      sorted_tags_data = if sort_by.normalize_tag_sort == :name
-                           tags_data.sort_by { |k, _v| k }
-                         else
-                           tags_data.sort_by { |_k, v| v }
-                         end
-
-      sorted_tags_data.reverse! if sort_order.normalize_order == :asc
-      case format
-      when :html
-
-        output = <<EOHEAD
-          <table>
-          <caption id="tagtotals">Tag Totals</caption>
-          <colgroup>
-          <col style="text-align:left;"/>
-          <col style="text-align:left;"/>
-          </colgroup>
-          <thead>
-          <tr>
-            <th style="text-align:left;">project</th>
-            <th style="text-align:left;">time</th>
-          </tr>
-          </thead>
-          <tbody>
-EOHEAD
-        sorted_tags_data.reverse.each do |k, v|
-          if v.positive?
-            output += "<tr><td style='text-align:left;'>#{k}</td><td style='text-align:left;'>#{v.time_string(format: :clock)}</td></tr>\n"
-          end
-        end
-        tail = <<EOTAIL
-        <tr>
-          <td style="text-align:left;" colspan="2"></td>
-        </tr>
-        </tbody>
-        <tfoot>
-        <tr>
-          <td style="text-align:left;"><strong>Total</strong></td>
-          <td style="text-align:left;">#{total.time_string(format: :clock)}</td>
-        </tr>
-        </tfoot>
-        </table>
-EOTAIL
-        output + tail
-      when :markdown
-        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)}: | :------- |
-        EOHEADER
-        sorted_tags_data.reverse.each do |k, v|
-          if v.positive?
-            output += "| #{' ' * (pad - k.length)}#{k} | #{v.time_string(format: :clock)} |\n"
-          end
-        end
-        tail = '[Tag Totals]'
-        output + tail
-      when :json
-        output = []
-        sorted_tags_data.reverse.each do |k, v|
-          output << {
-            'tag' => k,
-            'seconds' => v,
-            'formatted' => v.time_string(format: :clock)
-          }
-        end
-        output
-      when :human
-        output = []
-        sorted_tags_data.reverse.each do |k, v|
-          spacer = ''
-          (max - k.length).times do
-            spacer += ' '
-          end
-          output.push("┃ #{spacer}#{k}:#{v.time_string(format: :hm)} ┃")
-        end
-
-        header = '┏━━ Tag Totals '
-        (max - 2).times { header += '━' }
-        header += '┓'
-        footer = '┗'
-        (max + 12).times { footer += '━' }
-        footer += '┛'
-        divider = '┣'
-        (max + 12).times { divider += '━' }
-        divider += '┫'
-        output = output.empty? ? '' : "\n#{header}\n#{output.join("\n")}"
-        output += "\n#{divider}"
-        spacer = ''
-        (max - 6).times do
-          spacer += ' '
-        end
-        total_time = total.time_string(format: :hm)
-        total = "┃ #{spacer}total: "
-        total += total_time
-        total += ' ┃'
-        output += "\n#{total}"
-        output += "\n#{footer}"
-        output
-      else
-        output = []
-        sorted_tags_data.reverse.each do |k, v|
-          spacer = ''
-          (max - k.length).times do
-            spacer += ' '
-          end
-          output.push("#{k}:#{spacer}#{v.time_string(format: :clock)}")
-        end
-
-        output = output.empty? ? '' : "\n--- Tag Totals ---\n#{output.join("\n")}"
-        output += "\n\nTotal tracked: #{total.time_string(format: :clock)}\n"
-        output
-      end
-    end
-
-    ##
-    ## Gets the interval between entry's start
-    ##             date and @done date
-    ##
-    ## @param      item       [Item] The entry
-    ## @param      formatted  [Boolean] Return human readable
-    ##                        time (default seconds)
-    ## @param      record     [Boolean] Add the interval to the
-    ##                        total for each tag
-    ##
-    ## @return     Interval in seconds, or [d, h, m] array if
-    ##             formatted is true. False if no end date or
-    ##             interval is 0
-    ##
-    def get_interval(item, formatted: true, record: true)
-      if item.interval
-        seconds = item.interval
-        record_tag_times(item, seconds) if record
-        return seconds.positive? ? seconds : false unless formatted
-
-        return seconds.positive? ? seconds.time_string(format: :clock) : false
-      end
-
-      false
-    end##
-    ## Get total elapsed time for all tags in
-    ##             selection
-    ##
-    ## @param      format        [String] return format (html,
-    ##                           json, or text)
-    ## @param      sort_by       [Symbol] Sort by :name or :time
-    ## @param      sort_order    [Symbol] The sort order (:asc or :desc)
-    ##
-    def tag_times(format: :text, sort_by: :time, sort_order: :asc)
-      return '' if @timers.empty?
+      @timers.delete('meanwhile')
 
       max = @timers.keys.sort_by(&:length).reverse[0].length + 1
 

data/lib/templates/doing.css

@@ -50,7 +50,7 @@ article > ul > li:hover {
 .date {
   color: #7d9ca2;
   font-size: 17px;
-  padding: 15px 1ch 0 0;
+  padding: 3px 1ch 0 0;
   text-align: right;
   white-space: nowrap;
   transition: color .2s ease-in-out;
@@ -59,7 +59,7 @@ article > ul > li:hover {
 .entry {
   border-left: solid 1px #ccc;
   line-height: 1.2;
-  padding: 10px 10px 10px 3ch;
+  padding: 2px 10px 2px 3ch;
   text-indent: -2ch;
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.60
+  version: 2.1.63
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-29 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup