scss_lint 0.47.0 → 0.47.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 220e8895bebf7c06f86e7fd713590d1a000f39a5
-  data.tar.gz: 2ba553b10d57c144b4d70872969be373973f0d77
+  metadata.gz: e0ac6b15087b8dec70d1bdde62a549b7257d06a5
+  data.tar.gz: 1c82559401919e75e12460d080b0f1744d9b1ba4
 SHA512:
-  metadata.gz: 9f1c249c6885cedd4d7f33355e4b97206b0f2e84296d0cdd588016a3598d32af9f68920db045b85c8824c6ef1790297701c6430795f892f292291f591e88ebfa
-  data.tar.gz: f8f7e66b89debe64c3ae32d69212e1f9513e32dad3288ef69c203be65b130d65a2238d884708fda84c5571107c6ccb44233c2eaca9051147607753182f89d067
+  metadata.gz: f02fc63d1f4f277c8193ec256303ca9f483fcc413554049b1c02f1fc9227d431b7b5a30d4cc982e89673c739ea5e50045c733af488ba0456a7924d6b25129336
+  data.tar.gz: a590c19d6d195d590a7a4189f0678fd265df38a0a704d90383f09cc02dc89c9105a8be588a81917d8205346dd591f01003ae51661b01219b132a9bb4007c6114

data/lib/scss_lint/cli.rb

@@ -182,7 +182,7 @@ module SCSSLint
 
     # @param options [Hash]
     # @param lints [Array<Lint>]
-    # @param files [Array<String>]
+    # @param files [Array<Hash>]
     def report_lints(options, lints, files)
       sorted_lints = lints.sort_by { |l| [l.filename, l.location] }
       options.fetch(:reporters).each do |reporter, output|

data/lib/scss_lint/linter/duplicate_property.rb

@@ -42,7 +42,7 @@ module SCSSLint
     # for purposes of uniqueness.
     def property_key(prop)
       prop_key = prop.name.join
-      prop_value = property_value(prop)
+      prop_value = value_as_string(prop.value)
 
       # Differentiate between values for different vendor prefixes
       prop_value.to_s.scan(/^(-[^-]+-.+)/) do |vendor_keyword|
@@ -52,15 +52,17 @@ module SCSSLint
       prop_key
     end
 
-    def property_value(prop)
-      case prop.value
+    def value_as_string(value)
+      case value
       when Sass::Script::Funcall
-        prop.value.name
+        value.name
       when Sass::Script::String
       when Sass::Script::Tree::Literal
-        prop.value.value
+        value.value
+      when Sass::Script::Tree::ListLiteral
+        value.elements.map { |e| value_as_string(e) }.join(' ')
       else
-        prop.value.to_s
+        value.to_s
       end
     end
 

data/lib/scss_lint/reporter/tap_reporter.rb

@@ -14,7 +14,7 @@ module SCSSLint
 
   private
 
-    # @param files [Array<String>]
+    # @param files [Array<Hash>]
     # @param lints [Array<SCSSLint::Lint>]
     # @return [String]
     def format_plan(files, lints)
@@ -24,15 +24,15 @@ module SCSSLint
       "1..#{files.count + extra_lines}#{comment}"
     end
 
-    # @param files [Array<String>]
+    # @param files [Array<Hash>]
     # @param lints [Array<SCSSLint::Lint>]
     # @return [Array<String>] one item per ok file or not ok lint
     def format_files(files, lints)
       unless lints.any?
         # There are no lints, so we can take a shortcut and just output an ok
         # test line for every file.
-        return files.map.with_index do |filename, index|
-          format_ok(filename, index + 1)
+        return files.map.with_index do |file, index|
+          format_ok(file, index + 1)
         end
       end
 
@@ -45,17 +45,17 @@ module SCSSLint
       grouped_lints = group_lints_by_filename(lints)
 
       test_number = 1
-      files.map do |filename|
-        if grouped_lints.key?(filename)
+      files.map do |file|
+        if grouped_lints.key?(file[:path])
           # This file has lints, so we want to generate a "not ok" test line for
           # each failing lint.
-          grouped_lints[filename].map do |lint|
+          grouped_lints[file[:path]].map do |lint|
             formatted = format_not_ok(lint, test_number)
             test_number += 1
             formatted
           end
         else
-          formatted = format_ok(filename, test_number)
+          formatted = format_ok(file, test_number)
           test_number += 1
           [formatted]
         end
@@ -73,30 +73,38 @@ module SCSSLint
       grouped_lints
     end
 
-    # @param filename [String]
+    # @param file [Hash]
     # @param test_number [Number]
     # @return [String]
-    def format_ok(filename, test_number)
-      "ok #{test_number} - #{filename}"
+    def format_ok(file, test_number)
+      "ok #{test_number} - #{file[:path]}"
     end
 
     # @param lint [SCSSLint::Lint]
     # @param test_number [Number]
     # @return [String]
-    def format_not_ok(lint, test_number)
+    def format_not_ok(lint, test_number) # rubocop:disable Metrics/AbcSize
       location = lint.location
       test_line_description = "#{lint.filename}:#{location.line}:#{location.column}"
-      test_line_description += " #{lint.linter.name}" if lint.linter
+
+      data = {
+        'message' => lint.description,
+        'severity' => lint.severity.to_s,
+        'file' => lint.filename,
+        'line' => lint.location.line,
+        'column' => lint.location.column,
+      }
+
+      if lint.linter
+        test_line_description += " #{lint.linter.name}" if lint.linter
+        data['name'] = lint.linter.name
+      end
+
+      data_yaml = data.to_yaml.strip.gsub(/^/, '  ')
 
       <<-EOS.strip
 not ok #{test_number} - #{test_line_description}
-  ---
-  message: #{lint.description}
-  severity: #{lint.severity}
-  data:
-    file: #{lint.filename}
-    line: #{lint.location.line}
-    column: #{lint.location.column}
+#{data_yaml}
   ...
       EOS
     end

data/lib/scss_lint/reporter.rb

@@ -8,7 +8,7 @@ module SCSSLint
     end
 
     # @param lints [List<Lint>] a list of Lints sorted by file and line number
-    # @param files [List<String>] a list of the files that were linted
+    # @param files [List<Hash>] a list of the files that were linted
     # @param logger [SCSSLint::Logger]
     def initialize(lints, files, logger)
       @lints = lints

data/lib/scss_lint/version.rb

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

data/spec/scss_lint/linter/duplicate_property_spec.rb

@@ -76,6 +76,7 @@ describe SCSSLint::Linter::DuplicateProperty do
       @mixin cursor-grabbing($num) {
         cursor: -moz-grabbing;
         cursor: -webkit-grabbing;
+        cursor: -foo-grabbing unquote('!important');
         cursor: grabbing;
       }
     SCSS

data/spec/scss_lint/reporter/tap_reporter_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe SCSSLint::Reporter::TAPReporter do
   let(:logger) { SCSSLint::Logger.new($stdout) }
-  subject { described_class.new(lints, filenames, logger) }
+  let(:files) { filenames.map { |filename| { path: filename } } }
+  subject { described_class.new(lints, files, logger) }
 
   describe '#report_lints' do
     context 'when there are no files' do
@@ -66,28 +67,28 @@ not ok 2 - not-ok1.scss:123:10 SCSSLint::Linter::PrivateNamingConvention
   ---
   message: Description of lint 1
   severity: warning
-  data:
-    file: not-ok1.scss
-    line: 123
-    column: 10
+  file: not-ok1.scss
+  line: 123
+  column: 10
+  name: SCSSLint::Linter::PrivateNamingConvention
   ...
 not ok 3 - not-ok2.scss:20:2 SCSSLint::Linter::PrivateNamingConvention
   ---
   message: Description of lint 2
   severity: error
-  data:
-    file: not-ok2.scss
-    line: 20
-    column: 2
+  file: not-ok2.scss
+  line: 20
+  column: 2
+  name: SCSSLint::Linter::PrivateNamingConvention
   ...
 not ok 4 - not-ok2.scss:21:3 SCSSLint::Linter::PrivateNamingConvention
   ---
   message: Description of lint 3
   severity: warning
-  data:
-    file: not-ok2.scss
-    line: 21
-    column: 3
+  file: not-ok2.scss
+  line: 21
+  column: 3
+  name: SCSSLint::Linter::PrivateNamingConvention
   ...
 ok 5 - ok2.scss
         EOS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss_lint
 version: !ruby/object:Gem::Version
-  version: 0.47.0
+  version: 0.47.1
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake