dependabot-cargo 0.94.7 → 0.94.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29fd7cece76acc3c05ff92790e5469c78d8fe7ef2b93f55bacb6dc99ed620cca
-  data.tar.gz: 57768d258414cd60505f5358cf00369d5834f0616e98d9126a872a56ffc16e93
+  metadata.gz: 2cee607bf20f532f1385061a48f3deffe5a229a94afbf70fe6729c2507295a1d
+  data.tar.gz: c9ece501b8ef817f7a9595e572e26a43a4af5970690015be742c423a7575162a
 SHA512:
-  metadata.gz: f2c730106ebf3c650a6a3c11bd86a93cb926b1925723ba6ac1fcc97fd9d67e30eeed2cef6a35f13b24daab691c5236be3718b5107f6cefbd91d09950624df811
-  data.tar.gz: 47c0661088136eee87d8bc009131c99df25f1d3e89147748a58a7eb892d6d0d763b0ae97ac418ca478f9f0529b3b760ed31d23c056adc3a1c14aeb5aa590acfa
+  metadata.gz: 8372539630a93279e8aa9f02499345d26e1f4631db7a72539728ac9f6f8eb022681ae8de6483727ef247676d5d4362b23b2834827325a4715f3ac4e1d9b65836
+  data.tar.gz: e7105d8834fdc29f279cfbecfaba5f68b8ac8b1f33ce73e0812a4dc723e76b54af1e87de46a1c2efa4c0cb83229bf719b81e4e533d93f8501adab45bf8ad6da9

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

@@ -60,17 +60,22 @@ module Dependabot
           raise Dependabot::DependencyFileNotResolvable, error.message
         end
 
+        # rubocop:disable Metrics/PerceivedComplexity
         def dependency_spec
           spec = dependency.name
 
-          if git_dependency?
+          if git_dependency? && git_source_url && git_previous_version
+            spec = "#{git_source_url}##{git_previous_version}"
+          elsif git_dependency?
             spec += ":#{git_previous_version}" if git_previous_version
           elsif dependency.previous_version
             spec += ":#{dependency.previous_version}"
+            spec = "https://github.com/rust-lang/crates.io-index#" + spec
           end
 
           spec
         end
+        # rubocop:enable Metrics/PerceivedComplexity
 
         def git_previous_version
           TomlRB.parse(lockfile.content).
@@ -80,6 +85,12 @@ module Dependabot
             fetch("version")
         end
 
+        def git_source_url
+          dependency.previous_requirements.
+            find { |r| r.dig(:source, :type) == "git" }&.
+            dig(:source, :url)
+        end
+
         def desired_lockfile_content
           return dependency.version if git_dependency?
 

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

@@ -78,17 +78,22 @@ module Dependabot
           end
         end
 
+        # rubocop:disable Metrics/PerceivedComplexity
         def dependency_spec
           spec = dependency.name
 
-          if git_dependency?
+          if git_dependency? && git_source_url && git_dependency_version
+            spec = "#{git_source_url}##{git_dependency_version}"
+          elsif git_dependency?
             spec += ":#{git_dependency_version}" if git_dependency_version
           elsif dependency.version
             spec += ":#{dependency.version}"
+            spec = "https://github.com/rust-lang/crates.io-index#" + spec
           end
 
           spec
         end
+        # rubocop:enable Metrics/PerceivedComplexity
 
         def run_cargo_command(command)
           start = Time.now
@@ -216,6 +221,12 @@ module Dependabot
             fetch("version")
         end
 
+        def git_source_url
+          dependency.requirements.
+            find { |r| r.dig(:source, :type) == "git" }&.
+            dig(:source, :url)
+        end
+
         def dummy_app_content
           %{fn main() {\nprintln!("Hello, world!");\n}}
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-cargo
 version: !ruby/object:Gem::Version
-  version: 0.94.7
+  version: 0.94.8
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-03 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.94.7
+        version: 0.94.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.94.7
+        version: 0.94.8
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement