dependabot-swift 0.384.0 → 0.385.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cf94b34911945b4f8885eff1363488d114f46787eef9d3f3cea702932681a1a
-  data.tar.gz: 7af4cbf5d88e97539e6ad1faf0bfe137f13b0f2baa79b542d890a230a4a0fc93
+  metadata.gz: 8ecfc5e4eb7a1047aeafd3f861b99f949efc398e2d52631443f836cfcee1844c
+  data.tar.gz: aa846626e5bd32753a4693312002ae13e64940d1274693c15d8fc5fd042c9db1
 SHA512:
-  metadata.gz: 468b122655b44dc0d6a992f70df04b2b3dc4ffaf03f96c97f159fb13a08ae4bf8c6adc12766acdbc86fa10dfea627912b2975031df99880f4dbe5c3bcce9e10a
-  data.tar.gz: 5a719d8cd8cda56ee0eea34cf7521b5c6b401f8b1e2a96aafbffc462d894798917614d442a7b7a9dde328d452d9b8aca292b396bd8ba782970518d6275a7047a
+  metadata.gz: e9240c61398c22267d842a763898623324e8be022605c6c910be0afcea60bd5cd3702df15ae55e9982e177e6b2190cc09306572c7bba699110a6ccdfd244611f
+  data.tar.gz: 12fdf67a310d1433d310527eb29c8bbf2b36fa4beff1fa2f2a4767f6bd61120e12e9cc5fabb1136d66070a1c7152c5480ccea74f9057eeb468a5184e7494204b

data/lib/dependabot/swift/update_checker.rb

@@ -18,7 +18,6 @@ module Dependabot
 
       require_relative "update_checker/requirements_updater"
       require_relative "update_checker/version_resolver"
-      require_relative "update_checker/latest_version_resolver"
       require_relative "update_checker/xcode_version_resolver"
 
       sig { override.returns(T.nilable(Dependabot::Version)) }
@@ -182,14 +181,9 @@ module Dependabot
         )
       end
 
-      sig { returns(LatestVersionResolver) }
-      def cooldown_check_version_resolver_for
-        LatestVersionResolver.new(
-          dependency: dependency,
-          credentials: credentials,
-          cooldown_options: update_cooldown,
-          git_commit_checker: git_commit_checker
-        )
+      sig { returns(T.nilable(T::Hash[Symbol, T.untyped])) }
+      def latest_version_tag
+        git_commit_checker.local_tag_for_latest_version(update_cooldown)
       end
 
       sig { returns(T::Array[T::Hash[Symbol, T.untyped]]) }
@@ -262,11 +256,6 @@ module Dependabot
         )
       end
 
-      sig { returns(T.nilable(T::Hash[Symbol, T.untyped])) }
-      def latest_version_tag
-        cooldown_check_version_resolver_for.latest_version_tag
-      end
-
       sig { returns(T.nilable(T::Hash[Symbol, T.untyped])) }
       def lowest_security_fix_version_tag
         tags = git_commit_checker.local_tags_for_allowed_versions

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-swift
 version: !ruby/object:Gem::Version
-  version: 0.384.0
+  version: 0.385.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.384.0
+        version: 0.385.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.384.0
+        version: 0.385.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -258,11 +258,9 @@ files:
 - lib/dependabot/swift/language.rb
 - lib/dependabot/swift/metadata_finder.rb
 - lib/dependabot/swift/native_requirement.rb
-- lib/dependabot/swift/package/package_details_fetcher.rb
 - lib/dependabot/swift/package_manager.rb
 - lib/dependabot/swift/requirement.rb
 - lib/dependabot/swift/update_checker.rb
-- lib/dependabot/swift/update_checker/latest_version_resolver.rb
 - lib/dependabot/swift/update_checker/requirements_updater.rb
 - lib/dependabot/swift/update_checker/version_resolver.rb
 - lib/dependabot/swift/update_checker/xcode_version_resolver.rb
@@ -274,7 +272,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.384.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.385.0
 rdoc_options: []
 require_paths:
 - lib

data/lib/dependabot/swift/package/package_details_fetcher.rb

@@ -1,68 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-require "json"
-require "time"
-require "excon"
-require "sorbet-runtime"
-require "dependabot/swift"
-
-module Dependabot
-  module Swift
-    module Package
-      class PackageDetailsFetcher
-        extend T::Sig
-
-        RELEASES_URL = "https://api.github.com/repos/"
-        APPLICATION_JSON = "JSON"
-
-        sig do
-          params(
-            dependency: Dependency,
-            credentials: T::Array[Dependabot::Credential],
-            git_commit_checker: Dependabot::GitCommitChecker
-          ).void
-        end
-        def initialize(dependency:, credentials:, git_commit_checker:)
-          @dependency = dependency
-          @credentials = credentials
-          @git_commit_checker = git_commit_checker
-        end
-
-        sig { returns(Dependabot::GitCommitChecker) }
-        attr_reader :git_commit_checker
-
-        sig { returns(T::Array[Dependabot::Credential]) }
-        attr_reader :credentials
-
-        sig { returns(T::Array[GitTagWithDetail]) }
-        def fetch_tag_and_release_date
-          truncate_github_url = @dependency.name.gsub("github.com/", "")
-          url = RELEASES_URL + "#{truncate_github_url}/releases"
-          result_lines = T.let([], T::Array[GitTagWithDetail])
-          # Fetch the releases from the GitHub API
-          response = Excon.get(url, headers: { "Accept" => "application/vnd.github.v3+json" })
-          Dependabot.logger.error("Failed call details: #{response.body}") unless response.status == 200
-          return result_lines unless response.status == 200
-
-          # Parse the JSON response
-          releases = JSON.parse(response.body)
-
-          # Extract version names and release dates into a hash
-          releases.map do |release|
-            result_lines << GitTagWithDetail.new(
-              tag: release["tag_name"],
-              release_date: release["published_at"]
-            )
-          end
-
-          # sort the result lines by tag in descending order
-          result_lines = result_lines.sort_by(&:tag).reverse
-          # Log the extracted details for debugging
-          Dependabot.logger.info("Extracted release details: #{result_lines}")
-          result_lines
-        end
-      end
-    end
-  end
-end

data/lib/dependabot/swift/update_checker/latest_version_resolver.rb

@@ -1,171 +0,0 @@
-# typed: strong
-# frozen_string_literal: true
-
-require "dependabot/update_checkers/base"
-require "dependabot/swift/file_parser/dependency_parser"
-require "dependabot/swift/file_updater/lockfile_updater"
-require "dependabot/swift/package/package_details_fetcher"
-require "sorbet-runtime"
-require "dependabot/git_commit_checker"
-
-module Dependabot
-  module Swift
-    class UpdateChecker < Dependabot::UpdateCheckers::Base
-      class LatestVersionResolver
-        extend T::Sig
-
-        DAY_IN_SECONDS = T.let(24 * 60 * 60, Integer)
-
-        sig do
-          params(
-            dependency: Dependabot::Dependency,
-            credentials: T::Array[Dependabot::Credential],
-            cooldown_options: T.nilable(Dependabot::Package::ReleaseCooldownOptions),
-            git_commit_checker: Dependabot::GitCommitChecker
-          ).void
-        end
-        def initialize(dependency:, credentials:, cooldown_options:, git_commit_checker:)
-          @dependency = dependency
-          @credentials = credentials
-          @cooldown_options = cooldown_options
-          @git_commit_checker = T.let(
-            git_commit_checker,
-            Dependabot::GitCommitChecker
-          )
-        end
-
-        sig { returns(Dependabot::Dependency) }
-        attr_reader :dependency
-
-        sig { returns(T::Array[Dependabot::Credential]) }
-        attr_reader :credentials
-
-        sig { returns(T.nilable(Dependabot::Package::ReleaseCooldownOptions)) }
-        attr_reader :cooldown_options
-
-        sig { returns(Dependabot::GitCommitChecker) }
-        attr_reader :git_commit_checker
-
-        # Return latest version tag for the dependency, it removes tags that are in cooldown period
-        # and returns the latest version tag that is not in cooldown period. If an exception occurs
-        # and returns the latest version tag that is not in cooldown period. If an exception occurs,
-        # it will return the latest version tag from the git_commit_checker, as before.
-        sig { returns(T.nilable(T::Hash[Symbol, T.untyped])) }
-        def latest_version_tag
-          # step one fetch allowed version tags and
-          return git_commit_checker.local_tag_for_latest_version unless cooldown_enabled?
-
-          allowed_version_tags = git_commit_checker.allowed_version_tags
-          select_version_tags_in_cooldown_period&.each do |tag_name|
-            # filter out if name is in cooldown period
-            allowed_version_tags.reject! do |gitref_filtered|
-              gitref_filtered.name == tag_name
-            end
-          end
-
-          git_commit_checker.max_local_tag(allowed_version_tags)
-        rescue StandardError => e
-          Dependabot.logger.error("Error fetching latest version tag: #{e.message}")
-          git_commit_checker.local_tag_for_latest_version
-        end
-
-        sig { returns(T.nilable(T::Array[String])) }
-        def select_version_tags_in_cooldown_period
-          version_tags_in_cooldown_period = T.let([], T::Array[String])
-
-          package_details_fetcher.fetch_tag_and_release_date.each do |git_tag_with_detail|
-            if check_if_version_in_cooldown_period?(git_tag_with_detail)
-              version_tags_in_cooldown_period << git_tag_with_detail.tag
-            end
-          end
-          version_tags_in_cooldown_period
-        rescue StandardError => e
-          Dependabot.logger.error("Error checking if version is in cooldown: #{e.message}")
-          version_tags_in_cooldown_period
-        end
-
-        sig { params(tag_with_detail: Dependabot::GitTagWithDetail).returns(T::Boolean) }
-        def check_if_version_in_cooldown_period?(tag_with_detail)
-          return false unless tag_with_detail.release_date
-
-          current_version = version_class.correct?(dependency.version) ? version_class.new(dependency.version) : nil
-          days = cooldown_days_for(current_version, version_class.new(tag_with_detail.tag.delete("v")))
-
-          # Calculate the number of seconds passed since the release
-          passed_seconds = Time.now.to_i - release_date_to_seconds(tag_with_detail.release_date)
-          # Check if the release is within the cooldown period
-          passed_seconds < days * DAY_IN_SECONDS
-        end
-
-        sig do
-          params(
-            current_version: T.nilable(Dependabot::Version),
-            new_version: Dependabot::Version
-          ).returns(Integer)
-        end
-        def cooldown_days_for(current_version, new_version)
-          return 0 unless cooldown_enabled?
-
-          cooldown = T.must(cooldown_options)
-          return 0 unless cooldown.included?(dependency.name)
-          return cooldown.default_days if current_version.nil?
-
-          current_version_semver = current_version.semver_parts
-          new_version_semver = new_version.semver_parts
-
-          # If semver_parts is nil for either, return default cooldown
-          return cooldown.default_days if current_version_semver.nil? || new_version_semver.nil?
-
-          # Ensure values are always integers
-          current_major, current_minor, current_patch = current_version_semver
-          new_major, new_minor, new_patch = new_version_semver
-
-          # Determine cooldown based on version difference
-          return cooldown.semver_major_days if new_major > current_major
-          return cooldown.semver_minor_days if new_minor > current_minor
-          return cooldown.semver_patch_days if new_patch > current_patch
-
-          cooldown.default_days
-        end
-
-        sig { returns(T.class_of(Dependabot::Version)) }
-        def version_class
-          dependency.version_class
-        end
-
-        sig { params(release_date: T.nilable(String)).returns(Integer) }
-        def release_date_to_seconds(release_date)
-          return 0 unless release_date
-
-          Time.parse(release_date).to_i
-        rescue ArgumentError => e
-          Dependabot.logger.error("Invalid release date format: #{release_date} and error: #{e.message}")
-          0 # Default to 360 days in seconds if parsing fails, so that it will not be in cooldown
-        end
-
-        sig { returns(Package::PackageDetailsFetcher) }
-        def package_details_fetcher
-          @package_details_fetcher ||= T.let(
-            Package::PackageDetailsFetcher.new(
-              dependency: dependency,
-              credentials: credentials,
-              git_commit_checker: git_commit_checker
-            ),
-            T.nilable(Package::PackageDetailsFetcher)
-          )
-        end
-
-        sig { returns(T::Boolean) }
-        def cooldown_enabled?
-          return false if cooldown_options.nil?
-
-          cooldown = T.must(cooldown_options)
-          cooldown.default_days.to_i.positive? ||
-            cooldown.semver_major_days.to_i.positive? ||
-            cooldown.semver_minor_days.to_i.positive? ||
-            cooldown.semver_patch_days.to_i.positive?
-        end
-      end
-    end
-  end
-end