scss-lint 0.24.0 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17fa291ee89e19fe0f6103299f2615c7e3a83633
-  data.tar.gz: e52fcd5476a7f944884cb7d8714649dc51ea4e89
+  metadata.gz: 6a3663e2870c45af5654c5fea5a7289ac4fb9632
+  data.tar.gz: 1167dbea3c255892fda1ccd621cb47b4b50f632f
 SHA512:
-  metadata.gz: 19b28041ce7fa7c14ff869de3be4193543a9c1e43285c2f150e23dc22cdaac3aeaebf4764803a61880646fb4baf5e5d9a5d78e6a970956b0eeae7763f14c0d8e
-  data.tar.gz: b87d1c50bbd9805083d687de07e8eaafbd90e931c85171a58fa6ca09cc344d57da30b6fd85ab55d928b633ff4cf7c4c680a2b5671c310c79f7f9cec03e6181c6
+  metadata.gz: 507b9deb0e2cbcde999f141ae35d9ebba74e80e045054334a0d448a94afadc3934b5963d88276cfee4be1f8ee98d3b1b4c0136f2ad1030b75554f9170a052c79
+  data.tar.gz: 67c939b682e3b4f05d260ebc771a8a0c68455c4766025badf8d69ccecb91ffddabe01ef1b68af2bb69434707ea21c41bf6465645a8475d43125bbf13ffe43657

data/bin/scss-lint

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'scss_lint'
+require 'scss_lint/cli'
 
 SCSSLint::CLI.new(ARGV).tap do |cli|
   cli.parse_arguments

data/lib/scss_lint.rb

@@ -1,6 +1,5 @@
 require 'scss_lint/constants'
 require 'scss_lint/config'
-require 'scss_lint/cli'
 require 'scss_lint/engine'
 require 'scss_lint/location'
 require 'scss_lint/lint'
@@ -24,6 +23,6 @@ end
 
 # Load all reporters
 require 'scss_lint/reporter'
-Dir[File.expand_path('scss_lint/reporter/*.rb', File.dirname(__FILE__))].sort.each do |file|
+Dir[File.expand_path('scss_lint/reporter/**/*.rb', File.dirname(__FILE__))].sort.each do |file|
   require file
 end

data/lib/scss_lint/cli.rb

@@ -186,7 +186,7 @@ module SCSSLint
     # @param lints [Array<Lint>]
     def report_lints(lints)
       sorted_lints = lints.sort_by { |l| [l.filename, l.location] }
-      reporter = @options.fetch(:reporter, Reporter::DefaultReporter)
+      reporter = @options.fetch(:reporter, SCSSLint::Reporter::DefaultReporter)
                          .new(sorted_lints)
       output = reporter.report_lints
       print output if output

data/lib/scss_lint/linter/mergeable_selector.rb

@@ -48,6 +48,7 @@ module SCSSLint
     end
 
     def single_rule?(node)
+      return unless node.parsed_rules
       node.parsed_rules.members.count == 1
     end
 

data/lib/scss_lint/linter/trailing_semicolon_after_property_value.rb

@@ -9,12 +9,10 @@ module SCSSLint
 
       unless has_nested_props
         if has_space_before_semicolon?(node)
-          line = node.source_range.end_pos
+          line = node.source_range.start_pos.line
           add_lint line, 'Property declaration should be terminated by a semicolon'
         elsif !ends_with_semicolon?(node)
-          # Adjust line since lack of semicolon results in end of source range
-          # being on the next line
-          line = node.source_range.end_pos.line - 1
+          line = node.source_range.start_pos.line
           add_lint line,
                    'Property declaration should not have a space before ' \
                    'the terminating semicolon'

data/lib/scss_lint/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss-lint
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.1
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow