mdless 2.1.26 → 2.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1fb1a921f8fba70376fd696f457190e28222c5c07419dd13aad328323f29622
-  data.tar.gz: fb42bcba760484824b3ab6516206645890b8ddbe1274817894fc42780fac42fc
+  metadata.gz: 7be9ab30b8078d94b965d0f45094cd1b8e737210daaf1baa5030b54fac95c66a
+  data.tar.gz: aec7cf2e130cfd6d66b9482d417c1cb479e80c8e76c919f3b393524f68dc768d
 SHA512:
-  metadata.gz: 4325d830a288a4ba59fe4810f350de7c0259ec54a6aade29b440f4d5a71d542cc4b99de1f453d5b6c0f0aba50c5dc833b2311180c1cf8f7865d3c5ca2a6fb419
-  data.tar.gz: bbe50fdaa45cf08c2a77b19d3902ed82e72fde33b190b8fc62c98adbec96171b91f7f7d9aad213505ddcf7fa93c03603f4f7e8fcefffe5ee75084e58bce55263
+  metadata.gz: 66ebe7c5ee11c2266ecfb214058b71225c5842b81cf200e5c76854da9f0c3bdbd83fe34241a7dc7198b818203fb557cc0c4b4b642a95eb59e1190f7ae15d633d
+  data.tar.gz: 870ced12acb6fbbd687ea2159a7a88ac983e0fc058db27c367b6be626b778407a71a5b78c35e3775bbb08f6edc668821f02cf8826da46acef98df4ceb1abe41a

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 2.1.26
 
+2.1.28
+: Default to 0 width, which makes the width the column width of the terminal
+: Don't save a --width setting to config, require that to be manually updated if desired
+
+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

data/lib/mdless/converter.rb

@@ -114,11 +114,18 @@ module CLIMarkdown
           exit
         end
 
-        default(:width, TTY::Screen.cols)
-        opts.on('-w', '--width=COLUMNS', 'Column width to format for (default: terminal width)') do |columns|
-          MDLess.options[:width] = columns.to_i
+        default(:width, 0)
+        opts.on('-w', '--width=COLUMNS', 'Column width to format for (default: 0 -> terminal width)') do |columns|
+          columns = columns.to_i
           cols = TTY::Screen.cols
-          MDLess.options[:width] = cols if MDLess.options[:width] > cols
+          MDLess.cols = columns > 2 ? columns - 2 : cols
+
+          MDLess.options[:width] = columns > cols ? cols - 2 : columns - 2
+        end
+
+        MDLess.cols = MDLess.options[:width]
+        if MDLess.cols == 0
+          MDLess.cols = TTY::Screen.cols - 2
         end
 
         default(:autolink, true)
@@ -195,26 +202,26 @@ module CLIMarkdown
         end
 
         MDLess.options[:taskpaper] = if MDLess.options[:taskpaper]
-                                 case MDLess.options[:taskpaper].to_s
-                                 when /^[ty1]/
-                                   true
-                                 when /^a/
-                                   :auto
-                                 else
-                                   false
-                                 end
-                               else
-                                 false
-                               end
+                                       case MDLess.options[:taskpaper].to_s
+                                       when /^[ty1]/
+                                         true
+                                       when /^a/
+                                         :auto
+                                       else
+                                         false
+                                       end
+                                     else
+                                       false
+                                     end
         opts.on('--taskpaper=OPTION', 'Highlight TaskPaper format (true|false|auto)') do |tp|
           MDLess.options[:taskpaper] = case tp
-                                 when /^[ty1]/
-                                   true
-                                 when /^a/
-                                   :auto
-                                 else
-                                   false
-                                 end
+                                       when /^[ty1]/
+                                         true
+                                       when /^a/
+                                         :auto
+                                       else
+                                         false
+                                       end
         end
 
         default(:transclude, true)
@@ -223,7 +230,8 @@ module CLIMarkdown
         end
 
         default(:update_config, false)
-        opts.on('--update-config', '--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
 
@@ -264,15 +272,13 @@ module CLIMarkdown
           opts.delete(:section)
           opts.delete(:update_config)
           opts.delete(:update_theme)
-          opts.delete(:width)
+          opts[:width] = 0
           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}"
         end
       end
 
-      MDLess.cols = MDLess.options[:width] - 2
-
       @output = ''
       @headers = []
       @setheaders = []

data/lib/mdless/version.rb

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

metadata

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