slim_lint 0.17.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c46c0d7a658f450e3e00c0f5748acb512c8e19b06be92654c70640231a24658c
-  data.tar.gz: 4a53220961467310115ea4dd91242517a0bb13c549fd6035889ae3963adc779a
+  metadata.gz: 70c5fb4937778a7f451600310d934305853a938b8bf08df3e3c08b28f680b2a4
+  data.tar.gz: a1b2e962a79cf35c060768d562997e04bb0835a8d474cd1c85b54c22c98b3af7
 SHA512:
-  metadata.gz: dd248063a6e41b9c25f29ecfcf8dbdd370cf0974217158f1c7be7e5d1989ad9861c3a6fd266b18bb6f4756698386580ab6c2f0ba746337d2edd989809e96641e
-  data.tar.gz: f7735d7db2b0be57b832b0399b617a53709dda7c3e6c1ddc0eb3b9c1b58eea0619acc0cd93c8a12cf3c40b9d6916f096f6b18ae6c56fa2f8e91e9ec59321c127
+  metadata.gz: d0105fb2ef8ba6551b8a98f55677d939f922405150477cdaff62118caabb8d99f1c07426283e590e9ffb6fc9098bdd01c4214db612659f37fb4a087dd506836a
+  data.tar.gz: 8559c4cf8e7850a11657b9cffa9ff09fa6c08c4283f33638f7b604c63859ac24c52ff9c8e3366c7900a678240ae5876d71eb58de2bd2a8853138ec4e7a56af30

data/config/default.yml

@@ -42,16 +42,18 @@ linters:
     # WARNING: If you define this list in your own .slim-lint.yml file, you'll
     # be overriding the list defined here.
     ignored_cops:
-      - Layout/AlignArguments
-      - Layout/AlignArray
-      - Layout/AlignHash
-      - Layout/AlignParameters
+      - Layout/ArgumentAlignment
+      - Layout/ArrayAlignment
+      - Layout/BlockAlignment
       - Layout/EmptyLineAfterGuardClause
+      - Layout/EndAlignment
+      - Layout/FirstArrayElementIndentation
       - Layout/FirstParameterIndentation
-      - Layout/IndentArray
+      - Layout/HashAlignment
       - Layout/IndentationConsistency
       - Layout/IndentationWidth
       - Layout/InitialIndentation
+      - Layout/LineLength
       - Layout/MultilineArrayBraceLayout
       - Layout/MultilineAssignmentLayout
       - Layout/MultilineHashBraceLayout
@@ -59,16 +61,15 @@ linters:
       - Layout/MultilineMethodCallIndentation
       - Layout/MultilineMethodDefinitionBraceLayout
       - Layout/MultilineOperationIndentation
-      - Layout/TrailingBlankLines
+      - Layout/ParameterAlignment
+      - Layout/TrailingEmptyLines
       - Layout/TrailingWhitespace
-      - Lint/BlockAlignment
-      - Lint/EndAlignment
       - Lint/Void
       - Metrics/BlockLength
       - Metrics/BlockNesting
-      - Metrics/LineLength
       - Naming/FileName
       - Style/FrozenStringLiteralComment
+      - Style/IdenticalConditionalBranches
       - Style/IfUnlessModifier
       - Style/Next
       - Style/WhileUntilModifier

data/lib/slim_lint.rb

@@ -19,7 +19,7 @@ require 'slim_lint/logger'
 require 'slim_lint/version'
 
 # Load all filters (required by SlimLint::Engine)
-Dir[File.expand_path('slim_lint/filters/*.rb', File.dirname(__FILE__))].each do |file|
+Dir[File.expand_path('slim_lint/filters/*.rb', File.dirname(__FILE__))].sort.each do |file|
   require file
 end
 
@@ -37,16 +37,16 @@ require 'slim_lint/runner'
 
 # Load all matchers
 require 'slim_lint/matcher/base'
-Dir[File.expand_path('slim_lint/matcher/*.rb', File.dirname(__FILE__))].each do |file|
+Dir[File.expand_path('slim_lint/matcher/*.rb', File.dirname(__FILE__))].sort.each do |file|
   require file
 end
 
 # Load all linters
-Dir[File.expand_path('slim_lint/linter/*.rb', File.dirname(__FILE__))].each do |file|
+Dir[File.expand_path('slim_lint/linter/*.rb', File.dirname(__FILE__))].sort.each do |file|
   require file
 end
 
 # Load all reporters
-Dir[File.expand_path('slim_lint/reporter/*.rb', File.dirname(__FILE__))].each do |file|
+Dir[File.expand_path('slim_lint/reporter/*.rb', File.dirname(__FILE__))].sort.each do |file|
   require file
 end

data/lib/slim_lint/cli.rb

@@ -3,11 +3,18 @@
 require 'slim_lint'
 require 'slim_lint/options'
 
-require 'sysexits'
-
 module SlimLint
   # Command line application interface.
   class CLI # rubocop:disable Metrics/ClassLength
+    # Exit codes
+    # @see https://man.openbsd.org/sysexits.3
+    EX_OK = 0
+    EX_USAGE = 64
+    EX_DATAERR = 65
+    EX_NOINPUT = 67
+    EX_SOFTWARE = 70
+    EX_CONFIG = 78
+
     # Create a CLI that outputs to the specified logger.
     #
     # @param logger [SlimLint::Logger]
@@ -39,16 +46,16 @@ module SlimLint
 
       if options[:help]
         print_help(options)
-        Sysexits::EX_OK
+        EX_OK
       elsif options[:version] || options[:verbose_version]
         print_version(options)
-        Sysexits::EX_OK
+        EX_OK
       elsif options[:show_linters]
         print_available_linters
-        Sysexits::EX_OK
+        EX_OK
       elsif options[:show_reporters]
         print_available_reporters
-        Sysexits::EX_OK
+        EX_OK
       else
         scan_for_lints(options)
       end
@@ -60,20 +67,20 @@ module SlimLint
       case exception
       when SlimLint::Exceptions::ConfigurationError
         log.error exception.message
-        Sysexits::EX_CONFIG
+        EX_CONFIG
       when SlimLint::Exceptions::InvalidCLIOption
         log.error exception.message
         log.log "Run `#{APP_NAME}` --help for usage documentation"
-        Sysexits::EX_USAGE
+        EX_USAGE
       when SlimLint::Exceptions::InvalidFilePath
         log.error exception.message
-        Sysexits::EX_NOINPUT
+        EX_NOINPUT
       when SlimLint::Exceptions::NoLintersError
         log.error exception.message
-        Sysexits::EX_NOINPUT
+        EX_NOINPUT
       else
         print_unexpected_exception(exception)
-        Sysexits::EX_SOFTWARE
+        EX_SOFTWARE
       end
     end
 
@@ -83,7 +90,7 @@ module SlimLint
     def scan_for_lints(options)
       report = Runner.new.run(options)
       print_report(report, options)
-      report.failed? ? Sysexits::EX_DATAERR : Sysexits::EX_OK
+      report.failed? ? EX_DATAERR : EX_OK
     end
 
     # Outputs a report of the linter run using the specified reporter.

data/lib/slim_lint/file_finder.rb

@@ -38,7 +38,7 @@ module SlimLint
     #
     # @param patterns [Array<String>]
     # @return [Array<String>]
-    def extract_files_from(patterns) # rubocop:disable MethodLength
+    def extract_files_from(patterns) # rubocop:disable Metrics/MethodLength
       files = []
 
       patterns.each do |pattern|

data/lib/slim_lint/linter/comment_control_statement.rb

@@ -11,6 +11,8 @@ module SlimLint
 
       comment = code[/\A\s*#(.*\z)/, 1]
 
+      next if comment =~ /^\s*rubocop:\w+/
+
       report_lint(sexp,
                   "Slim code comments (`/#{comment}`) are preferred over " \
                   "control statement comments (`-##{comment}`)")

data/lib/slim_lint/linter/control_statement_spacing.rb

@@ -9,7 +9,6 @@ module SlimLint
 
     on [:html, :tag, anything, [],
          [:slim, :output, anything, capture(:ruby, anything)]] do |sexp|
-
       # Fetch original Slim code that contains an element with a control statement.
       line = document.source_lines[sexp.line() - 1]
 

data/lib/slim_lint/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module SlimLint
-  VERSION = '0.17.0'
+  VERSION = '0.20.1'
 end

metadata

@@ -1,49 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: slim_lint
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '13'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '13'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.78.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.78.0
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -64,20 +44,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: sysexits
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.1
 signing_key: 
 specification_version: 4
 summary: Slim template linting tool