dependabot-common 0.364.0 → 0.365.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6da1e661120cc32753f744c61f71c22ea49fc6f2fdcbbfd3a137631acf3103e4
-  data.tar.gz: 1c3c5a19b497c29ac3fa2853202918f514cc2c702c091b8dd4af352b186ad61f
+  metadata.gz: f60295381915191cca0d05b7be5c04af89cbe52a0f3df889e8365503d9d23ab6
+  data.tar.gz: 6cce9d750a9d91859998a579d9701329ed3bfc40ce63edf21c4c7cd7659e2ca1
 SHA512:
-  metadata.gz: fd97c8d6b0978058bf3204aee949f1082fda7d8724ac366a7684d35c3d82d867e1d26ce0bf24e3dd97e94b08b689d3276b681cdfa86782525dfa09aeae892af5
-  data.tar.gz: 13d846c8ab332fa64643df2bdc4aa95a47250efdbf10a382a77df4e63312bf773a1f01fdaaa72390d715cd4132f1798d5a4ceec70910dca43ee271abaeca5a29
+  metadata.gz: 7b6a7a215197bbfc58f9652bb25c4e240d4ca82cb2cf693e9bba403546a26f97507b18c3456ccacf07ae140b85a975f44ccf3775ffd1747e7a2f943f88796076
+  data.tar.gz: 6da0b1e735407a95fb73d30588cdb9c4c31e84239cd049e91c5c3cbc70e8113525c5e56e3d70ccac910be6a43ebb8d425cc948c2da2e332483ba081faabd4442

data/lib/dependabot/dependency.rb

@@ -14,6 +14,10 @@ module Dependabot
     )
     @display_name_builders = T.let({}, T::Hash[String, T.proc.params(arg0: String).returns(String)])
     @name_normalisers = T.let({}, T::Hash[String, T.proc.params(arg0: String).returns(String)])
+    @humanized_previous_version_builders = T.let(
+      {},
+      T::Hash[String, T.proc.params(arg0: Dependency).returns(T.nilable(String))]
+    )
 
     sig do
       params(package_manager: String).returns(T.proc.params(arg0: T::Array[T.untyped]).returns(T::Boolean))
@@ -61,6 +65,25 @@ module Dependabot
       @name_normalisers[package_manager] = name_builder
     end
 
+    sig do
+      params(
+        package_manager: String
+      ).returns(T.nilable(T.proc.params(arg0: Dependency).returns(T.nilable(String))))
+    end
+    def self.humanized_previous_version_builder_for_package_manager(package_manager)
+      @humanized_previous_version_builders[package_manager]
+    end
+
+    sig do
+      params(
+        package_manager: String,
+        builder: T.proc.params(arg0: Dependency).returns(T.nilable(String))
+      ).void
+    end
+    def self.register_humanized_previous_version_builder(package_manager, builder)
+      @humanized_previous_version_builders[package_manager] = builder
+    end
+
     sig { returns(String) }
     attr_reader :name
 
@@ -225,24 +248,10 @@ module Dependabot
 
     sig { returns(T.nilable(String)) }
     def humanized_previous_version
-      # If we don't have a previous version, we *may* still be able to figure
-      # one out if a ref was provided and has been changed (in which case the
-      # previous ref was essentially the version).
-      if previous_version.nil?
-        return ref_changed? ? previous_ref : nil
-      end
-
-      if T.must(previous_version).match?(/^[0-9a-f]{40}/)
-        return previous_ref if ref_changed? && previous_ref
+      custom_version = custom_humanized_previous_version
+      return custom_version if custom_version
 
-        "`#{T.must(previous_version)[0..6]}`"
-      elsif version == previous_version &&
-            package_manager == "docker"
-        digest = docker_digest_from_reqs(T.must(previous_requirements))
-        "`#{T.must(T.must(digest).split(':').last)[0..6]}`"
-      else
-        previous_version
-      end
+      default_humanized_previous_version
     end
 
     sig { returns(T.nilable(String)) }
@@ -391,6 +400,40 @@ module Dependabot
 
     private
 
+    sig { returns(T.nilable(String)) }
+    def custom_humanized_previous_version
+      builder = self.class.humanized_previous_version_builder_for_package_manager(package_manager)
+      return nil unless builder
+
+      builder.call(self)
+    end
+
+    sig { returns(T.nilable(String)) }
+    def default_humanized_previous_version
+      # If we don't have a previous version, we *may* still be able to figure
+      # one out if a ref was provided and has been changed (in which case the
+      # previous ref was essentially the version).
+      return (ref_changed? ? previous_ref : nil) if previous_version.nil?
+
+      return humanized_sha_previous_version if T.must(previous_version).match?(/^[0-9a-f]{40}/)
+      return humanized_docker_previous_version if version == previous_version && package_manager == "docker"
+
+      previous_version
+    end
+
+    sig { returns(T.nilable(String)) }
+    def humanized_sha_previous_version
+      return previous_ref if ref_changed? && previous_ref
+
+      "`#{T.must(previous_version)[0..6]}`"
+    end
+
+    sig { returns(String) }
+    def humanized_docker_previous_version
+      digest = docker_digest_from_reqs(T.must(previous_requirements))
+      "`#{T.must(T.must(digest).split(':').last)[0..6]}`"
+    end
+
     sig { void }
     def check_values
       check_requirement_fields

data/lib/dependabot/pull_request_creator/message_builder/title_builder.rb

@@ -0,0 +1,126 @@
+# typed: strict
+# frozen_string_literal: true
+
+require "sorbet-runtime"
+require "dependabot/dependency"
+require "dependabot/logger"
+require "dependabot/pull_request_creator/pr_name_prefixer"
+
+module Dependabot
+  class PullRequestCreator
+    class MessageBuilder
+      # Composes a final PR title from a base title + prefix.
+      #
+      # Works in two modes:
+      # 1. With a full PrNamePrefixer (updater path — has source/credentials for
+      #    commit style auto-detection)
+      # 2. With just commit_message_options (API path — explicit prefix only,
+      #    no network calls needed)
+      class TitleBuilder
+        extend T::Sig
+
+        sig { returns(String) }
+        attr_reader :base_title
+
+        sig { returns(T.nilable(Dependabot::PullRequestCreator::PrNamePrefixer)) }
+        attr_reader :prefixer
+
+        sig { returns(T.nilable(T::Hash[Symbol, T.untyped])) }
+        attr_reader :commit_message_options
+
+        sig { returns(T.nilable(T::Array[Dependabot::Dependency])) }
+        attr_reader :dependencies
+
+        sig do
+          params(
+            base_title: String,
+            prefixer: T.nilable(Dependabot::PullRequestCreator::PrNamePrefixer),
+            commit_message_options: T.nilable(T::Hash[Symbol, T.untyped]),
+            dependencies: T.nilable(T::Array[Dependabot::Dependency])
+          ).void
+        end
+        def initialize(base_title:, prefixer: nil, commit_message_options: nil, dependencies: nil)
+          @base_title = base_title
+          @prefixer = prefixer
+          @commit_message_options = commit_message_options
+          @dependencies = dependencies
+        end
+
+        # Generates a base title for multi-ecosystem combined PR updates.
+        sig { params(group_name: String, update_count: Integer).returns(String) }
+        def self.multi_ecosystem_base_title(group_name:, update_count:)
+          "bump the \"#{group_name}\" group with " \
+            "#{update_count} update#{'s' unless update_count == 1} across multiple ecosystems"
+        end
+
+        sig { returns(String) }
+        def build
+          name = base_title.dup
+          name[0] = T.must(name[0]).capitalize if !name.empty? && capitalize?
+          "#{prefix}#{name}"
+        end
+
+        private
+
+        sig { returns(String) }
+        def prefix
+          return T.must(prefixer).pr_name_prefix if prefixer
+
+          build_explicit_prefix
+        rescue StandardError => e
+          Dependabot.logger.error("Error while generating PR name prefix: #{e.message}")
+          Dependabot.logger.error(e.backtrace&.join("\n"))
+          ""
+        end
+
+        sig { returns(T::Boolean) }
+        def capitalize?
+          return T.must(prefixer).capitalize_first_word? if prefixer
+
+          true
+        end
+
+        # Builds prefix from explicit commit_message_options only.
+        # Same logic as PrNamePrefixer#prefix_from_explicitly_provided_details
+        # but without requiring source/credentials.
+        sig { returns(String) }
+        def build_explicit_prefix
+          return "" unless commit_message_options&.key?(:prefix)
+
+          prefix = explicit_prefix_string
+          return "" if prefix.empty?
+
+          prefix += "(#{scope})" if commit_message_options&.dig(:include_scope)
+          # Append colon after alphanumeric or closing bracket to follow
+          # conventional commit format (e.g., "chore: ..." or "fix(deps): ...")
+          prefix += ":" if prefix.match?(/[A-Za-z0-9\)\]]\Z/)
+          prefix += " " unless prefix.end_with?(" ")
+          prefix
+        end
+
+        sig { returns(String) }
+        def explicit_prefix_string
+          if production_dependencies?
+            commit_message_options&.dig(:prefix).to_s
+          elsif commit_message_options&.key?(:prefix_development)
+            commit_message_options&.dig(:prefix_development).to_s
+          else
+            commit_message_options&.dig(:prefix).to_s
+          end
+        end
+
+        sig { returns(T::Boolean) }
+        def production_dependencies?
+          dependencies&.any?(&:production?) != false
+        rescue StandardError
+          true
+        end
+
+        sig { returns(String) }
+        def scope
+          production_dependencies? ? "deps" : "deps-dev"
+        end
+      end
+    end
+  end
+end

data/lib/dependabot/pull_request_creator/message_builder.rb

@@ -24,6 +24,7 @@ module Dependabot
       require_relative "message_builder/metadata_presenter"
       require_relative "message_builder/issue_linker"
       require_relative "message_builder/link_and_mention_sanitizer"
+      require_relative "message_builder/title_builder"
       require_relative "pr_name_prefixer"
 
       sig { returns(Dependabot::Source) }
@@ -130,8 +131,10 @@ module Dependabot
       sig { returns(String) }
       def pr_name
         name = dependency_group ? group_pr_name : solo_pr_name
-        name[0] = T.must(name[0]).capitalize if pr_name_prefixer.capitalize_first_word?
-        "#{pr_name_prefix}#{name}"
+        MessageBuilder::TitleBuilder.new(
+          base_title: name,
+          prefixer: pr_name_prefixer
+        ).build
       end
 
       sig { returns(String) }

data/lib/dependabot.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.364.0
+  version: 0.365.0
 platform: ruby
 authors:
 - Dependabot
@@ -586,6 +586,7 @@ files:
 - lib/dependabot/pull_request_creator/message_builder/issue_linker.rb
 - lib/dependabot/pull_request_creator/message_builder/link_and_mention_sanitizer.rb
 - lib/dependabot/pull_request_creator/message_builder/metadata_presenter.rb
+- lib/dependabot/pull_request_creator/message_builder/title_builder.rb
 - lib/dependabot/pull_request_creator/pr_name_prefixer.rb
 - lib/dependabot/pull_request_updater.rb
 - lib/dependabot/pull_request_updater/azure.rb
@@ -615,7 +616,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.364.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.365.0
 rdoc_options: []
 require_paths:
 - lib