scss_lint 0.43.2 → 0.44.0

data/lib/scss_lint/reporter/default_reporter.rb

@@ -12,15 +12,15 @@ module SCSSLint
   private
 
     def location(lint)
-      "#{lint.filename.color(:cyan)}:#{lint.location.line.to_s.color(:magenta)}"
+      "#{log.cyan(lint.filename)}:#{log.magenta(lint.location.line.to_s)}"
     end
 
     def type(lint)
-      lint.error? ? '[E]'.color(:red) : '[W]'.color(:yellow)
+      lint.error? ? log.red('[E]') : log.yellow('[W]')
     end
 
     def message(lint)
-      linter_name = "#{lint.linter.name}: ".color(:green) if lint.linter
+      linter_name = log.green("#{lint.linter.name}: ") if lint.linter
       "#{linter_name}#{lint.description}"
     end
   end

data/lib/scss_lint/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 # Defines the gem version.
 module SCSSLint
-  VERSION = '0.43.2'
+  VERSION = '0.44.0'.freeze
 end

data/spec/scss_lint/cli_spec.rb

@@ -19,10 +19,6 @@ describe SCSSLint::CLI do
   class SCSSLint::Linter::FakeTestLinter2 < SCSSLint::Linter; end
 
   before do
-    # Silence console output
-    @output = ''
-    STDOUT.stub(:write) { |*args| @output.<<(*args) }
-
     SCSSLint::Config.stub(:load)
                     .with(SCSSLint::Config::DEFAULT_FILE, merge_with_default: false)
                     .and_return(config)
@@ -32,9 +28,12 @@ describe SCSSLint::CLI do
   end
 
   describe '#run' do
-    let(:files) { ['file1.scss', 'file2.scss'] }
-    let(:flags) { [] }
-    subject     { SCSSLint::CLI.new }
+    let(:files)  { ['file1.scss', 'file2.scss'] }
+    let(:flags)  { [] }
+    let(:io)     { StringIO.new }
+    let(:output) { io.string }
+    let(:logger) { SCSSLint::Logger.new(io) }
+    subject      { SCSSLint::CLI.new(logger) }
 
     before do
       SCSSLint::FileFinder.any_instance.stub(:find).and_return(files)
@@ -47,6 +46,59 @@ describe SCSSLint::CLI do
       # Keep running tests
     end
 
+    context 'when passed the --color flag' do
+      let(:flags) { ['--color'] }
+
+      it 'sets the logger to output in color' do
+        safe_run
+        logger.color_enabled.should == true
+      end
+
+      context 'and the output stream is not a TTY' do
+        before do
+          io.stub(:tty?).and_return(false)
+        end
+
+        it 'sets the logger to output in color' do
+          safe_run
+          logger.color_enabled.should == true
+        end
+      end
+    end
+
+    context 'when passed the --no-color flag' do
+      let(:flags) { ['--no-color'] }
+
+      it 'sets the logger to not output in color' do
+        safe_run
+        logger.color_enabled.should == false
+      end
+    end
+
+    context 'when --[no-]color flag is not specified' do
+      before do
+        io.stub(:tty?).and_return(tty)
+      end
+
+      context 'and the output stream is a TTY' do
+        let(:tty) { true }
+
+        it 'sets the logger to output in color' do
+          safe_run
+          logger.color_enabled.should == true
+        end
+      end
+
+      context 'and the output stream is not a TTY' do
+        let(:tty) { false }
+
+        it 'sets the logger to not output in color' do
+          safe_run
+          logger.color_enabled.should == false
+        end
+      end
+    end
+
     context 'when there are no lints' do
       before do
         SCSSLint::Runner.any_instance.stub(:lints).and_return([])
@@ -58,7 +110,7 @@ describe SCSSLint::CLI do
 
       it 'outputs nothing' do
         safe_run
-        @output.should be_empty
+        output.should be_empty
       end
     end
 
@@ -81,7 +133,7 @@ describe SCSSLint::CLI do
 
       it 'outputs the warnings' do
         safe_run
-        @output.should include 'Some description'
+        output.should include 'Some description'
       end
     end
 
@@ -104,7 +156,7 @@ describe SCSSLint::CLI do
 
       it 'outputs the errors' do
         safe_run
-        @output.should include 'Some description'
+        output.should include 'Some description'
       end
     end
 
@@ -125,17 +177,17 @@ describe SCSSLint::CLI do
 
       it 'outputs the error message' do
         safe_run
-        @output.should include message
+        output.should include message
       end
 
       it 'outputs the backtrace' do
         safe_run
-        @output.should include backtrace.join("\n")
+        output.should include backtrace.join("\n")
       end
 
       it 'outputs a link to the issue tracker' do
         safe_run
-        @output.should include SCSSLint::BUG_REPORT_URL
+        output.should include SCSSLint::BUG_REPORT_URL
       end
     end
 
@@ -171,7 +223,7 @@ describe SCSSLint::CLI do
     context 'when specified SCSS file globs match no files' do
       before do
         SCSSLint::FileFinder.any_instance.stub(:find)
-          .and_raise(SCSSLint::Exceptions::NoFilesError)
+                            .and_raise(SCSSLint::Exceptions::NoFilesError)
       end
 
       it 'exits with an appropriate status code' do

data/spec/scss_lint/config_spec.rb

@@ -132,15 +132,15 @@ describe SCSSLint::Config do
 
       before do
         SCSSLint::LinterRegistry.stub(:linters)
-          .and_return([SCSSLint::Linter::SomeNamespace::FakeLinter1,
-                       SCSSLint::Linter::SomeNamespace::FakeLinter2])
+                                .and_return([SCSSLint::Linter::SomeNamespace::FakeLinter1,
+                                             SCSSLint::Linter::SomeNamespace::FakeLinter2])
       end
 
       it 'returns the same options for all linters under that namespace' do
         subject.linter_options(SCSSLint::Linter::SomeNamespace::FakeLinter1)
-          .should eq('enabled' => true)
+               .should include 'enabled' => true
         subject.linter_options(SCSSLint::Linter::SomeNamespace::FakeLinter2)
-          .should eq('enabled' => true)
+               .should include 'enabled' => true
       end
     end
 
@@ -229,7 +229,27 @@ describe SCSSLint::Config do
 
     it 'returns the options for the specified linter' do
       config.linter_options(SCSSLint::Linter::FakeConfigLinter.new)
-        .should == linter_options
+            .should include linter_options
+    end
+
+    context 'when global severity is specified' do
+      let(:options) { super().merge('severity' => 'some-severity') }
+
+      context 'and linter severity is not specified' do
+        it 'returns the global severity' do
+          config.linter_options(SCSSLint::Linter::FakeConfigLinter.new)
+                .should include 'severity' => 'some-severity'
+        end
+      end
+
+      context 'and linter severity is specified' do
+        let(:linter_options) { super().merge('severity' => 'custom-severity') }
+
+        it 'returns the custom linter severity' do
+          config.linter_options(SCSSLint::Linter::FakeConfigLinter.new)
+                .should include 'severity' => 'custom-severity'
+        end
+      end
     end
   end
 

data/spec/scss_lint/linter/name_format_spec.rb

@@ -48,6 +48,16 @@ describe SCSSLint::Linter::NameFormat do
       it { should report_lint line: 1 }
     end
 
+    context 'when a function contains variables with capital letters' do
+      let(:scss) { <<-SCSS }
+        p {
+          content: good-function($badVariable);
+        }
+      SCSS
+
+      it { should report_lint line: 2 }
+    end
+
     context 'when a mixin is declared with a capital letter' do
       let(:scss) { <<-SCSS }
         @mixin badMixin() {

data/spec/scss_lint/linter/property_sort_order_spec.rb

@@ -364,6 +364,20 @@ describe SCSSLint::Linter::PropertySortOrder do
       SCSS
 
       it { should_not report_lint }
+
+      context 'and there are duplicate properties' do
+        let(:scss) { <<-SCSS }
+          p {
+            position: absolute;
+            top: 0;
+            transition: -webkit-transform .33s;
+            transition: transform .33s;
+            background-color: #eee;
+          }
+        SCSS
+
+        it { should_not report_lint }
+      end
     end
 
     context 'and the properties do not match the order' do
@@ -377,6 +391,20 @@ describe SCSSLint::Linter::PropertySortOrder do
       SCSS
 
       it { should report_lint }
+
+      context 'and there are duplicate properties' do
+        let(:scss) { <<-SCSS }
+          p {
+            position: absolute;
+            transition: -webkit-transform .33s;
+            transition: transform .33s;
+            top: 0;
+            background-color: #eee;
+          }
+        SCSS
+
+        it { should report_lint line: 3 }
+      end
     end
   end
 

data/spec/scss_lint/linter/unnecessary_parent_reference_spec.rb

@@ -95,4 +95,14 @@ describe SCSSLint::Linter::UnnecessaryParentReference do
 
     it { should_not report_lint }
   end
+
+  context 'when an ampersand is used in concatentation following an ampersand' do
+    let(:scss) { <<-SCSS }
+      .icon {
+        & &-small {}
+      }
+    SCSS
+
+    it { should_not report_lint }
+  end
 end

data/spec/scss_lint/linter/variable_for_property_spec.rb

@@ -118,6 +118,16 @@ describe SCSSLint::Linter::VariableForProperty do
       it { should_not report_lint }
     end
 
+    context 'when property specifies `initial`' do
+      let(:scss) { <<-SCSS }
+        p {
+          color: initial;
+        }
+      SCSS
+
+      it { should_not report_lint }
+    end
+
     context 'when property specifies `transparent`' do
       let(:scss) { <<-SCSS }
         p {

data/spec/scss_lint/logger_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe SCSSLint::Logger do
+  let(:io)     { StringIO.new }
+  let(:logger) { described_class.new(io) }
+
+  describe '#color_enabled' do
+    subject { io.string }
+
+    before do
+      logger.color_enabled = enabled
+      logger.success('Success!')
+    end
+
+    context 'when color is enabled' do
+      let(:enabled) { true }
+
+      it { should include '32' }
+    end
+
+    context 'when color is disabled' do
+      let(:enabled) { false }
+
+      it { should_not include '32' }
+    end
+  end
+end

data/spec/scss_lint/options_spec.rb

@@ -30,5 +30,23 @@ describe SCSSLint::Options do
         expect { subject }.to raise_error SCSSLint::Exceptions::InvalidCLIOption
       end
     end
+
+    context 'color' do
+      describe 'manually on' do
+        let(:args) { ['--color'] }
+
+        it 'sets the `color` option to true' do
+          subject.should include color: true
+        end
+      end
+
+      describe 'manually off' do
+        let(:args) { ['--no-color'] }
+
+        it 'sets the `color option to false' do
+          subject.should include color: false
+        end
+      end
+    end
   end
 end

data/spec/scss_lint/plugins/linter_dir_spec.rb

@@ -13,7 +13,7 @@ describe SCSSLint::Plugins::LinterDir do
   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
+             .with(File.join(plugin_directory, 'linter_plugin.rb')).once
 
       subject.load
     end

data/spec/scss_lint/reporter/clean_files_reporter_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe SCSSLint::Reporter::CleanFilesReporter do
-  subject { described_class.new(lints, files) }
+  subject { described_class.new(lints, files, nil) }
 
   describe '#report_lints' do
     context 'when there are no lints and no files' do

data/spec/scss_lint/reporter/config_reporter_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe SCSSLint::Reporter::ConfigReporter do
   subject { YAML.load(result) }
-  let(:result) { described_class.new(lints, []).report_lints }
+  let(:result) { described_class.new(lints, [], nil).report_lints }
 
   describe '#report_lints' do
     context 'when there are no lints' do

data/spec/scss_lint/reporter/default_reporter_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
 describe SCSSLint::Reporter::DefaultReporter do
-  subject { SCSSLint::Reporter::DefaultReporter.new(lints, []) }
+  let(:logger) { SCSSLint::Logger.new($stdout) }
+  subject { SCSSLint::Reporter::DefaultReporter.new(lints, [], logger) }
 
   describe '#report_lints' do
     context 'when there are no lints' do

data/spec/scss_lint/reporter/files_reporter_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe SCSSLint::Reporter::FilesReporter do
-  subject { described_class.new(lints, []) }
+  subject { described_class.new(lints, [], nil) }
 
   describe '#report_lints' do
     context 'when there are no lints' do

data/spec/scss_lint/reporter/json_reporter_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe SCSSLint::Reporter::JSONReporter do
-  subject { SCSSLint::Reporter::JSONReporter.new(lints, []) }
+  subject { SCSSLint::Reporter::JSONReporter.new(lints, [], nil) }
 
   describe '#report_lints' do
     let(:json) { JSON.parse(subject.report_lints) }
@@ -56,22 +56,22 @@ describe SCSSLint::Reporter::JSONReporter do
 
       it 'marks each issue with a line number' do
         json.values.flat_map { |issues| issues.map { |issue| issue['line'] } }
-          .should =~ locations.map(&:line)
+            .should =~ locations.map(&:line)
       end
 
       it 'marks each issue with a column number' do
         json.values.flat_map { |issues| issues.map { |issue| issue['column'] } }
-          .should =~ locations.map(&:column)
+            .should =~ locations.map(&:column)
       end
 
       it 'marks each issue with a length' do
         json.values.flat_map { |issues| issues.map { |issue| issue['length'] } }
-          .should =~ locations.map(&:length)
+            .should =~ locations.map(&:length)
       end
 
       it 'marks each issue with a reason containing the lint description' do
         json.values.flat_map { |issues| issues.map { |issue| issue['reason'] } }
-          .should =~ descriptions
+            .should =~ descriptions
       end
 
       context 'when lints are warnings' do