slim_lint 0.19.0 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f8981bc153e8cbdd0d0f3be73acfcbbc22cebcc536b5e868e21021551d6b51f
-  data.tar.gz: 27f4b83491d752017a65c82951ce8edfadd43a41c8ff7cd7b6d6a7ee8790b789
+  metadata.gz: ba421a3f089d61c739817da641835d0f1154fda39e56114ddbd8c0bbebf8d3a4
+  data.tar.gz: 4fee0abaf859c5cb826684ff6aea6146d7b07949faf90f6a7ae3a26839f9c179
 SHA512:
-  metadata.gz: 69cd8f58ebc3d1950f8ce70a980db280eeaa1887de85dd2f1c5f507fc835b5016693d88bf3d995d82c377a40b210443595c38554485afcb22e96c74b47479d81
-  data.tar.gz: afc8b85309b1aec3532711b46fdd25c98e662ffa55879e1f295bff3aef96f949ce4ed041b343765a0f5f78de0d0a505704b5a4f93024a46954f0352207d5d3a0
+  metadata.gz: 382eaadb2170a24c75e48163612cb0b4d32f80516f7576c4e152fdbaaa6c77281a4174203c4a10c4f4b402c0812d918f8e73cdbb5205f672ef8f788a7b4b0fe9
+  data.tar.gz: 463ac3fbf8f3677183440abdf937209b886c5f02e8b4b4bec6405a920297993049aa4d0199f54b57bcc5ccaab03833557a179651beee0bc43802e928564059d9

data/config/default.yml

@@ -18,6 +18,10 @@ linters:
   ControlStatementSpacing:
     enabled: true
 
+  EmbeddedEngines:
+    enabled: false
+    forbidden_engines: []
+
   EmptyControlStatement:
     enabled: true
 
@@ -53,6 +57,7 @@ linters:
       - Layout/IndentationConsistency
       - Layout/IndentationWidth
       - Layout/InitialIndentation
+      - Layout/LineLength
       - Layout/MultilineArrayBraceLayout
       - Layout/MultilineAssignmentLayout
       - Layout/MultilineHashBraceLayout
@@ -66,11 +71,12 @@ linters:
       - Lint/Void
       - Metrics/BlockLength
       - Metrics/BlockNesting
-      - Metrics/LineLength
       - Naming/FileName
       - Style/FrozenStringLiteralComment
+      - Style/IdenticalConditionalBranches
       - Style/IfUnlessModifier
       - Style/Next
+      - Style/WhileUntilDo
       - Style/WhileUntilModifier
 
   Tab:

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/linter/embedded_engines.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module SlimLint
+  # Checks for forbidden embedded engines.
+  class Linter::EmbeddedEngines < Linter
+    include LinterRegistry
+
+    MESSAGE = 'Forbidden embedded engine `%s` found'
+
+    on_start do |_sexp|
+      forbidden_engines = config['forbidden_engines']
+      dummy_node = Struct.new(:line)
+      document.source_lines.each_with_index do |line, index|
+        forbidden_engines.each do |forbidden_engine|
+          next unless line =~ /^#{forbidden_engine}.*:\s*$/
+
+          report_lint(dummy_node.new(index + 1), MESSAGE % forbidden_engine)
+        end
+      end
+    end
+  end
+end

data/lib/slim_lint/options.rb

@@ -73,6 +73,11 @@ module SlimLint
                 'List of file names to exclude') do |files|
         @options[:excluded_files] = files
       end
+
+      parser.on('--stdin-file-path file', String,
+                'Pipe source from STDIN, using file in offense reports.') do |file|
+        @options[:stdin_file_path] = file
+      end
     end
 
     # Register informational flags.

data/lib/slim_lint/reporter/emacs_reporter.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module SlimLint
+  # Outputs lints in format: {filename}:{line}:{column}: {kind}: {message}.
+  class Reporter::EmacsReporter < Reporter
+    def display_report(report)
+      sorted_lints = report.lints.sort_by { |l| [l.filename, l.line] }
+
+      sorted_lints.each do |lint|
+        print_location(lint)
+        print_type(lint)
+        print_message(lint)
+      end
+    end
+
+    private
+
+    def print_location(lint)
+      log.info lint.filename, false
+      log.log ':', false
+      log.bold lint.line, false
+      log.log ':', false
+      # TODO: change 1 to column number when linter will have this info.
+      log.bold 1, false
+      log.log ':', false
+    end
+
+    def print_type(lint)
+      if lint.error?
+        log.error ' E: ', false
+      else
+        log.warning ' W: ', false
+      end
+    end
+
+    def print_message(lint)
+      if lint.linter
+        log.success("#{lint.linter.name}: ", false)
+      end
+
+      log.log lint.message
+    end
+  end
+end

data/lib/slim_lint/reporter/json_reporter.rb

@@ -45,6 +45,7 @@ module SlimLint
         location: {
           line: offense.line,
         },
+        linter: offense.linter&.name,
       }
     end
   end

data/lib/slim_lint/runner.rb

@@ -15,13 +15,17 @@ module SlimLint
     # @return [SlimLint::Report] a summary of all lints found
     def run(options = {})
       config = load_applicable_config(options)
-      files = extract_applicable_files(config, options)
-
       linter_selector = SlimLint::LinterSelector.new(config, options)
 
-      lints = files.map do |file|
-        collect_lints(file, linter_selector, config)
-      end.flatten
+      if options[:stdin_file_path].nil?
+        files = extract_applicable_files(config, options)
+        lints = files.map do |file|
+          collect_lints(File.read(file), file, linter_selector, config)
+        end.flatten
+      else
+        files = [options[:stdin_file_path]]
+        lints = collect_lints($stdin.read, options[:stdin_file_path], linter_selector, config)
+      end
 
       SlimLint::Report.new(lints, files)
     end
@@ -49,14 +53,14 @@ module SlimLint
     # @param file [String] path to file to lint
     # @param linter_selector [SlimLint::LinterSelector]
     # @param config [SlimLint::Configuration]
-    def collect_lints(file, linter_selector, config)
+    def collect_lints(file_content, file_name, linter_selector, config)
       begin
-        document = SlimLint::Document.new(File.read(file), file: file, config: config)
+        document = SlimLint::Document.new(file_content, file: file_name, config: config)
       rescue SlimLint::Exceptions::ParseError => e
-        return [SlimLint::Lint.new(nil, file, e.lineno, e.error, :error)]
+        return [SlimLint::Lint.new(nil, file_name, e.lineno, e.error, :error)]
       end
 
-      linter_selector.linters_for_file(file).map do |linter|
+      linter_selector.linters_for_file(file_name).map do |linter|
         linter.run(document)
       end.flatten
     end

data/lib/slim_lint/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim_lint
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.21.1
 platform: ruby
 authors:
 - Shane da Silva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.77.0
+        version: 0.78.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.77.0
+        version: 0.78.0
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,7 @@ files:
 - lib/slim_lint/linter/comment_control_statement.rb
 - lib/slim_lint/linter/consecutive_control_statements.rb
 - lib/slim_lint/linter/control_statement_spacing.rb
+- lib/slim_lint/linter/embedded_engines.rb
 - lib/slim_lint/linter/empty_control_statement.rb
 - lib/slim_lint/linter/empty_lines.rb
 - lib/slim_lint/linter/file_length.rb
@@ -127,6 +128,7 @@ files:
 - lib/slim_lint/reporter.rb
 - lib/slim_lint/reporter/checkstyle_reporter.rb
 - lib/slim_lint/reporter/default_reporter.rb
+- lib/slim_lint/reporter/emacs_reporter.rb
 - lib/slim_lint/reporter/json_reporter.rb
 - lib/slim_lint/ruby_extract_engine.rb
 - lib/slim_lint/ruby_extractor.rb
@@ -140,7 +142,7 @@ homepage: https://github.com/sds/slim-lint
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -155,8 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Slim template linting tool
 test_files: []