mdless 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 618302eecf35ed202db845ca4ddd45fcb6f7df8c
-  data.tar.gz: 9413e7e0106c478d120d475efd4d62bde3075d29
+SHA256:
+  metadata.gz: bfcee3f2aa45bb9582ae159a7eb7633a002ab6ebc4ff26785f7ed6fa04e4d2aa
+  data.tar.gz: ff9bb80e0c4b3cbfe8951f8bae3f82150b561c77523dda0f93451119a94dd185
 SHA512:
-  metadata.gz: dba40280383d15349c27b69c91cb536ec2f63cdb787cba3da251738957a41e4e3b2a7a38bdf25d333d5cb452042e4d9b8516fe8983a8f17a0f31bd9151fa0ece
-  data.tar.gz: ecdd1dbdf0b44d29d4c34e74435ca38da3861c92df9d634ac2f90144f806c26313f46bf84cfe4fe51a6254479b26f062421c104825c806690a05fe07dbcc3928
+  metadata.gz: '08248246829c7fd58677f2456a4d4ded712d2905c249f298e3fc2e98ee6eee17f4cd24e46a3376262dab5a1312a7c2d8d6342c7cea412bef63900d51c45a0068'
+  data.tar.gz: 84f9faa5f08157313d9dc0b8d91a661c401b4bc52c0e2f4db68cd9025b11bf9f7d5be5e84423c7bfe52c30f91388ce54db70a6299715c23c30e02a5f0aecb22a

data/lib/mdless/converter.rb

@@ -14,7 +14,7 @@ module CLIMarkdown
 
       @options = {}
       optparse = OptionParser.new do |opts|
-        opts.banner = "#{version} by Brett Terpstra\n\n> Usage: #{CLIMarkdown::EXECUTABLE_NAME} [options] path\n\n"
+        opts.banner = "#{version} by Brett Terpstra\n\n> Usage: #{CLIMarkdown::EXECUTABLE_NAME} [options] [path]\n\n"
 
         @options[:section] = nil
         opts.on( '-s', '--section=TITLE', 'Output only a headline-based section of the input (numeric from -l)' ) do |section|
@@ -119,7 +119,7 @@ module CLIMarkdown
           end
         }
         printout
-      elsif STDIN.stat.size > 0
+      elsif ! STDIN.tty?
         @file = nil
         begin
           input = STDIN.read.force_encoding('utf-8')
@@ -307,6 +307,38 @@ module CLIMarkdown
       "#{c([:x,:red])}!#{c([:b,:black])}[#{c([:x,:cyan])}#{text}#{c([:b,:black])}](#{c([:u,:yellow])}#{url}#{c([:b,:black])})" + find_color(line)
     end
 
+    def hiliteCode(language, codeBlock, leader, block)
+      if exec_available('pygmentize')
+        lexer = language.nil? ? '-g' : "-l #{language}"
+        begin
+          hilite, s = Open3.capture2(%Q{pygmentize #{lexer} 2> /dev/null}, :stdin_data=>codeBlock)
+
+          if s.success?
+            hilite = hilite.split(/\n/).map{|l| "#{c([:x,:black])}~ #{xc}" + l}.join("\n")
+          end
+        rescue => e
+          @log.error(e)
+          hilite = block
+        end
+      else
+        hilite = codeBlock.split(/\n/).map do |line|
+          new_code_line = line.gsub(/\t/, '    ')
+          orig_length = new_code_line.size + 3
+          new_code_line.gsub!(/ /, "#{c(%i[x white on_black])} ")
+
+          [
+            "#{c(%i[x black])}~ #{c(%i[x white on_black])} ",
+            new_code_line,
+            c(%i[x white on_black]),
+            ' ' * [@cols - orig_length, 0].max,
+            xc
+          ].join
+        end.join("\n")
+      end
+
+      "#{c(%i[x magenta])}#{leader}\n#{hilite}#{xc}"
+    end
+
     def convert_markdown(input)
       @headers = get_headers(input)
       # yaml/MMD headers
@@ -401,34 +433,28 @@ module CLIMarkdown
         "#" * (match[1].length - h_adjust)
       end
 
+      # code block parsing
       input.gsub!(/(?i-m)([`~]{3,})([\s\S]*?)\n([\s\S]*?)\1/ ) do |cb|
         m = Regexp.last_match
-        leader = m[2] ? m[2].upcase + ":" : 'CODE:'
-        leader += xc
-
-        if exec_available('pygmentize')
-          lexer = m[2].nil? ? '-g' : "-l #{m[2]}"
-          begin
-            hilite, s = Open3.capture2(%Q{pygmentize #{lexer} 2> /dev/null}, :stdin_data=>m[3])
-
-            if s.success?
-              hilite = hilite.split(/\n/).map{|l| "#{c([:x,:black])}~ #{xc}" + l}.join("\n")
-            end
-          rescue => e
-            @log.error(e)
-            hilite = m[0]
-          end
-
+        if m.to_s.include? '#!'
+            @log.warn('Code block contains Shebang')
+            shebang = m.to_s.match(/(#!(?:\/)?)([a-z]\w*)/)
+            language = shebang[2]
+            codeBlock = m[3].to_s.gsub(shebang[1]+shebang[2], '').strip
+            leader = shebang[2] ? shebang[2].upcase + ':' : 'CODE:'
         else
-
+            # Ignore leading spaces, and use only first word
           hilite = m[3].split(/\n/).map{|l|
             new_code_line = l.gsub(/\t/,'    ')
             orig_length = new_code_line.size + 3
             new_code_line.gsub!(/ /,"#{c([:x,:white,:on_black])} ")
-            "#{c([:x,:black])}~ #{c([:x,:white,:on_black])} " + new_code_line + c([:x,:white,:on_black]) + " "*(@cols - orig_length) + xc
+            pad_count = [@cols - orig_length, 0].max
+            "#{c([:x,:black])}~ #{c([:x,:white,:on_black])} " + new_code_line + c([:x,:white,:on_black]) + " "*pad_count + xc
           }.join("\n")
+            leader = language ? language.upcase + ":" : 'CODE:'
         end
-        "#{c([:x,:magenta])}#{leader}\n#{hilite}#{xc}"
+        leader += xc
+        hiliteCode(language, codeBlock, leader, m[0])
       end
 
       # remove empty links
@@ -742,7 +768,7 @@ module CLIMarkdown
 
     def which_pager
       pagers = [ENV['GIT_PAGER'], ENV['PAGER'],
-                `git config --get-all core.pager`.split.first,
+                `git config --get-all core.pager || true`.split.first,
                 'less', 'more', 'cat', 'pager']
       pagers.select! do |f|
         if f

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '0.0.10'
+  VERSION = '0.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -101,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A pager like less, but for Markdown files