dependabot-bundler 0.230.0 → 0.232.0

data/helpers/v2/spec/functions_spec.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "native_spec_helper"

data/helpers/v2/spec/native_spec_helper.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "rspec/its"

data/helpers/v2/spec/shared_contexts.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "tmpdir"
@@ -29,8 +30,8 @@ end
 RSpec.shared_context "without caching rubygems" do
   before do
     # Stub Bundler to stop it using a cached versions of Rubygems
-    allow_any_instance_of(Bundler::CompactIndexClient::Updater).
-      to receive(:etag_for).and_return("")
+    allow_any_instance_of(Bundler::CompactIndexClient::Updater)
+      .to receive(:etag_for).and_return("")
   end
 end
 
@@ -39,8 +40,8 @@ RSpec.shared_context "stub rubygems compact index" do
 
   before do
     # Stub the Rubygems index
-    stub_request(:get, "https://index.rubygems.org/versions").
-      to_return(
+    stub_request(:get, "https://index.rubygems.org/versions")
+      .to_return(
         status: 200,
         body: fixture("rubygems_responses", "index")
       )
@@ -50,8 +51,8 @@ RSpec.shared_context "stub rubygems compact index" do
       Dir[File.join("../../spec", "fixtures", "rubygems_responses", "info-*")]
     fixtures.each do |path|
       dep_name = path.split("/").last.gsub("info-", "")
-      stub_request(:get, "https://index.rubygems.org/info/#{dep_name}").
-        to_return(
+      stub_request(:get, "https://index.rubygems.org/info/#{dep_name}")
+        .to_return(
           status: 200,
           body: fixture("rubygems_responses", "info-#{dep_name}")
         )

data/lib/dependabot/bundler/file_fetcher/child_gemfile_finder.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "pathname"

data/lib/dependabot/bundler/file_fetcher/gemspec_finder.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "pathname"
@@ -78,8 +79,8 @@ module Dependabot
           kwargs_node = node.children.last
 
           path_hash_pair =
-            kwargs_node.children.
-            find { |hash_pair| key_from_hash_pair(hash_pair) == :path }
+            kwargs_node.children
+                       .find { |hash_pair| key_from_hash_pair(hash_pair) == :path }
 
           return unless path_hash_pair
 

data/lib/dependabot/bundler/file_fetcher/path_gemspec_finder.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "pathname"
@@ -77,8 +78,8 @@ module Dependabot
           kwargs_node = node.children.last
 
           path_hash_pair =
-            kwargs_node.children.
-            find { |hash_pair| key_from_hash_pair(hash_pair) == :path }
+            kwargs_node.children
+                       .find { |hash_pair| key_from_hash_pair(hash_pair) == :path }
 
           return unless path_hash_pair
 

data/lib/dependabot/bundler/file_fetcher/require_relative_finder.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "pathname"

data/lib/dependabot/bundler/file_fetcher.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "dependabot/file_fetchers"
@@ -56,15 +57,15 @@ module Dependabot
 
       def uniq_files(fetched_files)
         uniq_files = fetched_files.reject(&:support_file?).uniq
-        uniq_files += fetched_files.
-                      reject { |f| uniq_files.map(&:name).include?(f.name) }
+        uniq_files += fetched_files
+                      .reject { |f| uniq_files.map(&:name).include?(f.name) }
       end
 
       def check_required_files_present
         return if gemfile || gemspecs.any?
 
-        path = Pathname.new(File.join(directory, "Gemfile")).
-               cleanpath.to_path
+        path = Pathname.new(File.join(directory, "Gemfile"))
+                       .cleanpath.to_path
         raise Dependabot::DependencyFileNotFound, path
       end
 
@@ -84,11 +85,11 @@ module Dependabot
         return @gemspecs if defined?(@gemspecs)
 
         gemspecs_paths =
-          gemspec_directories.
-          flat_map do |d|
-            repo_contents(dir: d).
-              select { |f| f.name.end_with?(".gemspec") }.
-              map { |f| File.join(d, f.name) }
+          gemspec_directories
+          .flat_map do |d|
+            repo_contents(dir: d)
+              .select { |f| f.name.end_with?(".gemspec") }
+              .map { |f| File.join(d, f.name) }
           end
 
         @gemspecs = gemspecs_paths.map { |n| fetch_file_from_host(n) }
@@ -111,8 +112,8 @@ module Dependabot
         return unless gemfile.content.include?(".ruby-version")
 
         @ruby_version_file ||=
-          fetch_file_if_present(".ruby-version")&.
-          tap { |f| f.support_file = true }
+          fetch_file_if_present(".ruby-version")
+          &.tap { |f| f.support_file = true }
       end
 
       def path_gemspecs
@@ -125,8 +126,8 @@ module Dependabot
 
           # Get any gemspecs nested one level deeper
           nested_directories =
-            repo_contents(dir: path).
-            select { |f| f.type == "dir" }
+            repo_contents(dir: path)
+            .select { |f| f.type == "dir" }
 
           nested_directories.each do |dir|
             dir_path = File.join(path, dir.name)
@@ -159,24 +160,24 @@ module Dependabot
         end
 
         @require_relative_files ||=
-          paths.map { |path| fetch_file_from_host(path) }.
-          tap { |req_files| req_files.each { |f| f.support_file = true } }
+          paths.map { |path| fetch_file_from_host(path) }
+               .tap { |req_files| req_files.each { |f| f.support_file = true } }
       end
 
       def fetch_gemspecs_from_directory(dir_path)
-        repo_contents(dir: dir_path, fetch_submodules: true).
-          select { |f| f.name.end_with?(".gemspec", ".specification") }.
-          map { |f| File.join(dir_path, f.name) }.
-          map { |fp| fetch_file_from_host(fp, fetch_submodules: true) }
+        repo_contents(dir: dir_path, fetch_submodules: true)
+          .select { |f| f.name.end_with?(".gemspec", ".specification") }
+          .map { |f| File.join(dir_path, f.name) }
+          .map { |fp| fetch_file_from_host(fp, fetch_submodules: true) }
       end
 
       def fetch_path_gemspec_paths
         if lockfile
-          parsed_lockfile = ::Bundler::LockfileParser.
-                            new(sanitized_lockfile_content)
-          parsed_lockfile.specs.
-            select { |s| s.source.instance_of?(::Bundler::Source::Path) }.
-            map { |s| s.source.path }.uniq
+          parsed_lockfile = ::Bundler::LockfileParser
+                            .new(sanitized_lockfile_content)
+          parsed_lockfile.specs
+                         .select { |s| s.source.instance_of?(::Bundler::Source::Path) }
+                         .map { |s| s.source.path }.uniq
         else
           gemfiles = ([gemfile] + child_gemfiles).compact
           gemfiles.flat_map do |file|

data/lib/dependabot/bundler/file_parser/file_preparer.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "dependabot/dependency_file"
@@ -44,14 +45,14 @@ module Dependabot
         end
 
         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 == "Gemfile" }.
-            reject { |f| f.name == "gems.rb" }.
-            reject { |f| f.name == "gems.locked" }
+          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 == "Gemfile" }
+            .reject { |f| f.name == "gems.rb" }
+            .reject { |f| f.name == "gems.locked" }
         end
 
         def specification_files
@@ -72,17 +73,17 @@ module Dependabot
         end
 
         def imported_ruby_files
-          dependency_files.
-            select { |f| f.name.end_with?(".rb") }.
-            reject { |f| f.name == "gems.rb" }
+          dependency_files
+            .select { |f| f.name.end_with?(".rb") }
+            .reject { |f| f.name == "gems.rb" }
         end
 
         def sanitize_gemspec_content(gemspec_content)
           # No need to set the version correctly - this is just an update
           # check so we're not going to persist any changes to the lockfile.
-          FileUpdater::GemspecSanitizer.
-            new(replacement_version: "0.0.1").
-            rewrite(gemspec_content)
+          FileUpdater::GemspecSanitizer
+            .new(replacement_version: "0.0.1")
+            .rewrite(gemspec_content)
         end
       end
     end

data/lib/dependabot/bundler/file_parser/gemfile_declaration_finder.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "parser/current"

data/lib/dependabot/bundler/file_parser/gemspec_declaration_finder.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "parser/current"

data/lib/dependabot/bundler/file_parser.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "dependabot/dependency"
@@ -188,8 +189,8 @@ module Dependabot
 
       def prepared_dependency_files
         @prepared_dependency_files ||=
-          FilePreparer.new(dependency_files: dependency_files).
-          prepared_dependency_files
+          FilePreparer.new(dependency_files: dependency_files)
+                      .prepared_dependency_files
       end
 
       def write_temporary_dependency_files
@@ -238,14 +239,14 @@ module Dependabot
       end
 
       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 == "Gemfile" }.
-          reject { |f| f.name == "gems.rb" }.
-          reject { |f| f.name == "gems.locked" }
+        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 == "Gemfile" }
+          .reject { |f| f.name == "gems.rb" }
+          .reject { |f| f.name == "gems.locked" }
       end
 
       def lockfile
@@ -260,10 +261,10 @@ module Dependabot
 
       def production_dep_names
         @production_dep_names ||=
-          (gemfile_dependencies + gemspec_dependencies).dependencies.
-          select { |dep| production?(dep) }.
-          flat_map { |dep| expanded_dependency_names(dep) }.
-          uniq
+          (gemfile_dependencies + gemspec_dependencies).dependencies
+                                                       .select { |dep| production?(dep) }
+                                                       .flat_map { |dep| expanded_dependency_names(dep) }
+                                                       .uniq
       end
 
       def expanded_dependency_names(dep)
@@ -277,9 +278,9 @@ module Dependabot
       end
 
       def production?(dependency)
-        groups = dependency.requirements.
-                 flat_map { |r| r.fetch(:groups) }.
-                 map(&:to_s)
+        groups = dependency.requirements
+                           .flat_map { |r| r.fetch(:groups) }
+                           .map(&:to_s)
 
         return true if groups.empty?
         return true if groups.include?("runtime")
@@ -296,14 +297,14 @@ module Dependabot
 
       def gemspecs
         # Path gemspecs are excluded (they're supporting files)
-        @gemspecs ||= prepared_dependency_files.
-                      select { |file| file.name.end_with?(".gemspec") }
+        @gemspecs ||= prepared_dependency_files
+                      .select { |file| file.name.end_with?(".gemspec") }
       end
 
       def imported_ruby_files
-        dependency_files.
-          select { |f| f.name.end_with?(".rb") }.
-          reject { |f| f.name == "gems.rb" }
+        dependency_files
+          .select { |f| f.name.end_with?(".rb") }
+          .reject { |f| f.name == "gems.rb" }
       end
 
       def bundler_version

data/lib/dependabot/bundler/file_updater/gemfile_updater.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "dependabot/bundler/file_updater"
@@ -43,14 +44,14 @@ module Dependabot
           return content unless requirement_changed?(file, dependency)
 
           updated_requirement =
-            dependency.requirements.
-            find { |r| r[:file] == file.name }.
-            fetch(:requirement)
+            dependency.requirements
+                      .find { |r| r[:file] == file.name }
+                      .fetch(:requirement)
 
           previous_requirement =
-            dependency.previous_requirements.
-            find { |r| r[:file] == file.name }.
-            fetch(:requirement)
+            dependency.previous_requirements
+                      .find { |r| r[:file] == file.name }
+                      .fetch(:requirement)
 
           RequirementReplacer.new(
             dependency: dependency,
@@ -69,22 +70,22 @@ module Dependabot
 
         def remove_git_source?(dependency)
           old_gemfile_req =
-            dependency.previous_requirements.
-            find { |f| GEMFILE_FILENAMES.include?(f[:file]) }
+            dependency.previous_requirements
+                      .find { |f| GEMFILE_FILENAMES.include?(f[:file]) }
 
           return false unless old_gemfile_req&.dig(:source, :type) == "git"
 
           new_gemfile_req =
-            dependency.requirements.
-            find { |f| GEMFILE_FILENAMES.include?(f[:file]) }
+            dependency.requirements
+                      .find { |f| GEMFILE_FILENAMES.include?(f[:file]) }
 
           new_gemfile_req[:source].nil?
         end
 
         def update_git_pin?(dependency, file)
           new_gemfile_req =
-            dependency.requirements.
-            find { |f| f[:file] == file.name }
+            dependency.requirements
+                      .find { |f| f[:file] == file.name }
           return false unless new_gemfile_req&.dig(:source, :type) == "git"
 
           # If the new requirement is a git dependency with a ref then there's
@@ -98,13 +99,13 @@ module Dependabot
 
         def update_gemfile_git_pin(dependency, file, content)
           new_pin =
-            dependency.requirements.
-            find { |f| f[:file] == file.name }.
-            fetch(:source).fetch(:ref)
+            dependency.requirements
+                      .find { |f| f[:file] == file.name }
+                      .fetch(:source).fetch(:ref)
 
-          GitPinReplacer.
-            new(dependency: dependency, new_pin: new_pin).
-            rewrite(content)
+          GitPinReplacer
+            .new(dependency: dependency, new_pin: new_pin)
+            .rewrite(content)
         end
       end
     end

data/lib/dependabot/bundler/file_updater/gemspec_dependency_name_finder.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "parser/current"

data/lib/dependabot/bundler/file_updater/gemspec_sanitizer.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "parser/current"
@@ -34,9 +35,9 @@ module Dependabot
           ast = Parser::CurrentRuby.new.parse(buffer)
 
           updated_content =
-            Rewriter.
-            new(replacement_version: replacement_version).
-            rewrite(buffer, ast)
+            Rewriter
+            .new(replacement_version: replacement_version)
+            .rewrite(buffer, ast)
 
           # Remove any constants from strings
           updated_content.gsub(
@@ -298,10 +299,10 @@ module Dependabot
             return false unless node.is_a?(Parser::AST::Node)
             return false unless node.type == :dstr
 
-            node.children.
-              select { |n| n.type == :begin }.
-              flat_map(&:children).
-              any? { |n| node_is_version_constant?(n) }
+            node.children
+                .select { |n| n.type == :begin }
+                .flat_map(&:children)
+                .any? { |n| node_is_version_constant?(n) }
           end
 
           def replace_constant(node)

data/lib/dependabot/bundler/file_updater/gemspec_updater.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "dependabot/bundler/file_updater"
@@ -33,14 +34,14 @@ module Dependabot
           return content unless requirement_changed?(gemspec, dependency)
 
           updated_requirement =
-            dependency.requirements.
-            find { |r| r[:file] == gemspec.name }.
-            fetch(:requirement)
+            dependency.requirements
+                      .find { |r| r[:file] == gemspec.name }
+                      .fetch(:requirement)
 
           previous_requirement =
-            dependency.previous_requirements.
-            find { |r| r[:file] == gemspec.name }.
-            fetch(:requirement)
+            dependency.previous_requirements
+                      .find { |r| r[:file] == gemspec.name }
+                      .fetch(:requirement)
 
           RequirementReplacer.new(
             dependency: dependency,

data/lib/dependabot/bundler/file_updater/git_pin_replacer.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "parser/current"
@@ -19,9 +20,9 @@ module Dependabot
           buffer.source = content
           ast = Parser::CurrentRuby.new.parse(buffer)
 
-          Rewriter.
-            new(dependency: dependency, new_pin: new_pin).
-            rewrite(buffer, ast)
+          Rewriter
+            .new(dependency: dependency, new_pin: new_pin)
+            .rewrite(buffer, ast)
         end
 
         class Rewriter < Parser::TreeRewriter

data/lib/dependabot/bundler/file_updater/git_source_remover.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "parser/current"

data/lib/dependabot/bundler/file_updater/lockfile_updater.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "bundler"
@@ -141,14 +142,14 @@ module Dependabot
         end
 
         def imported_ruby_files
-          dependency_files.
-            select { |f| f.name.end_with?(".rb") }.
-            reject { |f| f.name == "gems.rb" }
+          dependency_files
+            .select { |f| f.name.end_with?(".rb") }
+            .reject { |f| f.name == "gems.rb" }
         end
 
         def top_level_gemspecs
-          dependency_files.
-            select { |file| file.name.end_with?(".gemspec") && Pathname.new(file.name).dirname.to_s == "." }
+          dependency_files
+            .select { |file| file.name.end_with?(".gemspec") && Pathname.new(file.name).dirname.to_s == "." }
         end
 
         def ruby_version_file
@@ -199,21 +200,21 @@ module Dependabot
         def sanitized_gemspec_content(path, gemspec_content)
           new_version = replacement_version_for_gemspec(path, gemspec_content)
 
-          GemspecSanitizer.
-            new(replacement_version: new_version).
-            rewrite(gemspec_content)
+          GemspecSanitizer
+            .new(replacement_version: new_version)
+            .rewrite(gemspec_content)
         end
 
         def replacement_version_for_gemspec(path, gemspec_content)
           return "0.0.1" unless lockfile
 
           gem_name =
-            GemspecDependencyNameFinder.new(gemspec_content: gemspec_content).
-            dependency_name || File.basename(path, ".gemspec")
+            GemspecDependencyNameFinder.new(gemspec_content: gemspec_content)
+                                       .dependency_name || File.basename(path, ".gemspec")
 
           gemspec_specs =
-            ::Bundler::LockfileParser.new(sanitized_lockfile_body).specs.
-            select { |s| s.name == gem_name && gemspec_sources.include?(s.source.class) }
+            ::Bundler::LockfileParser.new(sanitized_lockfile_body).specs
+                                     .select { |s| s.name == gem_name && gemspec_sources.include?(s.source.class) }
 
           gemspec_specs.first&.version || "0.0.1"
         end
@@ -260,15 +261,15 @@ module Dependabot
 
         def evaled_gemfiles
           @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 == "Gemfile" }.
-            reject { |f| f.name == "gems.rb" }.
-            reject { |f| f.name == "gems.locked" }.
-            reject(&:support_file?)
+            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 == "Gemfile" }
+            .reject { |f| f.name == "gems.rb" }
+            .reject { |f| f.name == "gems.locked" }
+            .reject(&:support_file?)
         end
 
         def specification_files

data/lib/dependabot/bundler/file_updater/requirement_replacer.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "parser/current"
@@ -48,8 +49,8 @@ module Dependabot
 
           updated_lines = updated_content.lines
           updated_line_index =
-            updated_lines.length.
-            times.find { |i| content.lines[i] != updated_content.lines[i] }
+            updated_lines.length
+                         .times.find { |i| content.lines[i] != updated_content.lines[i] }
           updated_line = updated_lines[updated_line_index]
 
           updated_line =
@@ -188,8 +189,8 @@ module Dependabot
                                      use_equality_operator:)
             open_quote, close_quote = quote_characters
             new_requirement_string =
-              updated_requirement.split(",").
-              map do |r|
+              updated_requirement.split(",")
+                                 .map do |r|
                 req_string = serialized_req(r, use_equality_operator)
                 req_string = %(#{open_quote}#{req_string}#{close_quote})
                 req_string = req_string.delete(" ") unless space_after_specifier

data/lib/dependabot/bundler/file_updater/ruby_requirement_setter.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "parser/current"
@@ -57,9 +58,9 @@ module Dependabot
                         end
 
           ruby_version =
-            RUBY_VERSIONS.
-            map { |v| Gem::Version.new(v) }.sort.
-            find { |v| requirement.satisfied_by?(v) }
+            RUBY_VERSIONS
+            .map { |v| Gem::Version.new(v) }.sort
+            .find { |v| requirement.satisfied_by?(v) }
 
           raise RubyVersionNotFound unless ruby_version