Merge 8181a98 into 99d323a

platanus · Dec 31, 2018 · 2634bc0 · 2634bc0
2 parents 99d323a + 8181a98
commit 2634bc0
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -37,9 +37,9 @@ tslint:
 ruby:
   enabled: true
   config_file: style/config/.rubocop.yml
-scss:
+stylelint:
   enabled: true
-  config_file: style/config/.scss-lint.yml
+  config_file: style/config/.stylelintrc.json
 ```
 
 And running...
@@ -53,7 +53,7 @@ You will get in your `$HOME` path the following files:
 ```
 .eslintrc.json
 .rubocop.yml
-.scss-lint.yml
+.stylelintrc.json
 ```
 
 Also, you can pass a linter's name to update rules for specific languages.

diff --git a/lib/hound.rb b/lib/hound.rb
@@ -13,7 +13,7 @@
 require "hound/config/ruby"
 require "hound/config/eslint"
 require "hound/config/tslint"
-require "hound/config/scss"
+require "hound/config/stylelint"
 
 module Hound
 end
diff --git a/lib/hound/config/scss.rb → lib/hound/config/stylelint.rb b/lib/hound/config/scss.rb → lib/hound/config/stylelint.rb
@@ -1,8 +1,8 @@
 module Hound
   module Config
-    class Scss < Base
+    class Stylelint < Base
       def initialize
-        @linters_file_name = ".scss-lint.yml"
+        @linters_file_name = ".stylelintrc.json"
       end
     end
   end

diff --git a/lib/hound/config_collection.rb b/lib/hound/config_collection.rb
@@ -2,7 +2,7 @@ module Hound
   module ConfigCollection
     extend self
 
-    LINTER_NAMES = %w{ruby eslint tslint scss}
+    LINTER_NAMES = %w{ruby eslint tslint stylelint}
 
     def config_instances(linter_names = [])
       linter_names = LINTER_NAMES if linter_names.empty?

diff --git a/lib/hound/rules_updater.rb b/lib/hound/rules_updater.rb
@@ -30,6 +30,7 @@ def write_rules(linter_configs, local)
     end
 
     def get_rules(linter_config, local)
+      puts linter_config.name
       if !HoundConfig.enabled_for?(linter_config.name)
         inform_disabled(linter_config)
         return

diff --git a/spec/hound_config_spec.rb b/spec/hound_config_spec.rb
@@ -11,7 +11,7 @@ def stub_config_source(config_file_name)
 
     it "returns the content of the remote config file" do
       expect(HoundConfig.content).to eq(
-        "scss" => { "enabled" => false },
+        "stylelint" => { "enabled" => true },
         "ruby" => { "config_file" => ".ruby-style.yml" },
         "javascript" => { "ignore_file" => ".javascript_ignore" }
       )

diff --git a/spec/support/assets/config/.hound.enabled.yml b/spec/support/assets/config/.hound.enabled.yml
@@ -1,5 +1,5 @@
-scss:
-  enabled: false
+stylelint:
+  enabled: true
 
 ruby:
   enabled: true

diff --git a/spec/support/assets/config/.hound.remote.yml b/spec/support/assets/config/.hound.remote.yml
@@ -1,5 +1,5 @@
-scss:
-  enabled: false
+stylelint:
+  enabled: true
 
 ruby:
   config_file: .ruby-style.yml

diff --git a/spec/support/assets/rules/.scss-lint.yml b/spec/support/assets/rules/.scss-lint.yml
diff --git a/spec/support/assets/rules/.stylelintrc.json b/spec/support/assets/rules/.stylelintrc.json
@@ -0,0 +1,7 @@
+{
+  "rules": {
+    "rule1": true,
+    "ruel2": false,
+    "ruel3": false
+  }
+}