dependabot-common 0.249.0 → 0.251.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 217c5c870b824a19e49395f0ae3ecb4a01326f04c48acea4014aaca26ba7735d
-  data.tar.gz: 9a587a5c8c08853903d2e3ed5aec1ebdd943da45d82bbe1f7c2a83187a241d3e
+  metadata.gz: 7a434c5c00b5a51f18a1999a4a120d28c8e2cd8b52efb44146cb01e4165b2421
+  data.tar.gz: f4c755156b9f6d3b66e6ff57d7d7c0ba417627ab74cd9aab34c28a1f9c397bbf
 SHA512:
-  metadata.gz: 87a101be9e06ab4602930b296950db93b8b27ae81319a3ba1523f42866f7e2ea4dde7320ccfc69f604bd87c2aa720023716ca92f1e42bea8f4aeab0ecdde7045
-  data.tar.gz: efdcc0bc5bc3a49cd0f4746a490582cf07884c3a4a4618a784d40aa7f09edf8dcc28b3af05949e39fded10a0450ce30a6bc87ac9d489eeb1baa7e2a38f225c5e
+  metadata.gz: 53daea6535edab5620dc074b2563858b26c27defe804cb10d8e2cc39579affd42c1993998ee65c063ec375bae2a3211770a43f126589c96ce7c1b3d95f3e66db
+  data.tar.gz: a11371492f650794ec47e29f13db7a22b400c751d2bf6d00831f1c4c0efce11e66b3110fa38303c681570af6fc336a0510242fa20f8e5bf352fbae71b9e0ed16

data/lib/dependabot/dependency.rb

@@ -214,7 +214,7 @@ module Dependabot
 
     sig { returns(T.nilable(String)) }
     def humanized_version
-      return if removed?
+      return "removed" if removed?
 
       if T.must(version).match?(/^[0-9a-f]{40}/)
         return new_ref if ref_changed? && new_ref
@@ -238,6 +238,8 @@ module Dependabot
 
     sig { returns(T.nilable(String)) }
     def previous_ref
+      return nil if previous_requirements.nil?
+
       previous_refs = T.must(previous_requirements).filter_map do |r|
         r.dig(:source, "ref") || r.dig(:source, :ref)
       end.uniq

data/lib/dependabot/file_fetchers/base.rb

@@ -159,7 +159,7 @@ module Dependabot
       end
 
       # Returns the path to the cloned repo
-      sig { returns(String) }
+      sig { overridable.returns(String) }
       def clone_repo_contents
         @clone_repo_contents ||= T.let(
           _clone_repo_contents(target_directory: repo_contents_path),

data/lib/dependabot/metadata_finders/base/changelog_finder.rb

@@ -128,6 +128,15 @@ module Dependabot
           tmp_files = T.unsafe(suggested_source_client).contents(suggested_source&.repo, opts)
 
           filename = T.must(T.must(suggested_changelog_url).split("/").last).split("#").first
+
+          # If the suggested source points to a specific directory
+          # then we will receive a hash for just the changelog file
+          if suggested_source&.directory && tmp_files[:name] == filename
+            return @changelog_from_suggested_url = tmp_files
+          end
+
+          # Otherwise we will get back an array of hashes representing the files
+          # in the root directory and we need to find the changelog
           @changelog_from_suggested_url =
             tmp_files.find { |f| f.name == filename }
         rescue Octokit::NotFound, Octokit::UnavailableForLegalReasons

data/lib/dependabot/pull_request_creator/branch_namer/solo_strategy.rb

@@ -15,6 +15,8 @@ module Dependabot
 
         sig { override.returns(String) }
         def new_branch_name
+          return short_branch_name if branch_name_might_be_long?
+
           @name ||=
             T.let(
               begin
@@ -198,6 +200,27 @@ module Dependabot
         def requirements_changed?(dependency)
           (dependency.requirements - T.must(dependency.previous_requirements)).any?
         end
+
+        sig { returns(T::Boolean) }
+        def branch_name_might_be_long?
+          dependencies.count > 1 && !updating_a_property? && !updating_a_dependency_set?
+        end
+
+        sig { returns(String) }
+        def short_branch_name
+          # Fix long branch names by using a digest of the dependencies instead of their names.
+          sanitize_branch_name(File.join(prefixes, "multi-#{dependency_digest}"))
+        end
+
+        sig { returns(T.nilable(String)) }
+        def dependency_digest
+          T.let(
+            Digest::MD5.hexdigest(dependencies.map do |dependency|
+              "#{dependency.name}-#{dependency.removed? ? 'removed' : dependency.version}"
+            end.sort.join(",")).slice(0, 10),
+            T.nilable(String)
+          )
+        end
       end
     end
   end

data/lib/dependabot/pull_request_creator/github.rb

@@ -396,6 +396,7 @@ module Dependabot
         return true if message.include?("Could not resolve to a node")
         return true if message.include?("not a collaborator")
         return true if message.include?("Could not add requested reviewers")
+        return true if message.include?("Review cannot be requested from pull request author")
 
         false
       end

data/lib/dependabot/pull_request_creator/message_builder.rb

@@ -233,22 +233,41 @@ module Dependabot
 
       sig { returns(String) }
       def group_pr_name
+        if source.directories
+          grouped_directory_name
+        else
+          grouped_name
+        end
+      end
+
+      sig { returns(String) }
+      def grouped_name
+        updates = dependencies.map(&:name).uniq.count
+        if dependencies.count == 1
+          "#{solo_pr_name} in the #{T.must(dependency_group).name} group"
+        else
+          "bump the #{T.must(dependency_group).name} group#{pr_name_directory} " \
+            "with #{updates} update#{'s' if updates > 1}"
+        end
+      end
+
+      sig { returns(String) }
+      def grouped_directory_name
+        updates = dependencies.map(&:name).uniq.count
+
         directories_from_dependencies = dependencies.to_set { |dep| dep.metadata[:directory] }
 
         directories_with_updates = source.directories&.filter do |directory|
           directories_from_dependencies.include?(directory)
         end
 
-        updates = dependencies.map(&:name).uniq.count
-
-        if source.directories
+        if dependencies.count == 1
+          "#{solo_pr_name} in the #{T.must(dependency_group).name} group across " \
+            "#{T.must(directories_with_updates).count} directory"
+        else
           "bump the #{T.must(dependency_group).name} group across #{T.must(directories_with_updates).count} " \
             "#{T.must(directories_with_updates).count > 1 ? 'directories' : 'directory'} " \
             "with #{updates} update#{'s' if updates > 1}"
-        else
-          "bump the #{T.must(dependency_group).name} group#{pr_name_directory} with #{updates} update#{if updates > 1
-                                                                                                         's'
-                                                                                                       end}"
         end
       end
 
@@ -478,7 +497,7 @@ module Dependabot
                        "`#{dep.humanized_version}`"
                      ]
                    end
-                   "\n\n#{table([header] + rows)}"
+                   "\n\n#{table([header] + rows)}\n"
                  elsif update_count > 1
                    dependency_links_in_directory = dependency_links_for_directory(directory)
                    " #{T.must(T.must(dependency_links_in_directory)[0..-2]).join(', ')}" \

data/lib/dependabot/pull_request_updater/github.rb

@@ -229,7 +229,8 @@ module Dependabot
         if e.message.match?(/protected branch/i) ||
            e.message.match?(/not authorized to push/i) ||
            e.message.include?("must not contain merge commits") ||
-           e.message.match?(/required status check/i)
+           e.message.match?(/required status check/i) ||
+           e.message.match?(/cannot force-push to this branch/i)
           raise BranchProtected
         end
 

data/lib/dependabot.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.249.0"
+  VERSION = "0.251.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.249.0
+  version: 0.251.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-28 00:00:00.000000000 Z
+date: 2024-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-codecommit
@@ -583,7 +583,7 @@ licenses:
 - Nonstandard
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.249.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.251.0
 post_install_message: 
 rdoc_options: []
 require_paths: