mdless 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 721c2ba19c8a2e2fe201254c4d988855d208d8c9e339a435897d5ed08696cc33
-  data.tar.gz: 0ffd801640a457d78ad076b05ddf44b2e735d8ca57928b94916db5c48f718663
+  metadata.gz: 32198570a885b3c03e6ec0e35c7d19f70f89330b9f3174270835a06f0efaec51
+  data.tar.gz: add6fadf749c0415363c6853c10f7de58a1a41a658ad1b12f1c4a692db425cb1
 SHA512:
-  metadata.gz: '0380d39b79517ec7f1c278728b598c7780e5ccec1b1dd0fda74fd063430e20e18551a4d08bf6cc0d9091c68bb4ace60dac62ab5c78804dc10cca62cce81ab1b4'
-  data.tar.gz: 19e1df9c6bb6a7cf4289463f52e74bdad480b5d41a8f387145ca99b935068149d8cc53a8815f0fa1c0cffeee2ef280bfbe5a3c72062b5568ff375a71901d53ce
+  metadata.gz: ab05974fb41187a1ba7b4fc95358ec65299a6c3496372bb7067e793bba209b66ec3a21daf0a78e133d63b26f6e93ee913420c968f3e746dcd147e4ea808f2a70
+  data.tar.gz: 2e1954c54a87c356b2a42bb847ea6c738df729da0bce1feefc13e9fb6c22b1a858bc53bedb63375e90e44e7d15e2d44de8770db7d92e19ae9d1630e4d782d2f2

data/lib/mdless/converter.rb

@@ -41,9 +41,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 +53,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
 
@@ -847,20 +847,36 @@ 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?
+                if exec_available('chafa')
+                  Dir.mktmpdir do |dir|
+                    `curl -Sso #{img_path} 2> /dev/null`
+                    tmp_img = File.join(dir, 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 + res + post
+                    result = pre + img + post
+                  end
+                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 +888,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
@@ -963,16 +983,16 @@ 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
 
@@ -990,6 +1010,9 @@ module CLIMarkdown
         if f
           if f.strip =~ /[ |]/
             f
+          elsif f == 'most'
+            @log.warn('most not allowed as pager')
+            false
           else
             system "which #{f}", :out => File::NULL, :err => File::NULL
           end

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '1.0.15'
+  VERSION = '1.0.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: A pager like less, but for Markdown files