gitlab-releases 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78806d4f54d19b124e736eaa493288e1942b45574eefb88c9777f5a8a9951e6e
-  data.tar.gz: f09e1f9758ed572eae93a7be14ddf2b33718223f0d210c6229e663abba9949ba
+  metadata.gz: 1ee5944be724a7bf016c25ee0f56e31c4b270b8c812a9ce51abd87249aa4f587
+  data.tar.gz: 4c66c8ba98397bc550b4d0e80294805db8f15a8e97dfab6395de7c289a453ace
 SHA512:
-  metadata.gz: bbc5d17a85e3af99014858f514deda6ad5afc4cfbafbd8dba6eeacf621f017ea71c6adf6f49179d9ea1ce0442a51751843727dfce8825b7f5cbe8a9641b82339
-  data.tar.gz: 468f45b7a38e8d0a90f646cacd6d3ff6422562ad68f6568f2508bf36303a247663964fe5c638d6e49ff7e026ac66430801cd58fe2967ac0d0cbff5ae0aeed64e
+  metadata.gz: a01deb7460c318184f6f60c1ddfa63dd6cb69ea58055d3f30122701274ab3fa7d1fda235e84382be833a093e5fdecb951575cd29110f4113475179609be77fac
+  data.tar.gz: a91fad2b0ae7d3b341c3d536afa2ba05c095fbe9b4d6fc334f0a9aba839d03816e451016aebf7241841c04c8033fcd4f74d0307cf2e7676cc3cd4a68aa119eb7

data/CHANGELOG.md

@@ -32,3 +32,11 @@
 ## [0.2.3] - 2023-10-11
 
 - Update ActiveSupport gem and loosen version restriction
+
+## [0.2.4] - 2023-11-03
+
+- Remove logic for static release date. All release dates will be calculated based on the third Thursday of the month.
+
+## [0.2.5] - 2023-11-23
+
+- Add methods to calculate the current version of a given date (`#current_minor_for_date`) and the previous minors for a specific version (`#previous_minors`)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-releases (0.2.3)
+    gitlab-releases (0.2.4)
       activesupport (~> 7.1)
       gitlab (~> 4.19.0)
       http (~> 5.1.0)

data/README.md

@@ -12,7 +12,7 @@ Library to interact with GitLab releases and versions. The information is fetche
 Gemfile:
 
 ```
-gem 'gitlab-releases', '~> 0.2.2'
+gem 'gitlab-releases', '~> 0.2.5'
 ```
 
 Install:
@@ -36,6 +36,9 @@ There are different methods available:
 * `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.
+* `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
 
 To make use of it:
 
@@ -47,7 +50,7 @@ To make use of it:
 > require 'gitlab_releases'
 > GitlabReleases.upcoming_releases
 =>
-{"16.4"=>"2023-09-22",
+{
  "16.5"=>"2023-10-22",
  "16.6"=>"2023-11-16",
  "16.7"=>"2023-12-21",
@@ -59,15 +62,22 @@ To make use of it:
  "17.1"=>"2024-06-20",
  "17.2"=>"2024-07-18",
  "17.3"=>"2024-08-15",
- "17.4"=>"2024-09-19"}
+ "17.4"=>"2024-09-19"
+}
 > GitlabReleases.active_version
- => "16.5"
+ => "16.6"
 > GitlabReleases.current_version
-=> "16.4"
+=> "16.5"
 > GitlabReleases.next_versions
-=> ["16.4.2", "16.3.6", "16.2.9"]
+=> ["16.5.2", "16.4.3", "16.3.7"]
 > GitlabReleases.previous_version
-=> "16.3.5"
+=> "16.4.2"
+> GitlabReleases.version_for_date('2023-11-23')
+=> "16.7"
+> GitlabReleases.current_minor_for_date('2023-11-23')
+=> "16.6"
+> GitlabReleases.previous_minors
+=> ["16.6", "16.5", "16.4"]
 ```
 
 ## Contributing

data/lib/gitlab_releases/date_calculator.rb

@@ -3,12 +3,6 @@
 require 'active_support/all'
 
 class DateCalculator
-  # Represents the minimum version that uses the new release date
-  RELEASE_VERSION = '16.6'
-
-  # Represents the minimum date that uses the new release date
-  RELEASE_DATE = Date.parse('2023-11-16')
-
   # @param version [ReleaseVersion]
   # @param candidate_date [Date] - The month to calculate the release date. It should be
   # the first day of the month.
@@ -18,27 +12,13 @@ class DateCalculator
   end
 
   def execute
-    result_date = if before_new_release_date?
-                    twenty_second_of_the_month
-                  else
-                    calculate_third_thursday_of_month
-                  end
-
-    result_date.strftime('%Y-%m-%d')
+    calculate_third_thursday_of_month.strftime('%Y-%m-%d')
   end
 
   private
 
   attr_reader :next_version, :candidate_date
 
-  def before_new_release_date?
-    next_version.to_f < RELEASE_VERSION.to_f && candidate_date < RELEASE_DATE
-  end
-
-  def twenty_second_of_the_month
-    Date.parse("#{candidate_date.year}-#{candidate_date.month}-22")
-  end
-
   # If the first day of the month is a Thursday, it fetches the subsequent Two thursdays,
   # if not searches for the 3rd Thursday of the month.
   def calculate_third_thursday_of_month

data/lib/gitlab_releases/release_versions.rb

@@ -75,8 +75,8 @@ class ReleaseVersions
 
   # Returns the scheduled major.minor for the given date
   def self.version_for_date(date)
-    # Returns the release associated with the date by calling `releases_yaml` and fetching the
-    # release whose date is greater than the given date.
+    # Returns the active release associated with the date by calling `releases_yaml` and fetching the
+    # release whose date is greater or equal than the given date.
     #
     # For example:
     #
@@ -99,6 +99,34 @@ class ReleaseVersions
     ReleaseVersion.new(row['version'])
   end
 
+  # Returns the current major.minor for the given date
+  def self.current_minor_for_date(date)
+    # Returns the current version associated with the date by calling `releases_yaml`
+    # and fetching the version whose release date is less or equal to the given date.
+    #
+    # For example:
+    #
+    # | Version | Date           |
+    # |:--------|:---------------|
+    # | 16.3    | August 22nd    |
+    # | 16.4    | September 22nd |
+    # | 16.5    | October 22nd   |
+    # | 16.6    | November 16th  |
+    # | 16.7    | December 21st  |
+    #
+    # * For August 21st, the release should be 16.2
+    # * For August 22nd, the release should be 16.3
+    # * For August 23rd, the release should be 16.3
+    # * For November 17th, the release should be 16.6
+    return nil if releases_yaml.empty?
+
+    row = releases_yaml
+      .reverse
+      .detect { |release| date.to_date >= release['date'] }
+
+    ReleaseVersion.new(row['version'])
+  end
+
   # Returns the last patch of the previous minor version
   #
   # For example, if the current version is 16.4, then
@@ -114,6 +142,19 @@ class ReleaseVersions
     ::VersionSorter.sort(versions).uniq
   end
 
+  # Returns the previous major.minor versions of the major.minor version based on the
+  # releases.yml data
+  #
+  # For example:
+  # - If the current version is 16.7, the previous patch versions are 16.7, 16.6, and 16.5
+  # - If the current version is 17.1, the previous patch versions are 17.1, 16.11, and 16.10
+  def self.previous_minors(version)
+    versions = releases_yaml.map { |release| release['version'] }
+      .reverse
+
+    versions[versions.index(version), 3]
+  end
+
   def self.raw_versions
     ReleaseVersionClient.versions
   end

data/lib/gitlab_releases/version.rb

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

data/lib/gitlab_releases.rb

@@ -33,6 +33,14 @@ module GitlabReleases
     ReleaseVersions.previous_version
   end
 
+  def self.current_minor_for_date(date)
+    ReleaseVersions.current_minor_for_date(date)
+  end
+
+  def self.previous_minors(version)
+    ReleaseVersions.previous_minors(version)
+  end
+
   def self.release_date
     ReleaseVersions.previous_release_date
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-releases
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Mayra Cabrera
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-11 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.13
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: Utilities for GitLab releases and versions