puppet_metadata 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbf0cec07a466deb7e97d1e4c20b75087243573b954c8350c605141f534fe1b9
-  data.tar.gz: 3522efe76946069d526bd87ac9023da1b054b0676d4cc0c0b3ac1f476f32c979
+  metadata.gz: 6214264b2f9a9a8848eb3a02fb25b376f597b7fe083b1a96b2cc2625cea88e16
+  data.tar.gz: 8475ef16fdeb252ac39f26135dcaba133ccfa85665cfaa326de1f00b542bf233
 SHA512:
-  metadata.gz: 6149d30f3403cbf37f17ccb6d132ce15c86eae5e4d3de16d2dbc96362d5b3e82751e229919fe39afc7fa06528873cfea974ec123aed9165ab7f6f3531c205212
-  data.tar.gz: 8d759313fbb484738c39984190d0756712ba0aab483a7f909bebfebc629f9c9b80cf69695bb8690a0c3f23dc3eaa3654f6c80a7cb05b46215d4e89be6494f339
+  metadata.gz: 79311279ba3fb754c8c9bf2dd4435d90546ce73d3f3d4a051f8d3e931976f5558f0aae086aa580d756d8adc6338ac195e45b91abd781032aba049f1301e43b69
+  data.tar.gz: 9fb3ffeb08c835bcac25a891e7083fe2b4598011b3c8ac686ec52dd339eefc00a9cda9cc89848c7e9d51457069c9972859892db66984c8d44d155b980eb925b4

data/bin/update_eol_dates

@@ -206,6 +206,26 @@ def handle_ubuntu(current_data)
   updated_data
 end
 
+def sort_versions(versions)
+  versions.sort do |a, b|
+    version_a, eol_a = a
+    version_b, eol_b = b
+
+    # Handle nil values (not yet EOL) - they go first
+    if eol_a.nil? && !eol_b.nil?
+      -1
+    elsif !eol_a.nil? && eol_b.nil?
+      1
+    elsif eol_a == eol_b
+      # Same EOL date (or both nil) - sort by version number descending
+      Gem::Version.new(version_b) <=> Gem::Version.new(version_a)
+    else
+      # Different EOL dates - sort by date descending (later date first)
+      eol_b <=> eol_a
+    end
+  end.to_h
+end
+
 def main
   data_file = File.expand_path('../data/eol_dates.json', __dir__)
 
@@ -231,26 +251,7 @@ def main
   end
 
   # Sort each OS's versions by EOL date (latest EOL first, then nulls)
-  sorted_data = {}
-  updated_data.each do |os_name, versions|
-    sorted_versions = versions.sort do |a, b|
-      version_a, eol_a = a
-      version_b, eol_b = b
-
-      # Handle nil values (not yet EOL) - they go first
-      return -1 if eol_a.nil? && !eol_b.nil?
-      return 1 if !eol_a.nil? && eol_b.nil?
-
-      if eol_a == eol_b
-        # Same EOL date (or both nil) - sort by version number descending
-        Gem::Version.new(version_b) <=> Gem::Version.new(version_a)
-      else
-        # Different EOL dates - sort by date descending (later date first)
-        (eol_b || '0000-00-00') <=> (eol_a || '0000-00-00')
-      end
-    end.to_h
-    sorted_data[os_name] = sorted_versions
-  end
+  sorted_data = updated_data.transform_values { |versions| sort_versions(versions) }
 
   File.write(data_file, "#{JSON.pretty_generate(sorted_data)}\n")
   puts "\nUpdated #{data_file}"

data/data/eol_dates.json

@@ -7,27 +7,27 @@
   "Amazon": {
     "2023": "2029-06-30",
     "2.0": "2026-06-30",
-    "2010.11": "2023-12-31",
-    "2011.09": "2023-12-31",
-    "2012.03": "2023-12-31",
-    "2012.09": "2023-12-31",
-    "2013.03": "2023-12-31",
-    "2013.09": "2023-12-31",
-    "2014.03": "2023-12-31",
-    "2014.09": "2023-12-31",
-    "2015.03": "2023-12-31",
-    "2015.09": "2023-12-31",
-    "2016.03": "2023-12-31",
-    "2016.09": "2023-12-31",
-    "2017.03": "2023-12-31",
+    "2018.03": "2023-12-31",
     "2017.09": "2023-12-31",
-    "2018.03": "2023-12-31"
+    "2017.03": "2023-12-31",
+    "2016.09": "2023-12-31",
+    "2016.03": "2023-12-31",
+    "2015.09": "2023-12-31",
+    "2015.03": "2023-12-31",
+    "2014.09": "2023-12-31",
+    "2014.03": "2023-12-31",
+    "2013.09": "2023-12-31",
+    "2013.03": "2023-12-31",
+    "2012.09": "2023-12-31",
+    "2012.03": "2023-12-31",
+    "2011.09": "2023-12-31",
+    "2010.11": "2023-12-31"
   },
   "CentOS": {
     "10": "2030-01-01",
     "9": "2027-05-31",
     "7": "2024-06-30",
-    "8": "2021-12-31",
+    "8": "2024-05-31",
     "6": "2020-11-30",
     "5": "2017-03-31",
     "4": "2012-02-29",
@@ -47,7 +47,7 @@
     "3.1": "2008-03-31",
     "3.0": "2006-06-30",
     "2.2": "2003-06-30",
-    "2.1": "2000-09-30",
+    "2.1": "2000-10-30",
     "2.0": "1999-02-15",
     "1.3": "1998-12-08",
     "1.2": "1997-10-23",
@@ -63,7 +63,7 @@
   "Fedora": {
     "43": "2026-12-09",
     "42": "2026-05-13",
-    "41": "2025-11-26",
+    "41": "2025-12-15",
     "40": "2025-05-13",
     "39": "2024-11-26",
     "38": "2024-05-21",
@@ -106,66 +106,69 @@
     "1": "2004-09-20"
   },
   "FreeBSD": {
+    "15": "2029-12-31",
     "14": "2028-11-30",
+    "14.4": "2026-12-31",
+    "15.0": "2026-09-30",
     "14.3": "2026-06-30",
-    "13": "2026-04-30",
     "13.5": "2026-04-30",
+    "13": "2026-04-30",
     "14.2": "2025-09-30",
     "13.4": "2025-06-30",
     "14.1": "2025-03-31",
     "13.3": "2024-12-31",
     "14.0": "2024-09-30",
     "13.2": "2024-06-30",
-    "12": "2023-12-31",
     "12.4": "2023-12-31",
+    "12": "2023-12-31",
     "13.1": "2023-07-31",
     "12.3": "2023-03-31",
     "13.0": "2022-08-31",
     "12.2": "2022-03-31",
-    "11": "2021-09-30",
     "11.4": "2021-09-30",
+    "11": "2021-09-30",
     "12.1": "2021-01-31",
     "11.3": "2020-09-30",
     "12.0": "2020-02-29",
     "11.2": "2019-10-31",
-    "10": "2018-10-31",
     "10.4": "2018-10-31",
+    "10": "2018-10-31",
     "11.1": "2018-09-30",
     "10.3": "2018-04-30",
     "11.0": "2017-11-30",
-    "9": "2016-12-31",
-    "9.3": "2016-12-31",
-    "10.1": "2016-12-31",
     "10.2": "2016-12-31",
-    "8": "2015-08-01",
+    "10.1": "2016-12-31",
+    "9.3": "2016-12-31",
+    "9": "2016-12-31",
     "8.4": "2015-08-01",
+    "8": "2015-08-01",
     "10.0": "2015-02-28",
-    "9.1": "2014-12-31",
     "9.2": "2014-12-31",
+    "9.1": "2014-12-31",
     "8.3": "2014-04-30",
     "9.0": "2013-03-31",
-    "7": "2013-02-28",
     "7.4": "2013-02-28",
-    "8.1": "2012-07-31",
+    "7": "2013-02-28",
     "8.2": "2012-07-31",
+    "8.1": "2012-07-31",
     "7.3": "2012-03-31",
     "7.1": "2011-02-28",
-    "6": "2010-11-30",
-    "6.4": "2010-11-30",
     "8.0": "2010-11-30",
+    "6.4": "2010-11-30",
+    "6": "2010-11-30",
     "7.2": "2010-06-30",
     "6.3": "2010-01-31",
     "7.0": "2009-04-30",
-    "5": "2008-05-31",
+    "6.2": "2008-05-31",
     "6.1": "2008-05-31",
     "5.5": "2008-05-31",
-    "6.2": "2008-05-31",
-    "4": "2007-01-31",
-    "4.10": "2007-01-31",
-    "4.11": "2007-01-31",
+    "5": "2008-05-31",
     "6.0": "2007-01-31",
-    "5.3": "2006-10-31",
+    "4.11": "2007-01-31",
+    "4.10": "2007-01-31",
+    "4": "2007-01-31",
     "5.4": "2006-10-31",
+    "5.3": "2006-10-31",
     "5.2": "2005-02-28",
     "4.9": "2004-08-31",
     "5.1": "2004-04-30",
@@ -207,20 +210,21 @@
     "8": "2029-05-31"
   },
   "Scientific": {
-    "7": "2024-06-30",
     "8": "2024-06-30",
+    "7": "2024-06-30",
     "6": "2020-11-30",
     "5": "2017-03-31",
     "4": "2012-02-29",
     "3": "2010-10-30"
   },
   "SLES": {
-    "15": "2031-07-31",
     "15.7": "2031-07-31",
+    "15": "2031-07-31",
+    "16.0": "2027-11-30",
     "15.6": "2025-12-31",
     "15.5": "2024-12-31",
-    "12": "2024-10-31",
     "12.5": "2024-10-31",
+    "12": "2024-10-31",
     "15.4": "2023-12-31",
     "15.3": "2022-12-31",
     "15.2": "2021-12-31",
@@ -228,15 +232,15 @@
     "12.4": "2020-06-30",
     "15.0": "2019-12-31",
     "12.3": "2019-06-30",
-    "11": "2019-03-31",
     "11.4": "2019-03-31",
+    "11": "2019-03-31",
     "12.2": "2018-03-31",
     "12.1": "2017-05-31",
     "12.0": "2016-06-30",
     "11.3": "2016-01-31",
     "11.2": "2014-01-31",
-    "10": "2013-07-31",
     "10.4": "2013-07-31",
+    "10": "2013-07-31",
     "11.1": "2012-08-31",
     "10.3": "2011-10-11",
     "11.0": "2010-12-31",
@@ -245,7 +249,8 @@
     "10.0": "2007-12-31"
   },
   "Ubuntu": {
-    "24.04": "2029-04-25",
+    "26.04": "2031-05-31",
+    "24.04": "2029-05-31",
     "22.04": "2027-04-01",
     "25.10": "2026-07-01",
     "25.04": "2026-01-17",
@@ -273,9 +278,9 @@
     "13.10": "2014-07-17",
     "12.10": "2014-05-16",
     "13.04": "2014-01-27",
-    "8.04": "2013-05-09",
-    "10.04": "2013-05-09",
     "11.10": "2013-05-09",
+    "10.04": "2013-05-09",
+    "8.04": "2013-05-09",
     "11.04": "2012-10-28",
     "10.10": "2012-04-10",
     "6.06": "2011-06-01",

data/lib/puppet_metadata/aio.rb

@@ -52,6 +52,12 @@ module PuppetMetadata
                                              '12' => 7..8,
                                              '13' => [8],
                                            },
+                                           'Ubuntu' => {
+                                             '20.04' => 7..8,
+                                             '22.04' => 7..8,
+                                             '24.04' => 7..8,
+                                             '26.04' => [8],
+                                           },
                                          }).freeze
 
     PUPPET_RUBY_VERSIONS = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_metadata
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Vox Pupuli