mdless 1.0.31 → 1.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e0a66c5ea1522d66b1cca9ad1e74e66b4e5dd301fd5b42eb9ff20d912074c02
-  data.tar.gz: 75e46348a488ae50975f931b3164a127ae085d53b1eba3ebd1264ce19e5c6048
+  metadata.gz: 124d704b9e69d3c7afbba30442cc2e3f3b9ebd92edc16b345c3a5489b64a5823
+  data.tar.gz: 0e257d07a7c684441140ad2d526711c41127f97af37ae798311d9f04e5f832fd
 SHA512:
-  metadata.gz: 362da8ff8940e858a31a5c40a375454d54b0632bfef39ab50426257424887115f56dfe92909ba00e365a6953c7c4381db34a3bb4b78995702c2e9668d82506c7
-  data.tar.gz: 0e1df0694ecfc053517aa22cd0430e554dc06742a3443d37648f15cd2db82f97b5de697f18ab2982d9511d30d68a4165c813c23a8cfc33363bba92170cd539c3
+  metadata.gz: 621d98dd881546000fdff38ad51e691d1c729fce4a87f96dc19b5041b9fefefd826245ed9b865db272165b591a0d300b6d1c5dca71d2612b611bc9549dce3181
+  data.tar.gz: 33287f2fd78bdc15fd9bc15003a30df2396688475864063e012d96418c8e390a2c2e6c67c746831608a40e4bea0ee594540e209dbcc6806d3e7950c870406785

data/README.md

@@ -1,12 +1,13 @@
 # mdless
 
 <!--README-->
+
 `mdless` is a utility that provides a formatted and highlighted view of Markdown files in Terminal.
 
 I often use iTerm2 in visor mode, so `qlmanage -p` is annoying. I still wanted a way to view Markdown files quickly and without cruft.
 
 <!--GITHUB-->![mdless screenshot](screenshots/mdless.png)<!--END GITHUB-->
-<!--JEKYLL {% gif /uploads/2015/08/mdless.gif %} -->
+<!--JEKYLL{% gif /uploads/2015/08/mdless.gif %}-->
 
 ## Features
 
@@ -17,7 +18,7 @@ I often use iTerm2 in visor mode, so `qlmanage -p` is annoying. I still wanted a
 - Display footnotes after each paragraph
 - Inline image display (local, optionally remote) if using iTerm2 2.9+
 - Syntax highlighting when [Pygments](http://pygments.org/) is installed
-    - Only fenced code with a language defined (e.g. `\`\`\`python`) will be highlighted
+    - Only fenced code with a language defined (e.g. `python`) will be highlighted
     - Languages can also be determined by hashbang in the code block
 - List headlines in document
     - Display single section of the document based on headlines
@@ -114,4 +115,5 @@ Use 'r' to reverse foreground and background colors. `r white on_black` would di
 To set a background color, use `on_[color]` with one of the 8 colors. This can be used with foreground colors in the same setting, e.g. `white on_black`.
 
 Use 'd' (dark) to indicate the darker version of a foreground color. On macOS (and possibly other systems) you can use the brighter version of a color by prefixing with "intense", e.g. `intense_red` or `on_intense_black`.
+
 <!--END README-->

data/bin/mdless

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
-# coding: utf-8
+# frozen_string_literal: true
+
 require 'mdless'
 
 def class_exists?(class_name)
   klass = Module.const_get(class_name)
-  return klass.is_a?(Class)
+  klass.is_a?(Class)
 rescue NameError
-  return false
+  false
 end
 
 if class_exists? 'Encoding'

data/lib/mdless/converter.rb

@@ -22,11 +22,11 @@ module CLIMarkdown
         opts.banner = "#{version} by Brett Terpstra\n\n> Usage: #{CLIMarkdown::EXECUTABLE_NAME} [options] [path]\n\n"
 
         @options[:color] = true
-        opts.on( '-c', '--[no-]color', 'Colorize output (default on)' ) do |c|
+        opts.on('-c', '--[no-]color', 'Colorize output (default on)') do |c|
           @options[:color] = c
         end
 
-        opts.on( '-d', '--debug LEVEL', 'Level of debug messages to output' ) do |level|
+        opts.on('-d', '--debug LEVEL', 'Level of debug messages to output') do |level|
           if level.to_i > 0 && level.to_i < 5
             @log.level = 5 - level.to_i
           else
@@ -35,7 +35,7 @@ module CLIMarkdown
           end
         end
 
-        opts.on( '-h', '--help', 'Display this screen' ) do
+        opts.on('-h', '--help', 'Display this screen') do
           puts opts
           exit
         end
@@ -54,8 +54,8 @@ module CLIMarkdown
             end
           end
         end
-        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'
+        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'
             @options[:local_images] = true
             @options[:remote_images] = true
           else
@@ -64,51 +64,51 @@ module CLIMarkdown
         end
 
         @options[:links] = :inline
-        opts.on( '--links=FORMAT', 'Link style ([inline, reference], default inline) [NOT CURRENTLY IMPLEMENTED]' ) do |format|
+        opts.on('--links=FORMAT', 'Link style ([inline, reference], default inline) [NOT CURRENTLY IMPLEMENTED]') do |format|
           if format =~ /^r/i
             @options[:links] = :reference
           end
         end
 
         @options[:list] = false
-        opts.on( '-l', '--list', 'List headers in document and exit' ) do
+        opts.on('-l', '--list', 'List headers in document and exit' ) do
           @options[:list] = true
         end
 
         @options[:pager] = true
-        opts.on( '-p', '--[no-]pager', 'Formatted output to pager (default on)' ) do |p|
+        opts.on('-p', '--[no-]pager', 'Formatted output to pager (default on)') do |p|
           @options[:pager] = p
         end
 
-        opts.on( '-P', 'Disable pager (same as --no-pager)' ) do
+        opts.on('-P', 'Disable pager (same as --no-pager)') do
           @options[:pager] = false
         end
 
         @options[:section] = nil
-        opts.on( '-s', '--section=NUMBER', 'Output only a headline-based section of the input (numeric from --list)' ) do |section|
-          @options[:section] = section.to_i
+        opts.on('-s', '--section=NUMBER[,NUMBER]', 'Output only a headline-based section of the input (numeric from --list)') do |section|
+          @options[:section] = section.split(/ *, */).map(&:strip).map(&:to_i)
         end
 
         @options[:theme] = 'default'
-        opts.on( '-t', '--theme=THEME_NAME', 'Specify an alternate color theme to load' ) do |theme|
+        opts.on('-t', '--theme=THEME_NAME', 'Specify an alternate color theme to load') do |theme|
           @options[:theme] = theme
         end
 
-        opts.on( '-v', '--version', 'Display version number' ) do
+        opts.on('-v', '--version', 'Display version number') do
           puts version
           exit
         end
 
-        @options[:width] = %x{tput cols}.strip.to_i
-        opts.on( '-w', '--width=COLUMNS', 'Column width to format for (default terminal width)' ) do |columns|
+        @options[:width] = `tput cols`.strip.to_i
+        opts.on('-w', '--width=COLUMNS', 'Column width to format for (default: terminal width)') do |columns|
           @options[:width] = columns.to_i
         end
       end
 
       begin
         optparse.parse!
-      rescue OptionParser::ParseError => pe
-        $stderr.puts "error: #{pe.message}"
+      rescue OptionParser::ParseError => e
+        warn "error: #{e.message}"
         exit 1
       end
 
@@ -122,33 +122,33 @@ module CLIMarkdown
       @ref_links = {}
       @footnotes = {}
 
-      if args.length > 0
-        files = args.delete_if { |f| !File.exists?(f) }
-        files.each {|file|
-          @log.info(%Q{Processing "#{file}"})
+      if !args.empty?
+        files = args.delete_if { |f| !File.exist?(f) }
+        files.each do |file|
+          @log.info(%(Processing "#{file}"))
           @file = file
           begin
             input = IO.read(file).force_encoding('utf-8')
-          rescue
+          rescue StandardError
             input = IO.read(file)
           end
-          input.gsub!(/\r?\n/,"\n")
+          input.gsub!(/\r?\n/, "\n")
           if @options[:list]
             puts list_headers(input)
             Process.exit 0
           else
             convert_markdown(input)
           end
-        }
+        end
         printout
-      elsif ! STDIN.tty?
+      elsif !$stdin.isatty
         @file = nil
         begin
-          input = STDIN.read.force_encoding('utf-8')
-        rescue
-          input = STDIN.read
+          input = $stdin.read.force_encoding('utf-8')
+        rescue StandardError
+          input = $stdin.read
         end
-        input.gsub!(/\r?\n/,"\n")
+        input.gsub!(/\r?\n/, "\n")
         if @options[:list]
           puts list_headers(input)
           Process.exit 0
@@ -157,7 +157,7 @@ module CLIMarkdown
         end
         printout
       else
-        $stderr.puts "No input"
+        warn 'No input'
         Process.exit 1
       end
 
@@ -172,19 +172,17 @@ module CLIMarkdown
         @log.error("Invalid theme key: #{key}") unless keys[0] =~ /^text/
         return c([:reset])
       end
-      keys.each {|k|
+      keys.each do |k|
         if val.key?(k)
           val = val[k]
         else
           @log.error("Invalid theme key: #{k}")
           return c([:reset])
         end
-      }
-      if val.kind_of? String
+      end
+      if val.is_a? String
         val = "x #{val}"
-        res = val.split(/ /).map {|k|
-          k.to_sym
-        }
+        res = val.split(/ /).map { |k| k.to_sym }
         c(res)
       else
         c([:reset])
@@ -192,7 +190,7 @@ module CLIMarkdown
     end
 
     def get_headers(input)
-      unless @headers && @headers.length > 0
+      unless @headers && !@headers.empty?
         @headers = []
         headers = input.scan(/^((?!#!)(\#{1,6})\s*([^#]+?)(?: #+)?\s*|(\S.+)\n([=-]+))$/i)
 
@@ -490,6 +488,10 @@ module CLIMarkdown
     end
 
     def convert_markdown(input)
+      ## Replace setex headers with ATX
+      input.gsub!(/^([^\n]+)\n={3,}\s*$/m, "# \\1\n")
+      input.gsub!(/^([^\n]+?)\n-{3,}\s*$/m, "## \\1\n")
+
       @headers = get_headers(input)
       input += "\n\n@@@"
       # yaml/MMD headers
@@ -529,7 +531,6 @@ module CLIMarkdown
 
       end
 
-
       # Gather reference links
       input.gsub!(/^\s{,3}(?<![\e*])\[\b(.+)\b\]: +(.+)/) do |m|
         match = Regexp.last_match
@@ -546,34 +547,34 @@ module CLIMarkdown
       end
 
       if @options[:section]
-        in_section = false
-        top_level = 1
         new_content = []
-
-        input.split(/\n/).each {|graf|
-          if graf =~ /^(#+) *(.*?)( *#+)?$/
-            level = $1.length
-            title = $2
-
-            if in_section
-              if level >= top_level
+        @options[:section].each do |sect|
+          in_section = false
+          top_level = 1
+          input.split(/\n/).each do |graf|
+            if graf =~ /^(#+) *(.*?)( *#+)?$/
+              m = Regexp.last_match
+              level = m[1].length
+              title = m[2]
+              if in_section
+                if level >= top_level
+                  new_content.push(graf)
+                else
+                  in_section = false
+                  break
+                end
+              elsif title.downcase == @headers[sect - 1][1].downcase
+                in_section = true
+                top_level = level + 1
                 new_content.push(graf)
               else
-                in_section = false
-                break
+                next
               end
-            elsif title.downcase == "#{@headers[@options[:section] - 1][1].downcase}"
-              in_section = true
-              top_level = level + 1
+            elsif in_section
               new_content.push(graf)
-            else
-              next
             end
-          elsif in_section
-            new_content.push(graf)
           end
-        }
-
+        end
         input = new_content.join("\n")
       end
 
@@ -1042,8 +1043,6 @@ module CLIMarkdown
       args = case pg
       when 'delta'
         ' --pager="less -Xr"'
-      when 'more'
-        ' -r'
       when 'less'
         ' -Xr'
       when 'bat'

data/lib/mdless/theme.rb

@@ -2,92 +2,92 @@ module CLIMarkdown
   module Theme
 
     THEME_DEFAULTS = {
-        'metadata' => {
-          'border' => 'd blue on_black',
-          'marker' => 'd black on_black',
-          'color' => 'd white on_black'
-        },
-        'emphasis' => {
-          'bold' => 'b',
-          'italic' => 'u i',
-          'bold-italic' => 'b u i'
-        },
-        'h1' => {
-          'color' => 'b intense_black on_white',
-          'pad' => 'd black on_white',
-          'pad_char' => '='
-        },
-        'h2' => {
-          'color' => 'b white on_intense_black',
-          'pad' => 'd white on_intense_black',
-          'pad_char' => '-'
-        },
-        'h3' => {
-          'color' => 'u b yellow'
-        },
-        'h4' => {
-          'color' => 'u yellow'
-        },
-        'h5' => {
-          'color' => 'b white'
-        },
-        'h6' => {
-          'color' => 'b white'
-        },
-        'link' => {
-          'brackets' => 'b black',
-          'text' => 'u b blue',
-          'url' => 'cyan'
-        },
-        'image' => {
-          'bang' => 'red',
-          'brackets' => 'b black',
-          'title' => 'cyan',
-          'url' => 'u yellow'
-        },
-        'list' => {
-          'bullet' => 'b intense_red',
-          'number' => 'b intense_blue',
-          'color' => 'intense_white'
-        },
-        'footnote' => {
-          'brackets' => 'b black on_black',
-          'caret' => 'b yellow on_black',
-          'title' => 'x yellow on_black',
-          'note' => 'u white on_black'
-        },
-        'code_span' => {
-          'marker' => 'b white',
-          'color' => 'b white on_intense_black'
-        },
-        'code_block' => {
-          'marker' => 'intense_black',
-          'bg' => 'on_black',
-          'color' => 'white on_black',
-          'border' => 'blue',
-          'title' => 'magenta',
-          'eol' => 'intense_black on_black',
-          'pygments_theme' => 'monokai'
-        },
-        'dd' => {
-          'marker' => 'd red',
-          'color' => 'b white'
-        },
-        'hr' => {
-          'color' => 'd white'
-        },
-        'table' => {
-          'border' => 'd black',
-          'header' => 'yellow',
-          'divider' => 'b black',
-          'color' => 'white',
-          'bg' => 'on_black'
-        },
-        'html' => {
-          'brackets' => 'd yellow on_black',
-          'color' => 'yellow on_black'
-        }
+      'metadata' => {
+        'border' => 'd blue on_black',
+        'marker' => 'd black on_black',
+        'color' => 'd white on_black'
+      },
+      'emphasis' => {
+        'bold' => 'b',
+        'italic' => 'u i',
+        'bold-italic' => 'b u i'
+      },
+      'h1' => {
+        'color' => 'b intense_black on_white',
+        'pad' => 'd black on_white',
+        'pad_char' => '='
+      },
+      'h2' => {
+        'color' => 'b white on_intense_black',
+        'pad' => 'd white on_intense_black',
+        'pad_char' => '-'
+      },
+      'h3' => {
+        'color' => 'u b yellow'
+      },
+      'h4' => {
+        'color' => 'u yellow'
+      },
+      'h5' => {
+        'color' => 'b white'
+      },
+      'h6' => {
+        'color' => 'b white'
+      },
+      'link' => {
+        'brackets' => 'b black',
+        'text' => 'u b blue',
+        'url' => 'cyan'
+      },
+      'image' => {
+        'bang' => 'red',
+        'brackets' => 'b black',
+        'title' => 'cyan',
+        'url' => 'u yellow'
+      },
+      'list' => {
+        'bullet' => 'b intense_red',
+        'number' => 'b intense_blue',
+        'color' => 'intense_white'
+      },
+      'footnote' => {
+        'brackets' => 'b black on_black',
+        'caret' => 'b yellow on_black',
+        'title' => 'x yellow on_black',
+        'note' => 'u white on_black'
+      },
+      'code_span' => {
+        'marker' => 'b white',
+        'color' => 'b white on_intense_black'
+      },
+      'code_block' => {
+        'marker' => 'intense_black',
+        'bg' => 'on_black',
+        'color' => 'white on_black',
+        'border' => 'blue',
+        'title' => 'magenta',
+        'eol' => 'intense_black on_black',
+        'pygments_theme' => 'monokai'
+      },
+      'dd' => {
+        'marker' => 'd red',
+        'color' => 'b white'
+      },
+      'hr' => {
+        'color' => 'd white'
+      },
+      'table' => {
+        'border' => 'd black',
+        'header' => 'yellow',
+        'divider' => 'b black',
+        'color' => 'white',
+        'bg' => 'on_black'
+      },
+      'html' => {
+        'brackets' => 'd yellow on_black',
+        'color' => 'yellow on_black'
       }
+    }
 
     def load_theme_file(theme_file)
       new_theme = YAML.load(IO.read(theme_file))
@@ -98,15 +98,13 @@ module CLIMarkdown
         # File.open(theme_file,'w') {|f|
         #   f.puts theme.to_yaml
         # }
-      rescue
+      rescue StandardError
         @log.warn('Error merging user theme')
         theme = THEME_DEFAULTS
         if File.basename(theme_file) =~ /mdless\.theme/
           FileUtils.rm(theme_file)
           @log.info("Rewriting default theme file to #{theme_file}")
-          File.open(theme_file,'w') {|f|
-            f.puts theme.to_yaml
-          }
+          File.open(theme_file, 'w') { |f| f.puts theme.to_yaml }
         end
       end
       theme
@@ -114,12 +112,12 @@ module CLIMarkdown
 
     def load_theme(theme)
       config_dir = File.expand_path('~/.config/mdless')
-      default_theme_file = File.join(config_dir,'mdless.theme')
+      default_theme_file = File.join(config_dir, 'mdless.theme')
       if theme =~ /default/i || !theme
         theme_file = default_theme_file
       else
-        theme = theme.strip.sub(/(\.theme)?$/,'.theme')
-        theme_file = File.join(config_dir,theme)
+        theme = theme.strip.sub(/(\.theme)?$/, '.theme')
+        theme_file = File.join(config_dir, theme)
       end
 
       unless File.directory?(config_dir)
@@ -127,16 +125,14 @@ module CLIMarkdown
         FileUtils.mkdir_p(config_dir)
       end
 
-      unless File.exists?(theme_file)
-        unless File.exists?(default_theme_file)
+      unless File.exist?(theme_file)
+        if File.exist?(default_theme_file)
+          @log.info('Specified theme not found, using default')
+          theme_file = default_theme_file
+        else
           theme = THEME_DEFAULTS
           @log.info("Writing fresh theme file to #{theme_file}")
-          File.open(theme_file,'w') {|f|
-            f.puts theme.to_yaml
-          }
-        else
-          @log.info("Specified theme not found, using default")
-          theme_file = default_theme_file
+          File.open(theme_file, 'w') { |f| f.puts theme.to_yaml }
         end
       end
 

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '1.0.31'
+  VERSION = '1.0.33'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 1.0.31
+  version: 1.0.33
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2023-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake