dependabot-common 0.95.37 → 0.95.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f84e3f8b023a6cf787eca7dc3ed71b932495d297d8b36c732427998dd243c87
-  data.tar.gz: a60c2c05ab9c9107513daf426405881603d3dc6ceb68d0ed20c39f856fa94ab7
+  metadata.gz: 2cd16136446691dedf83884a49397548a4b6ccee205b8a620b085b8f6c8b1d53
+  data.tar.gz: 17d1376d3a58ab2222af571cc5e464e461441e7aca4bc2ecfbb2f15a7aeb01f4
 SHA512:
-  metadata.gz: b9cd41a89bb9ba29d7fd78c96e064585a29ffb86fb7174cf79d1fc015ce3cbb304210095b2c5cac385b0370cb5818ba89c8768e990ec0a89d8f980b816291a28
-  data.tar.gz: cfb13c360a37753c3a1373b93b1ff00b9f1705016defa754169008a263e1d767233c27ae1f7fdb3bdd9a8cc251fbc02da97b491c17ac59a853c5e51c7daa1dab
+  metadata.gz: eb148c5fc0b9fc92e0d138e8b71749c6d9e1cf39537acd04ec09ccbbe90a21fd092b8939948032ed4fd937d9c0334e86e224dfa7c68feab2164ec94ba6c83cd0
+  data.tar.gz: 41fad9b2357ee3904f22e3574fff4c0ef2d4efa790663de113839e2eaf35b5b18e288b7293c1c642ce5f68934691272e562ceae28ff1c233a2ee7d78147ea06a

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

@@ -78,19 +78,32 @@ module Dependabot
 
         def lowest_tag_satisfying_previous_requirements
           tags = dependency_tags.
-                 select { |t| version_class.correct?(t.gsub(/^v/, "")) }.
-                 select do |t|
-                   version = version_class.new(t.gsub(/^v/, ""))
-                   dependency.previous_requirements.all? do |req|
-                     next true unless req.fetch(:requirement)
-
-                     requirement_class.
-                       requirements_array(req.fetch(:requirement)).
-                       all? { |r| r.satisfied_by?(version) }
-                   end
-                 end
-
-          tags.min_by { |t| version_class.new(t.gsub(/^v/, "")) }
+                 select { |t| version_from_tag(t) }.
+                 select { |t| satisfies_previous_reqs?(version_from_tag(t)) }.
+                 sort_by { |t| version_from_tag(t) }
+
+          tags.find { |t| t.include?(dependency.name) } || tags.first
+        end
+
+        def version_from_tag(tag)
+          if version_class.correct?(tag.gsub(/^v/, ""))
+            version_class.new(tag.gsub(/^v/, ""))
+          end
+
+          return unless tag.gsub(/^[^\d]*/, "").length > 1
+          return unless version_class.correct?(tag.gsub(/^[^\d]*/, ""))
+
+          version_class.new(tag.gsub(/^[^\d]*/, ""))
+        end
+
+        def satisfies_previous_reqs?(version)
+          dependency.previous_requirements.all? do |req|
+            next true unless req.fetch(:requirement)
+
+            requirement_class.
+              requirements_array(req.fetch(:requirement)).
+              all? { |r| r.satisfied_by?(version) }
+          end
         end
 
         # TODO: Refactor me so that Composer doesn't need to be special cased

data/lib/dependabot/version.rb

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

metadata

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