doing 2.0.13 → 2.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 666eb185b6fd472aab95e2cc55e902b31935a5efd1d42f877999f4482424d9f4
-  data.tar.gz: 543c2e95e079c6037aa3e851fd0e1b3fa453413f40b5b40c37e735f47cef883b
+  metadata.gz: cbd007c83df322397ff7da7025dfbc0e31fd0b54b3247bfffb2e7a61134366a5
+  data.tar.gz: 78e741e12e3f28771d68bc7028caf2ed03edb677be1cfe8f975f32406d3d4f01
 SHA512:
-  metadata.gz: 4fafa3abb7d604df5ecf3aaa40ae96ac195ba6969759a197a61056dfc3f4615402707fed3307b2fe1c51872e10b6d0fa904131622ee045fe73b8ac54d2e40324
-  data.tar.gz: 6df14adeb8187888002008751239d70054aec9c931df707c83c6eff48f28b4e9d19c0d6b3dd7c25e943096a7dda46b9779cff7befc12d12101eb096873dee4d0
+  metadata.gz: 1a7262555d07ecea5e0e504df1edaacd48654156a50dff44f1d5ee365c04b6c5ae5f4785d9a97f7b6363c450d8184f186aff21ac47653684494e5aec3d1e5f8a
+  data.tar.gz: 1b2e38445ffbe3a6a9687bdd8607f5b41591a4370e4ac68f4036155baceac97e98a50c58cb31e1948f6bdbfd6419fa419e9e1db75170e339227e09361f0b601b

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+### 2.0.18
+
+#### FIXED
+
+- Escape codes being included in doing file
+
+### 2.0.17
+
+#### IMPROVED
+
+- Improvements to %title formatting and wrapping
+
+### 2.0.16
+
+- Test release to validate git flow automation
+
 ### 2.0.13
 
 #### FIXED

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.0.13)
+    doing (2.0.18)
       chronic (~> 0.10, >= 0.10.2)
       deep_merge (~> 1.2, >= 1.2.1)
       gli (~> 2.19, >= 2.19.2)

data/README.md

@@ -6,7 +6,7 @@ _If you're one of the rare people like me who find this useful, feel free to [bu
 
 <!--README-->
 
-The current version of `doing` is <!--VER-->2.0.11<!--END VER-->.
+The current version of `doing` is <!--VER-->2.0.17<!--END VER-->.
 
 Find all of the documentation in the [doing wiki](https://github.com/ttscoff/doing/wiki).
 

data/bin/doing

@@ -1582,7 +1582,12 @@ command :show do |c|
 
     options[:times] = true if options[:totals]
 
-    tags_color = settings.key?('tags_color') ? settings['tags_color'] : nil
+    template = settings['templates']['default'].deep_merge({
+        'wrap_width' => settings['wrap_width'] || 0,
+        'date_format' => settings['default_date_format'],
+        'order' => settings['order'] || 'asc',
+        'tags_color' => settings['tags_color']
+      })
 
     options[:case] = options[:case].normalize_case
 
@@ -1603,7 +1608,7 @@ command :show do |c|
     opt[:tag] = nil
     opt[:tag_filter] = tag_filter
     opt[:tag_order] = options[:tag_order].normalize_order
-    opt[:tags_color] = tags_color
+    opt[:tags_color] = template['tags_color']
 
     Doing::Pager.page wwid.list_section(opt)
   end
@@ -1674,7 +1679,8 @@ command %i[grep search] do |c|
     options[:fuzzy] = false
     raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
-    tags_color = settings.key?('tags_color') ? settings['tags_color'] : nil
+    template = settings['templates']['default'].deep_merge(settings)
+    tags_color = template.key?('tags_color') ? template['tags_color'] : nil
 
     section = wwid.guess_section(options[:section]) if options[:section]
 
@@ -1740,7 +1746,9 @@ command :recent do |c|
 
       options[:t] = true if options[:totals]
       options[:sort_tags] = options[:tag_sort] =~ /^n/i
-      tags_color = settings.key?('tags_color') ? settings['tags_color'] : nil
+
+      template = settings['templates']['recent'].deep_merge(settings['templates']['default'])
+      tags_color = template.key?('tags_color') ? template['tags_color'] : nil
 
       opts = {
         sort_tags: options[:sort_tags],
@@ -1801,8 +1809,7 @@ command :today do |c|
       before: options[:before],
       section: options[:section],
       sort_tags: options[:sort_tags],
-      totals: options[:totals],
-      order: settings.dig('templates', 'today', 'order')
+      totals: options[:totals]
     }
     Doing::Pager.page wwid.today(options[:times], options[:output], opt).chomp
   end
@@ -2278,6 +2285,7 @@ command :view do |c|
 
       template = view.key?('template') ? view['template'] : nil
       date_format = view.key?('date_format') ? view['date_format'] : nil
+
       tags_color = view.key?('tags_color') ? view['tags_color'] : nil
       tag_filter = false
       if options[:tag]

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.0.13
+v2.0.18
 
 === Global Options
 === --config_file arg

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

@@ -42,6 +42,7 @@ module Doing
         else
           note = []
         end
+
         output = opt[:template].dup
 
         output.gsub!(/%[a-z]+/) do |m|
@@ -69,22 +70,28 @@ module Doing
 
         output.sub!(/%section/, item.section) if item.section
 
-        title_offset = Doing::Color.uncolor(output).match(/%(-?\d+)?([ _t]\d+)?title/).begin(0)
-        output.sub!(/%(-?\d+)?(([ _t])(\d+))?title(.*?)$/) do
+        title_rx = /(?mi)%(?<width>-?\d+)?(?:(?<ichar>[ _t])(?<icount>\d+))?(?<prefix>.[ _t]?)?title(?<after>.*?)$/
+        title_color = Doing::Color.reset + output.match(/(?mi)^(.*?)(%.*?title)/)[1].last_color
+
+        title_offset = Doing::Color.uncolor(output).match(title_rx).begin(0)
+
+        output.sub!(title_rx) do
           m = Regexp.last_match
-          pad = m[1].to_i
+
+          after = m['after']
+          pad = m['width'].to_i
           indent = ''
-          if m[2]
-            char = m[3] =~ /t/ ? "\t" : " "
-            indent = char * m[4].to_i
+          if m['ichar']
+            char = m['ichar'] =~ /t/ ? "\t" : ' '
+            indent = char * m['icount'].to_i
           end
-          after = m[5]
+          prefix = m['prefix']
           if opt[:wrap_width]&.positive? || pad.positive?
             width = pad.positive? ? pad : opt[:wrap_width]
-            item.title.wrap(width, pad: pad, indent: indent, offset: title_offset, prefix: flag, after: after, reset: reset)
+            item.title.wrap(width, pad: pad, indent: indent, offset: title_offset, prefix: prefix, color: title_color, after: after, reset: reset)
             # flag + item.title.gsub(/(.{#{opt[:wrap_width]}})(?=\s+|\Z)/, "\\1\n ").sub(/\s*$/, '') + reset
           else
-            format("%s%#{pad}s%s%s", flag, item.title.sub(/\s*$/, ''), reset, after)
+            format("%s%#{pad}s%s", prefix, item.title.sub(/\s*$/, ''), after)
           end
         end
 
@@ -129,6 +136,7 @@ module Doing
 
         out += "#{output}\n"
       end
+
       # Doing.logger.debug('Template Export:', "#{items.count} items output to template #{opt[:template]}")
       out += wwid.tag_times(format: wwid.config['timer_format'].to_sym, sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) if opt[:totals]
       out

data/lib/doing/string.rb

@@ -77,13 +77,15 @@ module Doing
     ##
     def highlight_tags(color = 'yellow')
       escapes = scan(/(\e\[[\d;]+m)[^\e]+@/)
-      tag_color = Doing::Color.send(color)
+      color = color.split(' ') unless color.is_a?(Array)
+      tag_color = ''
+      color.each { |c| tag_color += Doing::Color.send(c) }
       last_color = if !escapes.empty?
                      escapes[-1][0]
                    else
                      Doing::Color.default
                    end
-      gsub(/(\s|m)(@[^ ("']+)/, "\\1#{tag_color}\\2#{last_color}")
+      gsub(/(\s|m)(@[^ ("']+)/, "\\1#{tag_color}\\2#{Doing::Color.reset}#{last_color}")
     end
 
     ##
@@ -159,19 +161,21 @@ module Doing
     ## @param      offset  [Integer] (Optional) The width to pad each subsequent line
     ## @param      prefix  [String] (Optional) A prefix to add to each line
     ##
-    def wrap(len, pad: 0, indent: '  ', offset: 0, prefix: '', after: '', reset: '')
+    def wrap(len, pad: 0, indent: '  ', offset: 0, prefix: '', color: '', after: '', reset: '')
+      last_color = color.empty? ? '' : after.last_color
       note_rx = /(?i-m)(%(?:[io]d|(?:\^[\s\S])?(?:(?:[ _t]|[^a-z0-9])?\d+)?(?:[\s\S][ _t]?)?)?note)/
-      str = gsub(/@\w+\(.*?\)/) { |tag| tag.gsub(/\s/, '%%%%') }
+      # Don't break inside of tag values
+      str = gsub(/@\S+\(.*?\)/) { |tag| tag.gsub(/\s/, '%%%%') }
       words = str.split(/ /).map { |word| word.gsub(/%%%%/, ' ') }
       out = []
       line = []
       words.each do |word|
-        if line.join(' ').length + word.length + 1 > len
+        if line.join(' ').uncolor.length + word.uncolor.length + 1 > len
           out.push(line.join(' '))
           line.clear
         end
 
-        line << word
+        line << word.uncolor
       end
       out.push(line.join(' '))
       note = ''
@@ -180,10 +184,11 @@ module Doing
         ''
       end
 
-      out[0] = format("%-#{pad}s%s", out[0], after)
-      left_pad = ' ' * (offset)
+      out[0] = format("%-#{pad}s%s%s", out[0], last_color, after)
+
+      left_pad = ' ' * offset
       left_pad += indent
-      out.map { |l| "#{left_pad}#{prefix}#{l}" }.join("\n").strip + " #{note}".chomp
+      out.map { |l| "#{left_pad}#{color}#{l}#{last_color}" }.join("\n").strip + last_color + " #{note}".chomp
     end
 
     ##
@@ -368,6 +373,14 @@ module Doing
       title
     end
 
+    # Returns the last escape sequence from a string
+    #
+    # @param      string  The string to examine
+    #
+    def last_color
+      scan(/\e\[[\d;]+m/).join('')
+    end
+
     ##
     ## Turn raw urls into HTML links
     ##

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.0.13'
+  VERSION = '2.0.18'
 end

data/lib/doing/wwid.rb

@@ -1637,13 +1637,22 @@ module Doing
     ## @param      opt   [Hash] Additional Options
     ##
     def list_section(opt = {})
+      opt[:config_template] ||= 'default'
+      cfg = @config.dig('templates', opt[:config_template]).deep_merge({
+        'wrap_width' => @config['wrap_width'] || 0,
+        'date_format' => @config['default_date_format'],
+        'order' => @config['order'] || 'asc',
+        'tags_color' => @config['tags_color']
+      })
       opt[:count] ||= 0
       opt[:age] ||= 'newest'
-      opt[:format] ||= @config.dig('templates', 'default', 'date_format')
-      opt[:order] ||= @config.dig('templates', 'default', 'order') || 'asc'
+      opt[:format] ||= cfg['date_format']
+      opt[:order] ||= cfg['order'] || 'asc'
       opt[:tag_order] ||= 'asc'
-      opt[:tags_color] ||= false
-      opt[:template] ||= @config.dig('templates', 'default', 'template')
+      if opt[:tags_color].nil?
+        opt[:tags_color] = cfg['tags_color'] || false
+      end
+      opt[:template] ||= cfg['template']
 
       # opt[:highlight] ||= true
       title = ''
@@ -1684,7 +1693,7 @@ module Doing
 
       opt[:output] ||= 'template'
 
-      opt[:wrap_width] ||= @config['templates']['default']['wrap_width']
+      opt[:wrap_width] ||= @config['templates']['default']['wrap_width'] || 0
 
       output(items, title, is_single, opt)
     end
@@ -1729,13 +1738,18 @@ module Doing
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
 
-      cfg = @config['templates']['today']
+      cfg = @config['templates']['today'].deep_merge(@config['templates']['default']).deep_merge({
+        'wrap_width' => @config['wrap_width'] || 0,
+        'date_format' => @config['default_date_format'],
+        'order' => @config['order'] || 'asc',
+        'tags_color' => @config['tags_color']
+      })
       options = {
         after: opt[:after],
         before: opt[:before],
         count: 0,
         format: cfg['date_format'],
-        order: 'asc',
+        order: cfg['order'] || 'asc',
         output: output,
         section: opt[:section],
         sort_tags: opt[:sort_tags],
@@ -1743,7 +1757,9 @@ module Doing
         times: times,
         today: true,
         totals: opt[:totals],
-        wrap_width: cfg['wrap_width']
+        wrap_width: cfg['wrap_width'],
+        tags_color: cfg['tags_color'],
+        config_template: 'today'
       }
       list_section(options)
     end
@@ -1765,7 +1781,7 @@ module Doing
       dates = [dates, dates] if dates.instance_of?(String)
 
       list_section({ section: section, count: 0, order: 'asc', date_filter: dates, times: times,
-                     output: output, totals: opt[:totals], sort_tags: opt[:sort_tags] })
+                     output: output, totals: opt[:totals], sort_tags: opt[:sort_tags], config_template: 'default' })
     end
 
     ##
@@ -1795,7 +1811,8 @@ module Doing
         tag_order: opt[:tag_order],
         times: times,
         totals: opt[:totals],
-        yesterday: true
+        yesterday: true,
+        config_template: 'today'
       }
 
       list_section(options)
@@ -1813,14 +1830,19 @@ module Doing
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
 
-      cfg = @config['templates']['recent']
+      cfg = @config['templates']['recent'].deep_merge(@config['templates']['default']).deep_merge({
+        'wrap_width' => @config['wrap_width'] || 0,
+        'date_format' => @config['default_date_format'],
+        'order' => @config['order'] || 'asc',
+        'tags_color' => @config['tags_color']
+      })
       section ||= @config['current_section']
       section = guess_section(section)
 
       list_section({ section: section, wrap_width: cfg['wrap_width'], count: count,
                      format: cfg['date_format'], template: cfg['template'],
                      order: 'asc', times: times, totals: opt[:totals],
-                     sort_tags: opt[:sort_tags], tags_color: opt[:tags_color] })
+                     sort_tags: opt[:sort_tags], tags_color: opt[:tags_color], config_template: 'recent' })
     end
 
     ##
@@ -1831,7 +1853,12 @@ module Doing
     ##
     def last(times: true, section: nil, options: {})
       section = section.nil? || section =~ /all/i ? 'All' : guess_section(section)
-      cfg = @config['templates']['last']
+      cfg = @config['templates']['last'].deep_merge(@config['templates']['default']).deep_merge({
+        'wrap_width' => @config['wrap_width'] || 0,
+        'date_format' => @config['default_date_format'],
+        'order' => @config['order'] || 'asc',
+        'tags_color' => @config['tags_color']
+      })
 
       opts = {
         section: section,
@@ -1852,6 +1879,7 @@ module Doing
       opts[:search] = options[:search] if options[:search]
       opts[:case] = options[:case]
       opts[:not] = options[:negate]
+      opts[:config_template] = 'last'
       list_section(opts)
     end
 
@@ -2156,7 +2184,7 @@ EOS
 
       @content.each do |title, section|
         output += "#{section[:original]}\n"
-        output += list_section({ section: title, template: "\t- %date | %title%t2note", highlight: false, wrap_width: 0 })
+        output += list_section({ section: title, template: "\t- %date | %title%t2note", highlight: false, wrap_width: 0, tags_color: false })
       end
 
       output + @other_content_bottom.join("\n") unless @other_content_bottom.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.0.18
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-22 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml