dependabot-common 0.95.40 → 0.95.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 057043eb334d6bcab76bd43dded0ec14c45d73ca404ce828e71f66dead73a12b
-  data.tar.gz: 446809f0636d2493dbfb1c65db018da6b3862eaa958bd3878a07647ec8be204a
+  metadata.gz: 04c684cbe37c650367284f93e3d93ea0e1e4e0f46252bf60a2b9f35b8b509b97
+  data.tar.gz: 0d88a36f4d4b4d221063509f5bb52d85e4e84db2d146ca913b5a134e9b86696a
 SHA512:
-  metadata.gz: 6f5b862b611f07429c82c39e5b6d027d56577f9b878b60dd0ca4ed7eea994d7160076eb64dbc934a6b6ff12aeba46de7656ac7261bb875765d8e7717385a1e21
-  data.tar.gz: 402019c43f2351f1d05525db9f4d5bada85c4811a04a6f7089085e200513abe6b37a81c0ff4e61bbf2faf01d786c6e032c69fa2cefa794942dfa1fef725f48ff
+  metadata.gz: 5878e721a24aacb5ef28003e55671b7ee621c8422cc1d355c9263ef11779d73cbe1c5ab5cd437e380846af1721443bdbc2be0ced5337c7306fc4327648931f16
+  data.tar.gz: 15bdcbec5603f44c6378ecc3b555f65cde4c8c69c4931b04e3cb605b4335fb2884135803d63173c69163aa8dcea2bb40638b2717d07e54d76fdc27ffd181727a

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

@@ -55,11 +55,10 @@ module Dependabot
           return new_version if git_source?(dependency.requirements)
 
           tags = dependency_tags.
-                 select { |t| t =~ version_regex(new_version) }
+                 select { |t| t =~ version_regex(new_version) }.
+                 sort_by(&:length)
 
-          tags.find { |t| t.include?("#{dependency.name}@") } ||
-            tags.find { |t| t.include?(dependency.name) } ||
-            tags.first
+          tags.find { |t| t.include?(dependency.name) } || tags.first
         end
 
         private
@@ -71,10 +70,10 @@ module Dependabot
             previous_version || previous_ref
           elsif previous_version
             tags = dependency_tags.
-                   select { |t| t =~ version_regex(previous_version) }
-            tags.find { |t| t.include?("#{dependency.name}@") } ||
-              tags.find { |t| t.include?(dependency.name) } ||
-              tags.first
+                   select { |t| t =~ version_regex(previous_version) }.
+                   sort_by(&:length)
+
+            tags.find { |t| t.include?(dependency.name) } || tags.first
           else
             lowest_tag_satisfying_previous_requirements
           end
@@ -84,11 +83,9 @@ module Dependabot
           tags = dependency_tags.
                  select { |t| version_from_tag(t) }.
                  select { |t| satisfies_previous_reqs?(version_from_tag(t)) }.
-                 sort_by { |t| version_from_tag(t) }
+                 sort_by { |t| [version_from_tag(t), t.length] }
 
-          tags.find { |t| t.include?("#{dependency.name}@") } ||
-            tags.find { |t| t.include?(dependency.name) } ||
-            tags.first
+          tags.find { |t| t.include?(dependency.name) } || tags.first
         end
 
         def version_from_tag(tag)

data/lib/dependabot/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.95.40
+  version: 0.95.41
 platform: ruby
 authors:
 - Dependabot