erb_lint 0.0.29 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4a94b402b5b0e78c8597154a55807ab0cdab042b02aa105f8a84e7a800d1f78
-  data.tar.gz: 211323032036eee8cdc61c866d3d3049a80d8ddcf16c2e00795e8955dd8b112e
+  metadata.gz: 65e35ea36e2654316241c7267aca2f9b581fa7eb5c858008a80dfc098c07a187
+  data.tar.gz: db35c2f60f85651728bec14a853fc8d7060e93e686c9cababa55bccb3dd46c49
 SHA512:
-  metadata.gz: 7721c096adf5dc25e919a1f233292d393bfb005c14bd90e4271a191313fefc5ee6c6e64d625c3f5bac39fccb5eeba42d6fd1cb64c99c069a03cf7c2a64d7fe1b
-  data.tar.gz: b7e7f1f7fbfab896f3ade2708cf873a19c05011b76be978df594326b47d999d27692a0afaeb9d296395a2dc09678ee4008fbf06abed8cad2c4901dad1a071152
+  metadata.gz: dbe12716e085e0baa6beef5c1395bf86874f442db6087c2d1312315cb4d60704cca5a007a3843738197d58fa0025d35b993bbbed5606ca9a3c71b81928d365e2
+  data.tar.gz: 7bb3506036e3a098cb9c688c20373a80bc413a6528fcb05b951e16996dd62eea358c01658f5b2aceb4d4b1b4bc63afa7ad53d852478b2b49d549a13f3da6ed1c

data/lib/erb_lint/cli.rb

@@ -17,10 +17,11 @@ module ERBLint
     class ExitWithSuccess < RuntimeError; end
 
     class Stats
-      attr_accessor :found, :corrected
+      attr_accessor :found, :corrected, :exceptions
       def initialize
         @found = 0
         @corrected = 0
+        @exceptions = 0
       end
     end
 
@@ -32,15 +33,16 @@ module ERBLint
     end
 
     def run(args = ARGV)
-      load_options(args)
-      @files = args.dup
+      dupped_args = args.dup
+      load_options(dupped_args)
+      @files = dupped_args
 
       load_config
 
       if !@files.empty? && lint_files.empty?
-        success!("no files found...\n")
+        failure!("no files found...\n")
       elsif lint_files.empty?
-        success!("no files given...\n#{option_parser}")
+        failure!("no files found or given, specify files or config...\n#{option_parser}")
       end
 
       ensure_files_exist(lint_files)
@@ -53,11 +55,17 @@ module ERBLint
         "#{enabled_linter_classes.size} #{'autocorrectable ' if autocorrect?}linters..."
       puts
 
+      runner = ERBLint::Runner.new(file_loader, @config)
+
       lint_files.each do |filename|
+        runner.clear_offenses
         begin
-          run_with_corrections(filename)
+          run_with_corrections(runner, filename)
         rescue => e
+          @stats.exceptions += 1
           puts "Exception occured when processing: #{relative_filename(filename)}"
+          puts "If this file cannot be processed by erb-lint, "\
+            "you can exclude it in your configuration file."
           puts e.message
           puts Rainbow(e.backtrace.join("\n")).red
           puts
@@ -79,7 +87,7 @@ module ERBLint
         puts Rainbow("No errors were found in ERB files").green
       end
 
-      @stats.found == 0
+      @stats.found == 0 && @stats.exceptions == 0
     rescue OptionParser::InvalidOption, OptionParser::InvalidArgument, ExitWithFailure => e
       warn(Rainbow(e.message).red)
       false
@@ -97,10 +105,8 @@ module ERBLint
       @options[:autocorrect]
     end
 
-    def run_with_corrections(filename)
-      file_content = File.read(filename)
-
-      runner = ERBLint::Runner.new(file_loader, @config)
+    def run_with_corrections(runner, filename)
+      file_content = File.read(filename, encoding: Encoding::UTF_8)
 
       7.times do
         processed_source = ERBLint::ProcessedSource.new(filename, file_content)
@@ -144,14 +150,15 @@ module ERBLint
     def load_config
       if File.exist?(config_filename)
         config = RunnerConfig.new(file_loader.yaml(config_filename), file_loader)
-        @config = RunnerConfig.default.merge(config)
+        @config = RunnerConfig.default_for(config)
       else
         warn(Rainbow("#{config_filename} not found: using default config").yellow)
         @config = RunnerConfig.default
       end
-      @config.merge!(runner_config_override)
     rescue Psych::SyntaxError => e
       failure!("error parsing config: #{e.message}")
+    ensure
+      @config.merge!(runner_config_override)
     end
 
     def file_loader
@@ -163,17 +170,22 @@ module ERBLint
     end
 
     def lint_files
-      if @options[:lint_all]
-        pattern = File.expand_path(DEFAULT_LINT_ALL_GLOB, Dir.pwd)
-        Dir[pattern].select { |filename| !excluded?(filename) }
-      else
-        @files
-          .map { |f| Dir.exist?(f) ? Dir[File.join(f, DEFAULT_LINT_ALL_GLOB)] : f }
-          .map { |f| f.include?('*') ? Dir[f] : f }
-          .flatten
-          .map { |f| File.expand_path(f, Dir.pwd) }
-          .select { |filename| !excluded?(filename) }
-      end
+      @lint_files ||=
+        if @options[:lint_all]
+          pattern = File.expand_path(glob, Dir.pwd)
+          Dir[pattern].select { |filename| !excluded?(filename) }
+        else
+          @files
+            .map { |f| Dir.exist?(f) ? Dir[File.join(f, glob)] : f }
+            .map { |f| f.include?('*') ? Dir[f] : f }
+            .flatten
+            .map { |f| File.expand_path(f, Dir.pwd) }
+            .select { |filename| !excluded?(filename) }
+        end
+    end
+
+    def glob
+      @config.to_hash["glob"] || DEFAULT_LINT_ALL_GLOB
     end
 
     def excluded?(filename)
@@ -246,7 +258,7 @@ module ERBLint
           end
         end
 
-        opts.on("--lint-all", "Lint all files matching #{DEFAULT_LINT_ALL_GLOB}") do |config|
+        opts.on("--lint-all", "Lint all files matching configured glob [default: #{DEFAULT_LINT_ALL_GLOB}]") do |config|
           @options[:lint_all] = config
         end
 
@@ -264,7 +276,7 @@ module ERBLint
           @options[:enabled_linters] = linters
         end
 
-        opts.on("--autocorrect", "Correct offenses that can be corrected automatically (default: false)") do |config|
+        opts.on("-a", "--autocorrect", "Correct offenses automatically if possible (default: false)") do |config|
           @options[:autocorrect] = config
         end
 

data/lib/erb_lint/file_loader.rb

@@ -9,8 +9,14 @@ module ERBLint
       @base_path = base_path
     end
 
-    def yaml(filename)
-      YAML.safe_load(read_content(filename), [Regexp, Symbol], [], false, filename) || {}
+    if RUBY_VERSION >= "2.6"
+      def yaml(filename)
+        YAML.safe_load(read_content(filename), permitted_classes: [Regexp, Symbol], filename: filename) || {}
+      end
+    else
+      def yaml(filename)
+        YAML.safe_load(read_content(filename), [Regexp, Symbol], [], false, filename) || {}
+      end
     end
 
     private

data/lib/erb_lint/linters/no_javascript_tag_helper.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'better_html'
 require 'better_html/ast/node'
 require 'better_html/test_helper/ruby_node'
 require 'erb_lint/utils/block_map'

data/lib/erb_lint/linters/rubocop.rb

@@ -108,10 +108,8 @@ module ERBLint
         if @only_cops.present?
           selected_cops = RuboCop::Cop::Cop.all.select { |cop| cop.match?(@only_cops) }
           RuboCop::Cop::Registry.new(selected_cops)
-        elsif @rubocop_config['Rails']['Enabled']
-          RuboCop::Cop::Registry.new(RuboCop::Cop::Cop.all)
         else
-          RuboCop::Cop::Cop.non_rails
+          RuboCop::Cop::Registry.new(RuboCop::Cop::Cop.all)
         end
       end
 

data/lib/erb_lint/runner_config.rb

@@ -45,24 +45,30 @@ module ERBLint
     end
 
     class << self
-      def default
+      def default(default_enabled: nil)
+        default_enabled = default_enabled.nil? ? true : default_enabled
         new(
           linters: {
-            AllowedScriptType: { enabled: true },
-            ClosingErbTagIndent: { enabled: true },
-            ExtraNewline: { enabled: true },
-            FinalNewline: { enabled: true },
-            NoJavascriptTagHelper: { enabled: true },
-            ParserErrors: { enabled: true },
-            RightTrim: { enabled: true },
-            SelfClosingTag: { enabled: true },
-            SpaceAroundErbTag: { enabled: true },
-            SpaceIndentation: { enabled: true },
-            SpaceInHtmlTag: { enabled: true },
-            TrailingWhitespace: { enabled: true },
+            AllowedScriptType: { enabled: default_enabled },
+            ClosingErbTagIndent: { enabled: default_enabled },
+            ExtraNewline: { enabled: default_enabled },
+            FinalNewline: { enabled: default_enabled },
+            NoJavascriptTagHelper: { enabled: default_enabled },
+            ParserErrors: { enabled: default_enabled },
+            RightTrim: { enabled: default_enabled },
+            SelfClosingTag: { enabled: default_enabled },
+            SpaceAroundErbTag: { enabled: default_enabled },
+            SpaceIndentation: { enabled: default_enabled },
+            SpaceInHtmlTag: { enabled: default_enabled },
+            TrailingWhitespace: { enabled: default_enabled },
           },
         )
       end
+
+      def default_for(config)
+        default_linters_enabled = config.to_hash.dig("EnableDefaultLinters")
+        default(default_enabled: default_linters_enabled).merge(config)
+      end
     end
 
     private

data/lib/erb_lint/utils/offset_corrector.rb

@@ -38,7 +38,9 @@ module ERBLint
         @corrector.remove_trailing(range_with_offset(range), size)
       end
 
-      def range_with_offset(range)
+      def range_with_offset(node_or_range)
+        range = to_range(node_or_range)
+
         @processed_source.to_source_range(
           bound(@offset + range.begin_pos)..bound(@offset + (range.end_pos - 1))
         )
@@ -50,6 +52,21 @@ module ERBLint
           @bound_range.max,
         ].min
       end
+
+      private
+
+      def to_range(node_or_range)
+        case node_or_range
+        when ::RuboCop::AST::Node, ::Parser::Source::Comment
+          node_or_range.loc.expression
+        when ::Parser::Source::Range
+          node_or_range
+        else
+          raise TypeError,
+            'Expected a Parser::Source::Range, Comment or ' \
+                        "Rubocop::AST::Node, got #{node_or_range.class}"
+        end
+      end
     end
   end
 end

data/lib/erb_lint/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ERBLint
-  VERSION = '0.0.29'
+  VERSION = '0.0.34'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erb_lint
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.34
 platform: ruby
 authors:
 - Justin Chan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_html
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.79'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.79'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +167,8 @@ files:
 homepage: https://github.com/Shopify/erb-lint
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -176,15 +177,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ERB lint tool