mdless 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a7d200fbf2d90da97cf6ae65beecac52643ec377d2a60f7d8503ca2411694ea
-  data.tar.gz: f35b88bdf439f3436ddf2e6cf0b835e8a23d5d5553721b0c35d75954af43013e
+  metadata.gz: 0f08302d14bfa27b06fd821e56f46b6a04049009df87ab024c368e7776209810
+  data.tar.gz: c14bd96efedeaa61eba790a1f2e2664df39f85839ad914ffccfe323ef3312ee5
 SHA512:
-  metadata.gz: 906870b0032f1cba0a1c90be6ac2cb80f82c1abcb331470f75b02598d05d965996b2d2eb0a076b2651e32e9ae567334b693a9dffd702b517e15c5b8048f2e172
-  data.tar.gz: e1874c241362b44607a357ec4e125bdc463ae3b3ab906bdf7237e1b782a6122b6f90d664210cf7dd1b964bf843adb1056adbacdd93b816f0bb31db4d92ad1cf5
+  metadata.gz: 633007f423725e003e3c7154262801738bf22b79485d09b99caf06a83486fdca50a0e8b91f7d9a4118dd43c2bd0404cccc31a55486a8db00500e82a95007edeb
+  data.tar.gz: 870af2c74618556db8a6621016f9cc603f424956adda3441f0e8043f661bb2fac22b7c6f0e1aaa655570b0d7234e2d6e12c625d5a8af89599f2061db42e622ec

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+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/console.rb

@@ -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,

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/theme.rb

@@ -118,16 +118,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.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - Brett Terpstra