scss_lint 0.51.0 → 0.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 125c8c771a34f5997a2a5632b521c50cd5ffe301
-  data.tar.gz: 58f9ec25bf46faf67567b1f2f5e3a7075c1dfd58
+  metadata.gz: 19af5419180f80bdaad53ecffaa33992432af5e0
+  data.tar.gz: ad403dc48c33f6658ff318dabcd8f4fb3b2f5ba0
 SHA512:
-  metadata.gz: c16f9acd86f9330b1e693192597105cab8a5e6c80788d6fba28ea95bb4ec55f78b52104b4980cc5c93d8506455935fa22ec27a4e994e4c2204fa599ca03b960f
-  data.tar.gz: 26f1bc74bb06a32d7efab07ddd12baf5483719364e928ceac6b21c139f1a82240cc31313bae462c130651ebbe3afcb806ab84af2a8886d33314f0d1011f9d380
+  metadata.gz: 1c4f46183c914ad9f99cd41fc63583413e08465ccc76ea60387d12c11bfae897fe91e5cbdb354795d6bc65f813f59fea7aa4024385acbe372206ab0ed7a629ea
+  data.tar.gz: 45baee65c2f6a3d0268c3ff442e5ab93db4dcab3cafc3f73d29f0c756c9db6b76a21e6bd19d444ecba6e337e9741411eb6a5723b76ec3a689db743fb480ffb44

data/lib/scss_lint/plugins/linter_dir.rb

@@ -6,11 +6,11 @@ module SCSSLint
 
       def initialize(dir)
         @dir = dir
-        @config = SCSSLint::Config.new({}) # Will always be empty
       end
 
       def load
         ruby_files.each { |file| require file }
+        @config = plugin_config
         self
       end
 
@@ -19,6 +19,29 @@ module SCSSLint
       def ruby_files
         Dir.glob(File.expand_path(File.join(@dir, '**', '*.rb')))
       end
+
+      # Returns the {SCSSLint::Config} for this directory.
+      #
+      # This is intended to be merged with the configuration that loaded this
+      # plugin.
+      #
+      # @return [SCSSLint::Config]
+      def plugin_config
+        file = plugin_config_file
+
+        if File.exist?(file)
+          Config.load(file, merge_with_default: false)
+        else
+          Config.new({})
+        end
+      end
+
+      # Path of the configuration file to attempt to load for this directory.
+      #
+      # @return [String]
+      def plugin_config_file
+        File.join(@dir, Config::FILE_NAME)
+      end
     end
   end
 end

data/lib/scss_lint/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module SCSSLint
-  VERSION = '0.51.0'.freeze
+  VERSION = '0.52.0'.freeze
 end

data/spec/scss_lint/plugins/linter_dir_spec.rb

@@ -4,18 +4,42 @@ describe SCSSLint::Plugins::LinterDir do
   let(:plugin_directory) { File.expand_path('../../fixtures/plugins', __FILE__) }
   let(:subject) { described_class.new(plugin_directory) }
 
-  describe '#config' do
-    it 'returns empty configuration' do
-      subject.config.should == SCSSLint::Config.new({})
+  describe '#load' do
+    let(:config_file) { File.join(plugin_directory, '.scss-lint.yml') }
+    let(:config_file_exists) { false }
+
+    before do
+      File.stub(:exist?).with(config_file).and_return(config_file_exists)
     end
-  end
 
-  describe '#load' do
     it 'requires each file in the plugin directory' do
       subject.should_receive(:require)
              .with(File.join(plugin_directory, 'linter_plugin.rb')).once
 
       subject.load
     end
+
+    context 'when the dir does not include a configuration file' do
+      it 'loads an empty configuration' do
+        subject.load
+        subject.config.should == SCSSLint::Config.new({})
+      end
+    end
+
+    context 'when a config file exists in the dir' do
+      let(:config_file_exists) { true }
+      let(:fake_config) { SCSSLint::Config.new('linters' => { 'FakeLinter' => {} }) }
+
+      before do
+        SCSSLint::Config.should_receive(:load)
+                        .with(config_file, merge_with_default: false)
+                        .and_return(fake_config)
+      end
+
+      it 'loads the configuration' do
+        subject.load
+        subject.config.should == fake_config
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss_lint
 version: !ruby/object:Gem::Version
-  version: 0.51.0
+  version: 0.52.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: SCSS lint tool
@@ -369,3 +369,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/isolated_environment.rb
 - spec/support/matchers/report_lint.rb
+has_rdoc: