dependabot-common 0.384.0 → 0.386.0

data/lib/dependabot/pull_request_creator.rb

@@ -97,10 +97,10 @@ module Dependabot
     sig { returns(T.nilable(String)) }
     attr_reader :signature_key
 
-    sig { returns(T::Hash[Symbol, T.untyped]) }
+    sig { returns(T::Hash[Symbol, T.anything]) }
     attr_reader :commit_message_options
 
-    sig { returns(T::Hash[String, String]) }
+    sig { returns(T::Hash[String, T::Array[T::Hash[String, String]]]) }
     attr_reader :vulnerabilities_fixed
 
     AzureReviewers = T.type_alias { T.nilable(T::Array[String]) }
@@ -126,13 +126,22 @@ module Dependabot
     sig { returns(T.nilable(Integer)) }
     attr_reader :branch_name_max_length
 
+    sig { returns(T.nilable(String)) }
+    attr_reader :branch_name_word_separator
+
+    sig { returns(T.nilable(String)) }
+    attr_reader :branch_name_case
+
+    sig { returns(T.nilable(String)) }
+    attr_reader :branch_name_template
+
     sig { returns(String) }
     attr_reader :github_redirection_service
 
     sig { returns(T.nilable(T::Hash[String, String])) }
     attr_reader :custom_headers
 
-    sig { returns(T.nilable(T::Hash[Symbol, T.untyped])) }
+    sig { returns(T.nilable(T::Hash[Symbol, T.anything])) }
     attr_reader :provider_metadata
 
     sig { returns(T.nilable(Dependabot::DependencyGroup)) }
@@ -144,7 +153,7 @@ module Dependabot
     sig { returns(T.nilable(Encoding)) }
     attr_reader :pr_message_encoding
 
-    sig do
+    sig do # rubocop:disable Metrics/BlockLength
       params(
         source: Dependabot::Source,
         base_commit: String,
@@ -156,20 +165,23 @@ module Dependabot
         custom_labels: T.nilable(T::Array[String]),
         author_details: T.nilable(T::Hash[Symbol, String]),
         signature_key: T.nilable(String),
-        commit_message_options: T::Hash[Symbol, T.untyped],
-        vulnerabilities_fixed: T::Hash[String, String],
+        commit_message_options: T::Hash[Symbol, T.anything],
+        vulnerabilities_fixed: T::Hash[String, T::Array[T::Hash[String, String]]],
         reviewers: Reviewers,
         assignees: T.nilable(T.any(T::Array[String], T::Array[Integer])),
         milestone: T.nilable(T.any(T::Array[String], Integer)),
         branch_name_separator: String,
         branch_name_prefix: String,
         branch_name_max_length: T.nilable(Integer),
+        branch_name_word_separator: T.nilable(String),
+        branch_name_case: T.nilable(String),
+        branch_name_template: T.nilable(String),
         label_language: T::Boolean,
         automerge_candidate: T::Boolean,
         github_redirection_service: String,
         custom_headers: T.nilable(T::Hash[String, String]),
         require_up_to_date_base: T::Boolean,
-        provider_metadata: T.nilable(T::Hash[Symbol, T.untyped]),
+        provider_metadata: T.nilable(T::Hash[Symbol, T.anything]),
         message: T.nilable(
           T.any(Dependabot::PullRequestCreator::Message, Dependabot::PullRequestCreator::MessageBuilder)
         ),
@@ -198,6 +210,9 @@ module Dependabot
       branch_name_separator: "/",
       branch_name_prefix: "dependabot",
       branch_name_max_length: 100,
+      branch_name_word_separator: nil,
+      branch_name_case: nil,
+      branch_name_template: nil,
       label_language: false,
       automerge_candidate: false,
       github_redirection_service: DEFAULT_GITHUB_REDIRECTION_SERVICE,
@@ -227,6 +242,9 @@ module Dependabot
       @branch_name_separator      = branch_name_separator
       @branch_name_prefix         = branch_name_prefix
       @branch_name_max_length     = branch_name_max_length
+      @branch_name_word_separator = branch_name_word_separator
+      @branch_name_case = branch_name_case
+      @branch_name_template = branch_name_template
       @label_language             = label_language
       @automerge_candidate        = automerge_candidate
       @github_redirection_service = github_redirection_service
@@ -253,7 +271,7 @@ module Dependabot
     # TODO: This returns client-specific objects.
     # We should create a standard interface (`Dependabot::PullRequest`) and
     # then convert to that
-    sig { returns(T.untyped) }
+    sig { returns(T.anything) }
     def create
       case source.provider
       when "github" then github_creator.create
@@ -420,6 +438,9 @@ module Dependabot
           separator: branch_name_separator,
           prefix: branch_name_prefix,
           max_length: branch_name_max_length,
+          word_separator: branch_name_word_separator,
+          branch_name_case: branch_name_case,
+          template: branch_name_template,
           includes_security_fixes: includes_security_fixes?
         ),
         T.nilable(Dependabot::PullRequestCreator::BranchNamer)

data/lib/dependabot/registry_client.rb

@@ -21,8 +21,8 @@ module Dependabot
     sig do
       params(
         url: String,
-        headers: T::Hash[T.any(String, Symbol), T.untyped],
-        options: T::Hash[Symbol, T.untyped]
+        headers: T::Hash[T.any(String, Symbol), T.anything],
+        options: T::Hash[Symbol, T.anything]
       )
         .returns(Excon::Response)
     end
@@ -43,8 +43,8 @@ module Dependabot
     sig do
       params(
         url: String,
-        headers: T::Hash[T.any(String, Symbol), T.untyped],
-        options: T::Hash[Symbol, T.untyped]
+        headers: T::Hash[T.any(String, Symbol), T.anything],
+        options: T::Hash[Symbol, T.anything]
       )
         .returns(Excon::Response)
     end

data/lib/dependabot/simple_instrumentor.rb

@@ -9,14 +9,14 @@ module Dependabot
       extend T::Sig
       extend T::Generic
 
-      sig { returns(T.nilable(T::Array[T.proc.params(name: String, params: T::Hash[Symbol, T.untyped]).void])) }
+      sig { returns(T.nilable(T::Array[T.proc.params(name: String, params: T::Hash[Symbol, T.anything]).void])) }
       attr_accessor :subscribers
 
-      sig { params(block: T.proc.params(name: String, params: T::Hash[Symbol, T.untyped]).void).void }
+      sig { params(block: T.proc.params(name: String, params: T::Hash[Symbol, T.anything]).void).void }
       def subscribe(&block)
         @subscribers ||= T.let(
           [],
-          T.nilable(T::Array[T.proc.params(name: String, params: T::Hash[Symbol, T.untyped]).void])
+          T.nilable(T::Array[T.proc.params(name: String, params: T::Hash[Symbol, T.anything]).void])
         )
         @subscribers << block
       end
@@ -25,7 +25,7 @@ module Dependabot
         type_parameters(:T)
           .params(
             name: String,
-            params: T::Hash[Symbol, T.untyped],
+            params: T::Hash[Symbol, T.anything],
             block: T.proc.returns(T.type_parameter(:T))
           )
           .returns(T.nilable(T.type_parameter(:T)))

data/lib/dependabot/source.rb

@@ -126,16 +126,36 @@ module Dependabot
       )
     end
 
+    @github_enterprise_cache = T.let({}, T::Hash[String, T::Boolean])
+
+    sig { void }
+    def self.reset_github_enterprise_cache!
+      @github_enterprise_cache.clear
+    end
+
     sig { params(base_url: String).returns(T::Boolean) }
     def self.github_enterprise?(base_url)
+      return T.must(@github_enterprise_cache[base_url]) if @github_enterprise_cache.key?(base_url)
+
+      result = detect_github_enterprise(base_url)
+      @github_enterprise_cache[base_url] = result unless result.nil?
+      result || false
+    end
+
+    sig { params(base_url: String).returns(T.nilable(T::Boolean)) }
+    def self.detect_github_enterprise(base_url)
       resp = Excon.get(File.join(base_url, "status"))
-      resp.status == 200 &&
-        # Alternatively: resp.headers["Server"] == "GitHub.com", but this
-        # currently doesn't work with development environments
-        ((resp.headers["X-GitHub-Request-Id"] && !resp.headers["X-GitHub-Request-Id"]&.empty?) || false)
+      return false if resp.status == 404
+
+      return unless resp.status == 200
+
+      # Alternatively: resp.headers["Server"] == "GitHub.com", but this
+      # currently doesn't work with development environments
+      (resp.headers["X-GitHub-Request-Id"] && !resp.headers["X-GitHub-Request-Id"]&.empty?) || false
     rescue StandardError
-      false
+      nil
     end
+    private_class_method :detect_github_enterprise
 
     sig do
       params(

data/lib/dependabot/update_checkers/base.rb

@@ -46,7 +46,7 @@ module Dependabot
       sig { returns(T.nilable(Dependabot::Package::ReleaseCooldownOptions)) }
       attr_reader :update_cooldown
 
-      sig { returns(T::Hash[Symbol, T.untyped]) }
+      sig { returns(T::Hash[Symbol, T.anything]) }
       attr_reader :options
 
       sig do
@@ -61,7 +61,7 @@ module Dependabot
           requirements_update_strategy: T.nilable(Dependabot::RequirementsUpdateStrategy),
           dependency_group: T.nilable(Dependabot::DependencyGroup),
           update_cooldown: T.nilable(Dependabot::Package::ReleaseCooldownOptions),
-          options: T::Hash[Symbol, T.untyped]
+          options: T::Hash[Symbol, T.anything]
         )
           .void
       end
@@ -233,7 +233,7 @@ module Dependabot
       # instances are returned as-is; plain hashes are wrapped. Re-wrapping
       # would produce a value-equal copy, so skipping it avoids needless
       # allocations.
-      sig { params(requirements: T::Array[T::Hash[Symbol, T.untyped]]).returns(T::Array[Dependabot::DependencyRequirement]) }
+      sig { params(requirements: T::Array[T::Hash[Symbol, T.anything]]).returns(T::Array[Dependabot::DependencyRequirement]) }
       def wrap_requirements(requirements)
         requirements.map do |requirement|
           requirement.is_a?(Dependabot::DependencyRequirement) ? requirement : Dependabot::DependencyRequirement.create(requirement)
@@ -406,7 +406,7 @@ module Dependabot
           version_class.correct?(latest_version.to_s)) || false
       end
 
-      sig { returns(T::Array[T::Hash[Symbol, T.untyped]]) }
+      sig { returns(T::Array[Dependabot::DependencyRequirement]) }
       def changed_requirements
         (updated_requirements - dependency.requirements)
       end

data/lib/dependabot.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.384.0
+  version: 0.386.0
 platform: ruby
 authors:
 - Dependabot
@@ -574,6 +574,7 @@ files:
 - lib/dependabot/pull_request_creator.rb
 - lib/dependabot/pull_request_creator/azure.rb
 - lib/dependabot/pull_request_creator/bitbucket.rb
+- lib/dependabot/pull_request_creator/branch_name_template.rb
 - lib/dependabot/pull_request_creator/branch_namer.rb
 - lib/dependabot/pull_request_creator/branch_namer/base.rb
 - lib/dependabot/pull_request_creator/branch_namer/dependency_group_strategy.rb
@@ -621,7 +622,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.384.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.386.0
 rdoc_options: []
 require_paths:
 - lib