dependabot-cargo 0.119.0.beta1 → 0.119.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68e07a6e9e5b92016ca46bc374932bf4bb1697c08b5ce03b6474488b3c7e4cf9
-  data.tar.gz: cc77c0c6e8cf4ce72df9d1544a4edd06067ffbcc994ac7efe2c8591ab0067e56
+  metadata.gz: 6e6fe577f29137d26d131d38ad917663c2fd3db5bdbdb6b4e25293f3fa92fa72
+  data.tar.gz: 1b5a2685da24284552d48d1a8eb41776b16d8bf13218b379a5ebb583913f57f2
 SHA512:
-  metadata.gz: 476c39283e30bc3c90fd341f1839caff3994ca3b6bbc22d62f3b5d1fb678c2bd5c0bc4be29d3fb38db76923ba013fdf3830abe33d10c849b43541f5f434d52ad
-  data.tar.gz: 53044dad4ea97b4bc4542aa1194b16512159a71c62f37631e2988ed0a93c447e00c2848986c97b85b24548e717cb2345f2695305cc6cc92d459c42ebe2206382
+  metadata.gz: 68f549929a400c17c492f4c3e870593641f18ea0f133050f40e057a92d09ae52dcc1fe3cb29a1b3ee8d25a5472549218c815f17460f8e2d36b7850f75dff42de
+  data.tar.gz: fba52f77c819658c68f339bf26386e13ece02093c5a698875f8da84949b11d33391b4d8e547eb94673d3d4b06552f0e483830e9fed15751815c396f0721afddc

data/lib/dependabot/cargo/file_fetcher.rb

@@ -218,6 +218,7 @@ module Dependabot
       # an alternative source (i.e., a git source) is also specified
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/AbcSize
       def required_path?(file, path)
         # Paths specified in dependency declaration
         Cargo::FileParser::DEPENDENCY_TYPES.each do |type|
@@ -254,9 +255,9 @@ module Dependabot
 
         false
       end
-
-      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       def expand_workspaces(path)
         path = Pathname.new(path).cleanpath.to_path

data/lib/dependabot/cargo/file_parser.rb

@@ -56,6 +56,7 @@ module Dependabot
         raise Dependabot::DependencyFileNotEvaluatable, msg
       end
 
+      # rubocop:disable Metrics/PerceivedComplexity
       def manifest_dependencies
         dependency_set = DependencySet.new
 
@@ -82,6 +83,7 @@ module Dependabot
 
         dependency_set
       end
+      # rubocop:enable Metrics/PerceivedComplexity
 
       def build_dependency(name, requirement, type, file)
         Dependency.new(

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

@@ -68,6 +68,7 @@ module Dependabot
 
         # rubocop:disable Metrics/PerceivedComplexity
         # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/AbcSize
         def better_specification_needed?(error)
           return false if @custom_specification
           return false unless error.message.match?(/specification .* is ambigu/)
@@ -96,6 +97,7 @@ module Dependabot
           @custom_specification = spec_options.first
           true
         end
+        # rubocop:enable Metrics/AbcSize
         # rubocop:enable Metrics/CyclomaticComplexity
         # rubocop:enable Metrics/PerceivedComplexity
 

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

@@ -101,7 +101,7 @@ module Dependabot
             simple_declaration_regex =
               /(?:^|["'])#{Regexp.escape(simple_declaration)}/
             content.gsub(simple_declaration_regex) do |line|
-              line.gsub(old_req, new_req)
+              line.gsub(/.+=.*\K(#{old_req})/, new_req)
             end
           elsif content.match?(feature_declaration_version_regex(dep))
             content.gsub(feature_declaration_version_regex(dep)) do |part|

data/lib/dependabot/cargo/requirement.rb

@@ -53,8 +53,6 @@ module Dependabot
       private
 
       def convert_rust_constraint_to_ruby_constraint(req_string)
-        req_string = req_string
-
         if req_string.include?("*")
           ruby_range(req_string.gsub(/(?:\.|^)[*]/, "").gsub(/^[^\d]/, ""))
         elsif req_string.match?(/^~[^>]/) then convert_tilde_req(req_string)

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

@@ -201,6 +201,7 @@ module Dependabot
           lower_bound_req + ", <= #{latest_allowable_version}"
         end
 
+        # rubocop:disable Metrics/PerceivedComplexity
         def lower_bound_version
           @lower_bound_version ||=
             if git_dependency? && git_dependency_version
@@ -220,6 +221,7 @@ module Dependabot
               version_from_requirement || 0
             end
         end
+        # rubocop:enable Metrics/PerceivedComplexity
 
         def git_dependency_version
           return unless lockfile

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

@@ -15,8 +15,10 @@ module Dependabot
           /Unable to update (?<url>.*?)$/.freeze
         BRANCH_NOT_FOUND_REGEX =
           /#{UNABLE_TO_UPDATE}.*to find branch `(?<branch>[^`]+)`/m.freeze
+        REVSPEC_PATTERN = /revspec '.*' not found/.freeze
+        OBJECT_PATTERN = /object not found - no match for id \(.*\)/.freeze
         REF_NOT_FOUND_REGEX =
-          /#{UNABLE_TO_UPDATE}.*revspec '.*' not found/m.freeze
+          /#{UNABLE_TO_UPDATE}.*(#{REVSPEC_PATTERN}|#{OBJECT_PATTERN})/m.freeze
 
         def initialize(dependency:, credentials:,
                        original_dependency_files:, prepared_dependency_files:)
@@ -80,6 +82,7 @@ module Dependabot
 
         # rubocop:disable Metrics/PerceivedComplexity
         # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/AbcSize
         def better_specification_needed?(error)
           return false if @custom_specification
           return false unless error.message.match?(/specification .* is ambigu/)
@@ -108,6 +111,7 @@ module Dependabot
           @custom_specification = spec_options.first
           true
         end
+        # rubocop:enable Metrics/AbcSize
         # rubocop:enable Metrics/CyclomaticComplexity
         # rubocop:enable Metrics/PerceivedComplexity
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-cargo
 version: !ruby/object:Gem::Version
-  version: 0.119.0.beta1
+  version: 0.119.4
 platform: ruby
 authors:
 - Dependabot
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2020-09-15 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.119.0.beta1
+        version: 0.119.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.119.0.beta1
+        version: 0.119.4
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.88.0
+        version: 0.90.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.88.0
+        version: 0.90.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +161,7 @@ homepage: https://github.com/dependabot/dependabot-core
 licenses:
 - Nonstandard
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -176,8 +176,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.0
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Rust (Cargo) support for dependabot
 test_files: []