mdl 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb380ed1ad9ad6d2ca1bc1b4223035a7bbd48c0c59fea8d9c5e3f3eab97c143e
-  data.tar.gz: b69079b020875760b366c194184a219548b56b27b2038e73fcfb65b19727a418
+  metadata.gz: d2ef1682330d4d7498e347b19aaa6a18c8006ac62b811e93dc4f1b87ba9e73ef
+  data.tar.gz: 4711609a70fdd931788e6c50b05c3a515c813f3bb0e52ba6716f9ea666ada0a5
 SHA512:
-  metadata.gz: 06f58c21acc2a3a0686fc04dee9ac1ef1ca5e51850e148805170e4ae830e7fa87363649f2b97c30aecce3ebf4328b24993259ad557f6918a51f9e0ebe2a73e49
-  data.tar.gz: ba316560e686758e5167e64c1850e25d53cc6a74f62e0fbde9ec87a6124c59da68beedd3b632e5051c9a10ba75f3557096576b772ee434cc91e8d4d3965cd224
+  metadata.gz: 4bef5fff1c8e926baa7299487a17d711b4c79368b0722fd990c2b1d6e5ffcc046c6385ae5d863e4ad3cc708bec77239167a41c4ae78c9064fe1f7a45f9fcaafb
+  data.tar.gz: e8275c46e8c465f849b9766178b17f02644165f5c20ef6fbb030281b7ff917dc870ff5443aa0a94b05c28e3d195c2093f6213f6177551587c7e7b87017d491a7

data/lib/mdl.rb

@@ -1,10 +1,10 @@
-require 'mdl/cli'
-require 'mdl/config'
-require 'mdl/doc'
-require 'mdl/kramdown_parser'
-require 'mdl/ruleset'
-require 'mdl/style'
-require 'mdl/version'
+require_relative 'mdl/cli'
+require_relative 'mdl/config'
+require_relative 'mdl/doc'
+require_relative 'mdl/kramdown_parser'
+require_relative 'mdl/ruleset'
+require_relative 'mdl/style'
+require_relative 'mdl/version'
 
 require 'kramdown'
 
@@ -88,7 +88,6 @@ module MarkdownLint
         error_lines.each do |line|
           line += doc.offset # Correct line numbers for any yaml front matter
           if Config[:json]
-            require 'json'
             results << {
               'filename' => filename,
               'line' => line,
@@ -106,6 +105,7 @@ module MarkdownLint
     end
 
     if Config[:json]
+      require 'json'
       puts JSON.generate(results)
     elsif status != 0
       puts "\nA detailed description of the rules is available at "\

data/lib/mdl/doc.rb

@@ -1,5 +1,5 @@
 require 'kramdown'
-require 'mdl/kramdown_parser'
+require_relative 'kramdown_parser'
 
 module MarkdownLint
   ##
@@ -44,7 +44,7 @@ module MarkdownLint
       @lines = text.split(/\R/)
       @parsed = Kramdown::Document.new(text, :input => 'MarkdownLint')
       @elements = @parsed.root.children
-      add_levels(@elements)
+      add_annotations(@elements)
     end
 
     ##
@@ -190,7 +190,7 @@ module MarkdownLint
       if item.type != :li
         raise "list_style called with non-list element"
       end
-      line = element_line(item).strip
+      line = element_line(item).strip.gsub(/^>\s+/,'')
       if line.start_with?('*')
         :asterisk
       elsif line.start_with?('+')
@@ -277,12 +277,14 @@ module MarkdownLint
     private
 
     ##
-    # Adds a 'level' option to all elements to show how nested they are
+    # Adds a 'level' and 'parent' option to all elements to show how nested they
+    # are
 
-    def add_levels(elements, level=1)
+    def add_annotations(elements, level=1, parent=nil)
       elements.each do |e|
         e.options[:element_level] = level
-        add_levels(e.children, level+1)
+        e.options[:parent] = parent
+        add_annotations(e.children, level+1, e)
       end
     end
 

data/lib/mdl/rules.rb

@@ -470,7 +470,7 @@ rule "MD030", "Spaces after list markers" do
       # the items in it have multiple paragraphs/other block items.
       srule = items.map { |i| i.children.length }.max > 1 ? "multi" : "single"
       items.each do |i|
-        actual_spaces = doc.element_line(i).match(/^\s*\S+(\s+)/)[1].length
+        actual_spaces = doc.element_line(i).gsub(/^> /,'').match(/^\s*\S+(\s+)/)[1].length
         required_spaces = params["#{list_type}_#{srule}".to_sym]
         errors << doc.element_linenumber(i) if required_spaces != actual_spaces
       end
@@ -669,8 +669,22 @@ rule "MD046", "Code block style" do
             style = :fenced
           end
         end
-        if @params[:style] == :fenced
-          doc.element_line(i).start_with?("    ")
+        if style == :fenced
+          # if our parent is a list or a codeblock, we need to ignore
+          # its spaces, plus 4 more
+          parent = i.options[:parent]
+          ignored_spaces = 0
+          if parent
+            parent.options.delete(:children)
+            parent.options.delete(:parent)
+            if [:li, :codeblock].include?(parent.type)
+              linenum = doc.element_linenumbers([parent]).first
+              indent = doc.indent_for(doc.lines[linenum - 1])
+              ignored_spaces = indent + 4
+            end
+          end
+          start = ' ' * ignored_spaces
+          doc.element_line(i).start_with?("#{start}    ")
         else
           !doc.element_line(i).start_with?("    ")
         end

data/lib/mdl/style.rb

@@ -50,9 +50,23 @@ module MarkdownLint
     end
 
     def self.load(style_file, rules)
-      unless style_file.include?("/") or style_file.end_with?(".rb")
-        style_file = File.expand_path("../styles/#{style_file}.rb", __FILE__)
+      unless style_file.include?("/") || style_file.end_with?(".rb")
+        tmp = File.expand_path("../styles/#{style_file}.rb", __FILE__)
+        unless File.exist?(tmp)
+          STDERR.puts "#{style_file} does not appear to be a built-in style." +
+            " If you meant to pass in your own style file, it must contain" +
+            " a '/' or end in '.rb'. See https://github.com/markdownlint/" +
+            "markdownlint/blob/master/docs/configuration.md"
+          exit(1)
+        end
+        style_file = tmp
+      end
+
+      unless File.exist?(style_file)
+        STDERR.puts "Style '#{style_file}' does not exist."
+        exit(1)
       end
+
       style = new(rules)
       style.instance_eval(File.read(style_file), style_file)
       rules.select! {|r| style.rules.include?(r)}

data/lib/mdl/version.rb

@@ -1,3 +1,3 @@
 module MarkdownLint
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdl
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Mark Harrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-09 00:00:00.000000000 Z
+date: 2020-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Markdown lint tool