dependabot-common 0.145.1 → 0.146.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a80e631b98e75278c5ffc5528636e856a16a6b683e9c069ec86dfdf6c27884c9
-  data.tar.gz: 9626f4499aa5757d6145922a7fa9a8990fdb029f332744fd5b4d3aa7547e0feb
+  metadata.gz: fa4310a25f02fa6c1ae91369446cb06779a9c2e3abb74071b506a3fbb49b5d6a
+  data.tar.gz: e854803c22338391216f67613c991aea86c26633da2ae3fd312440d7fad58467
 SHA512:
-  metadata.gz: 3e974733619012f02b59f00ab83263141d39042238ba7ac3dc49ce513048e16277e2db16d6a22536e39e322d937f95892b2a40ff5ac17c970810c0aff210903a
-  data.tar.gz: 18b1cb50a00aabb33fe82261bdf657fcd976e47fef9dd23206a83959dbaddd9534e4032fbb8ef711aae31db1e7c2dd7ef519e8c904451206dac88c2de278f2e5
+  metadata.gz: b1f57b5f947ed4f5b10f96e094ef2fca747076f230b89f5a0e5528d1d38b699a2b07912a716887672a3a2d6e5e05ea94ed0335cddeb206ed7e1c2f7f76ad9cb7
+  data.tar.gz: 769bc9954d16c3f89161de191d293358f4995506dd3ff2eef76de28fefd13654551ef36b22b556bfb6da524858e8d91367517ce2091263fcd55547cdbd081443

data/lib/dependabot/git_commit_checker.rb

@@ -60,10 +60,10 @@ module Dependabot
     end
 
     def pinned_ref_looks_like_commit_sha?
-      return false unless pinned?
-
       ref = dependency_source_details.fetch(:ref)
-      return false unless ref.match?(/^[0-9a-f]{6,40}$/)
+      return false unless ref&.match?(/^[0-9a-f]{6,40}$/)
+
+      return false unless pinned?
 
       local_repo_git_metadata_fetcher.head_commit_for_ref(ref).nil?
     end
@@ -87,13 +87,16 @@ module Dependabot
     end
 
     # rubocop:disable Metrics/PerceivedComplexity
+    # rubocop:disable Metrics/AbcSize
     def local_tag_for_latest_version
       tags =
         local_tags.
         select { |t| version_tag?(t.name) && matches_existing_prefix?(t.name) }
       filtered = tags.
                  reject { |t| tag_included_in_ignore_requirements?(t) }
-      raise Dependabot::AllVersionsIgnored if @raise_on_ignored && tags.any? && filtered.empty?
+      if @raise_on_ignored && filter_lower_versions(filtered).empty? && filter_lower_versions(tags).any?
+        raise Dependabot::AllVersionsIgnored
+      end
 
       tag = filtered.
             reject { |t| tag_is_prerelease?(t) && !wants_prerelease? }.
@@ -113,8 +116,40 @@ module Dependabot
         tag_sha: tag.tag_sha
       }
     end
+    # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/PerceivedComplexity
 
+    def current_version
+      return unless dependency.version && version_tag?(dependency.version)
+
+      version = dependency.version.match(VERSION_REGEX).named_captures.fetch("version")
+      version_class.new(version)
+    end
+
+    def filter_lower_versions(tags)
+      return tags unless current_version
+
+      versions = tags.map do |t|
+        version = t.name.match(VERSION_REGEX).named_captures.fetch("version")
+        version_class.new(version)
+      end
+
+      versions.select do |version|
+        version > current_version
+      end
+    end
+
+    def local_tag_for_pinned_version
+      return unless pinned?
+
+      ref = dependency_source_details.fetch(:ref)
+      tags = local_tags.select { |t| t.commit_sha == ref && version_class.correct?(t.name) }.
+             sort_by { |t| version_class.new(t.name) }
+      return if tags.empty?
+
+      tags[-1].name
+    end
+
     def git_repo_reachable?
       local_upload_pack
       true

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.145.1
+  version: 0.146.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -298,14 +298,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement