mdless 1.0.13 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d6da924affdfcd0e5be75373d3e8be870fe4300a63c7a462d8fb35fed5d9c1d
-  data.tar.gz: 9ac90ee12218b43104728cdffdff67c265f53d0f6cc4ac92a7adf1eaa59e8397
+  metadata.gz: 8eea141a5dcf95ed15732749c7b5e975fb2e01de98b93e16dd2a4f88250f39a5
+  data.tar.gz: 5bc66169d0147198434cb21d8091366603412dec1745244a6b37aef483d4e909
 SHA512:
-  metadata.gz: 19c6121272e4975a75acc7e7e60a5cd00f842341a560fb795faa125ec5ebcfad794470d44932d142620a60c8d5627a127c7e95c057e5f2904ac821ed40041dc5
-  data.tar.gz: 4e6eeeb8179b8981675153ac389e90e532c33939c4df4d1f00d5a773c4c547533519bfaf4a32a7e87ea0f0425ab9431d96a3aae9afb0cc19b96cc6c8cb798589
+  metadata.gz: 6d36b471c343893525122228f2072342aba9ea6f880fb1edc4519ec612b878389adccfbf2a3ead4f6c11fa76afcc96f2af302f439ebfea23a5cde96d3f9ef132
+  data.tar.gz: a82c7b271295210979a0b205303af2e8a001872cff8767f52347e572180b1314c32b709628a03d1f5ac616bf169712b5c2bc54d0da3cca889893e9aff3f8e993

data/lib/mdless/converter.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'yaml'
+require 'fileutils'
 
 module CLIMarkdown
   class Converter
@@ -41,9 +42,9 @@ module CLIMarkdown
 
         @options[:local_images] = false
         @options[:remote_images] = false
-        opts.on('-i', '--images=TYPE', 'Include [local|remote (both)] images in output (requires imgcat and iTerm2, default NONE). Does not work with pagers, use with -P' ) do |type|
-          unless exec_available('imgcat')# && ENV['TERM_PROGRAM'] == 'iTerm.app'
-            @log.warn('images turned on but imgcat not found')
+        opts.on('-i', '--images=TYPE', 'Include [local|remote (both)] images in output (requires chafa or imgcat, default NONE). imgcat does not work with pagers, use with -P' ) do |type|
+          unless exec_available('imgcat') || exec_available('chafa')# && ENV['TERM_PROGRAM'] == 'iTerm.app'
+            @log.warn('images turned on but imgcat/chafa not found')
           else
             if type =~ /^(r|b|a)/i
               @options[:local_images] = true
@@ -53,12 +54,12 @@ module CLIMarkdown
             end
           end
         end
-        opts.on('-I', '--all-images', 'Include local and remote images in output (requires imgcat and iTerm2)' ) do
-          unless exec_available('imgcat')# && ENV['TERM_PROGRAM'] == 'iTerm.app'
-            @log.warn('images turned on but imgcat not found')
-          else
+        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
+            @log.warn('images turned on but imgcat/chafa not found')
           end
         end
 
@@ -339,6 +340,8 @@ module CLIMarkdown
 
     def clean_markers(input)
       input.gsub!(/^(\e\[[\d;]+m)?[%~] ?/,'\1')
+      input.gsub!(/^(\e\[[\d;]+m)*>(\e\[[\d;]+m)?( +)/,' \3\1\2')
+      input.gsub!(/^(\e\[[\d;]+m)*>(\e\[[\d;]+m)?/,'\1\2')
       input.gsub!(/(\e\[[\d;]+m)?@@@(\e\[[\d;]+m)?$/,'')
       input
     end
@@ -431,8 +434,8 @@ module CLIMarkdown
               new_code_line = l.gsub(/\t/, '    ')
               new_code_line.sub!(/^#{" "*first_indent}/,'')
               [
-                color('code_block marker'),
                 "> ",
+                color('code_block marker'),
                 " "*first_indent,
                 "#{color('code_block bg')}#{l}"
               ].join
@@ -448,8 +451,8 @@ module CLIMarkdown
           new_code_line.sub!(/^#{" "*first_indent}/,'')
           new_code_line.gsub!(/ /, "#{color('code_block color')} ")
           [
-            color('code_block marker'),
             "> ",
+            color('code_block marker'),
             " "*first_indent,
             color('code_block color'),
             new_code_line,
@@ -847,20 +850,41 @@ module CLIMarkdown
         else
           tail = match[4].nil? ? '' : " "+match[4].strip
           result = nil
-          if exec_available('imgcat') && @options[:local_images]
+          if (exec_available('imgcat') || exec_available('chafa')) && @options[:local_images]
             if match[3]
               img_path = match[3]
               if img_path =~ /^http/ && @options[:remote_images]
-                begin
-                  res, s = Open3.capture2(%Q{curl -sS "#{img_path}" 2> /dev/null | imgcat})
 
-                  if s.success?
-                    pre = match[2].size > 0 ? "    #{c(%i[d blue])}[#{match[2].strip}]\n" : ''
-                    post = tail.size > 0 ? "\n    #{c(%i[b blue])}-- #{tail} --" : ''
-                    result = pre + res + post
+                if exec_available('chafa')
+                  if File.directory?('.mdless_tmp')
+                    FileUtils.rm_r '.mdless_tmp', force: true
+                  end
+                  Dir.mkdir('.mdless_tmp')
+                  Dir.chdir('.mdless_tmp')
+                  `curl -SsO #{img_path} 2> /dev/null`
+                  tmp_img = File.basename(img_path)
+                  img = `chafa "#{tmp_img}"`
+                  pre = match[2].size > 0 ? "    #{c(%i[d blue])}[#{match[2].strip}]\n" : ''
+                  post = tail.size > 0 ? "\n    #{c(%i[b blue])}-- #{tail} --" : ''
+                  result = pre + img + post
+                  Dir.chdir('..')
+                  FileUtils.rm_r '.mdless_tmp', force: true
+                else
+                  if exec_available('imgcat')
+                    begin
+                      res, s = Open3.capture2(%Q{curl -sS "#{img_path}" 2> /dev/null | imgcat})
+
+                      if s.success?
+                        pre = match[2].size > 0 ? "    #{c(%i[d blue])}[#{match[2].strip}]\n" : ''
+                        post = tail.size > 0 ? "\n    #{c(%i[b blue])}-- #{tail} --" : ''
+                        result = pre + res + post
+                      end
+                    rescue => e
+                      @log.error(e)
+                    end
+                  else
+                    @log.warn("No viewer for remote images")
                   end
-                rescue => e
-                  @log.error(e)
                 end
               else
                 if img_path =~ /^[~\/]/
@@ -872,7 +896,11 @@ module CLIMarkdown
                 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} --" : ''
-                  img = %x{imgcat "#{img_path}"}
+                  if exec_available('chafa')
+                    img = %x{chafa "#{img_path}"}
+                  elsif exec_available('imgcat')
+                    img = %x{imgcat "#{img_path}"}
+                  end
                   result = pre + img + post
                 end
               end
@@ -911,7 +939,7 @@ module CLIMarkdown
       if File.exists?(File.expand_path(cli))
         File.executable?(File.expand_path(cli))
       else
-        system "which #{cli}", :out => File::NULL
+        system "which #{cli}", :out => File::NULL, :err => File::NULL
       end
     end
 
@@ -963,29 +991,38 @@ module CLIMarkdown
 
       out = cleanup_tables(out)
       out = clean_markers(out)
-      out = out.gsub(/\n+{2,}/m,"\n\n") + "\n#{xc}\n"
+      out = out.gsub(/\n{2,}/m,"\n\n") + "#{xc}"
 
       unless @options[:color]
         out.uncolor!
       end
 
       if @options[:pager]
-        page("\n\n" + out)
+        page(out)
       else
-        $stdout.puts ("\n\n" + out)
+        $stdout.puts (out)
       end
     end
 
     def which_pager
-      pagers = [ENV['GIT_PAGER'], ENV['PAGER'],
-                `git config --get-all core.pager || true`.split.first,
-                'bat', 'less', 'more', 'cat', 'pager']
+      pagers = [ENV['GIT_PAGER'], ENV['PAGER']]
+
+      if exec_available('git')
+        git_pager = `git config --get-all core.pager || true`.split.first
+        git_pager && pagers.push(git_pager)
+      end
+
+      pagers.concat(['bat', 'less', 'more', 'cat', 'pager'])
+
       pagers.select! do |f|
         if f
           if f.strip =~ /[ |]/
             f
+          elsif f == 'most'
+            @log.warn('most not allowed as pager')
+            false
           else
-            system "which #{f}", :out => File::NULL
+            system "which #{f}", :out => File::NULL, :err => File::NULL
           end
         else
           false

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '1.0.13'
+  VERSION = '1.0.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.18
 platform: ruby
 authors:
 - Brett Terpstra
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-13 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,7 +80,7 @@ homepage: http://brettterpstra.com/project/mdless/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - mdless
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A pager like less, but for Markdown files
 test_files: []