dependabot-composer 0.149.2 → 0.149.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9b529922948681c2de87fe8af8fd7df14d5a80fd118da1eb88279f8a54077ca
-  data.tar.gz: 652824a917a65097f4467ecad3b795df323910953701775e74995d06a1305243
+  metadata.gz: 41cadd9c46436abf9e34a3a3e99b6c064c77eddc2d22034de45673a493eec0b8
+  data.tar.gz: d50430b2dd11e91cbc834c32132d26177eac5338c62be7cd46d2a8807c9c74bc
 SHA512:
-  metadata.gz: 3829423ac95a919ba5e2588a64e652ca6527598de23d3147eb9d488ec026a7610f2712422d5b0108589e6013ec711630b6ff4a0c34b4c2c89a0e6c4d3023da42
-  data.tar.gz: 21829d5158c0adcbf4c64da0254924972e4877defe7f77f5f8e69e2fad5b31651b0a0365b52413f26733248b9ae1d08b8a7807eec7993b62511616c88096d6c0
+  metadata.gz: 36ff8778e8b67bb03e7f412bb0829db2b31c91bf7c8e76816e4169ca9065d27ad6d7353d80c509e34d9256a3958a2306c4adc8ab0d20b6eab0bd972b03f2df7f
+  data.tar.gz: 191eb8d638844c71fafb108c0fad50192f3f0762c25df3451ac54a5198fdb319b4de6377dc12af703d37cf02c87e40a604fa6313d25498ad652e27f5c8b3b2a6

data/lib/dependabot/composer/file_updater/lockfile_updater.rb

@@ -8,6 +8,7 @@ require "dependabot/composer/version"
 require "dependabot/composer/requirement"
 require "dependabot/composer/native_helpers"
 require "dependabot/composer/helpers"
+require "dependabot/composer/update_checker/version_resolver"
 
 # rubocop:disable Metrics/ClassLength
 module Dependabot
@@ -125,6 +126,8 @@ module Dependabot
           error.message.start_with?("Could not authenticate against")
         end
 
+        # TODO: Extract error handling and share between the version resolver
+        #
         # rubocop:disable Metrics/AbcSize
         # rubocop:disable Metrics/CyclomaticComplexity
         # rubocop:disable Metrics/MethodLength
@@ -167,18 +170,16 @@ module Dependabot
             raise PrivateSourceAuthenticationFailure, "nova.laravel.com"
           end
 
-          if error.message.start_with?("Failed to execute git clone")
-            dependency_url =
-              error.message.match(/(?:mirror|checkout) '(?<url>.*?)'/).
-              named_captures.fetch("url")
-            raise GitDependenciesNotReachable, dependency_url
+          if error.message.match?(UpdateChecker::VersionResolver::FAILED_GIT_CLONE_WITH_MIRROR)
+            dependency_url = error.message.match(UpdateChecker::VersionResolver::FAILED_GIT_CLONE_WITH_MIRROR).
+                             named_captures.fetch("url")
+            raise Dependabot::GitDependenciesNotReachable, dependency_url
           end
 
-          if error.message.start_with?("Failed to clone")
-            dependency_url =
-              error.message.match(/Failed to clone (?<url>.*?) via/).
-              named_captures.fetch("url")
-            raise GitDependenciesNotReachable, dependency_url
+          if error.message.match?(UpdateChecker::VersionResolver::FAILED_GIT_CLONE)
+            dependency_url = error.message.match(UpdateChecker::VersionResolver::FAILED_GIT_CLONE).
+                             named_captures.fetch("url")
+            raise Dependabot::GitDependenciesNotReachable, dependency_url
           end
 
           # NOTE: This matches an error message from composer plugins used to install ACF PRO

data/lib/dependabot/composer/update_checker/version_resolver.rb

@@ -37,7 +37,7 @@ module Dependabot
         VERSION_REGEX = /[0-9]+(?:\.[A-Za-z0-9\-_]+)*/.freeze
         SOURCE_TIMED_OUT_REGEX =
           /The "(?<url>[^"]+packages\.json)".*timed out/.freeze
-        FAILED_GIT_CLONE_WITH_MIRROR = /Failed to execute git clone --mirror[^']*'(?<url>.*?)'/.freeze
+        FAILED_GIT_CLONE_WITH_MIRROR = /Failed to execute git clone --(mirror|checkout)[^']*'(?<url>.*?)'/.freeze
         FAILED_GIT_CLONE = /Failed to clone (?<url>.*?) via/.freeze
 
         def initialize(credentials:, dependency:, dependency_files:,
@@ -233,6 +233,8 @@ module Dependabot
         # rubocop:enable Metrics/AbcSize
         # rubocop:enable Metrics/PerceivedComplexity
 
+        # TODO: Extract error handling and share between the lockfile updater
+        #
         # rubocop:disable Metrics/PerceivedComplexity
         # rubocop:disable Metrics/AbcSize
         # rubocop:disable Metrics/CyclomaticComplexity

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-composer
 version: !ruby/object:Gem::Version
-  version: 0.149.2
+  version: 0.149.3
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.149.2
+        version: 0.149.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.149.2
+        version: 0.149.3
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement