dependabot-common 0.180.3 → 0.181.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b4c1b2ea482de6dfe3ed2f5d528b9d955af8b8003a6b2ee0a525e7684bffb74
-  data.tar.gz: 5b3965c5bbb71869e057f04a20e561ba4ccef3b985133dfefb0ed48654d62d41
+  metadata.gz: bb71ba32bbc485a7ab9b3408cb8bf7d5f7f3880a5631fce81125fc92568f11f0
+  data.tar.gz: 8a3d04075708622fe08714bc5937a316d850c8a0c41e74159271c6ca88029a52
 SHA512:
-  metadata.gz: ebc82fe32f383fea95e3ae56f56f6d49b3fef6d483e548db131a8a8f02a93bfbf804ab26121b38fe75384aad2d23f53ebefef510bd286c9a5433d88f37ef5522
-  data.tar.gz: 2a88f5f5c1c021e7607fbc43b9300ceba2b8f31a1126dfc2f15df60978190d532c7f14e5a615bf86b226e0f0bffd18d8d69903182a4807c5407c18550bbe9bcb
+  metadata.gz: 27b48b0901c1962f8378329ac593448896537ce947a55f1ff79703a312a77177835889b4a5e43e8e34237e97355b26102b3e68a39f87a6c7a90ef5bcf07c7cb7
+  data.tar.gz: 9758deb16cc4e2cfa86141eb2c63a3a1821475cb72c18ddfe67b4c8765afea23bcb2e347e2b1e38285b65d2f719ec72ca72543f3982fed590cd60f617960c534

data/lib/dependabot/clients/github_with_retries.rb

@@ -5,10 +5,16 @@ require "octokit"
 module Dependabot
   module Clients
     class GithubWithRetries
+      DEFAULT_OPEN_TIMEOUT_IN_SECONDS = 2
+
+      def self.open_timeout_in_seconds
+        ENV.fetch("DEPENDABOT_OPEN_TIMEOUT_IN_SECONDS", DEFAULT_OPEN_TIMEOUT_IN_SECONDS).to_i
+      end
+
       DEFAULT_CLIENT_ARGS = {
         connection_options: {
           request: {
-            open_timeout: 2,
+            open_timeout: open_timeout_in_seconds,
             timeout: 5
           }
         }

data/lib/dependabot/git_commit_checker.rb

@@ -50,7 +50,7 @@ module Dependabot
       return true if dependency.version&.start_with?(ref)
 
       # Check the specified `ref` isn't actually a branch
-      !local_upload_pack.match?("refs/heads/#{ref}")
+      !local_upload_pack.match?(%r{ refs/heads/#{ref}$})
     end
 
     def pinned_ref_looks_like_version?
@@ -86,25 +86,27 @@ module Dependabot
       raise Dependabot::GitDependencyReferenceNotFound, dependency.name
     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) }
-      if @raise_on_ignored && filter_lower_versions(filtered).empty? && filter_lower_versions(tags).any?
-        raise Dependabot::AllVersionsIgnored
-      end
+    def local_tags_for_latest_version_commit_sha
+      tags = allowed_version_tags
+      max_tag = max_version_tag(tags)
+
+      return [] unless max_tag
 
-      tag = filtered.
-            reject { |t| tag_is_prerelease?(t) && !wants_prerelease? }.
-            max_by do |t|
-              version = t.name.match(VERSION_REGEX).named_captures.
-                        fetch("version")
-              version_class.new(version)
-            end
+      tags.
+        select { |t| t.commit_sha == max_tag.commit_sha }.
+        map do |t|
+          version = t.name.match(VERSION_REGEX).named_captures.fetch("version")
+          {
+            tag: t.name,
+            version: version_class.new(version),
+            commit_sha: t.commit_sha,
+            tag_sha: t.tag_sha
+          }
+        end
+    end
+
+    def local_tag_for_latest_version
+      tag = max_version_tag(allowed_version_tags)
 
       return unless tag
 
@@ -116,8 +118,29 @@ module Dependabot
         tag_sha: tag.tag_sha
       }
     end
-    # rubocop:enable Metrics/AbcSize
-    # rubocop:enable Metrics/PerceivedComplexity
+
+    def max_version_tag(tags)
+      tags.
+        max_by do |t|
+        version = t.name.match(VERSION_REGEX).named_captures.
+                  fetch("version")
+        version_class.new(version)
+      end
+    end
+
+    def allowed_version_tags
+      tags =
+        local_tags.
+        select { |t| version_tag?(t.name) && matches_existing_prefix?(t.name) }
+      filtered = tags.
+                 reject { |t| tag_included_in_ignore_requirements?(t) }
+      if @raise_on_ignored && filter_lower_versions(filtered).empty? && filter_lower_versions(tags).any?
+        raise Dependabot::AllVersionsIgnored
+      end
+
+      filtered.
+        reject { |t| tag_is_prerelease?(t) && !wants_prerelease? }
+    end
 
     def current_version
       return unless dependency.version && version_tag?(dependency.version)

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.180.3
+  version: 0.181.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -222,6 +222,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: debase
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4.1
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -298,14 +312,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.26.0
+        version: 1.27.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.27.0
+- !ruby/object:Gem::Dependency
+  name: ruby-debug-ide
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.26.0
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement