mdless 1.0.17 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ac64b734fe42bba2b3b4ad71b9d660f8bb0b3e4dfed50b022386784c5fd7d49
-  data.tar.gz: 74d77256b4d9dba3e6aab1ff39f253b70ce8c0268f0ce7275f5622bce94d5ac9
+  metadata.gz: f6d1b744e285d103ea81159c8663b7158a26d8609cd7411ca47c6451cf896ea8
+  data.tar.gz: 9b42221d8ed826e288067b56237af338c320c996fb57215784547ce57cc3b8f8
 SHA512:
-  metadata.gz: 9d3358e267c7f3fa453bbe8fbcb73c6ab506b4d8bd2e275239ca407e7913a08cffdf4a04ad2d8c7a9c4152a08036cd47039aafa0b00beec85bffd6273b47d45b
-  data.tar.gz: f88b17617997dae9ffa4b7aec4bed55d02085af6625a45b331843a91fecad364619c6798f692b12c274c6a67831fa41835f39e3f4d66241e7a16615e4971775e
+  metadata.gz: 1e168c66bc6eaf8cf30303ac4e8e33469d1d43c38c546b081aaccf5dd9cc7888aecef892e315036fa4c73c8a3bb4fe2887b35ae40169c9d3d18d60a882738c07
+  data.tar.gz: c57f891b278a448527a9ce432d5536ef09a1706132c233a27c62a44fdf273ccb6e030ca3227965f191634d3bfbc21fb4c1a4f80e28a3aed4f97e4f202178cf05

data/README.md

@@ -1,4 +1,3 @@
-
 # mdless
 
 `mdless` is a utility that provides a formatted and highlighted view of Markdown files in Terminal.
@@ -27,6 +26,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

@@ -105,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]
@@ -340,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
@@ -432,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
@@ -449,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,

data/lib/mdless/theme.rb

@@ -93,11 +93,11 @@ module CLIMarkdown
       new_theme = YAML.load(IO.read(theme_file))
       begin
         theme = THEME_DEFAULTS.deep_merge(new_theme)
-        # write merged theme back in case there are new keys since
-        # last updated
-        File.open(theme_file,'w') {|f|
-          f.puts theme.to_yaml
-        }
+        # # write merged theme back in case there are new keys since
+        # # last updated
+        # File.open(theme_file,'w') {|f|
+        #   f.puts theme.to_yaml
+        # }
       rescue
         @log.warn('Error merging user theme')
         theme = THEME_DEFAULTS

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '1.0.17'
+  VERSION = '1.0.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.21
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,20 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.1
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A CLI that provides a formatted and highlighted view of Markdown files
   in a terminal
 email: me@brettterpstra.com
@@ -103,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: A pager like less, but for Markdown files