doing 2.1.115 → 2.1.122

data/lib/doing/string/transform.rb

@@ -53,6 +53,7 @@ module Doing
         note = Regexp.last_match(0)
         ''
       end
+      after.sub!(/[ \t]+\z/, '') unless note.empty?
 
       left_pad = ' ' * offset
       left_pad += indent
@@ -82,7 +83,20 @@ module Doing
       out.push(line.join(' '))
 
       last_color = ''
-      out[0] = format("%-#{pad}s%s%s", out[0], last_color, after)
+      if pad_first && pad.positive?
+        out.map!.with_index do |l, idx|
+          suffix = idx.zero? ? "#{last_color}#{after}" : last_color
+          format("%-#{pad}s%s", l, suffix)
+        end
+      else
+        out[0] = format("%-#{pad}s%s%s", out[0], last_color, after)
+      end
+
+      suffix = if note.empty?
+                 pad_first && pad.positive? ? '' : ' '
+               else
+                 " #{note}".chomp
+               end
 
       out.map.with_index do |l, idx|
         if !pad_first && idx.zero?
@@ -90,7 +104,7 @@ module Doing
         else
           "#{left_pad}#{color}#{prefix}#{l}#{last_color}"
         end
-      end.join("\n") + " #{note}".chomp
+      end.join("\n") + suffix
       # res.join("\n").strip + last_color + " #{note}".chomp
     end
 

data/lib/doing/template_string.rb

@@ -105,7 +105,8 @@ module Doing
       return unless ph
 
       placeholder_offset = ph.begin(0)
-      last_colors = parsed_colors[:colors].select { |v| v[:index] <= placeholder_offset + 4 }
+      color_offset = parsed_colors[:string].match(rx)&.begin(0) || placeholder_offset
+      last_colors = parsed_colors[:colors].select { |v| v[:index] <= color_offset + 4 }
 
       last_color = last_colors.map { |v| v[:color] }.pop(3).join('')
 
@@ -166,10 +167,11 @@ module Doing
                   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.good?
-                  "#{line}  "
+                  pad.positive? ? line : "#{line}  "
                 end
               end.join("\n")
-              "\n#{last_color}#{mark}#{outstring}  "
+              suffix = pad.positive? ? '' : '  '
+              "\n#{last_color}#{mark}#{outstring}#{suffix}"
             else
               out = format("\n%s%s%s%#{pad}s%s", indent, prefix, last_color,
                            value.join("\n#{indent}#{prefix}").gsub(/%/, '\%').sub(/\s*$/, ''), after)
@@ -208,12 +210,14 @@ module Doing
           natural = natural_placeholder_width(name, value)
           if width_token == '*'
             if block_placeholder?(name)
+              reserved_width += 1
               queues[name] << block_placeholder_width(terminal_width, token)
             else
+              reserved_width += visible_literal_width(token['prefix'].to_s)
               stretch_tokens << token
             end
           else
-            reserved_width += reserved_placeholder_width(width_token, natural)
+            reserved_width += reserved_placeholder_width(name, width_token, natural)
           end
         end
 
@@ -239,7 +243,7 @@ module Doing
     end
 
     def natural_placeholder_width(name, value)
-      # note placeholders are rendered on their own wrapped lines and should not
+      # Block placeholders are rendered on their own wrapped lines and should not
       # reserve horizontal width on the title line
       return 0 if block_placeholder?(name)
       return 0 unless value.good?
@@ -255,13 +259,19 @@ module Doing
       normalized.split("\n").map { |line| visible_literal_width(line) }.max || 0
     end
 
-    def reserved_placeholder_width(width_token, natural_width)
+    def reserved_placeholder_width(name, width_token, natural_width)
+      return implicit_shortdate_width if name == 'shortdate' && (width_token.nil? || width_token.empty?)
       return natural_width if width_token.nil? || width_token.empty?
 
       minimum = width_token.to_i.abs
       [natural_width, minimum].max
     end
 
+    def implicit_shortdate_width
+      fmt_string = Doing.setting('shortdate_format.older', '%m/%d/%y %_I:%M%P', exact: true)
+      Date.today.strftime(fmt_string).length
+    end
+
     def block_placeholder?(name)
       %w[note idnote odnote].include?(name)
     end
@@ -295,6 +305,9 @@ module Doing
     end
 
     def detected_terminal_width
+      env_width = ENV['COLUMNS'].to_i
+      return env_width if env_width.positive?
+
       if $stdout.tty?
         begin
           require 'io/console'
@@ -309,9 +322,6 @@ module Doing
       tty_width = TTY::Screen.columns.to_i
       return tty_width if tty_width.positive?
 
-      env_width = ENV['COLUMNS'].to_i
-      return env_width if env_width.positive?
-
       80
     end
 

data/lib/doing/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Doing
-  VERSION = '2.1.115'
+  VERSION = '2.1.122'
 end

data/lib/doing/wwid/display.rb

@@ -380,18 +380,20 @@ module Doing
       placeholders = cfg['placeholders']
       return template unless placeholders.is_a?(Hash)
 
-      apply_placeholder_widths(template, placeholders)
+      apply_placeholder_widths(template, placeholders, cfg['elements'])
     end
 
-    def apply_placeholder_widths(template, placeholders)
+    def apply_placeholder_widths(template, placeholders, elements)
       keys = TEMPLATE_WIDTH_PLACEHOLDERS.map { |k| Regexp.escape(k) }.sort_by(&:length).reverse
       token_rx = /(?<!\\)%(?<width>\*|-?\d+)?(?:\^(?<mchar>.))?(?:(?<ichar>[ _t]|[^a-z0-9])(?<icount>\d+))?(?<prefix>.[ _t]?)?(?<name>#{keys.join('|')})/i
+      managed_elements = Array(elements).map(&:to_s)
 
       template.gsub(token_rx) do
         m = Regexp.last_match
         name = m['name']
 
-        width = normalized_placeholder_width(placeholders[name] || placeholders[name.to_sym])
+        width = normalized_placeholder_width(placeholders[name] || placeholders[name.to_sym], m['width'],
+                                             managed_elements.include?(name))
         mchar = m['mchar'] ? "^#{m['mchar']}" : ''
         indent = m['ichar'] ? "#{m['ichar']}#{m['icount']}" : ''
         prefix = m['prefix'] || ''
@@ -400,10 +402,11 @@ module Doing
       end
     end
 
-    def normalized_placeholder_width(config)
+    def normalized_placeholder_width(config, existing_width, managed)
       width = config['width'] || config[:width] if config.is_a?(Hash)
 
-      return '' if width.nil?
+      return '' if width.nil? && managed
+      return existing_width.to_s if width.nil?
 
       case width.to_s
       when /^stretch$/i

metadata

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