dependabot-common 0.363.0 → 0.364.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b04a10a34f26b5eb05c6a7e6c789fdda3bde3d118ab31eb1862e725f81aa930e
-  data.tar.gz: d8877825b52d5f928171490bf935afc2cf2b8272d39bb5d47244b57d3c4c62f8
+  metadata.gz: 6da1e661120cc32753f744c61f71c22ea49fc6f2fdcbbfd3a137631acf3103e4
+  data.tar.gz: 1c3c5a19b497c29ac3fa2853202918f514cc2c702c091b8dd4af352b186ad61f
 SHA512:
-  metadata.gz: 66c72eb2bc6a5890de1573e828b0bf6f5f8c826c4e80d5d8c1eae0f49ac5803a2b5e1c3e8273ce9be624e32f78f854f661c03a0cea3da5423b558f69329553f3
-  data.tar.gz: 9a8004bb292cebee846bc91ba9fe96d1e0ab632d8bb73522377ec1b98c88a2d99e6408f46792e3b19940d62bffbd109dbae34c7ca1e4b359b90df05bb198942a
+  metadata.gz: fd97c8d6b0978058bf3204aee949f1082fda7d8724ac366a7684d35c3d82d867e1d26ce0bf24e3dd97e94b08b689d3276b681cdfa86782525dfa09aeae892af5
+  data.tar.gz: 13d846c8ab332fa64643df2bdc4aa95a47250efdbf10a382a77df4e63312bf773a1f01fdaaa72390d715cd4132f1798d5a4ceec70910dca43ee271abaeca5a29

data/lib/dependabot/command_helpers.rb

@@ -103,7 +103,11 @@ module Dependabot
           Dependabot.logger.info("Started process PID: #{pid} with command: #{sanitized_env_cmd.join(' ')}")
 
           # Write to stdin if input data is provided
-          stdin&.write(stdin_data) if stdin_data
+          begin
+            stdin&.write(stdin_data) if stdin_data
+          rescue Errno::EPIPE
+            # Process exited before reading stdin - continue to collect output
+          end
           stdin&.close
 
           stdout_io.sync = true

data/lib/dependabot/dependency_graphers/base.rb

@@ -91,8 +91,8 @@ module Dependabot
       sig { returns(T::Hash[String, Dependabot::Dependency]) }
       def dependencies_by_name
         @dependencies_by_name ||= T.let(
-          @dependencies.each_with_object({}) do |dep, hash|
-            hash[dep.name] = dep
+          @dependencies.to_h do |dep|
+            [dep.name, dep]
           end,
           T.nilable(T::Hash[String, Dependabot::Dependency])
         )

data/lib/dependabot/dependency_group.rb

@@ -55,8 +55,6 @@ module Dependabot
 
     sig { returns(T::Boolean) }
     def group_by_dependency_name?
-      return false unless Dependabot::Experiments.enabled?(:group_by_dependency_name)
-
       @group_by == "dependency-name"
     end
 

data/lib/dependabot/file_fetchers/base.rb

@@ -641,20 +641,20 @@ module Dependabot
         T.unsafe(gitlab_client)
          .repo_tree(repo, path: path, ref: commit, per_page: 100)
          .map do |file|
-           # GitLab API essentially returns the output from `git ls-tree`
-           type = case file.type
-                  when "blob" then "file"
-                  when "tree" then "dir"
-                  when "commit" then "submodule"
-                  else file.fetch("type")
-                  end
-
-           RepositoryContent.new(
-             name: file.name,
-             path: file.path,
-             type: type,
-             size: 0 # GitLab doesn't return file size
-           )
+          # GitLab API essentially returns the output from `git ls-tree`
+          type = case file.type
+                 when "blob" then "file"
+                 when "tree" then "dir"
+                 when "commit" then "submodule"
+                 else file.fetch("type")
+                 end
+
+          RepositoryContent.new(
+            name: file.name,
+            path: file.path,
+            type: type,
+            size: 0 # GitLab doesn't return file size
+          )
         end
       end
 

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

@@ -309,11 +309,11 @@ module Dependabot
           T.unsafe(bitbucket_client)
            .compare(T.must(source).repo, previous_tag, new_tag)
            .map do |commit|
-             {
-               message: commit.dig("summary", "raw"),
-               sha: commit["hash"],
-               html_url: commit.dig("links", "html", "href")
-             }
+            {
+              message: commit.dig("summary", "raw"),
+              sha: commit["hash"],
+              html_url: commit.dig("links", "html", "href")
+            }
           end
         rescue Dependabot::Clients::Bitbucket::NotFound,
                Dependabot::Clients::Bitbucket::Unauthorized,
@@ -330,11 +330,11 @@ module Dependabot
            .compare(T.must(source).repo, previous_tag, new_tag)
            .commits
            .map do |commit|
-             {
-               message: commit["message"],
-               sha: commit["id"],
-               html_url: "#{T.must(source).url}/commit/#{commit['id']}"
-             }
+            {
+              message: commit["message"],
+              sha: commit["id"],
+              html_url: "#{T.must(source).url}/commit/#{commit['id']}"
+            }
           end
         rescue Gitlab::Error::NotFound
           []
@@ -346,11 +346,11 @@ module Dependabot
           azure_client
             .compare(previous_tag, new_tag, type)
             .map do |commit|
-              {
-                message: commit["comment"],
-                sha: commit["commitId"],
-                html_url: commit["remoteUrl"]
-              }
+            {
+              message: commit["comment"],
+              sha: commit["commitId"],
+              html_url: commit["remoteUrl"]
+            }
           end
         rescue Dependabot::Clients::Azure::NotFound,
                Dependabot::Clients::Azure::Unauthorized,

data/lib/dependabot/package/package_latest_version_finder.rb

@@ -240,9 +240,9 @@ module Dependabot
       def filter_ignored_versions(releases)
         filtered = releases
                    .reject do |release|
-                     ignore_requirements.any? do |r|
-                       r.satisfied_by?(release.version)
-                     end
+          ignore_requirements.any? do |r|
+            r.satisfied_by?(release.version)
+          end
         end
         if @raise_on_ignored && filter_lower_versions(filtered).empty? && filter_lower_versions(releases).any?
           raise Dependabot::AllVersionsIgnored
@@ -277,9 +277,9 @@ module Dependabot
 
         releases
           .select do |release|
-            reqs.all? do |r|
-              r.any? { |o| o.satisfied_by?(release.version) }
-            end
+          reqs.all? do |r|
+            r.any? { |o| o.satisfied_by?(release.version) }
+          end
         end
       end
 

data/lib/dependabot/pull_request_creator/message_builder.rb

@@ -263,6 +263,8 @@ module Dependabot
 
       sig { returns(String) }
       def group_pr_name
+        return dependency_name_group_pr_name if dependency_group&.group_by_dependency_name?
+
         if source.directories
           grouped_directory_name
         else
@@ -270,6 +272,20 @@ module Dependabot
         end
       end
 
+      sig { returns(String) }
+      def dependency_name_group_pr_name
+        dep = T.must(dependencies.first)
+        directories = dep.metadata[:updated_directories] || [dep.metadata[:directory]].compact
+
+        if directories.count > 1
+          "bump #{dep.name} across #{directories.count} directories"
+        elsif directories.one?
+          "bump #{dep.name} in #{directories.first}"
+        else
+          "bump #{dep.name}"
+        end
+      end
+
       sig { returns(String) }
       def grouped_name
         updates = dependencies.map(&:name).uniq.count
@@ -411,6 +427,8 @@ module Dependabot
       # rubocop:disable Metrics/AbcSize
       sig { returns(String) }
       def version_commit_message_intro
+        return dependency_name_group_intro if dependency_group&.group_by_dependency_name? && source.directories
+
         return multi_directory_group_intro if dependency_group && source.directories
 
         return group_intro if dependency_group
@@ -546,6 +564,33 @@ module Dependabot
       end
       # rubocop:enable Metrics/AbcSize
 
+      sig { returns(String) }
+      def dependency_name_group_intro
+        dep = T.must(dependencies.first)
+        directories = dep.metadata[:updated_directories] || [dep.metadata[:directory]].compact
+
+        msg = "Bumps #{dependency_links.first}"
+
+        if directories.count > 1
+          msg += " across #{directories.count} directories:\n\n"
+          msg += directories.map do |dir|
+            prev_version = dep.humanized_previous_version || "unknown"
+            new_version = dep.humanized_version || "unknown"
+            "- `#{dir}`: #{prev_version} → #{new_version}"
+          end.join("\n")
+        elsif directories.one?
+          msg += " in `#{directories.first}`"
+          msg += " #{from_version_msg(dep.humanized_previous_version)}"
+          msg += "to #{dep.humanized_version}."
+        else
+          msg += " #{from_version_msg(dep.humanized_previous_version)}"
+          msg += "to #{dep.humanized_version}."
+        end
+
+        msg += "\n"
+        msg
+      end
+
       sig { returns(String) }
       def group_intro
         # Ensure dependencies are unique by name, from and to versions

data/lib/dependabot/shared_helpers.rb

@@ -163,15 +163,13 @@ module Dependabot
       end
 
       env_cmd = [env, cmd].compact
-      if Experiments.enabled?(:enable_shared_helpers_command_timeout)
-        stdout, stderr, process = CommandHelpers.capture3_with_timeout(
-          env_cmd,
-          stdin_data: stdin_data,
-          timeout: timeout
-        )
-      else
-        stdout, stderr, process = T.unsafe(Open3).capture3(*env_cmd, stdin_data: stdin_data)
-      end
+      raw_stdout, raw_stderr, process = CommandHelpers.capture3_with_timeout(
+        env_cmd,
+        stdin_data: stdin_data,
+        timeout: timeout
+      )
+      stdout = T.let(raw_stdout || "", String)
+      stderr = T.let(raw_stderr || "", String)
       time_taken = Time.now - start
 
       if ENV["DEBUG_HELPERS"] == "true"
@@ -480,22 +478,16 @@ module Dependabot
       opts[:chdir] = cwd if cwd
 
       env_cmd = [env || {}, cmd, opts].compact
-      if Experiments.enabled?(:enable_shared_helpers_command_timeout)
-        kwargs = {
-          stderr_to_stdout: stderr_to_stdout,
-          timeout: timeout
-        }
-        kwargs[:output_observer] = output_observer if output_observer
-
-        stdout, stderr, process = CommandHelpers.capture3_with_timeout(
-          env_cmd,
-          **kwargs
-        )
-      elsif stderr_to_stdout
-        stdout, process = Open3.capture2e(env || {}, cmd, opts)
-      else
-        stdout, stderr, process = Open3.capture3(env || {}, cmd, opts)
-      end
+      kwargs = {
+        stderr_to_stdout: stderr_to_stdout,
+        timeout: timeout
+      }
+      kwargs[:output_observer] = output_observer if output_observer
+
+      stdout, stderr, process = CommandHelpers.capture3_with_timeout(
+        env_cmd,
+        **kwargs
+      )
 
       time_taken = Time.now - start
 

data/lib/dependabot.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.363.0
+  version: 0.364.0
 platform: ruby
 authors:
 - Dependabot
@@ -133,14 +133,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -175,14 +175,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
   requirement: !ruby/object:Gem::Requirement
@@ -615,7 +615,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.363.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.364.0
 rdoc_options: []
 require_paths:
 - lib