scss_lint 0.43.2 → 0.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e6187740250928694fb6a0deda93e0d3c38019a
-  data.tar.gz: 5e779311f77ca29e8f2e1ddbafc1ad4c41650351
+  metadata.gz: 7a86d234a01ef87070b4fd7889111970e80def37
+  data.tar.gz: 2a461b84b74cc8728e64dc9366a67be4df308c10
 SHA512:
-  metadata.gz: fe7b37e6ad330637fe0a6266fd5695fa2c8ae84e47426b0f77b28c599694e1cc81df334308380f447ccffa13a668264e665ef2936e12e3741f27c73b68d1f350
-  data.tar.gz: b9773b48c133d3c02e91446a150b595a95941c52301957548a13a6e9e3d1f21148c63dff87d0773e9d72279af13127818c1f105dd0261efa57f344176847aa64
+  metadata.gz: a0badb74dbb5f26d727b38dd71319b8429c35f23602bb73c30a7d197100a4d16f61df75604a4b19992aa1237d1d226b5941e786efe7c459bbde18f4a71b36a76
+  data.tar.gz: 4059abd1bac9430f32af1f7b125fe22a5a3ae24b146e026283648a4bfb7623453df0eb111cc9659b6f6e1866e3248425574617cef14662f5e1e32732851dc962

data/bin/scss-lint

@@ -3,4 +3,5 @@
 require 'scss_lint'
 require 'scss_lint/cli'
 
-exit SCSSLint::CLI.new.run(ARGV)
+logger = SCSSLint::Logger.new(STDOUT)
+exit SCSSLint::CLI.new(logger).run(ARGV)

data/config/default.yml

@@ -7,6 +7,9 @@ plugin_directories: ['.scss-linters']
 # installed)
 plugin_gems: []
 
+# Default severity of all linters.
+severity: warning
+
 linters:
   BangFormat:
     enabled: true

data/data/properties.txt

@@ -17,6 +17,7 @@ animation-timing-function
 app-region
 appearance
 aspect-ratio
+backdrop-filter
 backface-visibility
 background
 background-attachment
@@ -34,6 +35,7 @@ background-repeat-x
 background-repeat-y
 background-size
 baseline-shift
+block-size
 bookmark-label
 bookmark-level
 bookmark-target
@@ -46,6 +48,14 @@ border-before
 border-before-color
 border-before-style
 border-before-width
+border-block-end
+border-block-end-color
+border-block-end-style
+border-block-end-width
+border-block-start
+border-block-start-color
+border-block-start-style
+border-block-start-width
 border-bottom
 border-bottom-color
 border-bottom-left-radius
@@ -66,6 +76,14 @@ border-image-repeat
 border-image-slice
 border-image-source
 border-image-width
+border-inline-end
+border-inline-end-color
+border-inline-end-style
+border-inline-end-width
+border-inline-start
+border-inline-start-color
+border-inline-start-style
+border-inline-start-width
 border-left
 border-left-color
 border-left-style
@@ -213,6 +231,7 @@ image-orientation
 image-rendering
 image-resolution
 inline-box-align
+inline-size
 isolation
 justify-content
 justify-self
@@ -243,10 +262,14 @@ margin-after
 margin-after-collapse
 margin-before
 margin-before-collapse
+margin-block-end
+margin-block-start
 margin-bottom
 margin-bottom-collapse
 margin-collapse
 margin-end
+margin-inline-end
+margin-inline-start
 margin-left
 margin-right
 margin-start
@@ -287,12 +310,16 @@ mask-repeat-y
 mask-size
 mask-source-type
 mask-type
+max-block-size
 max-height
+max-inline-size
 max-logical-height
 max-logical-width
 max-width
 max-zoom
+min-block-size
 min-height
+min-inline-size
 min-logical-height
 min-logical-width
 min-width
@@ -306,6 +333,10 @@ nav-right
 nav-up
 object-fit
 object-position
+offset-block-end
+offset-block-start
+offset-inline-end
+offset-inline-start
 opacity
 order
 orientation
@@ -323,8 +354,12 @@ overflow-y
 padding
 padding-after
 padding-before
+padding-block-end
+padding-block-start
 padding-bottom
 padding-end
+padding-inline-end
+padding-inline-start
 padding-left
 padding-right
 padding-start

data/data/property-sort-orders/smacss.txt

@@ -55,7 +55,15 @@ column-count
 column-width
 
 transform
+transform-box
+transform-origin
+transform-style
+
 transition
+transition-delay
+transition-duration
+transition-property
+transition-timing-function
 
 # Border
 
@@ -97,6 +105,7 @@ outline-width
 # Background
 
 background
+background-attachment
 background-color
 background-image
 background-repeat

data/data/pseudo-elements.txt

@@ -54,6 +54,7 @@
 -webkit-datetime-edit-text
 -webkit-datetime-edit-year-field
 -webkit-file-upload-button
+-webkit-full-page-media
 -webkit-inner-spin-button
 -webkit-input-placeholder
 -webkit-keygen-select
@@ -73,7 +74,9 @@
 -webkit-scrollbar-track
 -webkit-scrollbar-track-piece
 -webkit-search-cancel-button
+-webkit-search-decoration
 -webkit-search-results-button
+-webkit-search-results-decoration
 -webkit-slider-runnable-track
 -webkit-slider-thumb
 -webkit-textfield-decoration-container
@@ -86,7 +89,9 @@
 after
 backdrop
 before
+content
 first-letter
 first-line
 placeholder
 selection
+shadow

data/lib/scss_lint.rb

@@ -5,6 +5,7 @@ require 'scss_lint/engine'
 require 'scss_lint/location'
 require 'scss_lint/lint'
 require 'scss_lint/linter_registry'
+require 'scss_lint/logger'
 require 'scss_lint/file_finder'
 require 'scss_lint/runner'
 require 'scss_lint/selector_visitor'

data/lib/scss_lint/cli.rb

@@ -1,5 +1,3 @@
-require 'rainbow'
-require 'rainbow/ext/string'
 require 'scss_lint/options'
 
 module SCSSLint
@@ -20,7 +18,14 @@ module SCSSLint
       config:         78, # Configuration error
       no_files:       80, # No files matched by specified glob patterns
       plugin:         82, # Plugin loading error
-    }
+    }.freeze
+
+    # Create a CLI that outputs to the specified logger.
+    #
+    # @param logger [SCSSLint::Logger]
+    def initialize(logger)
+      @log = logger
+    end
 
     def run(args)
       options = SCSSLint::Options.new.parse(args)
@@ -31,7 +36,10 @@ module SCSSLint
 
   private
 
+    attr_reader :log
+
     def act_on_options(options)
+      log.color_enabled = options.fetch(:color, log.tty?)
       load_required_paths(options)
       load_reporters(options)
 
@@ -77,40 +85,47 @@ module SCSSLint
     def handle_runtime_exception(exception, options) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/LineLength, Metrics/MethodLength
       case exception
       when SCSSLint::Exceptions::InvalidCLIOption
-        puts exception.message
-        puts 'Run `scss-lint --help` for usage documentation'
+        log.error exception.message
+        log.info 'Run `scss-lint --help` for usage documentation'
         halt :usage
       when SCSSLint::Exceptions::InvalidConfiguration
-        puts exception.message
+        log.error exception.message
         halt :config
       when SCSSLint::Exceptions::RequiredLibraryMissingError
-        puts exception.message
+        log.error exception.message
         halt :unavailable
       when SCSSLint::Exceptions::NoFilesError
-        puts exception.message
+        log.error exception.message
         halt :no_files
       when SCSSLint::Exceptions::PluginGemLoadError
-        puts exception.message
+        log.error exception.message
         halt :plugin
       when Errno::ENOENT
-        puts exception.message
+        log.error exception.message
         halt :no_input
       when NoSuchLinter
-        puts exception.message
+        log.error exception.message
         halt :usage
       else
         config_file = relevant_configuration_file(options) if options
 
-        puts exception.message
-        puts exception.backtrace
-        puts 'Report this bug at '.color(:yellow) + BUG_REPORT_URL.color(:cyan)
-        puts
-        puts 'To help fix this issue, please include:'.color(:green)
-        puts '- The above stack trace'
-        puts "- SCSS-Lint version: #{SCSSLint::VERSION.color(:cyan)}"
-        puts "- Sass version: #{Gem.loaded_specs['sass'].version.to_s.color(:cyan)}"
-        puts "- Ruby version: #{RUBY_VERSION.color(:cyan)}"
-        puts "- Contents of #{File.expand_path(config_file).color(:cyan)}" if config_file
+        log.bold_error exception.message
+        log.error exception.backtrace.join("\n")
+        log.warning 'Report this bug at ', false
+        log.info BUG_REPORT_URL
+        log.newline
+        log.success 'To help fix this issue, please include:'
+        log.log '- The above stack trace'
+        log.log '- SCSS-Lint version: ', false
+        log.info SCSSLint::VERSION
+        log.log '- Sass version: ', false
+        log.info Gem.loaded_specs['sass'].version.to_s
+        log.log '- Ruby version: ', false
+        log.info RUBY_VERSION
+        if config_file
+          log.log '- Contents of ', false
+          log.info File.expand_path(config_file)
+        end
         halt :software
       end
     end
@@ -167,9 +182,14 @@ module SCSSLint
     def report_lints(options, lints, files)
       sorted_lints = lints.sort_by { |l| [l.filename, l.location] }
       options.fetch(:reporters).each do |reporter, output|
-        results = reporter.new(sorted_lints, files).report_lints
-        io = (output == :stdout ? $stdout : File.new(output, 'w+'))
-        io.print results if results
+        results = reporter.new(sorted_lints, files, log).report_lints
+        next unless results
+
+        if output == :stdout
+          log.log results
+        else
+          File.new(output, 'w+').print results
+        end
       end
     end
 
@@ -195,26 +215,26 @@ module SCSSLint
     end
 
     def print_formatters
-      puts 'Installed formatters:'
+      log.log 'Installed formatters:'
 
       reporter_names = SCSSLint::Reporter.descendants.map do |reporter|
         reporter.name.split('::').last.split('Reporter').first
       end
 
       reporter_names.sort.each do |reporter_name|
-        puts " - #{reporter_name}"
+        log.log " - #{reporter_name}"
       end
 
       halt
     end
 
     def print_linters
-      puts 'Installed linters:'
+      log.log 'Installed linters:'
 
       linter_names = LinterRegistry.linters.map(&:simple_name)
 
       linter_names.sort.each do |linter_name|
-        puts " - #{linter_name}"
+        log.log " - #{linter_name}"
       end
 
       halt
@@ -222,13 +242,13 @@ module SCSSLint
 
     # @param options [Hash]
     def print_help(options)
-      puts options[:help]
+      log.log options[:help]
       halt :ok
     end
 
     # @param options [Hash]
     def print_version
-      puts "scss-lint #{SCSSLint::VERSION}"
+      log.log "scss-lint #{SCSSLint::VERSION}"
       halt :ok
     end
 

data/lib/scss_lint/config.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module SCSSLint
   # Loads and manages application configuration.
   class Config
-    FILE_NAME = '.scss-lint.yml'
+    FILE_NAME = '.scss-lint.yml'.freeze
     DEFAULT_FILE = File.join(SCSS_LINT_HOME, 'config', 'default.yml')
 
     attr_reader :options, :warnings
@@ -71,6 +73,7 @@ module SCSSLint
         options = merge_wildcard_linter_options(options)
         options = ensure_exclude_paths_are_absolute(options, file)
         options = ensure_linter_exclude_paths_are_absolute(options, file)
+        ensure_severities_are_valid(options)
         options
       end
 
@@ -149,6 +152,27 @@ module SCSSLint
         options
       end
 
+      def ensure_severities_are_valid(options)
+        unless severity_is_valid?(options)
+          raise SCSSLint::Exceptions::InvalidConfiguration,
+                'Global `severity` configuration option must be one of [' \
+                "#{SEVERITIES.join(' | ')}]"
+        end
+
+        options['linters'].each do |linter_name, linter_options|
+          next if severity_is_valid?(linter_options)
+
+          raise SCSSLint::Exceptions::InvalidConfiguration,
+                "#{linter_name} `severity` configuration option must be one " \
+                "of [#{SEVERITIES.join(' | ')}]"
+        end
+      end
+
+      SEVERITIES = %w[error warning].freeze
+      def severity_is_valid?(options)
+        SEVERITIES.include?(options.fetch('severity', 'warning'))
+      end
+
       def path_relative_to_config(relative_include_path, base_config_path)
         if relative_include_path.start_with?('/')
           relative_include_path
@@ -195,7 +219,6 @@ module SCSSLint
     def ==(other)
       super || @options == other.options
     end
-    alias_method :eql?, :==
 
     # Extend this {Config} with another configuration.
     #
@@ -246,7 +269,9 @@ module SCSSLint
     end
 
     def linter_options(linter)
-      @options['linters'].fetch(self.class.linter_name(linter), {})
+      { 'severity' => @options['severity'] }.merge(
+        @options['linters'].fetch(self.class.linter_name(linter), {})
+      )
     end
 
     def excluded_file?(file_path)

data/lib/scss_lint/constants.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # Global application constants.
 module SCSSLint
-  SCSS_LINT_HOME = File.realpath(File.join(File.dirname(__FILE__), '..', '..'))
-  SCSS_LINT_DATA = File.join(SCSS_LINT_HOME, 'data')
+  SCSS_LINT_HOME = File.realpath(File.join(File.dirname(__FILE__), '..', '..')).freeze
+  SCSS_LINT_DATA = File.join(SCSS_LINT_HOME, 'data').freeze
 
-  REPO_URL = 'https://github.com/brigade/scss-lint'
-  BUG_REPORT_URL = "#{REPO_URL}/issues"
+  REPO_URL = 'https://github.com/brigade/scss-lint'.freeze
+  BUG_REPORT_URL = "#{REPO_URL}/issues".freeze
 end

data/lib/scss_lint/control_comment_processor.rb

@@ -96,13 +96,14 @@ module SCSSLint
 
       comment_node = command[:node]
       start_line = command[:line]
-      if comment_node.class.node_name == :rule
-        end_line = start_line
-      elsif node.class.node_name == :root
-        end_line = @linter.engine.lines.length
-      else
-        end_line = end_line(node)
-      end
+      end_line =
+        if comment_node.class.node_name == :rule
+          start_line
+        elsif node.class.node_name == :root
+          @linter.engine.lines.length
+        else
+          end_line(node)
+        end
 
       @disabled_lines.merge(start_line..end_line)
     end