mdl 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce6e17c304d4a4d4ca5b98216786a517a7a121f13bd3e4c96b0be1f3dc3c7fb7
-  data.tar.gz: 66fad7cfe37a2eb2b300a4957f5773ed97096cc5623fe54dfce33182aa1961f3
+  metadata.gz: 0b0bf6bf60ca7328cdc7b7c979b1c7f9eea59f99c35a219da0eddf8c73e529cc
+  data.tar.gz: 954a6871342a9137babebe806cab333bbf883d835cdc1ff867731145fb52d85f
 SHA512:
-  metadata.gz: 24729a6e51b0d14ce062a1450975a7a25171a99058748b4a9318be53400d0414156f2199961472c1df5d60b7bcc6460449af01a56355360e867e8bd8b3f5ea9f
-  data.tar.gz: 272b422026df12ed0c30ce97f390468817867a2a649f4a37d6f1b438a08f8b3bf2e81ebecc509cb1bd553d052b1543d9130cd142be2bacd0f11637b69f9e0599
+  metadata.gz: 987343bbcf9c9a260e205970c1ea1bba1c5eb8dc5e0d2f3ed03013126efdf58a65085275f24081019d27fe63c02ce0ebbe0dded59e265392833f19cd00b582dd
+  data.tar.gz: aa09c154c250f31e0f0ad9cefc8b1e243562a836c9d2c1d740aa7d5d20eac38ea91f56dd73c7a6d1d8aa5ab57b0ba41143013372a65eb208411d3b8ebe4b53bf

data/Gemfile

@@ -1,2 +1,11 @@
-source 'https://rubygems.org'
+source 'https://gem.coop'
 gemspec
+
+group :development, :test do
+  gem 'base64'
+  gem 'bundler', '>= 1.12', '< 3'
+  gem 'minitest', '~> 5.26', '>= 5.26.2'
+  gem 'pry', '~> 0.15.2'
+  gem 'rake', '~> 13.3', '>= 13.3.1'
+  gem 'rubocop', '~> 1.81'
+end

data/lib/mdl/doc.rb

@@ -282,7 +282,7 @@ module MarkdownLint
       # returned and we'll just not catch that part of the text, which seems
       # like a sensible failure mode.
       element.children.map do |e|
-        if e.type == :text || e.type == :codespan
+        if %i{text codespan}.include?(e.type)
           e.value
         elsif %i{strong em p a}.include?(e.type)
           extract_as_text(e).join("\n")

data/lib/mdl/formatters/sarif.rb

@@ -8,7 +8,7 @@ module MarkdownLint
     class << self
       def generate(rules, results)
         matched_rules_id = results.map { |result| result['rule'] }.uniq
-        matched_rules = rules.select { |id, _| matched_rules_id.include?(id) }
+        matched_rules = rules.slice(*matched_rules_id)
         JSON.generate(generate_sarif(matched_rules, results))
       end
 

data/lib/mdl/rules.rb

@@ -51,8 +51,8 @@ rule 'MD003', 'Header style' do
       if doc_style == :setext_with_atx
         headers.map do |h|
           doc.element_linenumber(h) \
-                      unless (doc.header_style(h) == :setext) || \
-                             ((doc.header_style(h) == :atx) && \
+                      unless (doc.header_style(h) == :setext) ||
+                             ((doc.header_style(h) == :atx) &&
                               (h.options[:level] > 2))
         end.compact
       else
@@ -180,7 +180,7 @@ rule 'MD010', 'Hard tabs' do
     # inside of a code block are acceptable.
     codeblock_lines = doc.find_type_elements(:codeblock).map do |e|
       (doc.element_linenumber(e)..
-               doc.element_linenumber(e) + e.value.lines.count).to_a
+               (doc.element_linenumber(e) + e.value.lines.count)).to_a
     end.flatten
 
     # Check for lines with hard tab
@@ -207,7 +207,7 @@ rule 'MD012', 'Multiple consecutive blank lines' do
     # inside of a code block are acceptable.
     codeblock_lines = doc.find_type_elements(:codeblock).map do |e|
       (doc.element_linenumber(e)..
-               doc.element_linenumber(e) + e.value.lines.count).to_a
+               (doc.element_linenumber(e) + e.value.lines.count)).to_a
     end.flatten
     blank_lines = doc.matching_lines(/^\s*$/)
     cons_blank_lines = blank_lines.each_cons(2).select do |p, n|
@@ -227,7 +227,7 @@ rule 'MD013', 'Line length' do
     # Every line in the document that is part of a code block.
     codeblock_lines = doc.find_type_elements(:codeblock).map do |e|
       (doc.element_linenumber(e)..
-               doc.element_linenumber(e) + e.value.lines.count).to_a
+               (doc.element_linenumber(e) + e.value.lines.count)).to_a
     end.flatten
     # Every line in the document that is part of a table.
     locations = doc.elements
@@ -236,7 +236,7 @@ rule 'MD013', 'Line length' do
     table_lines = locations.map.with_index do |(l, e), i|
       if e.type == :table
         if i + 1 < locations.size
-          (l..locations[i + 1].first - 1).to_a
+          (l..(locations[i + 1].first - 1)).to_a
         else
           (l..doc.lines.count).to_a
         end
@@ -247,7 +247,7 @@ rule 'MD013', 'Line length' do
       overlines -= codeblock_lines
       unless params[:code_blocks]
         warn 'MD013 warning: Parameter :code_blocks is deprecated.'
-        warn '  Please replace \":code_blocks => false\" by '\
+        warn '  Please replace \":code_blocks => false\" by ' \
              '\":ignore_code_blocks => true\" in your configuration.'
       end
     end
@@ -543,7 +543,7 @@ rule 'MD030', 'Spaces after list markers' do
         next if line.empty?
 
         actual_spaces = line.gsub(/^> /, '').match(/^\s*\S+(\s+)/)[1].length
-        required_spaces = params["#{list_type}_#{srule}".to_sym]
+        required_spaces = params[:"#{list_type}_#{srule}"]
         errors << doc.element_linenumber(i) if required_spaces != actual_spaces
       end
     end
@@ -597,7 +597,7 @@ rule 'MD032', 'Lists should be surrounded by blank lines' do
       next if line.strip == '{:toc}'
 
       unless in_code
-        list_marker = line.strip.match(/^([*+\-]|(\d+\.))\s/)
+        list_marker = line.strip.match(/^([*+-]|(\d+\.))\s/)
         if list_marker && !in_list && !prev_line.match(/^($|\s)/)
           errors << (linenum + 1)
         elsif !list_marker && in_list && !line.match(/^($|\s)/)
@@ -692,7 +692,7 @@ rule 'MD037', 'Spaces inside emphasis markers' do
     # Kramdown doesn't parse emphasis with spaces, which means we can just
     # look for emphasis patterns inside regular text with spaces just inside
     # them.
-    (doc.matching_text_element_lines(/\s(\*\*?|__?)\s.+\1/) | \
+    (doc.matching_text_element_lines(/\s(\*\*?|__?)\s.+\1/) |
       doc.matching_text_element_lines(/(\*\*?|__?).+\s\1\s/)).sort
   end
 end

data/lib/mdl/ruleset.rb

@@ -3,7 +3,7 @@ module MarkdownLint
   class Rule
     attr_accessor :id, :description
 
-    def initialize(id, description, fallback_docs: nil, &block)
+    def initialize(id, description, fallback_docs: nil, &)
       @id = id
       @description = description
       @generate_docs = fallback_docs
@@ -11,7 +11,7 @@ module MarkdownLint
       @aliases = []
       @tags = []
       @params = {}
-      instance_eval(&block)
+      instance_eval(&)
     end
 
     def check(&block)
@@ -58,9 +58,9 @@ module MarkdownLint
       @rules = {}
     end
 
-    def rule(id, description, &block)
+    def rule(id, description, &)
       @rules[id] =
-        Rule.new(id, description, :fallback_docs => @fallback_docs, &block)
+        Rule.new(id, description, :fallback_docs => @fallback_docs, &)
     end
 
     def load(rules_file)

data/lib/mdl/style.rb

@@ -1,5 +1,3 @@
-require 'set'
-
 module MarkdownLint
   # defines a style
   class Style

data/lib/mdl/version.rb

@@ -1,3 +1,3 @@
 module MarkdownLint
-  VERSION = '0.14.0'.freeze
+  VERSION = '0.15.0'.freeze
 end

data/lib/mdl.rb

@@ -27,21 +27,21 @@ module MarkdownLint
       unless Config[:rules][:include].empty?
         rules.select! do |r, v|
           Config[:rules][:include].include?(r) or
-            !(Config[:rules][:include] & v.aliases).empty?
+            Config[:rules][:include].intersect?(v.aliases)
         end
       end
       unless Config[:rules][:exclude].empty?
         rules.select! do |r, v|
           !Config[:rules][:exclude].include?(r) and
-            (Config[:rules][:exclude] & v.aliases).empty?
+            !Config[:rules][:exclude].intersect?(v.aliases)
         end
       end
     end
     # Tag option filter
     if Config[:tags]
-      rules.reject! { |_r, v| (v.tags & Config[:tags][:include]).empty? } \
+      rules.select! { |_r, v| v.tags.intersect?(Config[:tags][:include]) } \
         unless Config[:tags][:include].empty?
-      rules.select! { |_r, v| (v.tags & Config[:tags][:exclude]).empty? } \
+      rules.reject! { |_r, v| v.tags.intersect?(Config[:tags][:exclude]) } \
         unless Config[:tags][:exclude].empty?
     end
 

data/mdl.gemspec

@@ -19,17 +19,11 @@ Gem::Specification.new do |spec|
   spec.executables = %w{mdl}
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 3.2'
 
   spec.add_dependency 'kramdown', '~> 2.3'
   spec.add_dependency 'kramdown-parser-gfm', '~> 1.1'
-  spec.add_dependency 'mixlib-cli', '~> 2.1', '>= 2.1.1'
-  spec.add_dependency 'mixlib-config', '>= 2.2.1', '< 4'
+  spec.add_dependency 'mixlib-cli'
+  spec.add_dependency 'mixlib-config'
   spec.add_dependency 'mixlib-shellout'
-
-  spec.add_development_dependency 'bundler', '>= 1.12', '< 3'
-  spec.add_development_dependency 'minitest', '~> 5.9'
-  spec.add_development_dependency 'pry', '~> 0.10'
-  spec.add_development_dependency 'rake', '>= 11.2', '< 14'
-  spec.add_development_dependency 'rubocop', '~> 1.28.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdl
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Mark Harrison
@@ -42,42 +42,30 @@ dependencies:
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -92,88 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.12'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.12'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.9'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '11.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '11.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '14'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.28.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.28.1
 description: Style checker/lint tool for markdown files
 email:
 - mark@mivok.net
@@ -213,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="