dependabot-common 0.145.3 → 0.147.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e529a98656bc4faab2c6e8e0b27cb487b272f0eb1e7a0a6b24c378917eb7fc0c
-  data.tar.gz: 1114132591919b93cc7a6ae9abd16f631028f7a6e21c523e0ceef94f4a8ea303
+  metadata.gz: abae304f54068dfcec44e81919bc0f3290fdfb5ecf0ee9f5f878c8612902315b
+  data.tar.gz: 75018dbfb55e8d3100e863064e7fc1b913cdc8b3b091722b06b307bd94968ee8
 SHA512:
-  metadata.gz: f47c6bcd3b685350199f6d724a711b5cee21375f76b65886550b82e3bd4485f0291807bac563ed24401c168f49b2c2d1da9856eecd8091e00b95030e96f61b78
-  data.tar.gz: 11f85cb1b184c490be8b969419f7ceedb4c61e9e17792ee077bfac738d1bdc5f4a35145cd17915519cc212c5068789e72c9eb7b95c952f3731ba04ed0cadf546
+  metadata.gz: 0b33fd489354101454ad3ea6a549d3080f47965bd1e8c200b1b380ae22ad219f759b02963d4d7f35f1bfaec97ad2b02dce1494033f89bfc081d2371b74603dfa
+  data.tar.gz: 48311e053bb7efa1be238da5819a86b379fa864e7c23aa4592ff48fa5baa807b982e056b5dd3f8a9bc260addaad552eb5ca00b8565d3133d8435e14937deb026

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.3"
+  VERSION = "0.147.1"
 end

metadata

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