erb_lint 0.0.31 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 421010e9ed7767b1702afd3360fc90e3461ba2955a06d9757aa7377943b26d7e
-  data.tar.gz: a8d4558c8407297f5470a7f50aae478f295b370a2af76f86118b24637a417de2
+  metadata.gz: 31efb24d1c4403b9325a23da3fcabce1be3e5cad7cf2f802c707911f966cfd16
+  data.tar.gz: 9a6a612f87175d77212f84c4062973ea7d6ceaf0a7c2b9dca9debe10020fd524
 SHA512:
-  metadata.gz: c00c0b52e0da4421ad79a52981a47a7dc7c1d289ab7ecd2757a201dac54ed75ff09a4f1ec009e8c7c242635eb5f8231059e147bf4d7e62c46518f07ccff7c08a
-  data.tar.gz: 4ec4bf36b000df7e2118f147e02507fa82a9a033c5bb656f35719616ed023ac89eec9e5b26ffa1a67ae642cde47d061e0e657ae9237afd0a520ed0b799364786
+  metadata.gz: b5fa4f3cb3051d6a30ffe2c9ff87770b40b224a5fb8dd000201846a613b42519a00e6a795082bc2dd055ef9e7aa88e92cecd7c365ca189bdbec6e9a41da32531
+  data.tar.gz: e9683a5db2457f4460a2eaed0e1c005dc98c33295ef554d77edf081e47503a4059537da75367ed5db31396a71547d8f0bf87c24f64c996ffc7c6b5c1f5fb6703

data/lib/erb_lint/cli.rb

@@ -33,8 +33,9 @@ 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
 
@@ -149,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
@@ -170,11 +172,11 @@ module ERBLint
     def lint_files
       @lint_files ||=
         if @options[:lint_all]
-          pattern = File.expand_path(DEFAULT_LINT_ALL_GLOB, Dir.pwd)
+          pattern = File.expand_path(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| 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) }
@@ -182,6 +184,10 @@ module ERBLint
         end
     end
 
+    def glob
+      @config.to_hash["glob"] || DEFAULT_LINT_ALL_GLOB
+    end
+
     def excluded?(filename)
       @config.global_exclude.any? do |path|
         File.fnmatch?(path, filename)
@@ -252,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
 

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erb_lint
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors:
 - Justin Chan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-04-07 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.79.0
+        version: '0.79'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        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: