scss_lint-auto_correct 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4ecb5464bb631a1ee5659093f896dc1b663d629
-  data.tar.gz: 0bbb3860b3d1f424961bd2eeab4649cc0b51f462
+  metadata.gz: f02b59e2ba450a6240d4cc537f6829deb900e39d
+  data.tar.gz: 31f982e70b5573bf1109bd540d2c41f0245625c7
 SHA512:
-  metadata.gz: f7ab60f764863fd5e1b9b61316c89da1d0f0e4a7b8a26d7f66eae4cbf16febc6f1a29202ba03d1e6cadcbeccb4cc77185be7f590a67b424c8f8cb9ce3e3a5fc3
-  data.tar.gz: eede024f9f01d0658bd1260f4daf543f3b59b8b74aacc1c611dbd1c23d4f3680aa68edf1a0e0a6e6811df4f10ea8515a0feb70f0ecd8c2a9e8ec07b44c03b6c0
+  metadata.gz: 6de3ebef2afc22be17b0bdbc59d0ad3f0cc32bd973192d30813a559e0b38c844c130f6b661349e684c24bba7925739b413145881e1eafd6b52615369e912eaba
+  data.tar.gz: c1fa01797cb26f47f7efbbf77509a1489c9f092b99460eb0ee58d44ea1425f52da31898d31d08d9b161443193c6414b46110c237ba683017a83b8c54b4efacf6

data/lib/scss_lint/auto_correct/cli.rb

@@ -49,6 +49,7 @@ module SCSSLint::AutoCorrect
         puts "Nothing to process"
         return 1
       end
+      puts "Dry run. Nothing written" if option? :dry
       process_all @paths
       0
     end
@@ -59,6 +60,7 @@ module SCSSLint::AutoCorrect
       puts "OPTIONS are:"
       puts "  --help, -h"
       puts "  --verbose, -v"
+      puts "  --debug  Prints extended debugging information"
       puts "  --dry"
       puts "  --list"
       puts "  --force  Ignore config disabling of corrector"
@@ -108,13 +110,13 @@ module SCSSLint::AutoCorrect
 
     def write_file(path, contents)
       puts "Writing file #{path}" if option? :verbose, :v
-      writer.write_file(path, contents)
+      writer.write_file(path, contents) unless option? :dry
     end
 
     def selected_correctors
       selected = []
       unselected = []
-      @correctors.each do |c|
+      selected_correctors.each do |c|
         selected << c if option? c.short_name
         unselected << c if option? "no-#{c.short_name}"
       end
@@ -126,11 +128,36 @@ module SCSSLint::AutoCorrect
       @correctors.each do |corrector|
         config = corrector.linter_name ? @config.options['linters'].fetch(corrector.linter_name) : {}
         instance = corrector.new(config)
+        contents_was = contents
         contents = instance.call(contents) if instance.enabled? || option?(:force)
+        if option?(:debug) && contents != contents_was
+          puts "* #{corrector.name} applied"
+          print_diff contents_was, contents
+        end
       end
       contents
     end
 
+    def print_diff(before, after)
+      @has_diff = `[ -x "$(command -v diff)" ] && echo "yay"`.strip == "yay" if @has_diff.nil?
+      return puts after unless @has_diff
+      require "tempfile"
+      files = []
+      file_before = Tempfile.new("before")
+      files << file_before
+      file_before.write before
+      file_before.close
+      file_after = Tempfile.new("after")
+      files << file_after
+      file_after.write after
+      file_after.close
+      cmd = "diff -u #{file_before.path} #{file_after.path}"
+      output = `#{cmd}`
+      puts output.lines[2..-1].join
+    ensure
+      files.each(&:unlink)
+    end
+
     class FilesystemWriter
       def write_file(path, contents)
         File.open(path, "w+") { |f| f.write contents }

data/lib/scss_lint/auto_correct/correctors.rb

@@ -4,7 +4,7 @@ module SCSSLint::AutoCorrect
       ObjectSpace.
         each_object(Class).
         select { |klass| klass < Base }.
-        sort_by(&:priority)
+        sort_by { |x| [x.priority.to_s.rjust(8, "0"), x.name].join }
     end
   end
 end

data/lib/scss_lint/auto_correct/correctors/color_keyword.rb

@@ -24,7 +24,7 @@ module SCSSLint::AutoCorrect::Correctors
     end
 
     def regexp
-      @regexp ||= Regexp.new("#{self.class.data.keys.join('|')}")
+      @regexp ||= Regexp.new("(?<![$_-])\\b(#{self.class.data.keys.join('|')})\\b")
     end
 
     def self.data

data/lib/scss_lint/auto_correct/correctors/indentation.rb

@@ -13,7 +13,7 @@ module SCSSLint::AutoCorrect::Correctors
     end
 
     def visit_line(line)
-      if line =~ /^\s*\/\//
+      if line =~ /^\s*\/\// || line =~ /^\s*$/
         @result << line
         return
       end

data/lib/scss_lint/auto_correct/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module SCSSLint::AutoCorrect
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.2'.freeze
 end

data/test/fixtures/indentation_with_blanks.scss

@@ -0,0 +1,12 @@
+.users-list {
+  margin-top: 1rem;
+}
+
+.new-membership {
+  select { width: 80%; }
+
+  select,
+  input {
+    display: inline-block;
+  }
+}

data/test/unit/color_keyword.rb

@@ -9,8 +9,26 @@ class ColorKeywordTest < Minitest::Test
     end
 
     it "transforms name to hex" do
-      output = corrector.new.call "white"
-      assert_equal "#fff", output
+      output = corrector.new.call "color: white"
+      assert_equal "color: #ffffff", output
+    end
+
+    it "doesnt mess replace into variable names" do
+      input = "color: $white"
+      output = corrector.new.call input
+      assert_equal input, output
+    end
+
+    it "respects dashes as non-boundaries" do
+      input = "color: $pale-red"
+      output = corrector.new.call input
+      assert_equal input, output
+    end
+
+    it "respects underscores as non-boundaries" do
+      input = "color: $pale_red"
+      output = corrector.new.call input
+      assert_equal input, output
     end
   end
 end

data/test/unit/indentation_test.rb

@@ -20,5 +20,12 @@ class IndentationTest < Minitest::Test
       output = corrector.new.call input
       assert_equal input, output
     end
+
+    it "doesnt remove blank lines" do
+      input = load_file "indentation_with_blanks.scss"
+      expected = input
+      output = corrector.new.call input
+      assert_equal expected, output
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scss_lint-auto_correct
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Dorian Marié
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scss_lint
@@ -67,6 +67,7 @@ files:
 - test/fixtures/has_uppercase_colors.scss
 - test/fixtures/indentation.scss
 - test/fixtures/indentation_corrected.scss
+- test/fixtures/indentation_with_blanks.scss
 - test/fixtures/indentation_with_comments.scss
 - test/fixtures/missing_semicolon.scss
 - test/fixtures/missing_semicolon_corrected.scss
@@ -130,6 +131,7 @@ test_files:
 - test/fixtures/has_uppercase_colors.scss
 - test/fixtures/indentation.scss
 - test/fixtures/indentation_corrected.scss
+- test/fixtures/indentation_with_blanks.scss
 - test/fixtures/indentation_with_comments.scss
 - test/fixtures/missing_semicolon.scss
 - test/fixtures/missing_semicolon_corrected.scss