dependabot-common 0.375.0 → 0.376.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9131ea6c1d60dcacb5910c06b15afb3c289d6ca84ed2b70633792148c37f69d3
-  data.tar.gz: 37e4b152ea03ba6cc051b89d27b89d8cdf07cde85209a9afb6e2772072f43647
+  metadata.gz: 2649607c4b50e0d3447b6127fee079597d0f6c404347195ef0e7283b9017d528
+  data.tar.gz: 29f1fbfd4fc78fe8ac967bc5d77c01ad1de766e65ed7a6f36408e63226ebf7f4
 SHA512:
-  metadata.gz: c0603247a8e5ac0f1498e0ea4e497900792cf72f22ded37fa7039483c3d6da07372b6d413ddb25a54b4574e77e01a9ef7e68a86dfe5af87bffebb0afa213b2c7
-  data.tar.gz: ec29620b703653d8b35724d5176b9dd9c073ebba37e63805119684766e18d3fd2fb94e1536a23556ce44256a4b3b30d2327d68fcba8bc1bfa3ae8f2fb1d0fdf7
+  metadata.gz: 55b79ec0676c883d3533f361215d3c704c96a297c717c2f9c721567391875990f726079c6873e442f86424c2858ecb545499639e5ce0987154743ea68689351c
+  data.tar.gz: e67f0a9ef1254c6747743f6ab56234ffe720ae4e0d56440fe8ab85220ecf3a5761c1545b7743bfbc65ea90c2ce6f72d6d2bbe4d6ad80ad486e69833eef69e01e

data/lib/dependabot/dependency_file.rb

@@ -1,6 +1,7 @@
 # typed: strong
 # frozen_string_literal: true
 
+require "digest"
 require "pathname"
 require "sorbet-runtime"
 
@@ -209,6 +210,24 @@ module Dependabot
       T.must(content)
     end
 
+    # Returns the Git blob OID for this file's content,
+    # matching the value GitHub/Spokes uses for the same blob.
+    # Accepts :sha1 (default) or :sha256 to match the repository's object format.
+    sig { params(algorithm: Symbol).returns(T.nilable(String)) }
+    def blob_oid(algorithm: :sha1)
+      return nil unless content
+
+      raw = decoded_content.dup.force_encoding(Encoding::BINARY)
+      header = "blob #{raw.bytesize}\0".b
+      digest = case algorithm
+               when :sha256 then Digest::SHA256.new
+               else Digest::SHA1.new
+               end
+      digest.update(header)
+      digest.update(raw)
+      digest.hexdigest
+    end
+
     private
 
     sig { params(directory: String).returns(String) }

data/lib/dependabot/registry_client.rb

@@ -36,7 +36,7 @@ module Dependabot
         retry_interval: 5
       )
     rescue Excon::Error::Timeout, Excon::Error::Socket => e
-      cache_error(url, e)
+      cache_error(url, e) if cacheable_error?(e)
       raise e
     end
 
@@ -57,7 +57,7 @@ module Dependabot
         **SharedHelpers.excon_defaults({ headers: headers }.merge(options))
       )
     rescue Excon::Error::Timeout, Excon::Error::Socket => e
-      cache_error(url, e)
+      cache_error(url, e) if cacheable_error?(e)
       raise e
     end
 
@@ -77,5 +77,17 @@ module Dependabot
       host = URI(url).host
       @cached_errors.fetch(host, nil)
     end
+
+    sig { params(error: CachedErrorType).returns(T::Boolean) }
+    private_class_method def self.cacheable_error?(error)
+      if error.is_a?(Excon::Error::Socket)
+        case error.socket_error
+        when EOFError
+          return false
+        end
+      end
+
+      true
+    end
   end
 end

data/lib/dependabot.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.375.0
+  version: 0.376.0
 platform: ruby
 authors:
 - Dependabot
@@ -43,20 +43,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: commonmarker
   requirement: !ruby/object:Gem::Requirement
@@ -147,14 +147,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.19'
+        version: '2.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.19'
+        version: '2.20'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -617,7 +617,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.375.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.376.0
 rdoc_options: []
 require_paths:
 - lib