mdless 1.0.31 → 1.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e0a66c5ea1522d66b1cca9ad1e74e66b4e5dd301fd5b42eb9ff20d912074c02
-  data.tar.gz: 75e46348a488ae50975f931b3164a127ae085d53b1eba3ebd1264ce19e5c6048
+  metadata.gz: fa89ffe14d9828b457116dde396a11bde06bbe58a258f721b5d0c0d2e5d381bf
+  data.tar.gz: 2b12d4353cf2f836b0dea6491f7671fae7d269e8b3617cfc92ba8f90e58da0ce
 SHA512:
-  metadata.gz: 362da8ff8940e858a31a5c40a375454d54b0632bfef39ab50426257424887115f56dfe92909ba00e365a6953c7c4381db34a3bb4b78995702c2e9668d82506c7
-  data.tar.gz: 0e1df0694ecfc053517aa22cd0430e554dc06742a3443d37648f15cd2db82f97b5de697f18ab2982d9511d30d68a4165c813c23a8cfc33363bba92170cd539c3
+  metadata.gz: 47a0731cd6e4a7febf475f253406938726deebb1e1cbb5808e2048789ab5f695ba9e234656ce40316978eb12e7da2d08b4bed3b42d27614a89fd8ed2ceffa725
+  data.tar.gz: 9d74ae761471b840e816e4b15ceb81697bbccdf7331d5431a0845727599967383c361c890008bc795312f91374f243a0f6696b953e6c38b197377913a64b6b86

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

@@ -123,32 +123,32 @@ module CLIMarkdown
       @footnotes = {}
 
       if args.length > 0
-        files = args.delete_if { |f| !File.exists?(f) }
-        files.each {|file|
-          @log.info(%Q{Processing "#{file}"})
+        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)
 
@@ -1042,8 +1040,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.32'
 end

metadata

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