dependabot-cargo 0.95.24 → 0.95.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 284d3c23fa7370955edb67caeaf44097c7d9e95b701aa953ab47367ad9b7d175
-  data.tar.gz: cd9bd6478a851cb0902797346b82884743a600aeae9f6278f3079c7b017a3d1e
+  metadata.gz: 71564e7f24065290df8ff2e611a00a3f90e3a1819f8c870b967f656a6177bc2a
+  data.tar.gz: 68835f974282c72b6d6b9edf823bcd150eaaf69e2d42d6852890cd8594acf6d2
 SHA512:
-  metadata.gz: 11539b7e2bd219222fffba881088196382d703d994ed6c9c7f7e8dfa78a0ae791891448ed399237a502ca4732c9269d8adf6a7f5b783364999447268ec61865a
-  data.tar.gz: 1b9744a3f7f3b2e489e79cb9172ef9b073095953d240cc8c26115b55cc650ec42fa40fb91eaae79713e3dd327edc4267c8f94769713bbaeaeed26ae71335c034
+  metadata.gz: a660f29be2e7e9bc0cca5ee2f1c4720b902385f334a20643cc97be2b3fdbdd8283aad3c87d84d2915c29460097ca47c21b4e1d8be4394d32f6ff5cd74f1c25dc
+  data.tar.gz: 5d12ce85366666f40f2effd45547a567a95d452abce058504f96505c8d70596ca5048735bc560ffac10ed41b702c4628bbfcc3066516e8162ce410c13cde59be

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

@@ -134,7 +134,7 @@ module Dependabot
         def run_shell_command(command)
           start = Time.now
           stdout, process = Open3.capture2e(command)
-          time_taken = start - Time.now
+          time_taken = Time.now - start
 
           # Raise an error with the output from the shell session if Cargo
           # returns a non-zero status

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

@@ -4,9 +4,11 @@ require "toml-rb"
 require "open3"
 require "dependabot/shared_helpers"
 require "dependabot/cargo/update_checker"
+require "dependabot/cargo/file_parser"
 require "dependabot/cargo/version"
 require "dependabot/errors"
 
+# rubocop:disable Metrics/ClassLength
 module Dependabot
   module Cargo
     class UpdateChecker
@@ -132,7 +134,7 @@ module Dependabot
         def run_cargo_command(command)
           start = Time.now
           stdout, process = Open3.capture2e(command)
-          time_taken = start - Time.now
+          time_taken = Time.now - start
 
           # Raise an error with the output from the shell session if Cargo
           # returns a non-zero status
@@ -180,10 +182,11 @@ module Dependabot
           end
 
           if error.message.include?("authenticate when downloading repository")
-            dependency_url =
-              error.message.match(/Unable to update (?<url>.*)$/).
-              named_captures.fetch("url").strip
-            raise Dependabot::GitDependenciesNotReachable, dependency_url
+            raise if unreachable_git_urls.none?
+
+            # Check all dependencies for reachability (so that we raise a
+            # consistent error)
+            raise Dependabot::GitDependenciesNotReachable, unreachable_git_urls
           end
 
           if error.message.match?(BRANCH_NOT_FOUND_REGEX)
@@ -208,6 +211,33 @@ module Dependabot
         end
         # rubocop:enable Metrics/AbcSize
 
+        def unreachable_git_urls
+          @unreachable_git_urls ||=
+            begin
+              parser = FileParser.new(
+                dependency_files: original_dependency_files,
+                source: nil
+              )
+
+              unreachable_git_dependencies =
+                parser.parse.
+                select do |dep|
+                  checker = GitCommitChecker.new(
+                    dependency: dep,
+                    credentials: credentials
+                  )
+
+                  checker.git_dependency? && !checker.git_repo_reachable?
+                end
+
+              unreachable_git_dependencies.map do |dep|
+                dep.requirements.
+                  find { |r| r.dig(:source, :type) == "git" }.
+                  fetch(:source).fetch(:url)
+              end
+            end
+        end
+
         def resolvability_error?(message)
           return true if message.include?("failed to parse lock")
           return true if message.include?("believes it's in a workspace")
@@ -326,3 +356,4 @@ module Dependabot
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-cargo
 version: !ruby/object:Gem::Version
-  version: 0.95.24
+  version: 0.95.25
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.95.24
+        version: 0.95.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.95.24
+        version: 0.95.25
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement