mdless 1.0.27 → 1.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 155e4a600259101069f5c7fa7a2c142a31ad0a6b7ea12a3185bf4f5477ae0e09
-  data.tar.gz: b19dadf9f8ae825f22aeeab2ba1b2044d0e3830d27ecd7a98aab6fa966c3488c
+  metadata.gz: a69b03a6efd774409146752f36c9afecc2cb2c3efa5f2359138400b269f6eb44
+  data.tar.gz: 855a0a8c4d71e2ff946324768d335c8403dd94d70c52a55a661e5c37c835e1ab
 SHA512:
-  metadata.gz: da901c9f4224ff23bf23dc71163db735ea1e4ac6a997b5f4d61f61124cea2809468a98e8035264733a68ec4c5d4f3b21711901a4eef8e77464c58e1694089561
-  data.tar.gz: ddd59266c9f67885ad271cc89effa782ddd1f47fdcc201d0d7194e0bfb23a01ea00c4f88073c3fadebdff94b0a9e1fbf9b29500c1cc5f2935aa5a58fd2920c7c
+  metadata.gz: fdb73be6939bf9584c0dc4c2615b2df1cfe020d8a6596d84351ac8caff9c2e94a9baa63ea73f69b200fe473f157c209d9409db767bb224d2c0c7da68970324f7
+  data.tar.gz: 839937da5fc9ef1343d777303f86ed9db2ffd23356c3c743ca90d5af1d8cea41bd3c3f98ada940882faa1fedb930f4e4bf8c9850e6ef20700b83bd931906addf

data/lib/mdless/converter.rb

@@ -811,8 +811,8 @@ module CLIMarkdown
           end
 
           # misc html
-          line.gsub!(/<br\/?>/, "\n")
-          line.gsub!(/(?i-m)((<\/?)(\w+[\s\S]*?)(>))/) do |tag|
+          line.gsub!(%r{<br/?>}, "\n")
+          line.gsub!(%r{(?i-m)((</?)(\w+[\s\S]*?)(>))}) do
             match = Regexp.last_match
             last = find_color(match.pre_match)
             [
@@ -822,12 +822,12 @@ module CLIMarkdown
               match[3],
               color('html brackets'),
               match[4],
-              last ? last : xc
+              last || xc
             ].join
           end
 
           # inline code spans
-          line.gsub!(/`(.*?)`/) do |m|
+          line.gsub!(/`(.*?)`/) do
             match = Regexp.last_match
             last = find_color(match.pre_match, true)
             [
@@ -837,7 +837,7 @@ module CLIMarkdown
               match[1],
               color('code_span marker'),
               '`',
-              last ? last : xc
+              last || xc
             ].join
           end
         end
@@ -853,7 +853,7 @@ module CLIMarkdown
       input = lines.join("\n")
 
       # images
-      input.gsub!(/^(.*?)!\[(.*)?\]\((.*?\.(?:png|gif|jpg))( +.*)?\)/) do |m|
+      input.gsub!(/^(.*?)!\[(.*)?\]\((.*?\.(?:png|gif|jpg))( +.*)?\)/) do
         match = Regexp.last_match
         if match[1].uncolor =~ /^( {4,}|\t)+/
           match[0]
@@ -893,23 +893,23 @@ module CLIMarkdown
                       @log.error(e)
                     end
                   else
-                    @log.warn("No viewer for remote images")
+                    @log.warn('No viewer for remote images')
                   end
                 end
               else
-                if img_path =~ /^[~\/]/
+                if img_path =~ %r{^[~/]}
                   img_path = File.expand_path(img_path)
                 elsif @file
                   base = File.expand_path(File.dirname(@file))
-                  img_path = File.join(base,img_path)
+                  img_path = File.join(base, img_path)
                 end
-                if File.exists?(img_path)
-                  pre = match[2].size > 0 ? "    #{c(%i[d blue])}[#{match[2].strip}]\n" : ''
-                  post = tail.size > 0 ? "\n    #{c(%i[b blue])}-- #{tail} --" : ''
+                if File.exist?(img_path)
+                  pre = !match[2].empty? ? "    #{c(%i[d blue])}[#{match[2].strip}]\n" : ''
+                  post = !tail.empty? ? "\n    #{c(%i[b blue])}-- #{tail} --" : ''
                   if exec_available('chafa')
-                    img = %x{chafa "#{img_path}"}
+                    img = `chafa "#{img_path}"`
                   elsif exec_available('imgcat')
-                    img = %x{imgcat "#{img_path}"}
+                    img = `imgcat "#{img_path}"`
                   end
                   result = pre + img + post
                 end
@@ -924,32 +924,31 @@ module CLIMarkdown
         end
       end
 
-      @footnotes.each {|t, v|
+      @footnotes.each do |t, v|
         input += [
           "\n\n",
           color('footnote brackets'),
-          "[",
+          '[',
           color('footnote caret'),
-          "^",
+          '^',
           color('footnote title'),
           t,
           color('footnote brackets'),
-          "]: ",
+          ']: ',
           color('footnote note'),
           v,
           xc
         ].join
-      }
+      end
 
       @output += input
-
     end
 
     def exec_available(cli)
-      if File.exists?(File.expand_path(cli))
+      if File.exist?(File.expand_path(cli))
         File.executable?(File.expand_path(cli))
       else
-        system "which #{cli}", :out => File::NULL, :err => File::NULL
+        system "which #{cli}", out: File::NULL, err: File::NULL
       end
     end
 
@@ -967,7 +966,7 @@ module CLIMarkdown
         IO.select [input]
 
         pager = which_pager
-        @log.info(%{Using #{pager} as pager})
+        @log.info("Using #{pager} as pager")
         begin
           exec(pager.join(' '))
         rescue SystemCallError => e
@@ -980,7 +979,7 @@ module CLIMarkdown
         read_io.close
         write_io.write(text)
         write_io.close
-      rescue SystemCallError => e
+      rescue SystemCallError
         exit 1
       end
 
@@ -1015,7 +1014,7 @@ module CLIMarkdown
     end
 
     def which_pager
-      pagers = [ENV['GIT_PAGER'], ENV['PAGER']]
+      pagers = [ENV['PAGER'], ENV['GIT_PAGER']]
 
       if exec_available('git')
         git_pager = `git config --get-all core.pager || true`.split.first
@@ -1041,6 +1040,8 @@ module CLIMarkdown
 
       pg = pagers.first
       args = case pg
+      when 'delta'
+        ' --pager="less -Xr"'
       when 'more'
         ' -r'
       when 'less'
@@ -1051,6 +1052,8 @@ module CLIMarkdown
         ''
       end
 
+      puts [pg, args]
+
       [pg, args]
     end
 

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '1.0.27'
+  VERSION = '1.0.28'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 1.0.27
+  version: 1.0.28
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2022-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,22 +28,16 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 6.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 6.3.1
 description: A CLI that provides a formatted and highlighted view of Markdown files
   in a terminal
 email: me@brettterpstra.com