Merge pull request #257 from Shopify/hm-fix-example-globs

Fix '**/vendor/**/*' glob broken in dc7cc25
Shopify · Jun 16, 2022 · d6e25bc · d6e25bc
2 parents 530ed7d + 1241fbc
commit d6e25bc
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/lib/erb_lint/linter.rb b/lib/erb_lint/linter.rb
@@ -46,7 +46,7 @@ def enabled?
     end
 
     def excludes_file?(filename)
-      @config.excludes_file?(filename)
+      @config.excludes_file?(filename, @file_loader.base_path)
     end
 
     def run(_processed_source)

diff --git a/lib/erb_lint/linter_config.rb b/lib/erb_lint/linter_config.rb
@@ -53,9 +53,12 @@ def to_hash
       end
     end
 
-    def excludes_file?(filename)
+    def excludes_file?(absolute_filename, base_path)
       exclude.any? do |path|
-        File.fnmatch?(path, filename)
+        return true if File.fnmatch?(path, absolute_filename)
+
+        relative_path = absolute_filename.delete_prefix("#{base_path}/")
+        File.fnmatch?(path, relative_path)
       end
     end
   end

diff --git a/lib/erb_lint/runner.rb b/lib/erb_lint/runner.rb
@@ -18,9 +18,8 @@ def initialize(file_loader, config)
     end
 
     def run(processed_source)
-      relative_filename = processed_source.filename.delete_prefix("#{@file_loader.base_path}/")
       @linters
-        .reject { |linter| linter.excludes_file?(relative_filename) }
+        .reject { |linter| linter.excludes_file?(processed_source.filename) }
         .each do |linter|
         linter.run(processed_source)
         @offenses.concat(linter.offenses)

diff --git a/spec/erb_lint/linter_config_spec.rb b/spec/erb_lint/linter_config_spec.rb
@@ -100,13 +100,25 @@ class CustomConfig < described_class
     describe "#excludes_file?" do
       context "when glob matches" do
         let(:config_hash) { { exclude: ["vendor/**/*"] } }
-        subject { linter_config.excludes_file?("vendor/gem/foo.rb") }
+        subject { linter_config.excludes_file?("/src/vendor/gem/foo.rb", "/src") }
         it { expect(subject).to(eq(true)) }
       end
 
       context "when glob does not match" do
         let(:config_hash) { { exclude: ["vendor/**/*"] } }
-        subject { linter_config.excludes_file?("app/foo.rb") }
+        subject { linter_config.excludes_file?("/src/app/foo.rb", "/src") }
+        it { expect(subject).to(eq(false)) }
+      end
+
+      context "when absolute glob matches" do
+        let(:config_hash) { { exclude: ["**/vendor/**/*"] } }
+        subject { linter_config.excludes_file?("/src/vendor/gem/foo.rb", "/src") }
+        it { expect(subject).to(eq(true)) }
+      end
+
+      context "when absolute glob does not match" do
+        let(:config_hash) { { exclude: ["**/vendor/**/*"] } }
+        subject { linter_config.excludes_file?("/src/app/foo.rb", "/src") }
         it { expect(subject).to(eq(false)) }
       end
     end