mdless 2.1.25 → 2.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e20c93485c7b39a9b31627f779b9d36c1671cbc13649b079edbe6a4b97a6cd5
-  data.tar.gz: f0c098c1b89fc82d532dd446152e5f8c24a4ff5e8c9ea1cfa0db5cdb7c749419
+  metadata.gz: e2ff8e5c411b2dca9194b32e684495ee5a43376da035e427365c7c8c305abc3d
+  data.tar.gz: 7de7a979e5aeeb61cb92d3e0dfd1166aec6ac63f446422592a3a005cd6ec8755
 SHA512:
-  metadata.gz: e7769b7398ce44574926efe08e97ac52e1f0cd5e0d39ed47a10b34da6e596fd37d7b88a498bed4c8ce88a70019c09d7ccc5ec9c255de04147921ad3fea1b36c1
-  data.tar.gz: ee7eabac8aacf7e268ac5708cdf97ade953d0dd1df50c1b83ca9dc20dd25a4a41c29068514b6ed3682d374e1c8b6ece6a2b6c484681b85213cc590d4293e2a5b
+  metadata.gz: 0b458218411a7a4952652aa807c2b98cb2ea298b3f3051b4743acf1afb670c914b690e7ce97e5185cb0a86c83bdf2b3c552d7b2d8075454324ce39fef9629f9c
+  data.tar.gz: d44ebccb7cb2230713c7250e0dcc904961b0f7b9f0fd2f146cbaa24ca7580a748e4282dd23c8e367f6d1bb5176c4c0efa08457cc7bde02481b66c5db722bdde9

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+2.1.26
+
+2.1.27
+: Error handling when YAML can't be processed
+
 2.1.25
 : YAML loading issues caused by safe_load
 

data/lib/mdless/console.rb

@@ -751,8 +751,17 @@ module Redcarpet
           in_yaml = true
           input.sub!(/(?i-m)^---[ \t]*\n(?<content>(?:[\s\S]*?))\n[-.]{3}[ \t]*\n/m) do
             m = Regexp.last_match
-            MDLess.log.info('Processing YAML Header')
-            MDLess.meta = YAML.load(m['content']).map { |k, v| "#{k.downcase}" => v }
+            MDLess.log.info('Processing YAML header')
+            begin
+              MDLess.meta = YAML.load(m['content']).map { |k, v| "#{k.downcase}" => v }
+            rescue Psych::DisallowedClass => e
+              @log.error('Error reading YAML header')
+              @log.error(e)
+              MDLess.meta = {}
+            rescue StandardError => e
+              @log.error("StandardError: #{e}")
+            end
+
             lines = m[0].split(/\n/)
             longest = lines.longest_element.length
             longest = longest < MDLess.cols ? longest + 1 : MDLess.cols
@@ -780,10 +789,12 @@ module Redcarpet
 
             lines.map do |line|
               line.sub!(/^(.*?:)[ \t]+(\S)/, '\1 \2')
-              parts = line.match(/[ \t]*(.*?): +(.*?)$/)
-              key = parts[1].gsub(/[^a-z0-9\-_]/i, '')
-              value = parts[2].strip
-              MDLess.meta[key] = value
+              parts = line.match(/^[ \t]*(\S.*?):[ \t]+(\S.*?)$/)
+              if parts
+                key = parts[1].gsub(/[^a-z0-9\-_]/i, '')
+                value = parts[2].strip
+                MDLess.meta[key] = value
+              end
               line = "#{color('metadata marker')}%#{color('metadata color')}#{line}"
               line += "\u00A0" * (longest - line.uncolor.strip.length) if (longest - line.uncolor.strip.length).positive?
               line + xc

data/lib/mdless/converter.rb

@@ -264,6 +264,7 @@ module CLIMarkdown
           opts.delete(:section)
           opts.delete(:update_config)
           opts.delete(:update_theme)
+          opts.delete(:width)
           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/version.rb

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

metadata

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