Filter out all support files from evaled_gemfiles() without listing e…

…ach pattern separately
dependabot · Mar 2, 2024 · 34af3a4 · 34af3a4
1 parent 72a48f1
commit 34af3a4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 20 deletions.
diff --git a/bundler/lib/dependabot/bundler/file_parser.rb b/bundler/lib/dependabot/bundler/file_parser.rb
@@ -242,12 +242,9 @@ def evaled_gemfiles
         dependency_files
           .reject { |f| f.name.end_with?(".gemspec") }
           .reject { |f| f.name.end_with?(".specification") }
-          .reject { |f| f.name.end_with?(".lock") }
-          .reject { |f| f.name.end_with?(".ruby-version") }
-          .reject { |f| f.name.end_with?(".tool-versions") }
           .reject { |f| f.name == "Gemfile" }
           .reject { |f| f.name == "gems.rb" }
-          .reject { |f| f.name == "gems.locked" }
+          .reject(&:support_file?)
       end
 
       def lockfile

diff --git a/bundler/lib/dependabot/bundler/file_parser/file_preparer.rb b/bundler/lib/dependabot/bundler/file_parser/file_preparer.rb
@@ -49,12 +49,9 @@ def evaled_gemfiles
           dependency_files
             .reject { |f| f.name.end_with?(".gemspec") }
             .reject { |f| f.name.end_with?(".specification") }
-            .reject { |f| f.name.end_with?(".lock") }
-            .reject { |f| f.name.end_with?(".ruby-version") }
-            .reject { |f| f.name.end_with?(".tool-versions") }
             .reject { |f| f.name == "Gemfile" }
             .reject { |f| f.name == "gems.rb" }
-            .reject { |f| f.name == "gems.locked" }
+            .reject(&:support_file?)
         end
 
         def specification_files

diff --git a/bundler/lib/dependabot/bundler/file_updater.rb b/bundler/lib/dependabot/bundler/file_updater.rb
@@ -126,12 +126,9 @@ def evaled_gemfiles
           dependency_files
           .reject { |f| f.name.end_with?(".gemspec") }
           .reject { |f| f.name.end_with?(".specification") }
-          .reject { |f| f.name.end_with?(".lock") }
-          .reject { |f| f.name.end_with?(".ruby-version") }
-          .reject { |f| f.name.end_with?(".tool-versions") }
           .reject { |f| f.name == "Gemfile" }
           .reject { |f| f.name == "gems.rb" }
-          .reject { |f| f.name == "gems.locked" }
+          .reject(&:support_file?)
       end
 
       def updated_gemfile_content(file)

diff --git a/bundler/lib/dependabot/bundler/file_updater/lockfile_updater.rb b/bundler/lib/dependabot/bundler/file_updater/lockfile_updater.rb
@@ -277,12 +277,8 @@ def evaled_gemfiles
             dependency_files
             .reject { |f| f.name.end_with?(".gemspec") }
             .reject { |f| f.name.end_with?(".specification") }
-            .reject { |f| f.name.end_with?(".lock") }
-            .reject { |f| f.name.end_with?(".ruby-version") }
-            .reject { |f| f.name.end_with?(".tool-versions") }
             .reject { |f| f.name == "Gemfile" }
             .reject { |f| f.name == "gems.rb" }
-            .reject { |f| f.name == "gems.locked" }
             .reject(&:support_file?)
         end
 

diff --git a/bundler/lib/dependabot/bundler/update_checker/file_preparer.rb b/bundler/lib/dependabot/bundler/update_checker/file_preparer.rb
@@ -127,12 +127,9 @@ def evaled_gemfiles
           dependency_files
             .reject { |f| f.name.end_with?(".gemspec") }
             .reject { |f| f.name.end_with?(".specification") }
-            .reject { |f| f.name.end_with?(".lock") }
-            .reject { |f| f.name.end_with?(".ruby-version") }
-            .reject { |f| f.name.end_with?(".tool-versions") }
             .reject { |f| f.name == "Gemfile" }
             .reject { |f| f.name == "gems.rb" }
-            .reject { |f| f.name == "gems.locked" }
+            .reject(&:support_file?)
         end
 
         def lockfile

diff --git a/bundler/spec/spec_helper.rb b/bundler/spec/spec_helper.rb
@@ -27,6 +27,11 @@ def self.bundler_version
 
 def bundler_project_dependency_files(project, directory: "/")
   project_dependency_files(File.join("bundler#{PackageManagerHelper.bundler_version}", project), directory: directory)
+    .each do |dep|
+      dep.support_file =
+        dep.name.end_with?(".lock", ".ruby-version", ".tool-versions") ||
+        dep.name == "gems.locked"
+    end
 end
 
 def bundler_project_dependency_file(project, filename:)