mdless 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60b3541746585a41e0cdd5ef8d078b7c64c3afa7024710f5a0af7d22b33e8722
-  data.tar.gz: 5e877c78b1924f7d34b1b13225702d6c236c75c0055cd7c3c2aea78c1dc802d8
+  metadata.gz: 47c92338d7793e3f3e394164c31eaae071933aaca4b468f09e507835ceb41512
+  data.tar.gz: fb290c4a11f812e06bfb48699b903c91565c8c57e437a6689430ed98dd7bf6ad
 SHA512:
-  metadata.gz: 60bffe2be11c62398ccba8e29c95f786b6eb9cdc0e86cf79dca7b3d29554426e75bf7221d01f6c52270075e8732fe26a554da2948e6a47598d7507dcfb928177
-  data.tar.gz: 44cde0fea6749c4d71a29c044dcece8385663c65e2540a2cbbb24d758895e371917f6e710dd0f599b416412b709b22dd15dfad7a8866b119eb40599eefaa5dfe
+  metadata.gz: 8d9a492f4f485aa43e19315f5526d3dba15b30b2e81420ff24f8e2dbd3bdb1a8335370c02e6c7d535d0a2b6c0f3904c21ad85fa4f81ca0aab8dc0713ac201863
+  data.tar.gz: 34c641d25c5b277e1cb9c0109df760cb1f9c179982447feeaafcaac1ada440b4e2cfc742f203176b20c09a1700c4a4c2d351f66b670f48748ae22b2de98d280a

data/lib/mdless.rb

@@ -6,6 +6,8 @@ require 'logger'
 require 'mdless/version.rb'
 require 'mdless/colors'
 require 'mdless/tables'
+require 'mdless/hash'
+require 'mdless/theme'
 require 'mdless/converter'
 
 module CLIMarkdown

data/lib/mdless/converter.rb

@@ -1,16 +1,10 @@
 require 'fileutils'
 require 'yaml'
 
-class ::Hash
-    def deep_merge(second)
-        merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
-        self.merge(second.to_h, &merger)
-    end
-end
-
 module CLIMarkdown
   class Converter
     include Colors
+    include Theme
 
     attr_reader :helpers, :log
 
@@ -22,167 +16,31 @@ module CLIMarkdown
       @log = Logger.new(STDERR)
       @log.level = Logger::ERROR
 
-      config_dir = File.expand_path('~/.config/mdless')
-      theme_file = File.join(config_dir,'mdless.theme')
-
-      theme_defaults = {
-        'metadata' => {
-          'border' => 'd blue on_black',
-          'marker' => 'd black on_black',
-          'color' => 'd white on_black'
-        },
-        'emphasis' => {
-          'bold' => 'b',
-          'italic' => 'u i',
-          'bold-italic' => 'b u i'
-        },
-        'h1' => {
-          'color' => 'b intense_black on_white',
-          'pad' => 'd black on_white',
-          'pad_char' => '='
-        },
-        'h2' => {
-          'color' => 'b white on_intense_black',
-          'pad' => 'd white on_intense_black',
-          'pad_char' => '-'
-        },
-        'h3' => {
-          'color' => 'u b yellow'
-        },
-        'h4' => {
-          'color' => 'u yellow'
-        },
-        'h5' => {
-          'color' => 'b white'
-        },
-        'h6' => {
-          'color' => 'b white'
-        },
-        'link' => {
-          'brackets' => 'b black',
-          'text' => 'u b blue',
-          'url' => 'cyan'
-        },
-        'image' => {
-          'bang' => 'red',
-          'brackets' => 'b black',
-          'title' => 'cyan',
-          'url' => 'u yellow'
-        },
-        'list' => {
-          'bullet' => 'b intense_red',
-          'number' => 'b intense_blue',
-          'color' => 'intense_white'
-        },
-        'footnote' => {
-          'brackets' => 'b black on_black',
-          'caret' => 'b yellow on_black',
-          'title' => 'x yellow on_black',
-          'note' => 'u white on_black'
-        },
-        'code_span' => {
-          'marker' => 'b white',
-          'color' => 'b black on_intense_blue'
-        },
-        'code_block' => {
-          'marker' => 'intense_black',
-          'bg' => 'on_black',
-          'color' => 'white on_black',
-          'border' => 'blue',
-          'title' => 'magenta',
-          'eol' => 'intense_black on_black',
-          'pygments_theme' => 'monokai'
-        },
-        'dd' => {
-          'marker' => 'd red',
-          'color' => 'b white'
-        },
-        'hr' => {
-          'color' => 'd white'
-        },
-        'table' => {
-          'border' => 'd black',
-          'header' => 'yellow',
-          'divider' => 'b black',
-          'color' => 'white'
-        },
-        'html' => {
-          'brackets' => 'd yellow on_black',
-          'color' => 'yellow on_black'
-        }
-      }
-
-      unless File.directory?(config_dir)
-        @log.info("Creating config directory at #{config_dir}")
-        FileUtils.mkdir_p(config_dir)
-      end
-
-      unless File.exists?(theme_file)
-        @log.info("Writing fresh theme file to #{theme_file}")
-        File.open(theme_file,'w') {|f|
-          f.puts @theme.to_yaml
-        }
-        @theme = theme_defaults
-      else
-        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
-          }
-        rescue
-          @log.warn('Error merging user theme')
-          @theme = theme_defaults
-        end
-      end
-
-
       @options = {}
       optparse = OptionParser.new do |opts|
         opts.banner = "#{version} by Brett Terpstra\n\n> Usage: #{CLIMarkdown::EXECUTABLE_NAME} [options] [path]\n\n"
 
-        @options[:section] = nil
-        opts.on( '-s', '--section=NUMBER', 'Output only a headline-based section of the input (numeric from --list)' ) do |section|
-          @options[:section] = section.to_i
-        end
-
-        @options[:width] = %x{tput cols}.strip.to_i
-        opts.on( '-w', '--width=COLUMNS', 'Column width to format for (default terminal width)' ) do |columns|
-          @options[:width] = columns.to_i
-        end
-
-        @options[:pager] = true
-        opts.on( '-p', '--[no-]pager', 'Formatted output to pager (default on)' ) do |p|
-          @options[:pager] = p
-        end
-
-        opts.on( '-P', 'Disable pager (same as --no-pager)' ) do
-          @options[:pager] = false
-        end
-
         @options[:color] = true
         opts.on( '-c', '--[no-]color', 'Colorize output (default on)' ) do |c|
           @options[:color] = c
         end
 
-        @options[:links] = :inline
-        opts.on( '--links=FORMAT', 'Link style ([inline, reference], default inline) [NOT CURRENTLY IMPLEMENTED]' ) do |format|
-          if format =~ /^r/i
-            @options[:links] = :reference
+        opts.on( '-d', '--debug LEVEL', 'Level of debug messages to output' ) do |level|
+          if level.to_i > 0 && level.to_i < 5
+            @log.level = 5 - level.to_i
+          else
+            $stderr.puts "Error: Log level out of range (1-4)"
+            Process.exit 1
           end
         end
 
-        @options[:list] = false
-        opts.on( '-l', '--list', 'List headers in document and exit' ) do
-          @options[:list] = true
+        opts.on( '-h', '--help', 'Display this screen' ) do
+          puts opts
+          exit
         end
 
         @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|
           unless exec_available('imgcat')# && ENV['TERM_PROGRAM'] == 'iTerm.app'
             @log.warn('images turned on but imgcat not found')
@@ -204,29 +62,51 @@ module CLIMarkdown
           end
         end
 
-
-        opts.on( '-d', '--debug LEVEL', 'Level of debug messages to output' ) do |level|
-          if level.to_i > 0 && level.to_i < 5
-            @log.level = 5 - level.to_i
-          else
-            $stderr.puts "Error: Log level out of range (1-4)"
-            Process.exit 1
+        @options[:links] = :inline
+        opts.on( '--links=FORMAT', 'Link style ([inline, reference], default inline) [NOT CURRENTLY IMPLEMENTED]' ) do |format|
+          if format =~ /^r/i
+            @options[:links] = :reference
           end
         end
 
-        opts.on( '-h', '--help', 'Display this screen' ) do
-          puts opts
-          exit
+        @options[:list] = false
+        opts.on( '-l', '--list', 'List headers in document and exit' ) do
+          @options[:list] = true
+        end
+
+        @options[:pager] = true
+        opts.on( '-p', '--[no-]pager', 'Formatted output to pager (default on)' ) do |p|
+          @options[:pager] = p
+        end
+
+        opts.on( '-P', 'Disable pager (same as --no-pager)' ) do
+          @options[:pager] = false
+        end
+
+        @options[:section] = nil
+        opts.on( '-s', '--section=NUMBER', 'Output only a headline-based section of the input (numeric from --list)' ) do |section|
+          @options[:section] = section.to_i
+        end
+
+        @options[:theme] = 'default'
+        opts.on( '-t', '--theme=THEME_NAME', 'Specify an alternate color theme to load' ) do |theme|
+          @options[:theme] = theme
         end
 
         opts.on( '-v', '--version', 'Display version number' ) do
           puts version
           exit
         end
+
+        @options[:width] = %x{tput cols}.strip.to_i
+        opts.on( '-w', '--width=COLUMNS', 'Column width to format for (default terminal width)' ) do |columns|
+          @options[:width] = columns.to_i
+        end
       end
 
       optparse.parse!
 
+      @theme = load_theme(@options[:theme])
       @cols = @options[:width]
       @output = ''
       @headers = []
@@ -678,11 +558,11 @@ module CLIMarkdown
         input = new_content.join("\n")
       end
 
-      h_adjust = highest_header(input) - 1
-      input.gsub!(/^(#+)/) do |m|
-        match = Regexp.last_match
-        "#" * (match[1].length - h_adjust)
-      end
+      # h_adjust = highest_header(input) - 1
+      # input.gsub!(/^(#+)/) do |m|
+      #   match = Regexp.last_match
+      #   "#" * (match[1].length - h_adjust)
+      # end
 
       # code block parsing
       input.gsub!(/(?i-m)(^[ \t]*[`~]{3,})([\s\S]*?)\n([\s\S]*?)\1/m) do

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

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