mdless 1.0.10 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b304cbb274cf4909d011239377a99fbecad0ef8cff1eef0eae9bc18407531cfc
-  data.tar.gz: a51aa9a7f785dbfd33d3a8f635d8a2f58bd79ac95506ad49fc21b59822dd9da6
+  metadata.gz: 32198570a885b3c03e6ec0e35c7d19f70f89330b9f3174270835a06f0efaec51
+  data.tar.gz: add6fadf749c0415363c6853c10f7de58a1a41a658ad1b12f1c4a692db425cb1
 SHA512:
-  metadata.gz: b245917f11ecf8806dc34240e5b039cb5685b68ee0b9d0c52cede089b5567bee0ebb9f68960bd59e7c54093951712577f845b03a13f75c076c6e64d41ee0e0dd
-  data.tar.gz: 8a267746ee40a94809750a1717076126e858b8d146bcb9ee11d4234270726fd580bc82617fba70889d7c65e2f1049eff55db249d947cc759fa494bef6058d5cd
+  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
 
@@ -154,6 +154,7 @@ module CLIMarkdown
         $stderr.puts "No input"
         Process.exit 1
       end
+
     end
 
     def color(key)
@@ -286,6 +287,7 @@ module CLIMarkdown
     end
 
     def cleanup_tables(input)
+
       in_table = false
       header_row = false
       all_content = []
@@ -312,6 +314,7 @@ module CLIMarkdown
               end
 
               table = this_table.join("\n").strip
+
               begin
                 formatted = MDTableCleanup.new(table)
                 res = formatted.to_md
@@ -336,6 +339,7 @@ module CLIMarkdown
 
     def clean_markers(input)
       input.gsub!(/^(\e\[[\d;]+m)?[%~] ?/,'\1')
+      input.gsub!(/(\e\[[\d;]+m)?@@@(\e\[[\d;]+m)?$/,'')
       input
     end
 
@@ -451,7 +455,7 @@ module CLIMarkdown
             new_code_line,
             xc
           ].join
-        end.join("\n") + "\n"
+        end.join("\n")
       end
 
       [
@@ -478,6 +482,7 @@ module CLIMarkdown
 
     def convert_markdown(input)
       @headers = get_headers(input)
+      input += "\n\n@@@"
       # yaml/MMD headers
       in_yaml = false
       if input.split("\n")[0] =~ /(?i-m)^---[ \t]*?(\n|$)/
@@ -842,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 =~ /^[~\/]/
@@ -867,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
@@ -906,7 +931,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
 
@@ -958,29 +983,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/theme.rb

@@ -80,7 +80,8 @@ module CLIMarkdown
           'border' => 'd black',
           'header' => 'yellow',
           'divider' => 'b black',
-          'color' => 'white'
+          'color' => 'white',
+          'bg' => 'on_black'
         },
         'html' => {
           'brackets' => 'd yellow on_black',

data/lib/mdless/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.16
 platform: ruby
 authors:
 - Brett Terpstra
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ homepage: http://brettterpstra.com/project/mdless/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - mdless
@@ -103,8 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A pager like less, but for Markdown files
 test_files: []