dependabot-common 0.288.0 → 0.289.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 550020f64e127c0aeb071589d9d77b6a9b00bc3c516ce3baecf6f8b072fa2621
-  data.tar.gz: 0f0162b707b4954b8a3f09addb4f5eb1d16f4d3863bb875dd95faee5efb0c2a7
+  metadata.gz: df0add56e9f09e63d8481893c92cb68ff4fa3724271c4378287b22853f237d15
+  data.tar.gz: bd4edfe5bb0ce0823d6a61fa3ec525ea98b77e1bfd4f665ba043f1f18db06834
 SHA512:
-  metadata.gz: 836eb356d0714bff9005c5d83f01f918c722094166df7a0d1c1629c6af484ab600680bd02ebe1b713f6f638d1c3e73ddd02b1ccdb7d16be3b03f25af8a7c04bf
-  data.tar.gz: 95190537ceea2262ced17707f5276931dd1554a92c1478054773a5395317154e6c99243cb048d45aee1377beeb33f556c145e8cd94838075633dc5116cf9800d
+  metadata.gz: 193dcab40ec19933c8fb9ca6eea0a41514ba006e4b554083d2ffbaee802e29d572fe0cf1897df3433981f85632aa7d03e700fce06d2b90661afc76630d4e39e9
+  data.tar.gz: 3c85ae8e5c55f03fca4ee85aa303a79385c188b34c402c5d8675ce65b51487ca43eab21abaa1570eea257964c0f7fbe2d16b0669754d31b441b8a4898f307d50

data/lib/dependabot/ecosystem.rb

@@ -12,6 +12,8 @@ module Dependabot
       extend T::Sig
       extend T::Helpers
 
+      DEFAULT_VERSION_PATTERN = /(\d+\.\d+(.\d+)*)/
+
       abstract!
       # Initialize version information for a package manager or language.
       # @param name [String] the name of the package manager or language (e.g., "bundler", "ruby").

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

@@ -18,9 +18,6 @@ module Dependabot
         sig { returns(T.nilable(String)) }
         attr_reader :target_branch
 
-        sig { returns(T::Array[String]) }
-        attr_reader :existing_branches
-
         sig { returns(String) }
         attr_reader :separator
 
@@ -35,19 +32,17 @@ module Dependabot
             dependencies: T::Array[Dependency],
             files: T::Array[DependencyFile],
             target_branch: T.nilable(String),
-            existing_branches: T::Array[String],
             separator: String,
             prefix: String,
             max_length: T.nilable(Integer)
           )
             .void
         end
-        def initialize(dependencies:, files:, target_branch:, existing_branches: [],
-                       separator: "/", prefix: "dependabot", max_length: nil)
+        def initialize(dependencies:, files:, target_branch:, separator: "/",
+                       prefix: "dependabot", max_length: nil)
           @dependencies      = dependencies
           @files             = files
           @target_branch     = target_branch
-          @existing_branches = existing_branches
           @separator         = separator
           @prefix            = prefix
           @max_length        = max_length

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

@@ -17,7 +17,6 @@ module Dependabot
             target_branch: T.nilable(String),
             dependency_group: Dependabot::DependencyGroup,
             includes_security_fixes: T::Boolean,
-            existing_branches: T::Array[String],
             separator: String,
             prefix: String,
             max_length: T.nilable(Integer)
@@ -25,12 +24,11 @@ module Dependabot
             .void
         end
         def initialize(dependencies:, files:, target_branch:, dependency_group:, includes_security_fixes:,
-                       existing_branches: [], separator: "/", prefix: "dependabot", max_length: nil)
+                       separator: "/", prefix: "dependabot", max_length: nil)
           super(
             dependencies: dependencies,
             files: files,
             target_branch: target_branch,
-            existing_branches: existing_branches,
             separator: separator,
             prefix: prefix,
             max_length: max_length,

data/lib/dependabot/pull_request_creator/branch_namer.rb

@@ -23,9 +23,6 @@ module Dependabot
       sig { returns(T.nilable(String)) }
       attr_reader :target_branch
 
-      sig { returns(T::Array[String]) }
-      attr_reader :existing_branches
-
       sig { returns(String) }
       attr_reader :separator
 
@@ -47,7 +44,6 @@ module Dependabot
           files: T::Array[Dependabot::DependencyFile],
           target_branch: T.nilable(String),
           dependency_group: T.nilable(Dependabot::DependencyGroup),
-          existing_branches: T::Array[String],
           separator: String,
           prefix: String,
           max_length: T.nilable(Integer),
@@ -55,13 +51,12 @@ module Dependabot
         )
           .void
       end
-      def initialize(dependencies:, files:, target_branch:, dependency_group: nil, existing_branches: [],
-                     separator: "/", prefix: "dependabot", max_length: nil, includes_security_fixes: false)
+      def initialize(dependencies:, files:, target_branch:, dependency_group: nil, separator: "/",
+                     prefix: "dependabot", max_length: nil, includes_security_fixes: false)
         @dependencies  = dependencies
         @files         = files
         @target_branch = target_branch
         @dependency_group = dependency_group
-        @existing_branches = existing_branches
         @separator     = separator
         @prefix        = prefix
         @max_length    = max_length
@@ -77,19 +72,12 @@ module Dependabot
 
       sig { returns(Dependabot::PullRequestCreator::BranchNamer::Base) }
       def strategy
-        if Dependabot::Experiments.enabled?(:dedup_branch_names) && existing_branches
-          Dependabot.logger.debug(
-            "Dependabot::PullRequestCreator::strategy : #{existing_branches}"
-          )
-        end
-
         @strategy ||= T.let(
           if dependency_group.nil?
             SoloStrategy.new(
               dependencies: dependencies,
               files: files,
               target_branch: target_branch,
-              existing_branches: existing_branches,
               separator: separator,
               prefix: prefix,
               max_length: max_length
@@ -101,7 +89,6 @@ module Dependabot
               target_branch: target_branch,
               dependency_group: T.must(dependency_group),
               includes_security_fixes: includes_security_fixes,
-              existing_branches: existing_branches,
               separator: separator,
               prefix: prefix,
               max_length: max_length

data/lib/dependabot/pull_request_creator/github.rb

@@ -114,7 +114,7 @@ module Dependabot
           "Initiating Github pull request."
         )
 
-        if experiment_duplicate_branch? && branch_exists?(branch_name) && no_pull_request_exists?
+        if branch_exists?(branch_name) && no_pull_request_exists?
           Dependabot.logger.info(
             "Existing branch \"#{branch_name}\" found. Pull request not created."
           )
@@ -600,11 +600,6 @@ module Dependabot
           raise type, message
         end
       end
-
-      sig { returns(T::Boolean) }
-      def experiment_duplicate_branch?
-        Dependabot::Experiments.enabled?(:dedup_branch_names)
-      end
     end
     # rubocop:enable Metrics/ClassLength
   end

data/lib/dependabot/pull_request_creator.rb

@@ -117,9 +117,6 @@ module Dependabot
     sig { returns(T.nilable(T.any(T::Array[String], Integer))) }
     attr_reader :milestone
 
-    sig { returns(T::Array[String]) }
-    attr_reader :existing_branches
-
     sig { returns(String) }
     attr_reader :branch_name_separator
 
@@ -164,7 +161,6 @@ module Dependabot
         reviewers: Reviewers,
         assignees: T.nilable(T.any(T::Array[String], T::Array[Integer])),
         milestone: T.nilable(T.any(T::Array[String], Integer)),
-        existing_branches: T::Array[String],
         branch_name_separator: String,
         branch_name_prefix: String,
         branch_name_max_length: T.nilable(Integer),
@@ -187,8 +183,7 @@ module Dependabot
                    pr_message_header: nil, pr_message_footer: nil,
                    custom_labels: nil, author_details: nil, signature_key: nil,
                    commit_message_options: {}, vulnerabilities_fixed: {},
-                   reviewers: nil, assignees: nil, milestone: nil,
-                   existing_branches: [], branch_name_separator: "/",
+                   reviewers: nil, assignees: nil, milestone: nil, branch_name_separator: "/",
                    branch_name_prefix: "dependabot", branch_name_max_length: nil,
                    label_language: false, automerge_candidate: false,
                    github_redirection_service: DEFAULT_GITHUB_REDIRECTION_SERVICE,
@@ -210,7 +205,6 @@ module Dependabot
       @assignees                  = assignees
       @milestone                  = milestone
       @vulnerabilities_fixed      = vulnerabilities_fixed
-      @existing_branches          = existing_branches
       @branch_name_separator      = branch_name_separator
       @branch_name_prefix         = branch_name_prefix
       @branch_name_max_length     = branch_name_max_length
@@ -404,7 +398,6 @@ module Dependabot
           files: files,
           target_branch: source.branch,
           dependency_group: dependency_group,
-          existing_branches: existing_branches,
           separator: branch_name_separator,
           prefix: branch_name_prefix,
           max_length: branch_name_max_length,

data/lib/dependabot/registry_client.rb

@@ -30,7 +30,8 @@ module Dependabot
       Excon.get(
         url,
         idempotent: true,
-        **SharedHelpers.excon_defaults({ headers: headers }.merge(options))
+        **SharedHelpers.excon_defaults({ headers: headers }.merge(options)),
+        retry_interval: 5
       )
     rescue Excon::Error::Timeout => e
       cache_error(url, e)

data/lib/dependabot/requirement.rb

@@ -34,11 +34,13 @@ module Dependabot
       # Select constraints with minimum operators
       min_constraints = requirements.select { |op, _| MINIMUM_OPERATORS.include?(op) }
 
-      # Choose the maximum version among the minimum constraints
-      max_min_constraint = min_constraints.max_by { |_, version| version }
+      # Process each minimum constraint using the respective handler
+      effective_min_versions = min_constraints.filter_map do |op, version|
+        handle_min_operator(op, version.is_a?(Dependabot::Version) ? version : Dependabot::Version.new(version))
+      end
 
-      # Return the version part of the max constraint, if it exists
-      Dependabot::Version.new(max_min_constraint&.last) if max_min_constraint&.last
+      # Return the maximum among the effective minimum constraints
+      Dependabot::Version.new(effective_min_versions.max) if effective_min_versions.any?
     end
 
     # Returns the lowest upper limit among all maximum constraints.
@@ -47,28 +49,89 @@ module Dependabot
       # Select constraints with maximum operators
       max_constraints = requirements.select { |op, _| MAXIMUM_OPERATORS.include?(op) }
 
-      # Process each maximum constraint, handling "~>" constraints based on length
-      effective_max_versions = max_constraints.map do |op, version|
-        if op == "~>"
-          # If "~>" constraint, bump based on the specificity of the version
-          case version.segments.length
-          when 1
-            # Bump major version (e.g., 2 -> 3.0.0)
-            Dependabot::Version.new((version.segments[0].to_i + 1).to_s + ".0.0")
-          when 2
-            # Bump minor version (e.g., 2.5 -> 2.6.0)
-            Dependabot::Version.new("#{version.segments[0]}.#{version.segments[1] + 1}.0")
-          else
-            # For three or more segments, use version.bump
-            version.bump # e.g., "~> 2.9.9" becomes upper bound 3.0.0
-          end
-        else
-          version
-        end
+      # Process each maximum constraint using the respective handler
+      effective_max_versions = max_constraints.filter_map do |op, version|
+        handle_max_operator(op, version.is_a?(Dependabot::Version) ? version : Dependabot::Version.new(version))
+      end
+
+      # Return the minimum among the effective maximum constraints
+      Dependabot::Version.new(effective_max_versions.min) if effective_max_versions.any?
+    end
+
+    # Dynamically handles minimum operators
+    sig { params(operator: String, version: Dependabot::Version).returns(T.nilable(Dependabot::Version)) }
+    def handle_min_operator(operator, version)
+      case operator
+      when ">=" then handle_greater_than_or_equal_for_min(version)
+      when ">"  then handle_greater_than_for_min(version)
+      when "~>" then handle_tilde_pessimistic_for_min(version)
+      end
+    end
+
+    # Dynamically handles maximum operators
+    sig { params(operator: String, version: Dependabot::Version).returns(T.nilable(Dependabot::Version)) }
+    def handle_max_operator(operator, version)
+      case operator
+      when "<=" then handle_less_than_or_equal_for_max(version)
+      when "<"  then handle_less_than_max(version)
+      when "~>" then handle_tilde_pessimistic_max(version)
       end
+    end
+
+    # Methods for handling minimum constraints
+    sig { params(version: Dependabot::Version).returns(Dependabot::Version) }
+    def handle_greater_than_or_equal_for_min(version)
+      version
+    end
+
+    sig { params(version: Dependabot::Version).returns(Dependabot::Version) }
+    def handle_greater_than_for_min(version)
+      version
+    end
+
+    sig { params(version: Dependabot::Version).returns(Dependabot::Version) }
+    def handle_tilde_pessimistic_for_min(version)
+      version
+    end
+
+    # Methods for handling maximum constraints
+    sig { params(version: Dependabot::Version).returns(Dependabot::Version) }
+    def handle_less_than_or_equal_for_max(version)
+      version
+    end
+
+    sig { params(version: Dependabot::Version).returns(Dependabot::Version) }
+    def handle_less_than_max(version)
+      version
+    end
+
+    sig { params(version: Dependabot::Version).returns(Dependabot::Version) }
+    def handle_tilde_pessimistic_max(version)
+      case version.segments.length
+      when 1
+        bump_major_segment(version)
+      when 2
+        bump_minor_segment(version)
+      else
+        bump_version(version)
+      end
+    end
+
+    private
+
+    sig { params(version: Dependabot::Version).returns(Dependabot::Version) }
+    def bump_major_segment(version)
+      Dependabot::Version.new("#{version.segments[0].to_i + 1}.0.0")
+    end
+
+    sig { params(version: Dependabot::Version).returns(Dependabot::Version) }
+    def bump_minor_segment(version)
+      Dependabot::Version.new("#{version.segments[0]}.#{version.segments[1].to_i + 1}.0")
+    end
 
-      # Return the smallest among the effective maximum constraints
-      Dependabot::Version.new(effective_max_versions.min) if effective_max_versions.min
+    sig { params(version: Dependabot::Version).returns(Dependabot::Version) }
+    def bump_version(version)
+      Dependabot::Version.new(version.bump)
     end
   end
 end

data/lib/dependabot.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.288.0
+  version: 0.289.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-21 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-codecommit
@@ -614,7 +614,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.288.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.289.0
 post_install_message: 
 rdoc_options: []
 require_paths: