mdless 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfcee3f2aa45bb9582ae159a7eb7633a002ab6ebc4ff26785f7ed6fa04e4d2aa
-  data.tar.gz: ff9bb80e0c4b3cbfe8951f8bae3f82150b561c77523dda0f93451119a94dd185
+  metadata.gz: 571d64e2a21dcfe0c1673a038cbb90977a4ca1aa36992ecef63bc5f7d94ee8bd
+  data.tar.gz: 972c19e2023a96d9c3905bd0ded7984d2a0d36ac15846ddfc1a303acdea4eba3
 SHA512:
-  metadata.gz: '08248246829c7fd58677f2456a4d4ded712d2905c249f298e3fc2e98ee6eee17f4cd24e46a3376262dab5a1312a7c2d8d6342c7cea412bef63900d51c45a0068'
-  data.tar.gz: 84f9faa5f08157313d9dc0b8d91a661c401b4bc52c0e2f4db68cd9025b11bf9f7d5be5e84423c7bfe52c30f91388ce54db70a6299715c23c30e02a5f0aecb22a
+  metadata.gz: 74cce597c475876b429a603b5619f837cbb709af2e44e021a5ec63b09b4cfe3ef5a1d69a96980dd37164c5df5ca3eda3722da85ba2daa55362c33c362b88c8f1
+  data.tar.gz: efd3b25c653f16fbdbd2d32fb9e60d998a712caf4cd5cf1b7abba42eef18f42fbcb75ad4089d7e0c259fa412d4988717433c2f96d07276fcd777cb404d39a006

data/lib/mdless/converter.rb

@@ -327,7 +327,7 @@ module CLIMarkdown
           new_code_line.gsub!(/ /, "#{c(%i[x white on_black])} ")
 
           [
-            "#{c(%i[x black])}~ #{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,
@@ -336,7 +336,7 @@ module CLIMarkdown
         end.join("\n")
       end
 
-      "#{c(%i[x magenta])}#{leader}\n#{hilite}#{xc}"
+      "#{c(%i[x blue]) + '--[ '}#{c(%i[x magenta])}#{leader}#{c(%i[x blue]) + ' ]' + '-'*(@cols-6-leader.size) + xc}\n#{hilite}\n#{c(%i[x blue]) + '--[ '}#{c(%i[x magenta])}END #{leader}#{c(%i[x blue]) + ' ]' + '-'*(@cols-10-leader.size) + xc}"
     end
 
     def convert_markdown(input)
@@ -434,27 +434,40 @@ module CLIMarkdown
       end
 
       # code block parsing
-      input.gsub!(/(?i-m)([`~]{3,})([\s\S]*?)\n([\s\S]*?)\1/ ) do |cb|
+      input.gsub!(/(?i-m)([`~]{3,})([\s\S]*?)\n([\s\S]*?)\1/) do
         m = Regexp.last_match
-        if m.to_s.include? '#!'
+        if m[2].strip !~ /^\s*$/
+          language = m[2].split(/ /)[0].downcase
+          code_block = m[3].to_s.strip
+          leader = language ? language.upcase : 'CODE'
+        else
+          first_line = m[3].to_s.split(/\n/)[0]
+
+          if first_line =~ /^#!/
             @log.warn('Code block contains Shebang')
-            shebang = m.to_s.match(/(#!(?:\/)?)([a-z]\w*)/)
+            shebang = first_line.match(/^(#!.*\/(?:env )?)([^\/]+)$/)
             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])} ")
-            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:'
+            code_block = m[3].to_s.strip
+            leader = shebang[2] ? shebang[2].upcase : 'CODE'
+          else
+            code_block = m[3].to_s.split(/\n/).map do |l|
+              new_code_line = l.gsub(/\t/, '    ')
+              orig_length = new_code_line.size + 4
+              new_code_line.gsub!(/ /, "#{c(%i[x white on_black])} ")
+              pad_count = [@cols - orig_length, 0].max
+              [
+                "#{c(%i[x black])}~ #{c(%i[x white on_black])} ",
+                new_code_line,
+                c(%i[x white on_black]),
+                ' ' * pad_count,
+                xc
+              ].join
+            end.join("\n")
+            leader = language ? language.upcase : 'CODE'
+          end
         end
         leader += xc
-        hiliteCode(language, codeBlock, leader, m[0])
+        hiliteCode(language, code_block, leader, m[0])
       end
 
       # remove empty links
@@ -581,15 +594,16 @@ module CLIMarkdown
           end
 
           # bold, bold/italic
-          line.gsub!(/(^|\s)[\*_]{2,3}([^\*_\s][^\*_]+?[^\*_\s])[\*_]{2,3}/) do |m|
+          line.gsub!(/(?<pre>^|\s)(?<open>[\*_]{2,3})(?<content>[^\*_\s][^\*_]+?[^\*_\s])[\*_]{2,3}/) do |m|
             match = Regexp.last_match
             last = find_color(match.pre_match, true)
             counter = i
             while last.nil? && counter > 0
               counter -= 1
-              find_color(lines[counter])
+              last = find_color(lines[counter])
             end
-            "#{match[1]}#{c([:b])}#{match[2]}" + (last ? last : xc)
+            emph = match['open'].length == 2 ? c([:b]) : c(%i[b u i])
+            "#{match['pre']}#{emph}#{match['content']}" + (last ? last : xc)
           end
 
           # italic
@@ -599,9 +613,9 @@ module CLIMarkdown
             counter = i
             while last.nil? && counter > 0
               counter -= 1
-              find_color(lines[counter])
+              last = find_color(lines[counter])
             end
-            "#{match[1]}#{c([:u])}#{match[2]}" + (last ? last : xc)
+            "#{match[1]}#{c(%i[u i])}#{match[2]}" + (last ? last : xc)
           end
 
           # equations
@@ -638,7 +652,7 @@ module CLIMarkdown
           line.gsub!(/(?i-m)((<\/?)(\w+[\s\S]*?)(>))/) do |tag|
             match = Regexp.last_match
             last = find_color(match.pre_match)
-            "#{c([:d,:black])}#{match[2]}#{c([:b,:black])}#{match[3]}#{c([:d,:black])}#{match[4]}" + (last ? last : xc)
+            "#{c([:d,:yellow,:on_black])}#{match[2]}#{match[3]}#{match[4]}" + (last ? last : xc)
           end
         end
 

data/lib/mdless/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake