mdless 1.0.6 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 838d2a736014669c73bd615bffdb9336fed0cfb761a2999cd1a00edb429b7178
-  data.tar.gz: 581e295c6e40b55ad424a4211e5475428ed492247f2ddb63015ba1060011a8a6
+  metadata.gz: 29be6a1b5ddb07f00761ef4ecba63116f6b0d3bbe78545536afb5382aa660a53
+  data.tar.gz: d5d08419668aab7a534a2c67ccb27e0a3a8d7d0b10e1793c6b4a087c591312ec
 SHA512:
-  metadata.gz: 3c5c4260f4912d22d0c5c053d30d81222b5865a481f7985439041696a4174c87f018e272bf094910325e1ce533f22ed8b0f250ea2894aadcfbe4799d55e80909
-  data.tar.gz: 234cee6e1ab695ff44c5202d0afb6a770166946bb6019e1f26caf770caefc9ffe4c979276e77f89a152ae9cef0a335668e60db9c9f127e6313ccdeb6ed144aaf
+  metadata.gz: a76b8fc03d9300c13bc58f73f80db23226cb01a6bf3141718c3cd96c7d947a4db02fcd36b8666ada394749677f2debbebf591e682418ce637ddf3df67d899ff1
+  data.tar.gz: 31485111a1836fcc4105a2d33addf4f18ac3180ce0ba7c35f6cf7b85a1d10d46666537478de913672548186f9d25048743340bf86747bd811ba52817172f21a5

data/README.md

@@ -21,6 +21,7 @@ I often use iTerm2 in visor mode, so `qlmanage -p` is annoying. I still wanted a
 - List headlines in document
     - Display single section of the document based on headlines
 - Customizable colors
+- Add iTerm marks for h1-3 navigation when pager is disabled
 
 ## Installation
 

data/lib/mdless/converter.rb

@@ -41,7 +41,7 @@ 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)' ) do |type|
+        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')
           else
@@ -154,6 +154,7 @@ module CLIMarkdown
         $stderr.puts "No input"
         Process.exit 1
       end
+
     end
 
     def color(key)
@@ -209,6 +210,7 @@ module CLIMarkdown
           ]
         }
       end
+
       @headers
     end
 
@@ -269,11 +271,15 @@ module CLIMarkdown
       first = true
       input.split(/\n/).map{|line|
         if first
-          first = false
-          line.gsub!(/\|/, "#{color('table border')}|#{color('table header')}")
-        elsif line.strip =~ /^[|:\- ]+$/
+          if line =~ /^\+-+/
+            line.gsub!(/^/, color('table border'))
+          else
+            first = false
+            line.gsub!(/\|/, "#{color('table border')}|#{color('table header')}")
+          end
+        elsif line.strip =~ /^[|:\- +]+$/
           line.gsub!(/^(.*)$/, "#{color('table border')}\\1#{color('table color')}")
-          line.gsub!(/([:\-]+)/,"#{color('table divider')}\\1#{color('table border')}")
+          line.gsub!(/([:\-+]+)/,"#{color('table divider')}\\1#{color('table border')}")
         else
           line.gsub!(/\|/, "#{color('table border')}|#{color('table color')}")
         end
@@ -281,6 +287,7 @@ module CLIMarkdown
     end
 
     def cleanup_tables(input)
+
       in_table = false
       header_row = false
       all_content = []
@@ -307,6 +314,7 @@ module CLIMarkdown
               end
 
               table = this_table.join("\n").strip
+
               begin
                 formatted = MDTableCleanup.new(table)
                 res = formatted.to_md
@@ -331,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
 
@@ -446,7 +455,7 @@ module CLIMarkdown
             new_code_line,
             xc
           ].join
-        end.join("\n") + "\n"
+        end.join("\n")
       end
 
       [
@@ -473,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|$)/
@@ -793,8 +803,8 @@ module CLIMarkdown
 
       # Headlines
       @headers.each {|h|
-        input.sub!(/^#{h[2]}/) do |m|
-          pad = ""
+        input.sub!(/^#{Regexp.escape(h[2])}/m) do |m|
+          pad = ''
           ansi = ''
           case h[0].length
           when 1
@@ -817,6 +827,14 @@ module CLIMarkdown
             ansi = color('h6 color')
           end
 
+          # If we're in iTerm and not paginating, add
+          # iTerm Marks for navigation on h1-3
+          if h[0].length < 4 &&
+            ENV['TERM_PROGRAM'] =~ /^iterm/i &&
+            @options[:pager] == false
+            ansi = "\e]1337;SetMark\a" + ansi
+          end
+
           "\n#{xc}#{ansi}#{h[1]} #{pad}#{xc}\n"
         end
       }
@@ -920,9 +938,13 @@ module CLIMarkdown
         end
       end
 
-      read_io.close
-      write_io.write(text)
-      write_io.close
+      begin
+        read_io.close
+        write_io.write(text)
+        write_io.close
+      rescue SystemCallError => e
+        exit 1
+      end
 
       _, status = Process.waitpid2(pid)
       status.success?
@@ -941,7 +963,7 @@ module CLIMarkdown
 
       out = cleanup_tables(out)
       out = clean_markers(out)
-      out = out.gsub(/\n+{2,}/m,"\n\n") + "\n#{xc}\n\n"
+      out = out.gsub(/\n+{2,}/m,"\n\n") + "\n#{xc}\n"
 
       unless @options[:color]
         out.uncolor!

data/lib/mdless/tables.rb

@@ -1,6 +1,8 @@
 module CLIMarkdown
   class MDTableCleanup
 
+    PAD_CHAR = '⎕'
+
     def initialize(input)
       @string = input
       @format_row = []
@@ -25,10 +27,11 @@ module CLIMarkdown
       end
 
       format.each_with_index {|cell, i|
+        cell.strip!
         f = 'left'
         if cell =~ /^:.*?:$/
           f = 'center'
-        elsif cell =~ /:$/
+        elsif cell =~ /[^:]+:$/
           f = 'right'
         else
           f = 'just'
@@ -81,13 +84,13 @@ module CLIMarkdown
     def pad(string,type,length)
       string.strip!
       if type == 'center'
-        string.center(length, ' ')
+        string.center(length, PAD_CHAR)
       elsif type == 'right'
-        string.rjust(length, ' ')
+        string.rjust(length, PAD_CHAR)
       elsif type == 'left'
-        string.ljust(length, ' ')
+        string.ljust(length, PAD_CHAR)
       else
-        string.ljust(length, ' ')
+        string.ljust(length, PAD_CHAR)
       end
     end
 
@@ -114,6 +117,14 @@ module CLIMarkdown
       "|#{output.join('|')}|"
     end
 
+    def table_border
+      output = []
+      @format_row.each_with_index do |column, i|
+        output.push separator(column_width(i), column)
+      end
+      "+#{output.join('+').gsub(/:/,'-')}+"
+    end
+
     def to_md
       output = []
       t = table.clone
@@ -123,7 +134,12 @@ module CLIMarkdown
         output.push("| #{row.join(' | ').lstrip} |")
       end
       output.insert(1, header_separator_row)
-      output.join("\n")
+      output.insert(0, table_border)
+      output.push(table_border)
+
+      output.join("\n").gsub(/((?<=\| )#{PAD_CHAR}+|#{PAD_CHAR}+(?= \|))/) {|m|
+        " "*m.length
+      }
     end
   end
 end

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',
@@ -100,6 +101,13 @@ module CLIMarkdown
       rescue
         @log.warn('Error merging user theme')
         theme = THEME_DEFAULTS
+        if File.basename(theme_file) =~ /mdless\.theme/
+          FileUtils.rm(theme_file)
+          @log.info("Rewriting default theme file to #{theme_file}")
+          File.open(theme_file,'w') {|f|
+            f.puts theme.to_yaml
+          }
+        end
       end
       theme
     end

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '1.0.6'
+  VERSION = '1.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.12
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2020-06-13 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.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A pager like less, but for Markdown files