gitlab-releases 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e51c4e22adebcd75c05415b56213905d1f78dc1f72f15da5da2d82224d83922
-  data.tar.gz: 40eb75af8a217fe84e32bca60da04397f8ef9cc326eb4485ac74775bd6ee3413
+  metadata.gz: dfa23ec3875d0be0aeb533880699472b519f9b79979f72abf8dec908211a54b3
+  data.tar.gz: 9ea6daf479a604784862880a253825b5cb2e45e0402a0be7314695f4072c16f8
 SHA512:
-  metadata.gz: 8ebfea495dd73367f14066c7d21dfec3c68f43c7d3588941793c39d0099b87ba9d73a6c1d1b7b8ea50bc11eb22705f0fc47cde223b100baa38864bbc51b26a78
-  data.tar.gz: a1f42624bc33734f2cd698cdf7a0ac7f22f937ff05da355dda48f3e3154fe404e2d3c8ff62ce214455f4ad4eaadcff6957487cb06548f87af5143b9519b8330e
+  metadata.gz: 4cdac277270ff3628ab6b2ee3d27ba94b5a8bddc2a46b507fa3d0610d7ad15a373ad501232f32dc3c84d94bab83474b34e76518a397d22a875fe11b2554dee61
+  data.tar.gz: 23f09c9c98ed1d3bf0fe998bb8b504eda5b09d6842735149b5c6d92822e58cce573e4654e7fbaa097d20a4c2b0bdc1ada7ce42c0d8397640754f93c4a3b7abc1

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [1.1.1] - 2025-05-19
+
+- Fix bug in `next_patch_release_date` - https://gitlab.com/gitlab-org/ruby/gems/gitlab-releases/-/merge_requests/49
+
+## [1.1.0] - 2025-03-04
+
+- Add `latest_patch_for_version` method to retrieve the latest patch for a given minor version
+
 ## [1.0.1] - 2024-11-20
 
 - Upgrade gitlab gem to 5.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-releases (1.0.1)
+    gitlab-releases (1.1.1)
       activesupport (~> 8.0)
       gitlab (~> 5.1)
       http (~> 5.2.0, ~> 5.2)

data/README.md

@@ -12,7 +12,7 @@ Library to interact with GitLab releases and versions. The information is fetche
 Gemfile:
 
 ```
-gem 'gitlab-releases', '~> 1.0.1'
+gem 'gitlab-releases', '~> 1.1.1'
 ```
 
 Install:
@@ -35,11 +35,12 @@ There are different methods available:
 * `active_version`  - Returns the active GitLab version.
 * `current_version` - Returns the current GitLab minor version.
 * `next_versions` - Returns the next GitLab patch versions (for patch and security releases).
-* `previous_version` - Returns the return the latest patch of the previous minor version.
+* `previous_version` - Returns the latest patch of the previous minor version.
 * `version_for_date` - Returns the active GitLab version for the given date
 * `current_minor_for_date` - Returns the current GitLab minor for the given date
 * `previous_minors` - Returns the previous minors for the given version
 * `next_patch_release_date` - Calculates the next best effort date for a GitLab patch release.
+* `latest_patch_for_version` - Returns the latest patch for the given minor version
 
 To make use of it:
 
@@ -83,6 +84,8 @@ To make use of it:
 => ["16.6", "16.5", "16.4"]
 > GitlabReleases.next_patch_release_date
 => "2024-03-13"
+> GitlabReleases.latest_patch_for_version('16.6')
+=> "16.6.10"
 
 ```
 
@@ -103,4 +106,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 Everyone interacting in the Releases project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://gitlab.com/gitlab-org/ruby/gems/gitlab-releases/-/blob/main/CODE_OF_CONDUCT.md).
 
 [Delivery team tracker]: https://gitlab.com/gitlab-com/gl-infra/delivery
-[Releases documentation]: https://gitlab.com/gitlab-org/ruby/gems/gitlab-releases/-/blob/master/docs/releases.md
+[Releases documentation]: https://gitlab.com/gitlab-org/ruby/gems/gitlab-releases/-/blob/main/docs/releases.md

data/lib/gitlab_releases/patch_date_calculator.rb

@@ -10,6 +10,7 @@ require 'active_support/all'
 class PatchDateCalculator
   def initialize
     @next_release_date = ReleaseVersions.upcoming_release_date
+    @previous_release_date = ReleaseVersions.previous_release_date
   end
 
   def execute
@@ -18,13 +19,15 @@ class PatchDateCalculator
 
   private
 
-  attr_reader :next_release_date
+  attr_reader :next_release_date, :previous_release_date
 
   def next_patch_date
-    if current_date >= prev_wednesday
-      next_wednesday
+    if current_date < prev_release_next_wednesday
+      prev_release_next_wednesday
+    elsif current_date < next_release_prev_wednesday
+      next_release_prev_wednesday
     else
-      prev_wednesday
+      next_release_next_wednesday
     end
   end
 
@@ -32,11 +35,15 @@ class PatchDateCalculator
     Date.today
   end
 
-  def prev_wednesday
+  def prev_release_next_wednesday
+    previous_release_date.next_week(:wednesday)
+  end
+
+  def next_release_prev_wednesday
     next_release_date.prev_week(:wednesday)
   end
 
-  def next_wednesday
+  def next_release_next_wednesday
     next_release_date.next_week(:wednesday)
   end
 end

data/lib/gitlab_releases/release_versions.rb

@@ -155,6 +155,19 @@ class ReleaseVersions
     next_versions.second.previous_patch
   end
 
+  # Returns the latest patch for a given minor version
+  #
+  # For example:
+  # - If the given version is 16.7 and available versions include 16.7.0, 16.7.1, 16.7.2
+  #   it will return 16.7.2
+  # - If the given version is 16.5 and available versions include 16.5.0, 16.5.1
+  #   it will return 16.5.1
+  def self.latest_patch_for_version(version)
+    minor_version = ReleaseVersion.new(version).to_minor
+
+    available_versions.find { |v| v.start_with?("#{minor_version}.") }
+  end
+
   def self.sort(versions)
     ::VersionSorter.sort(versions).uniq
   end

data/lib/gitlab_releases/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitlabReleases
-  VERSION = "1.0.1"
+  VERSION = "1.1.1"
 end

data/lib/gitlab_releases.rb

@@ -54,5 +54,9 @@ module GitlabReleases
     ReleaseVersions.previous_release_date
   end
 
+  def self.latest_patch_for_version(version)
+    ReleaseVersions.latest_patch_for_version(version)
+  end
+
   private_class_method :release_date
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-releases
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Mayra Cabrera
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-22 00:00:00.000000000 Z
+date: 2025-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,7 +86,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
-description: 
+description:
 email:
 - mcabrera@gitlab.com
 executables: []
@@ -121,7 +121,7 @@ metadata:
   homepage_uri: https://gitlab.com/gitlab-org/ruby/gems/gitlab-releases
   source_code_uri: https://gitlab.com/gitlab-org/ruby/gems/gitlab-releases
   changelog_uri: https://gitlab.com/gitlab-org/ruby/gems/gitlab-releases/-/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.5.9
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Utilities for GitLab releases and versions
 test_files: []