mdless 2.1.27 → 2.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2ff8e5c411b2dca9194b32e684495ee5a43376da035e427365c7c8c305abc3d
-  data.tar.gz: 7de7a979e5aeeb61cb92d3e0dfd1166aec6ac63f446422592a3a005cd6ec8755
+  metadata.gz: 1e5c2be4377b1bad77f8c7f3e0ab932a16ca9339332c91e3bc5f0b7db8c71df2
+  data.tar.gz: f540f256c1117dab4a9ef0e758f940d3f79a848abe2f15f5b2866e5f2e052656
 SHA512:
-  metadata.gz: 0b458218411a7a4952652aa807c2b98cb2ea298b3f3051b4743acf1afb670c914b690e7ce97e5185cb0a86c83bdf2b3c552d7b2d8075454324ce39fef9629f9c
-  data.tar.gz: d44ebccb7cb2230713c7250e0dcc904961b0f7b9f0fd2f146cbaa24ca7580a748e4282dd23c8e367f6d1bb5176c4c0efa08457cc7bde02481b66c5db722bdde9
+  metadata.gz: b52a6501909c93927e508419298a767aeb759c661b45c877feb33b72caa9f512146ab5fc67a41530666328e5e37ebc53bf25979b0340ee50666433e85f2df920
+  data.tar.gz: da7f8a1949c56474461847ca9b66fccc1dea888552976b2e00b3dea12a250ba3c28cc70bf2496a1293171c4c17300779f68c228ff24ddf9068ff08046492db6e

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 2.1.26
 
+2.1.29
+: More code cleanup, help output improvements
+: Line breaks in help output
+: This release should fix an error on Ruby 2.7 in string.rb
+
+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
 

data/bin/mdless

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -W1
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 require 'mdless'

data/lib/mdless/converter.rb

@@ -45,7 +45,8 @@ module CLIMarkdown
         default(:local_images, false)
         default(:remote_images, false)
         opts.on('-i', '--images=TYPE',
-                'Include [local|remote (both)|none] images in output (requires chafa or imgcat, default none).') do |type|
+                'Include [local|remote (both)|none] images in output'\
+                ' (requires chafa or imgcat, default none).') do |type|
           if exec_available('imgcat') || exec_available('chafa')
             case type
             when /^(r|b|a)/i
@@ -62,7 +63,8 @@ module CLIMarkdown
           end
         end
 
-        opts.on('-I', '--all-images', 'Include local and remote images in output (requires imgcat or chafa)') do
+        opts.on('-I', '--all-images', 'Include local and remote images in output'\
+               ' (requires imgcat or chafa)') do
           if exec_available('imgcat') || exec_available('chafa') # && ENV['TERM_PROGRAM'] == 'iTerm.app'
             MDLess.options[:local_images] = true
             MDLess.options[:remote_images] = true
@@ -114,13 +116,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]
+        MDLess.cols = TTY::Screen.cols - 2 if MDLess.cols.zero?
+
         default(:autolink, true)
         opts.on('--[no-]autolink', 'Convert bare URLs and emails to <links>') do |p|
           MDLess.options[:autolink] = p
@@ -138,8 +145,9 @@ module CLIMarkdown
           Process.exit 0
         end
 
-        opts.on('--edit-theme', ["Open the default or specified theme file in #{ENV['EDITOR'] || 'default editor'}. ",
-                                 "If theme doesn't exist, a new theme file will be populated and opened."].join) do
+        opts.on('--edit-theme', 'Open the default/specified theme in ' \
+                                "#{File.basename(ENV['EDITOR']) || 'default editor'}, "\
+                                'populating a new theme if needed. Use after --theme in the command.') do
           raise 'No $EDITOR defined' unless ENV['EDITOR']
 
           theme = MDLess.options[:theme] =~ /default/ ? 'mdless' : MDLess.options[:theme]
@@ -150,7 +158,7 @@ module CLIMarkdown
         end
 
         default(:inline_footnotes, false)
-        opts.on('--[no-]inline_footnotes',
+        opts.on('--[no-]inline-footnotes',
                 'Display footnotes immediately after the paragraph that references them') do |p|
           MDLess.options[:inline_footnotes] = p
         end
@@ -167,8 +175,8 @@ module CLIMarkdown
 
         default(:links, :inline)
         opts.on('--links=FORMAT',
-                'Link style ([inline, reference, paragraph], default inline,
-                "paragraph" will position reference links after each paragraph)') do |fmt|
+                'Link style ([*inline, reference, paragraph],'\
+                ' "paragraph" will position reference links after each paragraph)') do |fmt|
           MDLess.options[:links] = case fmt
                              when /^:?r/i
                                :reference
@@ -195,26 +203,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 +231,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 +273,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/string.rb

@@ -67,7 +67,7 @@ class ::String
       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 }
+        YAML.load(m['content']).map { |k, v| MDLess.meta[k.downcase] = v }
         lines = m['content'].split(/\n/)
         longest = lines.inject { |memo, word| memo.length > word.length ? memo : word }.length
         longest = longest < @cols ? longest + 1 : @cols

data/lib/mdless/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 2.1.27
+  version: 2.1.29
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-05 00:00:00.000000000 Z
+date: 2023-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: A pager like less, but for Markdown files