mdless 2.1.7 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a7d200fbf2d90da97cf6ae65beecac52643ec377d2a60f7d8503ca2411694ea
-  data.tar.gz: f35b88bdf439f3436ddf2e6cf0b835e8a23d5d5553721b0c35d75954af43013e
+  metadata.gz: 7b6335a8f0eb1e43af37924810a1e8e6b94f5b2da35b745824f3ce735536777d
+  data.tar.gz: 54643d669cfef096d92405e4b1ed2a216c749a67c3fb2f03dc32ad91e7a5f98a
 SHA512:
-  metadata.gz: 906870b0032f1cba0a1c90be6ac2cb80f82c1abcb331470f75b02598d05d965996b2d2eb0a076b2651e32e9ae567334b693a9dffd702b517e15c5b8048f2e172
-  data.tar.gz: e1874c241362b44607a357ec4e125bdc463ae3b3ab906bdf7237e1b782a6122b6f90d664210cf7dd1b964bf843adb1056adbacdd93b816f0bb31db4d92ad1cf5
+  metadata.gz: 8a3d3fc7ee471da0cd3b882deba060a19728492a2493c06cca461029ce7d664940e8e0f602a324c71ede7d8e0b617365e7375cb4702cd7b19a91d440fda32a24
+  data.tar.gz: be3fc65aca571dcc96af250f8bc0faf0e5c8be3a7ed1a2b30229fd5fd501e6087a8990bcc43f5d8f60b21599167833f55381a759a54e7765a3be4db729e16de4

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+2.1.9
+: Code block prefix configurable, can be left empty to make more copyable code blocks
+: Remove empty lines from block quotes
+: Infinite loop when calculating ANSI emphasis
+: Don't accept colors or semicolons inside of @tag names
+
+2.1.8
+: --update-theme option to add any missing keys to your theme file
+: Strip ul_char of any spaces before inserting
+
 2.1.7
 : Dedup and remove empty escape codes before output
 : Tables losing column alignment

data/lib/mdless/colors.rb

@@ -92,6 +92,7 @@ module CLIMarkdown
           bg = nil
           rgbb = c
         else
+          em = []
           c.split(/;/).each do |i|
             x = i.to_i
             if x <= 9
@@ -113,10 +114,13 @@ module CLIMarkdown
         end
       end
 
-      escape = "\e[#{em.join(';')}m"
+      escape = ''
+      escape += "\e[#{em.join(';')}m" unless em.empty?
       escape += "\e[#{rgbb}m" if rgbb
       escape += "\e[#{rgbf}m" if rgbf
-      escape + "\e[#{[fg, bg].delete_if(&:nil?).join(';')}m"
+      fg_bg = [fg, bg].delete_if(&:nil?).join(';')
+      escape += "\e[#{fg_bg}m" unless fg_bg.empty?
+      escape
     end
 
     def blackout(bgcolor)
@@ -133,25 +137,23 @@ module CLIMarkdown
       self.uncolor.size
     end
 
-    def wrap(width=78,foreground=:x)
-      if self.uncolor =~ /(^([%~] |\s*>)| +[=\-]{5,})/
-        return self
-      end
+    def wrap(width=78, foreground=:x)
+      return self if uncolor =~ /(^([%~] |\s*>)| +[=-]{5,})/
 
       visible_width = 0
       lines = []
       line = ''
       last_ansi = ''
 
-      line += self.match(/^\s*/)[0].gsub(/\t/,'    ')
-      input = self.dup # .gsub(/(\w-)(\w)/,'\1 \2')
+      line += match(/^\s*/)[0].gsub(/\t/, '    ')
+      input = dup # .gsub(/(\w-)(\w)/,'\1 \2')
       # input.gsub!(/\[.*?\]\(.*?\)/) do |link|
       #   link.gsub(/ /, "\u00A0")
       # end
       input.split(/\s+/).each do |word|
-        last_ansi = line.scan(/\e\[[\d;]+m/)[-1] || ''
+        last_ansi = line.last_color_code
         if visible_width + word.size_clean >= width
-          lines << line + xc(foreground)
+          lines << line + xc
           visible_width = word.size_clean
           line = last_ansi + word
         elsif line.empty?
@@ -162,7 +164,7 @@ module CLIMarkdown
           line << ' ' << last_ansi + word
         end
       end
-      lines << line + match(/\s*$/)[0] + xc(foreground) if line
+      lines << line + match(/\s*$/)[0] + xc if line
       lines.map!.with_index do |l, i|
         (i.positive? ? l[i - 1].last_color_code : '') + l
       end

data/lib/mdless/console.rb

@@ -97,8 +97,8 @@ module Redcarpet
               hilite = xc + hilite.split(/\n/).map do |l|
                 [
                   color('code_block marker'),
-                  '> ',
-                  "#{color('code_block bg')}#{l.strip}#{xc}"
+                  MDLess.theme['code_block']['character'],
+                  "#{color('code_block bg')}#{l.rstrip}#{xc}"
                 ].join
               end.join("\n").blackout(MDLess.theme['code_block']['bg']) + "#{xc}\n"
             end
@@ -110,7 +110,7 @@ module Redcarpet
           hilite = code_block.split(/\n/).map do |line|
             [
               color('code_block marker'),
-              '> ',
+              MDLess.theme['code_block']['character'],
               color('code_block color'),
               line,
               xc
@@ -172,7 +172,7 @@ module Redcarpet
 
       def block_quote(quote)
         ret = "\n\n"
-        quote.wrap(MDLess.cols, color('blockquote color')).split(/\n/).each do |line|
+        quote.strip.wrap(MDLess.cols, color('blockquote color')).split(/\n/).each do |line|
           ret += [
             color('blockquote marker color'),
             MDLess.theme['blockquote']['marker']['character'],
@@ -555,7 +555,7 @@ module Redcarpet
           [
             indent,
             color('list bullet'),
-            MDLess.theme['list']['ul_char'],
+            MDLess.theme['list']['ul_char'].strip,
             ' ',
             color('list color'),
             indent_lines(content, indent).strip,
@@ -941,7 +941,7 @@ module Redcarpet
       def highlight_tags(input)
         tag_color = color('at_tags tag')
         value_color = color('at_tags value')
-        input.gsub(/(?<pre>\s|m)(?<tag>@[^ \].?!,("']+)(?:(?<lparen>\()(?<value>.*?)(?<rparen>\)))?/) do
+        input.gsub(/(?<pre>\s|m)(?<tag>@[^ \]:;.?!,("'\n]+)(?:(?<lparen>\()(?<value>.*?)(?<rparen>\)))?/) do
           m = Regexp.last_match
           last_color = m.pre_match.last_color_code
           [

data/lib/mdless/converter.rb

@@ -146,6 +146,7 @@ module CLIMarkdown
           theme = File.expand_path("~/.config/mdless/#{theme}.theme")
           File.open(theme, 'w') { |f| f.puts(YAML.dump(MDLess.theme)) } unless File.exist?(theme)
           `#{ENV['EDITOR']} '#{theme}'`
+          Process.exit 0
         end
 
         default(:inline_footnotes, false)
@@ -212,10 +213,15 @@ module CLIMarkdown
         end
 
         default(:update_config, false)
-        opts.on('--update_config', 'Update the configuration file with new keys and current command line options') do
+        opts.on('--update-config', '--update_config', 'Update the configuration file with new keys and current command line options') do
           MDLess.options[:update_config] = true
         end
 
+        default(:update_theme, false)
+        opts.on('--update-theme', 'Update the current theme file with all available keys') do
+          MDLess.options[:update_theme] = true
+        end
+
         default(:wiki_links, false)
         opts.on('--[no-]wiki-links', 'Highlight [[wiki links]]') do |opt|
           MDLess.options[:wiki_links] = opt
@@ -229,6 +235,17 @@ module CLIMarkdown
         exit 1
       end
 
+      if MDLess.options[:update_theme]
+        FileUtils.mkdir_p(File.dirname(config))
+
+        theme = MDLess.options[:theme] =~ /default/ ? 'mdless' : MDLess.options[:theme]
+        theme = File.join(File.dirname(config), "#{theme}.theme")
+        contents = YAML.dump(MDLess.theme)
+
+        File.open(theme, 'w') { |f| f.puts contents }
+        Process.exit 0
+      end
+
       if !File.exist?(config) || MDLess.options[:update_config]
         FileUtils.mkdir_p(File.dirname(config))
         File.open(config, 'w') do |f|
@@ -236,6 +253,7 @@ module CLIMarkdown
           opts.delete(:list)
           opts.delete(:section)
           opts.delete(:update_config)
+          opts.delete(:update_theme)
           opts = opts.keys.map(&:to_s).sort.map { |k| [k.to_sym, opts[k.to_sym]] }.to_h
           f.puts YAML.dump(opts)
           warn "Config file saved to #{config}"

data/lib/mdless/hash.rb

@@ -1,8 +1,9 @@
 module CLIMarkdown
+  # Hash helpers
   class ::Hash
-      def deep_merge(second)
-          merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
-          self.merge(second.to_h, &merger)
-      end
+    def deep_merge(second)
+      merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
+      self.merge(second ? second.to_h : second, &merger)
+    end
   end
 end

data/lib/mdless/string.rb

@@ -107,7 +107,7 @@ class ::String
     log = MDLess.log
     tag_color = color('at_tags tag')
     value_color = color('at_tags value')
-    gsub(/(?<pre>\s|m)(?<tag>@[^ \].?!,("'\n]+)(?:(?<lparen>\()(?<value>.*?)(?<rparen>\)))?/) do
+    gsub(/(?<pre>\s|m)(?<tag>@[^ \]:;.?!,("'\n]+)(?:(?<lparen>\()(?<value>.*?)(?<rparen>\)))?(?=[ ;!,.?]|$)/) do
       m = Regexp.last_match
       last_color = m.pre_match.last_color_code
       [

data/lib/mdless/theme.rb

@@ -66,6 +66,7 @@ module CLIMarkdown
       },
       'code_block' => {
         'marker' => 'intense_black',
+        'character' => '>',
         'bg' => 'on_black',
         'color' => 'white on_black',
         'border' => 'blue',
@@ -118,16 +119,21 @@ module CLIMarkdown
     }
 
     def load_theme_file(theme_file)
-      new_theme = YAML.load(IO.read(theme_file))
+      raise "Theme #{theme_file} doesn't exist" unless File.exist?(theme_file)
+
       begin
+        theme_contents = IO.read(theme_file)
+        new_theme = YAML.load(theme_contents)
         theme = THEME_DEFAULTS.deep_merge(new_theme)
         # # write merged theme back in case there are new keys since
         # # last updated
         # File.open(theme_file,'w') {|f|
         #   f.puts theme.to_yaml
         # }
-      rescue StandardError
+      rescue StandardError => e
         @log.warn('Error merging user theme')
+        warn e
+        warn e.backtrace
         theme = THEME_DEFAULTS
         if File.basename(theme_file) =~ /mdless\.theme/
           FileUtils.rm(theme_file)

data/lib/mdless/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CLIMarkdown
-  VERSION = '2.1.7'
+  VERSION = '2.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.9
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 2023-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet