scss-lint 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67663cf8293192d8f0962e8fe04c86d2b2dafddb
-  data.tar.gz: 92271e0c11e57a9088be1bd94437b7c07c31e205
+  metadata.gz: 78eefba7814228e097ecd728f37ec53bd3a9c98b
+  data.tar.gz: 21356e0c75ed328ac007f0ae9841d0e30a434fbd
 SHA512:
-  metadata.gz: 7048b50c46c68b5d7cae9dea14a37791e550a40092b7d3443d266076fb5bfebf1d858b66eb8f6d8c147a75f54deafcbc3d72eb03740ed51f1b79a9406e925217
-  data.tar.gz: e89a5be79049adc3e1aa69e761a961ba711cab010843a54031e7ecdfc546c12c5647ff7b407f875be6577c3d22e817976cdb71fd39f3dc0d7f4bd045e2dfdca1
+  metadata.gz: 919f35cdcaa899ca549c87e549f653c89d0da5241bf45127d85ab89f9a76186df21432af47fc080827c7c9436aa915171aa70320faf859189d7ca051197d0c84
+  data.tar.gz: c29ec8826b699855207837b10ae2679707b599a5a1db8c06c5579f6631e989e385bf545453498f9ef37408602e11201ee6d3e9658f3998fa8b5557bf10b6c57d

data/lib/scss_lint/cli.rb

@@ -31,6 +31,7 @@ module SCSSLint
 
     def act_on_options(options)
       load_required_paths(options)
+      load_reporters(options)
 
       if options[:help]
         print_help(options)
@@ -176,6 +177,18 @@ module SCSSLint
       end
     end
 
+    def load_reporters(options)
+      options[:reporters].map! do |reporter_name, output_file|
+        begin
+          reporter = SCSSLint::Reporter.const_get(reporter_name + 'Reporter')
+        rescue NameError
+          raise SCSSLint::Exceptions::InvalidCLIOption,
+                "Invalid output format specified: #{reporter_name}"
+        end
+        [reporter, output_file]
+      end
+    end
+
     def print_formatters
       puts 'Installed formatters:'
 

data/lib/scss_lint/linter/bang_format.rb

@@ -3,6 +3,8 @@ module SCSSLint
   class Linter::BangFormat < Linter
     include LinterRegistry
 
+    STOPPING_CHARACTERS = ['!', "'", '"', nil]
+
     def visit_prop(node)
       return unless node.to_sass.include?('!')
       return unless check_spacing(node)
@@ -21,9 +23,8 @@ module SCSSLint
     # stop at quotation marks to protect against linting !'s within strings
     # (e.g. `content`)
     def find_bang_offset(range)
-      stopping_characters = ['!', '\'', '"']
       offset = 0
-      offset -= 1 until stopping_characters.include?(character_at(range.end_pos, offset))
+      offset -= 1 until STOPPING_CHARACTERS.include?(character_at(range.end_pos, offset))
       offset
     end
 

data/lib/scss_lint/linter/selector_format.rb

@@ -37,29 +37,28 @@ module SCSSLint
       return if @ignored_names.include?(name)
       return unless violation = violated_convention(name, type)
 
-      add_lint(node, "Selector `#{name}` should be " \
-                     "written #{violation[:explanation]}")
+      add_lint(node, "Selector `#{name}` #{violation[:explanation]}")
     end
 
     CONVENTIONS = {
       'hyphenated_lowercase' => {
-        explanation: 'in lowercase with hyphens',
+        explanation: 'should be written in lowercase with hyphens',
         validator: ->(name) { name !~ /[^\-a-z0-9]/ },
       },
       'snake_case' => {
-        explanation: 'in lowercase with underscores',
+        explanation: 'should be written in lowercase with underscores',
         validator: ->(name) { name !~ /[^_a-z0-9]/ },
       },
       'camel_case' => {
-        explanation: 'has no spaces with capitalized words except first',
+        explanation: 'should be written in camelCase format',
         validator: ->(name) { name =~ /^[a-z][a-zA-Z0-9]*$/ },
       },
       'hyphenated_BEM' => {
-        explanation: 'in hyphenated BEM (Block Element Modifier) format',
+        explanation: 'should be written in hyphenated BEM (Block Element Modifier) format',
         validator: ->(name) { name !~ /[A-Z]|-{3}|_{3}|[^_]_[^_]/ },
       },
       'BEM' => {
-        explanation: 'in BEM (Block Element Modifier) format',
+        explanation: 'should be written in BEM (Block Element Modifier) format',
         validator: lambda do |name|
           name =~ /
             ^[a-z]([-]?[a-z0-9]+)*
@@ -77,7 +76,7 @@ module SCSSLint
                         'hyphenated_lowercase'
 
       convention = CONVENTIONS[convention_name] || {
-        explanation: "must match regex /#{convention_name}/",
+        explanation: "should match regex /#{convention_name}/",
         validator: ->(name) { name =~ /#{convention_name}/ }
       }
 

data/lib/scss_lint/options.rb

@@ -3,7 +3,7 @@ require 'optparse'
 module SCSSLint
   # Handles option parsing for the command line application.
   class Options
-    DEFAULT_REPORTER = [SCSSLint::Reporter::DefaultReporter, :stdout]
+    DEFAULT_REPORTER = ['Default', :stdout]
 
     # Parses command line options into an options hash.
     #
@@ -48,14 +48,10 @@ module SCSSLint
 
     # @param format [String]
     def define_output_format(format)
-      unless @options[:reporters] == [DEFAULT_REPORTER] && format == 'Default'
-        @options[:reporters].reject! { |i| i == DEFAULT_REPORTER }
-        reporter = SCSSLint::Reporter.const_get(format + 'Reporter')
-        @options[:reporters] << [reporter, :stdout]
-      end
-    rescue NameError
-      raise SCSSLint::Exceptions::InvalidCLIOption,
-            "Invalid output format specified: #{format}"
+      return if @options[:reporters] == [DEFAULT_REPORTER] && format == 'Default'
+
+      @options[:reporters].reject! { |i| i == DEFAULT_REPORTER }
+      @options[:reporters] << [format, :stdout]
     end
 
     def add_linter_options(parser)

data/lib/scss_lint/rake_task.rb

@@ -29,10 +29,7 @@ module SCSSLint
       require 'scss_lint'
       require 'scss_lint/cli'
 
-      CLI.new([]).tap do |cli|
-        cli.parse_arguments
-        cli.run
-      end
+      CLI.new.run([])
     rescue SystemExit => ex
       if ex.status == CLI::EXIT_CODES[:data]
         abort('scss-lint found lints')

data/lib/scss_lint/version.rb

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

data/spec/scss_lint/linter/bang_format_spec.rb

@@ -96,4 +96,16 @@ describe SCSSLint::Linter::BangFormat do
 
     it { should_not report_lint }
   end
+
+  context 'when !<word> is not followed by a semicolon' do
+    let(:css) { <<-CSS }
+      .class {
+        margin: 0 !important
+      }
+    CSS
+
+    it 'does not loop forever' do
+      subject.should_not report_lint
+    end
+  end
 end

data/spec/scss_lint/linter/space_before_brace_spec.rb

@@ -654,7 +654,6 @@ describe SCSSLint::Linter::SpaceBeforeBrace do
   end
 
   context 'when using #{} interpolation' do
-
     context 'and the `style` option is `space`' do
       let(:css) { <<-CSS }
         @mixin test-mixin($class, $prop, $pixels) {
@@ -769,7 +768,6 @@ describe SCSSLint::Linter::SpaceBeforeBrace do
 
       it { should_not report_lint }
     end
-
   end
 
   context 'when curly brace is on own line' do

data/spec/scss_lint/options_spec.rb

@@ -15,7 +15,7 @@ describe SCSSLint::Options do
       end
 
       it 'specifies the DefaultReporter by default' do
-        subject[:reporters].first.should include SCSSLint::Reporter::DefaultReporter
+        subject[:reporters].first.should include 'Default'
       end
 
       it 'outputs to STDOUT' do
@@ -30,13 +30,5 @@ describe SCSSLint::Options do
         expect { subject }.to raise_error SCSSLint::Exceptions::InvalidCLIOption
       end
     end
-
-    context 'when a non-existent reporter is specified' do
-      let(:args) { %w[--format NonExistentReporter] }
-
-      it 'raises an error' do
-        expect { subject }.to raise_error SCSSLint::Exceptions::InvalidCLIOption
-      end
-    end
   end
 end

data/spec/scss_lint/rake_task_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'scss_lint/rake_task'
+
+describe SCSSLint::RakeTask do
+  before do
+    # Silence console output
+    STDOUT.stub(:write)
+  end
+
+  describe '#run' do
+    subject do
+      SCSSLint::RakeTask.new
+      Rake::Task['scss_lint']
+    end
+
+    it 'returns a successful exit code' do
+      expect(subject.invoke.first.call).to be_truthy
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss-lint
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -207,6 +207,7 @@ files:
 - spec/scss_lint/linter_spec.rb
 - spec/scss_lint/location_spec.rb
 - spec/scss_lint/options_spec.rb
+- spec/scss_lint/rake_task_spec.rb
 - spec/scss_lint/reporter/config_reporter_spec.rb
 - spec/scss_lint/reporter/default_reporter_spec.rb
 - spec/scss_lint/reporter/files_reporter_spec.rb
@@ -246,7 +247,6 @@ test_files:
 - spec/scss_lint/cli_spec.rb
 - spec/scss_lint/config_spec.rb
 - spec/scss_lint/engine_spec.rb
-- spec/scss_lint/linter/bang_format_spec.rb
 - spec/scss_lint/linter/border_zero_spec.rb
 - spec/scss_lint/linter/color_keyword_spec.rb
 - spec/scss_lint/linter/comment_spec.rb
@@ -278,7 +278,6 @@ test_files:
 - spec/scss_lint/linter/space_after_comma_spec.rb
 - spec/scss_lint/linter/space_after_property_colon_spec.rb
 - spec/scss_lint/linter/space_after_property_name_spec.rb
-- spec/scss_lint/linter/space_before_brace_spec.rb
 - spec/scss_lint/linter/space_between_parens_spec.rb
 - spec/scss_lint/linter/string_quotes_spec.rb
 - spec/scss_lint/linter/trailing_semicolon_spec.rb
@@ -291,9 +290,10 @@ test_files:
 - spec/scss_lint/linter/zero_unit_spec.rb
 - spec/scss_lint/linter/name_format_spec.rb
 - spec/scss_lint/linter/empty_line_between_blocks_spec.rb
+- spec/scss_lint/linter/bang_format_spec.rb
+- spec/scss_lint/linter/space_before_brace_spec.rb
 - spec/scss_lint/linter_registry_spec.rb
 - spec/scss_lint/location_spec.rb
-- spec/scss_lint/options_spec.rb
 - spec/scss_lint/reporter/config_reporter_spec.rb
 - spec/scss_lint/reporter/default_reporter_spec.rb
 - spec/scss_lint/reporter/files_reporter_spec.rb
@@ -303,7 +303,9 @@ test_files:
 - spec/scss_lint/runner_spec.rb
 - spec/scss_lint/selector_visitor_spec.rb
 - spec/scss_lint/linter_spec.rb
-- spec/spec_helper.rb
+- spec/scss_lint/rake_task_spec.rb
+- spec/scss_lint/options_spec.rb
 - spec/support/isolated_environment.rb
 - spec/support/matchers/report_lint.rb
+- spec/spec_helper.rb
 has_rdoc: