dependabot-common 0.248.0 → 0.250.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0416468eed1e5438af7e79bd0100cfc63ec42b84d87d36ba3640911c79801aa4'
-  data.tar.gz: d08694c51bd1c6f8c768f953c48d2924814a90b49574980e00b60ab4dd51915e
+  metadata.gz: '0983823ada7f861d47f3399954e68acd51ac9489e92a8720db43eff4d3cefb49'
+  data.tar.gz: 2fdc3a9999f7ed9d5127a350d17677618765f6c57bdf751c1f67402f48f35ef6
 SHA512:
-  metadata.gz: dcc419c9ec63f63d941fa34c9667b10e6e5c1bcbfc38351d9a87531a6cad5d343338a9e02dfb17403e3ff8a647478372567afbf6ff01b765ffdcdd9d8abf60ef
-  data.tar.gz: 7648c3ba8cba2e070e41e888c76bd3081b8a3798297c570c9e11eef441da874e678742a4563d7095cad18eeeeb16547d6540b22653fc200081d3214a9ad53365
+  metadata.gz: 27bc497b5c23a14648786d5406bb7e53c70b369fdb0e9f37c91fb6820bf6534bb4d4f6ecae92fb2d479eaf4624ee4d3788a69b563ae6803969397fd8e65a8227
+  data.tar.gz: 387cbc59de29fedd731f0c82352006e6f935a28afcae87a9ada8f78e0378c754482dc988ff690d9e68d858a08a302a29e10c8a2d945c11150bbea270c8069763

data/lib/dependabot/clients/bitbucket_with_retries.rb

@@ -1,6 +1,8 @@
 # typed: strict
 # frozen_string_literal: true
 
+require "sorbet-runtime"
+
 require_relative "bitbucket"
 
 module Dependabot

data/lib/dependabot/clients/codecommit.rb

@@ -82,7 +82,10 @@ module Dependabot
           repo: String, commit: T.nilable(String),
           path: T.nilable(String)
         )
-          .returns(Aws::CodeCommit::Types::GetFolderOutput)
+          # See PR 9344: should .returns(Seahorse::Client::Response)
+          # but it not extend Delegator, unblocking until shim or
+          # another fix is implemented
+          .returns(T.untyped)
       end
       def fetch_repo_contents(repo, commit = nil, path = nil)
         actual_path = path

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/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/message_builder.rb

@@ -242,7 +242,7 @@ module Dependabot
         updates = dependencies.map(&:name).uniq.count
 
         if source.directories
-          "bump the #{T.must(dependency_group).name} across #{T.must(directories_with_updates).count} " \
+          "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
@@ -466,7 +466,7 @@ module Dependabot
 
           update_count = dependencies_in_directory.map(&:name).uniq.count
 
-          msg += "Bumps the #{T.must(dependency_group).name} " \
+          msg += "Bumps the #{T.must(dependency_group).name} group " \
                  "with #{update_count} update#{update_count > 1 ? 's' : ''} in the #{directory} directory:"
 
           msg += if update_count >= 5

data/lib/dependabot/requirements_updater/base.rb

@@ -0,0 +1,28 @@
+# typed: strong
+# frozen_string_literal: true
+
+require "sorbet-runtime"
+
+module Dependabot
+  module RequirementsUpdater
+    module Base
+      extend T::Sig
+      extend T::Helpers
+      extend T::Generic
+
+      Version = type_member { { upper: Gem::Version } }
+      Requirement = type_member { { upper: Gem::Requirement } }
+
+      interface!
+
+      sig { abstract.returns(T::Array[T::Hash[Symbol, T.untyped]]) }
+      def updated_requirements; end
+
+      sig { abstract.returns(T::Class[Version]) }
+      def version_class; end
+
+      sig { abstract.returns(T::Class[Requirement]) }
+      def requirement_class; end
+    end
+  end
+end

data/lib/dependabot.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.248.0
+  version: 0.250.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-21 00:00:00.000000000 Z
+date: 2024-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-codecommit
@@ -562,6 +562,7 @@ files:
 - lib/dependabot/registry_client.rb
 - lib/dependabot/requirement.rb
 - lib/dependabot/requirements_update_strategy.rb
+- lib/dependabot/requirements_updater/base.rb
 - lib/dependabot/security_advisory.rb
 - lib/dependabot/shared_helpers.rb
 - lib/dependabot/simple_instrumentor.rb
@@ -582,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.248.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.250.0
 post_install_message: 
 rdoc_options: []
 require_paths: