dependabot-common 0.216.1 → 0.216.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc44d20c1eea5ffcfebda79597511add6d56ecad33107329dd60223d39f14185
-  data.tar.gz: 1f483e056ca6d4e065a6b81d8d2491afda80f2c7820b1dee3ece09efc3ce0fa5
+  metadata.gz: 4b38a1d09ce4d017caa3e68544d16abb8052e27febb10b6c2aa48ea7689dd5dd
+  data.tar.gz: 6f1f21ff545f58a09a7dd238cf3a2fe56ca59ab29c6f51a9d7594762769ccf79
 SHA512:
-  metadata.gz: de74b6faf4093eb8ccc59c99e85f561f0967d8f453cd20fd52f973a1def74c0fc588f88e8251adae1bb0a62a17efb4c81c80b7dedcc9098d79c290e36f43b3f8
-  data.tar.gz: cfc902894c13a7c0631def4ef00439e0eb0b8bb668224954113cdf48d5a4010d083efe5d650996a90c4bda4a5e2410d6d0a002d3cfb18837b9f46a93852a43e5
+  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

@@ -1,12 +1,20 @@
 # frozen_string_literal: true
 
+require "wildcard_matcher"
+
 module Dependabot
   class DependencyGroup
-    attr_reader :name, :rules
+    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/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/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,19 +38,13 @@ 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
@@ -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

@@ -226,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
 

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.1"
+  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.1
+  version: 0.216.2
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-codecommit
@@ -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