dependabot-common 0.95.83 → 0.95.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5222d4f53727c258b94711e8fc5b99c3cc96b3d922f37ec520062c93c734b615
-  data.tar.gz: 2556eb5243895505d6259dc43a6b9337a88a54e281ef99187597ceec46a17314
+  metadata.gz: 4836a18015fba2c91062d6c8d1278971c87f483f4a71f68381cd24a14ac1f465
+  data.tar.gz: fbca7aec29accfcb382bfe97c75828cbd3f0e1fc28c3280175d7b4a0cafa34ea
 SHA512:
-  metadata.gz: 68d6323d6d382e72390671027e4bb12123dd343054fa43768ddb53b385431b77da74c48c06d5ea2faa3f0eff6ae6aae4b0ae1d5dec96119732fd6188a8fbedff
-  data.tar.gz: bdc24dd734b065d976857dc385008911077c0952f6dadb4269f7414d49240c79209e037280e99c3e652b644e9e05b54b830e780611cf03869c4f54dd49b1d410
+  metadata.gz: d8486edd176e849d1f6ad580e2fe497b721390d28d8ebde0439f9d378f3e72bbf1c115f0d1d5c5d56ace4ab7f64ccfce24f156e57589ace6f6258cd31e3c73a9
+  data.tar.gz: 551ce48f4232e1de2416a8e166b16139d76af49d2037c49463d70cc2a4f25e795b348a71a5202d75b32ac4a80a98a3b070f097824515890e3713bae10101e15f

data/lib/dependabot/metadata_finders/base/commits_finder.rb

@@ -5,6 +5,7 @@ require "dependabot/clients/gitlab_with_retries"
 require "dependabot/clients/bitbucket"
 require "dependabot/shared_helpers"
 require "dependabot/git_metadata_fetcher"
+require "dependabot/git_commit_checker"
 require "dependabot/metadata_finders/base"
 
 module Dependabot
@@ -59,7 +60,7 @@ module Dependabot
           return new_ref if git_source?(dependency.requirements) && ref_changed?
 
           tags = dependency_tags.
-                 select { |t| t =~ version_regex(new_version) }.
+                 select { |tag| tag_matches_version?(tag, new_version) }.
                  sort_by(&:length)
 
           tags.find { |t| t.include?(dependency.name) } || tags.first
@@ -79,7 +80,7 @@ module Dependabot
             previous_ref
           elsif previous_version
             tags = dependency_tags.
-                   select { |t| t =~ version_regex(previous_version) }.
+                   select { |tag| tag_matches_version?(tag, previous_version) }.
                    sort_by(&:length)
 
             tags.find { |t| t.include?(dependency.name) } || tags.first
@@ -156,8 +157,19 @@ module Dependabot
           end.compact.first
         end
 
-        def version_regex(version)
-          /(?:[^0-9\.]|\A)#{Regexp.escape(version || "unknown")}\z/
+        def tag_matches_version?(tag, version)
+          return false unless version
+
+          unless version_class.correct?(version)
+            tag.match?(/(?:[^0-9\.]|\A)#{Regexp.escape(version)}\z/)
+          end
+
+          version_regex = GitCommitChecker::VERSION_REGEX
+          return false unless tag.match?(version_regex)
+
+          tag_version = tag.match(version_regex).named_captures.fetch("version")
+
+          version_class.new(tag_version) == version_class.new(version)
         end
 
         def dependency_tags

data/lib/dependabot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.95.83"
+  VERSION = "0.95.84"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.95.83
+  version: 0.95.84
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-28 00:00:00.000000000 Z
+date: 2019-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr