scss_lint 0.47.1 → 0.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0ac6b15087b8dec70d1bdde62a549b7257d06a5
-  data.tar.gz: 1c82559401919e75e12460d080b0f1744d9b1ba4
+  metadata.gz: 836d64855e532ba7edb008a354400fdb3a752b40
+  data.tar.gz: 9712c133bc9cf2ff5b9bc5081fc27ab2a258263b
 SHA512:
-  metadata.gz: f02fc63d1f4f277c8193ec256303ca9f483fcc413554049b1c02f1fc9227d431b7b5a30d4cc982e89673c739ea5e50045c733af488ba0456a7924d6b25129336
-  data.tar.gz: a590c19d6d195d590a7a4189f0678fd265df38a0a704d90383f09cc02dc89c9105a8be588a81917d8205346dd591f01003ae51661b01219b132a9bb4007c6114
+  metadata.gz: 8da6137c2915033192ede52347dd8ed2384a134afb192f8f053957da5d6043ea24b100d93f8acf6391bbef92e88d36aa6d97e258413056996b4aef0538de090e
+  data.tar.gz: e043ed88d75c13b5343f18c2cab961853016bfce1533a721ed8cc7f323fe2bd37d24d50cb90ba5b76931f4fb94a3be67f9b009183c28d8967e9a5b6e27663846

data/lib/scss_lint/linter/disable_linter_reason.rb

@@ -7,19 +7,37 @@ module SCSSLint
       # No lint if the first line of the comment is not a command (because then
       # either this comment has no commands, or the first line serves as a the
       # reason for a command on a later line).
-      return unless comment_lines(node).first.match(COMMAND_REGEX)
+      if comment_lines(node).first.match(COMMAND_REGEX)
+        visit_command_comment(node)
+      else
+        @previous_comment = node
+      end
+    end
 
-      # Maybe the previous node is the "reason" comment.
-      prev = previous_node(node)
+    def visit_command_comment(node)
+      if @previous_comment.nil?
+        report_lint(node)
+        return
+      end
 
-      if prev && prev.is_a?(Sass::Tree::CommentNode)
-        # No lint if the last line of the previous comment is not a command.
-        return unless comment_lines(prev).last.match(COMMAND_REGEX)
+      # Not a "disable linter reason" if the last line of the previous comment is a command.
+      if comment_lines(@previous_comment).last.match(COMMAND_REGEX)
+        report_lint(node)
+        return
       end
 
-      add_lint(node,
-               'scss-lint:disable control comments should be preceded by a ' \
-               'comment explaining why the linters need to be disabled.')
+      # No lint if the last line of the previous comment is on the previous line.
+      if @previous_comment.source_range.end_pos.line == node.source_range.end_pos.line - 1
+        return
+      end
+
+      # The "reason" comment doesn't have to be on the previous line, as long as it is exactly
+      # the previous node.
+      if previous_node(node) == @previous_comment
+        return
+      end
+
+      report_lint(node)
     end
 
   private
@@ -35,5 +53,11 @@ module SCSSLint
     def comment_lines(node)
       node.value.join.split("\n")
     end
+
+    def report_lint(node)
+      add_lint(node,
+               'scss-lint:disable control comments should be preceded by a ' \
+               'comment explaining why the linters need to be disabled.')
+    end
   end
 end

data/lib/scss_lint/linter/name_format.rb

@@ -39,6 +39,7 @@ module SCSSLint
       scaleX scaleY scaleZ
       skewX skewY
       translateX translateY translateZ
+      linear-gradient
     ].to_set
 
     def check_name(node, node_type, node_text = node.name)

data/lib/scss_lint/reporter/stats_reporter.rb

@@ -0,0 +1,39 @@
+module SCSSLint
+  # Reports a single line per lint.
+  class Reporter::StatsReporter < Reporter
+    def report_lints # rubocop:disable Metrics/AbcSize
+      return unless lints.any?
+
+      stats = organize_stats
+      total_lints = lints.length
+      linter_name_length =
+        stats.inject('') { |memo, stat| memo.length > stat[0].length ? memo : stat[0] }.length
+      total_files = lints.group_by(&:filename).size
+
+      # Math.log10(1) is 0; avoid this by using at least 1.
+      lint_count_length = [1, Math.log10(total_lints).ceil].max
+      file_count_length = [1, Math.log10(total_files).ceil].max
+
+      str = ''
+      stats.each do |linter_name, lint_count, file_count|
+        str << "%#{lint_count_length}d  %-#{linter_name_length}s" % [lint_count, linter_name]
+        str << "        (across %#{file_count_length}d files)\n" % [file_count]
+      end
+      str << "#{'-' * lint_count_length}  #{'-' * linter_name_length}"
+      str << "        #{'-' * (file_count_length + 15)}\n"
+      str << "%#{lint_count_length}d  #{'total'.ljust(linter_name_length)}" % total_lints
+      str << "        (across %#{file_count_length}d files)\n" % total_files
+      str
+    end
+
+    def organize_stats
+      lints
+        .group_by(&:linter)
+        .sort_by { |_, lints_by_linter| -lints_by_linter.size }
+        .inject([]) do |ary, (linter, lints_by_linter)|
+          file_count = lints_by_linter.group_by(&:filename).size
+          ary << [linter.name, lints_by_linter.size, file_count]
+        end
+    end
+  end
+end

data/lib/scss_lint/version.rb

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

data/spec/scss_lint/linter/disable_linter_reason_spec.rb

@@ -60,4 +60,15 @@ describe SCSSLint::Linter::DisableLinterReason do
 
     it { should_not report_lint }
   end
+
+  context 'when a reason precedes an inline disabling comment' do
+    let(:scss) { <<-SCSS }
+      p {
+      // Disable for now
+        border: none; // scss-lint:disable BorderZero
+      }
+    SCSS
+
+    it { should_not report_lint }
+  end
 end

data/spec/scss_lint/linter/name_format_spec.rb

@@ -163,6 +163,16 @@ describe SCSSLint::Linter::NameFormat do
       it { should_not report_lint }
     end
 
+    context 'when using whitelisted css function' do
+      let(:scss) { <<-SCSS }
+        .gradient {
+          background: linear-gradient(#000, #fff);
+        }
+      SCSS
+
+      it { should_not report_lint }
+    end
+
     context 'when a mixin contains keyword arguments with underscores' do
       let(:scss) { '@include mixin($some_var: 4);' }
 

data/spec/scss_lint/reporter/stats_reporter_spec.rb

@@ -0,0 +1,115 @@
+require 'spec_helper'
+
+describe SCSSLint::Reporter::StatsReporter do
+  class SCSSLint::Linter::FakeLinter1 < SCSSLint::Linter; end
+  class SCSSLint::Linter::FakeLinter2 < SCSSLint::Linter; end
+
+  let(:logger) { SCSSLint::Logger.new($stdout) }
+  let(:linter_1) { SCSSLint::Linter::FakeLinter1.new }
+  let(:linter_2) { SCSSLint::Linter::FakeLinter2.new }
+  subject { SCSSLint::Reporter::StatsReporter.new(lints, [], logger) }
+
+  def new_lint(linter, filename, line)
+    SCSSLint::Lint.new(linter, filename, SCSSLint::Location.new(line), 'Description', :warning)
+  end
+
+  describe '#report_lints' do
+    context 'when there are no lints' do
+      let(:lints) { [] }
+
+      it 'returns nil' do
+        subject.report_lints.should be_nil
+      end
+    end
+
+    context 'when there are lints from one linter in one file' do
+      let(:lints) do
+        [new_lint(linter_1, 'a.scss', 10), new_lint(linter_1, 'a.scss', 20)]
+      end
+
+      it 'prints one line per linter with lints, plus 2 summary lines' do
+        subject.report_lints.count("\n").should eq 3
+      end
+
+      it 'prints the name of each linter with lints' do
+        subject.report_lints.scan(linter_1.name).count.should eq 1
+      end
+
+      it 'prints the number of lints per linter' do
+        subject.report_lints.should include '2  FakeLinter1'
+      end
+
+      it 'prints the number of files where each linter found lints' do
+        subject.report_lints.should include '1 files'
+      end
+
+      it 'prints the total lints and total lines' do
+        subject.report_lints.should match /2  total +\(across 1/
+      end
+    end
+
+    context 'when there are lints from multiple linters in one file' do
+      let(:lints) do
+        [new_lint(linter_1, 'a.scss', 10),
+         new_lint(linter_1, 'a.scss', 20),
+         new_lint(linter_2, 'a.scss', 30)]
+      end
+
+      it 'prints one line per linter with lints, plus 2 summary lines' do
+        subject.report_lints.count("\n").should eq 4
+      end
+
+      it 'prints the name of each linter with lints' do
+        subject.report_lints.scan(linter_1.name).count.should eq 1
+        subject.report_lints.scan(linter_2.name).count.should eq 1
+      end
+
+      it 'prints the number of lints per linter' do
+        subject.report_lints.should include '2  FakeLinter1'
+        subject.report_lints.should include '1  FakeLinter2'
+      end
+
+      it 'prints the number of files where each linter found lints' do
+        subject.report_lints.scan(/FakeLinter\d +\(across 1 files/).count.should eq 2
+      end
+
+      it 'prints the total lints and total lines' do
+        subject.report_lints.should match /3  total +\(across 1/
+      end
+    end
+
+    context 'when there are lints from multiple linters in multiple files' do
+      let(:lints) do
+        [new_lint(linter_1, 'a.scss', 10),
+         new_lint(linter_1, 'a.scss', 20),
+         new_lint(linter_2, 'a.scss', 30),
+         new_lint(linter_1, 'b.scss', 15),
+         new_lint(linter_2, 'b.scss', 25),
+         new_lint(linter_1, 'c.scss', 100)]
+      end
+
+      it 'prints one line per linter with lints, plus 2 summary lines' do
+        subject.report_lints.count("\n").should eq 4
+      end
+
+      it 'prints the name of each linter with lints' do
+        subject.report_lints.scan(linter_1.name).count.should eq 1
+        subject.report_lints.scan(linter_2.name).count.should eq 1
+      end
+
+      it 'prints the number of lints per linter' do
+        subject.report_lints.should include '4  FakeLinter1'
+        subject.report_lints.should include '2  FakeLinter2'
+      end
+
+      it 'prints the number of files where each linter found lints' do
+        subject.report_lints.scan(/FakeLinter2 +\(across 2 files/).count.should eq 1
+        subject.report_lints.scan(/FakeLinter1 +\(across 3 files/).count.should eq 1
+      end
+
+      it 'prints the total lints and total lines' do
+        subject.report_lints.should match /6  total +\(across 3/
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss_lint
 version: !ruby/object:Gem::Version
-  version: 0.47.1
+  version: 0.48.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -20,7 +20,7 @@ dependencies:
         version: '0.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '0.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -45,20 +45,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.15
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.0
 description: Configurable tool for writing clean and consistent SCSS
 email:
 - eng@brigade.com
@@ -164,6 +150,7 @@ files:
 - lib/scss_lint/reporter/default_reporter.rb
 - lib/scss_lint/reporter/files_reporter.rb
 - lib/scss_lint/reporter/json_reporter.rb
+- lib/scss_lint/reporter/stats_reporter.rb
 - lib/scss_lint/reporter/tap_reporter.rb
 - lib/scss_lint/runner.rb
 - lib/scss_lint/sass/script.rb
@@ -253,6 +240,7 @@ files:
 - spec/scss_lint/reporter/default_reporter_spec.rb
 - spec/scss_lint/reporter/files_reporter_spec.rb
 - spec/scss_lint/reporter/json_reporter_spec.rb
+- spec/scss_lint/reporter/stats_reporter_spec.rb
 - spec/scss_lint/reporter/tap_reporter_spec.rb
 - spec/scss_lint/reporter_spec.rb
 - spec/scss_lint/runner_spec.rb
@@ -367,6 +355,7 @@ test_files:
 - spec/scss_lint/reporter/default_reporter_spec.rb
 - spec/scss_lint/reporter/files_reporter_spec.rb
 - spec/scss_lint/reporter/json_reporter_spec.rb
+- spec/scss_lint/reporter/stats_reporter_spec.rb
 - spec/scss_lint/reporter/tap_reporter_spec.rb
 - spec/scss_lint/reporter_spec.rb
 - spec/scss_lint/runner_spec.rb
@@ -374,4 +363,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/isolated_environment.rb
 - spec/support/matchers/report_lint.rb
-has_rdoc: