dependabot-common 0.216.0 → 0.216.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 645d08a2a5cfd122e1ec0bb4302d7c4e80bd0348e0c0e52d28dc210d196b963b
-  data.tar.gz: 25d81216a7b48d60b332d241e06f3a7dcc384b06ea3f5fac1dcc02949da226dc
+  metadata.gz: 4b38a1d09ce4d017caa3e68544d16abb8052e27febb10b6c2aa48ea7689dd5dd
+  data.tar.gz: 6f1f21ff545f58a09a7dd238cf3a2fe56ca59ab29c6f51a9d7594762769ccf79
 SHA512:
-  metadata.gz: 8ef726592da7c2ff04784322801d12902ab42613e53b084687acdbfb479982e60a5303cb6e7f249e5525547a7b7681af48c3afe9df16cfda435b771e5e3f84ad
-  data.tar.gz: ef3a1010b2dd5736c9595754b1eb1cf1cca4cd7eecdfae551b97a2d84c71952ccad43bedafab0f9b6cea07892afbff41b766d9d8941ae10bcd7eedb434970aa3
+  metadata.gz: ae81f98a72640e7ea5b5dd7d5f813ff8b32663a0269b9cd4b57bebfe74d5db654f4da4aa9d6bbfe8c0c6a64af78a7017bb29db0e646481a1c81d35b60f3f4ff0
+  data.tar.gz: 034a48105df2f2a2633944697a3339b08f4d6f4bdb2fe5f277926d38d7032d2fbb8d5c6878b926710d53f495d8d547165261faab818a70c143afb423af7fda2f

data/lib/dependabot/clients/github_with_retries.rb

@@ -95,7 +95,7 @@ module Dependabot
           c.proxy = ENV["HTTPS_PROXY"] if ENV["HTTPS_PROXY"]
         end
 
-        Octokit.middleware = Faraday::RackBuilder.new do |builder|
+        args[:middleware] = Faraday::RackBuilder.new do |builder|
           builder.use Faraday::Retry::Middleware, exceptions: RETRYABLE_ERRORS, max: max_retries || 3
 
           Octokit::Default::MIDDLEWARE.handlers.each do |handler|

data/lib/dependabot/dependency.rb

@@ -199,12 +199,16 @@ module Dependabot
       self == other
     end
 
-    private
+    def requirement_class
+      Utils.requirement_class_for_package_manager(package_manager)
+    end
 
     def version_class
       Utils.version_class_for_package_manager(package_manager)
     end
 
+    private
+
     def check_values
       raise ArgumentError, "blank strings must not be provided as versions" if [version, previous_version].any?("")
 

data/lib/dependabot/dependency_group.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "wildcard_matcher"
+
+module Dependabot
+  class DependencyGroup
+    attr_reader :name, :rules, :dependencies
+
+    def initialize(name:, rules:)
+      @name = name
+      @rules = rules
+      @dependencies = []
+    end
+
+    def contains?(dependency)
+      @dependencies.include?(dependency) if @dependencies.any?
+      rules.any? { |rule| WildcardMatcher.match?(rule, dependency.name) }
+    end
+  end
+end

data/lib/dependabot/errors.rb

@@ -80,7 +80,7 @@ module Dependabot
 
     def initialize(file_path, msg = nil)
       @file_path = file_path
-      super("#{file_path} not found" || msg)
+      super(msg || "#{file_path} not found")
     end
 
     def file_name
@@ -98,7 +98,7 @@ module Dependabot
 
     def initialize(file_path, msg = nil)
       @file_path = file_path
-      super(msg)
+      super(msg || "#{file_path} not parseable")
     end
 
     def file_name

data/lib/dependabot/file_parsers/base/dependency_set.rb

@@ -153,7 +153,7 @@ module Dependabot
           end
 
           def version_class
-            @version_class ||= Utils.version_class_for_package_manager(@combined.package_manager)
+            @version_class ||= @combined.version_class
           end
         end
         private_constant :DependencySlot

data/lib/dependabot/git_commit_checker.rb

@@ -459,11 +459,11 @@ module Dependabot
     end
 
     def version_class
-      @version_class ||= Utils.version_class_for_package_manager(dependency.package_manager)
+      @version_class ||= dependency.version_class
     end
 
     def requirement_class
-      @requirement_class ||= Utils.requirement_class_for_package_manager(dependency.package_manager)
+      @requirement_class ||= dependency.requirement_class
     end
 
     def local_repo_git_metadata_fetcher

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

@@ -164,7 +164,7 @@ module Dependabot
         end
 
         def version_class
-          Utils.version_class_for_package_manager(dependency.package_manager)
+          dependency.version_class
         end
       end
     end

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

@@ -341,13 +341,11 @@ module Dependabot
         end
 
         def version_class
-          Utils.version_class_for_package_manager(dependency.package_manager)
+          dependency.version_class
         end
 
         def requirement_class
-          Utils.requirement_class_for_package_manager(
-            dependency.package_manager
-          )
+          dependency.requirement_class
         end
 
         def git_sha?(version)

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

@@ -186,7 +186,7 @@ module Dependabot
         end
 
         def version_class
-          Utils.version_class_for_package_manager(dependency.package_manager)
+          dependency.version_class
         end
 
         def fetch_dependency_releases

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

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Dependabot
+  class PullRequestCreator
+    class BranchNamer
+      class DependencyGroupStrategy
+        def initialize(dependencies:, files:, target_branch:, dependency_group:,
+                       separator: "/", prefix: "dependabot", max_length: nil)
+          @dependencies     = dependencies
+          @files            = files
+          @target_branch    = target_branch
+          @dependency_group = dependency_group
+          @separator        = separator
+          @prefix           = prefix
+          @max_length       = max_length
+        end
+
+        # FIXME: Incorporate max_length truncation once we allow user config
+        #
+        # For now, we are using a placeholder DependencyGroup with a
+        # fixed-length name, so we can punt on handling truncation until
+        # we determine the strict validation rules for names
+        def new_branch_name
+          File.join(prefixes, dependency_group.name, prototype_suffix).gsub("/", separator)
+        end
+
+        private
+
+        attr_reader :dependencies, :dependency_group, :files, :target_branch, :separator, :prefix, :max_length
+
+        def prefixes
+          [
+            prefix,
+            package_manager,
+            directory,
+            target_branch
+          ].compact
+        end
+
+        # FIXME: Remove once grouped PRs can supersede each other
+        def prototype_suffix
+          "prototype-#{Time.now.utc.to_i}"
+        end
+
+        def package_manager
+          dependencies.first.package_manager
+        end
+
+        def directory
+          files.first.directory.tr(" ", "-")
+        end
+      end
+    end
+  end
+end

data/lib/dependabot/pull_request_creator/branch_namer.rb

@@ -5,18 +5,19 @@ require "digest"
 require "dependabot/metadata_finders"
 require "dependabot/pull_request_creator"
 require "dependabot/pull_request_creator/branch_namer/solo_strategy"
+require "dependabot/pull_request_creator/branch_namer/dependency_group_strategy"
 
 module Dependabot
   class PullRequestCreator
     class BranchNamer
-      attr_reader :dependencies, :files, :target_branch, :separator, :prefix, :max_length, :group_rule
+      attr_reader :dependencies, :files, :target_branch, :separator, :prefix, :max_length, :dependency_group
 
-      def initialize(dependencies:, files:, target_branch:, group_rule: nil,
+      def initialize(dependencies:, files:, target_branch:, dependency_group: nil,
                      separator: "/", prefix: "dependabot", max_length: nil)
         @dependencies  = dependencies
         @files         = files
         @target_branch = target_branch
-        @group_rule    = group_rule
+        @dependency_group = dependency_group
         @separator     = separator
         @prefix        = prefix
         @max_length    = max_length
@@ -30,7 +31,7 @@ module Dependabot
 
       def strategy
         @strategy ||=
-          if group_rule.nil?
+          if dependency_group.nil?
             SoloStrategy.new(
               dependencies: dependencies,
               files: files,
@@ -40,11 +41,11 @@ module Dependabot
               max_length: max_length
             )
           else
-            GroupRuleStrategy.new(
+            DependencyGroupStrategy.new(
               dependencies: dependencies,
               files: files,
               target_branch: target_branch,
-              group_rule: group_rule,
+              dependency_group: dependency_group,
               separator: separator,
               prefix: prefix,
               max_length: max_length

data/lib/dependabot/pull_request_creator/message_builder.rb

@@ -3,6 +3,7 @@
 require "pathname"
 require "dependabot/clients/github_with_retries"
 require "dependabot/clients/gitlab_with_retries"
+require "dependabot/dependency_group"
 require "dependabot/logger"
 require "dependabot/metadata_finders"
 require "dependabot/pull_request_creator"
@@ -21,12 +22,13 @@ module Dependabot
       attr_reader :source, :dependencies, :files, :credentials,
                   :pr_message_header, :pr_message_footer,
                   :commit_message_options, :vulnerabilities_fixed,
-                  :github_redirection_service
+                  :github_redirection_service, :dependency_group
 
       def initialize(source:, dependencies:, files:, credentials:,
                      pr_message_header: nil, pr_message_footer: nil,
                      commit_message_options: {}, vulnerabilities_fixed: {},
-                     github_redirection_service: DEFAULT_GITHUB_REDIRECTION_SERVICE)
+                     github_redirection_service: DEFAULT_GITHUB_REDIRECTION_SERVICE,
+                     dependency_group: nil)
         @dependencies               = dependencies
         @files                      = files
         @source                     = source
@@ -36,23 +38,17 @@ module Dependabot
         @commit_message_options     = commit_message_options
         @vulnerabilities_fixed      = vulnerabilities_fixed
         @github_redirection_service = github_redirection_service
+        @dependency_group           = dependency_group
       end
 
       def pr_name
-        begin
-          pr_name = pr_name_prefixer.pr_name_prefix
-        rescue StandardError => e
-          Dependabot.logger.error("Error while generating PR name: #{e.message}")
-          pr_name = ""
-        end
-        pr_name += library? ? library_pr_name : application_pr_name
-        return pr_name if files.first.directory == "/"
-
-        pr_name + " in #{files.first.directory}"
+        name = dependency_group ? group_pr_name : solo_pr_name
+        name[0] = name[0].capitalize if pr_name_prefixer.capitalize_first_word?
+        "#{pr_name_prefix}#{name}"
       end
 
       def pr_message
-        suffixed_pr_message_header + commit_message_intro + \
+        suffixed_pr_message_header + commit_message_intro +
           metadata_cascades + prefixed_pr_message_footer
       rescue StandardError => e
         Dependabot.logger.error("Error while generating PR message: #{e.message}")
@@ -82,11 +78,13 @@ module Dependabot
 
       private
 
-      def library_pr_name
-        pr_name = "update "
-        pr_name = pr_name.capitalize if pr_name_prefixer.capitalize_first_word?
+      def solo_pr_name
+        name = library? ? library_pr_name : application_pr_name
+        "#{name}#{pr_name_directory}"
+      end
 
-        pr_name +
+      def library_pr_name
+        "update " +
           if dependencies.count == 1
             "#{dependencies.first.display_name} requirement " \
               "#{from_version_msg(old_library_requirement(dependencies.first))}" \
@@ -101,12 +99,8 @@ module Dependabot
           end
       end
 
-      # rubocop:disable Metrics/AbcSize
       def application_pr_name
-        pr_name = "bump "
-        pr_name = pr_name.capitalize if pr_name_prefixer.capitalize_first_word?
-
-        pr_name +
+        "bump " +
           if dependencies.count == 1
             dependency = dependencies.first
             "#{dependency.display_name} " \
@@ -131,10 +125,23 @@ module Dependabot
             end
           end
       end
-      # rubocop:enable Metrics/AbcSize
+
+      def group_pr_name
+        updates = dependencies.map(&:name).uniq.count
+        "bump the #{dependency_group.name} group#{pr_name_directory} with #{updates} update#{'s' if updates > 1}"
+      end
 
       def pr_name_prefix
         pr_name_prefixer.pr_name_prefix
+      rescue StandardError => e
+        Dependabot.logger.error("Error while generating PR name: #{e.message}")
+        ""
+      end
+
+      def pr_name_directory
+        return "" if files.first.directory == "/"
+
+        " in #{files.first.directory}"
       end
 
       def commit_subject

data/lib/dependabot/pull_request_creator.rb

@@ -49,7 +49,7 @@ module Dependabot
                 :commit_message_options, :vulnerabilities_fixed,
                 :reviewers, :assignees, :milestone, :branch_name_separator,
                 :branch_name_prefix, :branch_name_max_length, :github_redirection_service,
-                :custom_headers, :provider_metadata
+                :custom_headers, :provider_metadata, :dependency_group
 
     def initialize(source:, base_commit:, dependencies:, files:, credentials:,
                    pr_message_header: nil, pr_message_footer: nil,
@@ -61,7 +61,7 @@ module Dependabot
                    automerge_candidate: false,
                    github_redirection_service: DEFAULT_GITHUB_REDIRECTION_SERVICE,
                    custom_headers: nil, require_up_to_date_base: false,
-                   provider_metadata: {}, message: nil)
+                   provider_metadata: {}, message: nil, dependency_group: nil)
       @dependencies               = dependencies
       @source                     = source
       @base_commit                = base_commit
@@ -87,6 +87,7 @@ module Dependabot
       @require_up_to_date_base    = require_up_to_date_base
       @provider_metadata          = provider_metadata
       @message                    = message
+      @dependency_group           = dependency_group
 
       check_dependencies_have_previous_version
     end
@@ -225,7 +226,8 @@ module Dependabot
           pr_message_header: pr_message_header,
           pr_message_footer: pr_message_footer,
           vulnerabilities_fixed: vulnerabilities_fixed,
-          github_redirection_service: github_redirection_service
+          github_redirection_service: github_redirection_service,
+          dependency_group: dependency_group
         )
     end
 
@@ -235,7 +237,7 @@ module Dependabot
           dependencies: dependencies,
           files: files,
           target_branch: source.branch,
-          group_rule: nil,
+          dependency_group: dependency_group,
           separator: branch_name_separator,
           prefix: branch_name_prefix,
           max_length: branch_name_max_length

data/lib/dependabot/update_checkers/base.rb

@@ -113,11 +113,11 @@ module Dependabot
       end
 
       def version_class
-        Utils.version_class_for_package_manager(dependency.package_manager)
+        dependency.version_class
       end
 
       def requirement_class
-        Utils.requirement_class_for_package_manager(dependency.package_manager)
+        dependency.requirement_class
       end
 
       # For some languages, the manifest file may be constructed such that

data/lib/dependabot.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.216.0"
+  VERSION = "0.216.2"
 end

data/lib/wildcard_matcher.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class WildcardMatcher
+  def self.match?(wildcard_string, candidate_string)
+    return false unless wildcard_string && candidate_string
+
+    regex_string = "a#{wildcard_string.downcase}a".split("*").
+                   map { |p| Regexp.quote(p) }.
+                   join(".*").gsub(/^a|a$/, "")
+    regex = /^#{regex_string}$/
+    regex.match?(candidate_string.downcase)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.216.0
+  version: 0.216.2
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-12 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-codecommit
@@ -318,14 +318,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.48.0
+        version: 1.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.48.0
+        version: 1.50.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -432,6 +432,7 @@ files:
 - lib/dependabot/config/update_config.rb
 - lib/dependabot/dependency.rb
 - lib/dependabot/dependency_file.rb
+- lib/dependabot/dependency_group.rb
 - lib/dependabot/errors.rb
 - lib/dependabot/experiments.rb
 - lib/dependabot/file_fetchers.rb
@@ -447,7 +448,6 @@ files:
 - lib/dependabot/file_updaters/vendor_updater.rb
 - lib/dependabot/git_commit_checker.rb
 - lib/dependabot/git_metadata_fetcher.rb
-- lib/dependabot/group_rule.rb
 - lib/dependabot/logger.rb
 - lib/dependabot/metadata_finders.rb
 - lib/dependabot/metadata_finders/README.md
@@ -460,7 +460,7 @@ files:
 - lib/dependabot/pull_request_creator/azure.rb
 - lib/dependabot/pull_request_creator/bitbucket.rb
 - lib/dependabot/pull_request_creator/branch_namer.rb
-- lib/dependabot/pull_request_creator/branch_namer/group_rule_strategy.rb
+- lib/dependabot/pull_request_creator/branch_namer/dependency_group_strategy.rb
 - lib/dependabot/pull_request_creator/branch_namer/solo_strategy.rb
 - lib/dependabot/pull_request_creator/codecommit.rb
 - lib/dependabot/pull_request_creator/commit_signer.rb
@@ -488,6 +488,7 @@ files:
 - lib/dependabot/update_checkers/version_filters.rb
 - lib/dependabot/utils.rb
 - lib/dependabot/version.rb
+- lib/wildcard_matcher.rb
 homepage: https://github.com/dependabot/dependabot-core
 licenses:
 - Nonstandard

data/lib/dependabot/group_rule.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Dependabot
-  class GroupRule
-    attr_reader :name
-
-    def initialize(name)
-      @name = name
-    end
-  end
-end

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

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Dependabot
-  class PullRequestCreator
-    class BranchNamer
-      class GroupRuleStrategy
-        def initialize(dependencies:, files:, target_branch:, group_rule:,
-                       separator: "/", prefix: "dependabot", max_length: nil)
-          @dependencies  = dependencies
-          @files         = files
-          @target_branch = target_branch
-          @group_rule    = group_rule
-          @separator     = separator
-          @prefix        = prefix
-          @max_length    = max_length
-        end
-
-        def new_branch_name
-          group_rule.name
-        end
-
-        private
-
-        attr_reader :group_rule
-      end
-    end
-  end
-end