dependabot-cargo 0.94.9 → 0.94.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e5953038e397819b0e452787de404808289166087115745f1d91a74fcf8bfae
-  data.tar.gz: 982cc2453a7fa8017b53d24893fd8535da1f31ad6fb492285ea02e180bd74337
+  metadata.gz: 67ed474b240b8ed58885a07a73f6d0f68e5a7bc0b0dbbf5775b691e799916370
+  data.tar.gz: 147153e98c1510df7db16ae0de22efc5603bae18087ced11a43fdb66ee826395
 SHA512:
-  metadata.gz: fedb3235fedcdf476a100035df39a1d5a5a86cf6d7c1f61a082357db656f0168a978e9bc3d0623bb35de7724df8915361f96812ff846c07013cd1cc2c5195cff
-  data.tar.gz: 6ba8562c203071312052020128a29730a3e0777da9af6951380e92d8905dce65070c7e1e3edf55fa256cba0348f138f91073d45bfb7b2990ab254f88b0083526
+  metadata.gz: 1c086ef837871301436582cdbdc6cbd1fb4696fe665af43739e63668f71806eaaffc3e0e72aec02f70d521fa585571a114c78d9eb57bc2f1057ffbe65b9a62af
+  data.tar.gz: 4c789583a7f959bdf8298420baf194bb2987b2e698c8b7171d61fdb1757029993ee1c4c6221e82554e76c3fe47ddce25d666ea633deca43ea4a72f3e65748ba0

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

@@ -40,6 +40,7 @@ module Dependabot
             raise "Failed to update #{dependency.name}!"
           end
         rescue Dependabot::SharedHelpers::HelperSubprocessFailed => error
+          retry if better_specification_needed?(error)
           handle_cargo_error(error)
         end
 
@@ -60,13 +61,47 @@ module Dependabot
           raise Dependabot::DependencyFileNotResolvable, error.message
         end
 
+        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/CyclomaticComplexity
         # rubocop:disable Metrics/PerceivedComplexity
+        def better_specification_needed?(error)
+          return false if @custom_specification
+          return false unless error.message.match?(/specification .* is ambigu/)
+
+          spec_options = error.message.gsub(/.*following:\n/m, "").
+                         lines.map(&:strip)
+
+          ver = if git_dependency? && git_dependency_version
+                  git_dependency_version
+                else
+                  dependency.version
+                end
+
+          if spec_options.count { |s| s.end_with?(ver) } == 1
+            @custom_specification = spec_options.find { |s| s.end_with?(ver) }
+            return true
+          elsif spec_options.count { |s| s.end_with?(ver) } > 1
+            spec_options.select! { |s| s.end_with?(ver) }
+          end
+
+          if git_dependency? && git_source_url &&
+             spec_options.count { |s| s.include?(git_source_url) } >= 1
+            spec_options.select! { |s| s.include?(git_source_url) }
+          end
+
+          @custom_specification = spec_options.first
+          true
+        end
+        # rubocop:enable Metrics/AbcSize
+        # rubocop:enable Metrics/CyclomaticComplexity
+        # rubocop:enable Metrics/PerceivedComplexity
+
         def dependency_spec
+          return @custom_specification if @custom_specification
+
           spec = dependency.name
 
-          if git_dependency? && git_source_url && git_previous_version
-            spec = "#{git_source_url}##{git_previous_version}"
-          elsif git_dependency?
+          if git_dependency?
             spec += ":#{git_previous_version}" if git_previous_version
           elsif dependency.previous_version
             spec += ":#{dependency.previous_version}"
@@ -75,7 +110,6 @@ module Dependabot
 
           spec
         end
-        # rubocop:enable Metrics/PerceivedComplexity
 
         def git_previous_version
           TomlRB.parse(lockfile.content).

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

@@ -55,6 +55,7 @@ module Dependabot
             version_class.new(updated_version)
           end
         rescue SharedHelpers::HelperSubprocessFailed => error
+          retry if better_specification_needed?(error)
           handle_cargo_errors(error)
         end
 
@@ -78,13 +79,47 @@ module Dependabot
           end
         end
 
+        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/CyclomaticComplexity
         # rubocop:disable Metrics/PerceivedComplexity
+        def better_specification_needed?(error)
+          return false if @custom_specification
+          return false unless error.message.match?(/specification .* is ambigu/)
+
+          spec_options = error.message.gsub(/.*following:\n/m, "").
+                         lines.map(&:strip)
+
+          ver = if git_dependency? && git_dependency_version
+                  git_dependency_version
+                else
+                  dependency.version
+                end
+
+          if spec_options.count { |s| s.end_with?(ver) } == 1
+            @custom_specification = spec_options.find { |s| s.end_with?(ver) }
+            return true
+          elsif spec_options.count { |s| s.end_with?(ver) } > 1
+            spec_options.select! { |s| s.end_with?(ver) }
+          end
+
+          if git_dependency? && git_source_url &&
+             spec_options.count { |s| s.include?(git_source_url) } >= 1
+            spec_options.select! { |s| s.include?(git_source_url) }
+          end
+
+          @custom_specification = spec_options.first
+          true
+        end
+        # rubocop:enable Metrics/AbcSize
+        # rubocop:enable Metrics/CyclomaticComplexity
+        # rubocop:enable Metrics/PerceivedComplexity
+
         def dependency_spec
+          return @custom_specification if @custom_specification
+
           spec = dependency.name
 
-          if git_dependency? && git_source_url && git_dependency_version
-            spec = "#{git_source_url}##{git_dependency_version}"
-          elsif git_dependency?
+          if git_dependency?
             spec += ":#{git_dependency_version}" if git_dependency_version
           elsif dependency.version
             spec += ":#{dependency.version}"
@@ -93,7 +128,6 @@ module Dependabot
 
           spec
         end
-        # rubocop:enable Metrics/PerceivedComplexity
 
         def run_cargo_command(command)
           start = Time.now

metadata

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