mdless 1.0.15 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 721c2ba19c8a2e2fe201254c4d988855d208d8c9e339a435897d5ed08696cc33
-  data.tar.gz: 0ffd801640a457d78ad076b05ddf44b2e735d8ca57928b94916db5c48f718663
+  metadata.gz: 388ed46c03bdf676e441d063ac9efd9e1491c87d40048dc5346014d9aa1cf7a5
+  data.tar.gz: 06c1958a97494c2b77b4f22c704c096ec06499e04ffb2fddae1c28c8311d3920
 SHA512:
-  metadata.gz: '0380d39b79517ec7f1c278728b598c7780e5ccec1b1dd0fda74fd063430e20e18551a4d08bf6cc0d9091c68bb4ace60dac62ab5c78804dc10cca62cce81ab1b4'
-  data.tar.gz: 19e1df9c6bb6a7cf4289463f52e74bdad480b5d41a8f387145ca99b935068149d8cc53a8815f0fa1c0cffeee2ef280bfbe5a3c72062b5568ff375a71901d53ce
+  metadata.gz: eb1035bbd071a64f84386f4c3ce6ce9b17219ba9408c705a80abb931ffb9e4255e40275414f6b9a409d13aa071871c4f6b687ce1c7d56ba8e7a601fec9b92dd7
+  data.tar.gz: c343ec9cb5715d938736bc343858669175d1c3e1c4685534a83ec1c9fdad869d59cb45da0d2b81aba7980f0d18c39a20c0e69c89f44d31fc041d1e1b4246ecd7

data/README.md

@@ -27,6 +27,14 @@ I often use iTerm2 in visor mode, so `qlmanage -p` is annoying. I still wanted a
 
     gem install mdless
 
+### Dependencies
+
+Some OSs are missing `tput`, which is necessary for mdless.
+
+    apt update
+    apt install ruby ncurses-utils
+    gem install mdless
+
 ## Usage 
 
 `mdless [options] path` or `cat [path] | mdless`

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
 
@@ -104,7 +105,12 @@ module CLIMarkdown
         end
       end
 
-      optparse.parse!
+      begin
+        optparse.parse!
+      rescue OptionParser::ParseError => pe
+        $stderr.puts "error: #{pe.message}"
+        exit 1
+      end
 
       @theme = load_theme(@options[:theme])
       @cols = @options[:width]
@@ -339,6 +345,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 +439,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 +456,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 +855,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 +901,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 +996,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 +1023,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.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.20
 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