scss_lint 0.40.0 → 0.40.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2875735c6ff15b0a0c04496ae19043825c289c95
-  data.tar.gz: abf49a6521c68efcedcf413a15208983bd116914
+  metadata.gz: 3d64ee14edbfefaee47bcf0b30500c2ee83231c0
+  data.tar.gz: 513d15bc52ea0f5d854972d661053c6ccc79f855
 SHA512:
-  metadata.gz: f14a4ee19fc7124cadc19e33fa9f3ee8232f9b34c27bb2824100d4400d998e590004b214ccefc3b37b97490f167aef0950dc1775467e84d5fe2fa63ad6f37798
-  data.tar.gz: 56abaad1303a536a32d57a6cfc3862144c05e5a4c6140e377745a7a801bbd9ba9bd43fdb397527532918aa3203579473dcd0336f0e387e15e223d7194eef8628
+  metadata.gz: 60cff3d31434509cb38dcee086f0f877f4346f5c9cb060d26897193e02b21e5c5109fe68dbc53f3bd99c4ca31ec09746a698ae5b8eed9ede9f57dd1dbf494777
+  data.tar.gz: 386501b6cb355a6924e1e2f6c0741a68dd54a7245fd28f7b71dac6488c32e79322d435bb1f5d69a419b680bdc30aefca0bfe604b104f697054e5ae6cc81a98ec

data/lib/scss_lint/config.rb

@@ -208,7 +208,18 @@ module SCSSLint
     end
 
     def load_plugins
-      load_plugins_and_merge_config.tap { ensure_plugins_have_default_options }
+      previous_linters = LinterRegistry.linters
+      plugins = SCSSLint::Plugins.new(self).load
+      new_linters = LinterRegistry.linters - previous_linters
+
+      plugins.each do |plugin|
+        # Have the plugin options be overrideable by the local configuration
+        @options = self.class.send(:smart_merge, plugin.config.options, @options)
+      end
+
+      # We only want to set defaults for linters introduced via plugins,
+      # otherwise we'll accidentally enable some linters
+      ensure_linters_have_default_options(new_linters)
     end
 
     def enabled_linters
@@ -218,7 +229,7 @@ module SCSSLint
     end
 
     def linter_enabled?(linter)
-      linter_options(linter)['enabled']
+      (linter_options(linter) || {}).fetch('enabled', false)
     end
 
     def enable_linter(linter)
@@ -236,7 +247,7 @@ module SCSSLint
     end
 
     def linter_options(linter)
-      @options['linters'][self.class.linter_name(linter)]
+      @options['linters'].fetch(self.class.linter_name(linter), {})
     end
 
     def excluded_file?(file_path)
@@ -289,15 +300,8 @@ module SCSSLint
       end
     end
 
-    def load_plugins_and_merge_config
-      SCSSLint::Plugins.new(self).load.each do |plugin|
-        # Have the plugin options be overrideable by the local configuration
-        @options = self.class.send(:smart_merge, plugin.config.options, @options)
-      end
-    end
-
-    def ensure_plugins_have_default_options
-      LinterRegistry.linters.each do |linter|
+    def ensure_linters_have_default_options(linters)
+      linters.each do |linter|
         if linter_options(linter).nil?
           @options['linters'].merge!(default_plugin_options(linter))
         end

data/lib/scss_lint/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module SCSSLint
-  VERSION = '0.40.0'
+  VERSION = '0.40.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss_lint
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.40.1
 platform: ruby
 authors:
 - Brigade Engineering