RubyGems - puppet_metadata - Versions diffs - 4.6.0 → 5.1.0 - Mend

puppet_metadata 4.6.0 → 5.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +4 -4
data/lib/puppet_metadata/aio.rb +26 -29
data/lib/puppet_metadata/github_actions.rb +27 -22
data/lib/puppet_metadata/metadata.rb +29 -11
data/lib/puppet_metadata/operatingsystem.rb +45 -2
metadata +5 -8

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c6b227acc94c9c68da32eed52aebd0bf2c3e7c47fe604d377f1e2389df0a68c
-  data.tar.gz: cf77d1e5835cce701514e32ef2cf04295949262426b067fd632f74f5c7347214
+  metadata.gz: 524caad31fa4d4d85cf6df58f43ec003b8267abb0bef9974e336753c88160f29
+  data.tar.gz: 1bc931eeee6247d0308b1fad5fc4fd01dbe6ab3615129c24a0f7e9caa0b58493
 SHA512:
-  metadata.gz: f0554c4a17dc0fc9c99cc41d4c5e224cb86c28d68f81c9e6cc8ffeeb576ee6a371b7f5a69016e1f0c16985f00461a4f90844f928cfeb107480e2045f7e577e9e
-  data.tar.gz: 5534c09575ba2b2cf2e6c6efffed2f27676138dbc59f4d785e7dfe041ef2463e2b8983b0b3e35ae43c4969cde252ab02d838aec7ac40d557586c9ca7149d7143
+  metadata.gz: 9973f6d3d9611f28ed44dda6e23d2b21b214f956c262efae86b2f3e52c0f95882a0c2de07bea7c9fa3d17a18ae8586980023eb10e3ccf6c204eaf8ce1674d656
+  data.tar.gz: 33553b19365fcb4c8ab8647af3b8d722bc77be30acd36dbb02ab1bb666758e9e4a20b27325d4609971b45d5d956fc8e5c19135da5338e7f58596fc11f186bf2a

data/lib/puppet_metadata/aio.rb CHANGED Viewed

@@ -9,24 +9,14 @@ module PuppetMetadata
       'Scientific' => 'RedHat',
     }.freeze
-    BUILDS = {
+    PUPPET_BUILDS = {
       # RPM-based
       'RedHat' => {
-        '5' => 5..7,
-        '6' => 5..7,
-        '7' => 5..8,
-        '8' => 5..8,
-        '9' => 6..8,
+        '7' => 7..8,
+        '8' => 7..8,
+        '9' => 7..8,
       },
       'Fedora' => {
-        '26' => [5],
-        '27' => 5..6,
-        '28' => 5..6,
-        '29' => 5..6,
-        '30' => 5..7,
-        '31' => 5..7,
-        '32' => 6..7,
-        '34' => 6..7,
         '36' => 7..8,
         '40' => 7..8,
       },
@@ -37,38 +27,45 @@ module PuppetMetadata
       },
       # deb-based
       'Debian' => {
-        '7' => [5],
-        '8' => 5..6,
-        '9' => 5..7,
-        '10' => 5..8,
-        '11' => 6..8,
+        '11' => 7..8,
         '12' => 7..8,
       },
       'Ubuntu' => {
-        '14.04' => 5..6,
-        '16.04' => 5..7,
-        '18.04' => 5..8,
-        '20.04' => 6..8,
-        '22.04' => 6..8,
+        '20.04' => 7..8,
+        '22.04' => 7..8,
         '24.04' => 7..8,
       },
     }.freeze
+    OPENVOX_BUILDS = PUPPET_BUILDS.merge({
+                                           'RedHat' => {
+                                             '7' => 7..8,
+                                             '8' => 7..8,
+                                             '9' => 7..8,
+                                             '10' => 7..8,
+                                           },
+                                           'Debian' => {
+                                             '11' => 7..8,
+                                             '12' => 7..8,
+                                             '13' => [8],
+                                           },
+                                         }).freeze
     PUPPET_RUBY_VERSIONS = {
-      4 => '2.1',
-      5 => '2.4',
-      6 => '2.5',
       7 => '2.7',
       8 => '3.2',
     }.freeze
+    OPENVOX_RUBY_VERSIONS = PUPPET_RUBY_VERSIONS
     class << self
       def find_base_os(os)
         COMPATIBLE.fetch(os, os)
       end
-      def has_aio_build?(os, release, puppet_version)
-        BUILDS.dig(find_base_os(os), release)&.include?(puppet_version)
+      def has_aio_build?(os, release, puppet_version, requirement)
+        builds = (requirement == 'openvox') ? OPENVOX_BUILDS : PUPPET_BUILDS
+        builds.dig(find_base_os(os), release)&.include?(puppet_version)
       end
     end
   end

data/lib/puppet_metadata/github_actions.rb CHANGED Viewed

@@ -16,7 +16,6 @@ module PuppetMetadata
     # @return [Hash[Symbol, Any]] The outputs for Github Actions
     def outputs(at = nil)
       {
-        puppet_major_versions: puppet_major_versions,
         puppet_unit_test_matrix: puppet_unit_test_matrix,
         puppet_beaker_test_matrix: puppet_beaker_test_matrix(at),
       }
@@ -24,23 +23,29 @@ module PuppetMetadata
     private
-    def puppet_major_versions
-      metadata.puppet_major_versions.sort.reverse.map do |version|
-        next if puppet_version_below_minimum?(version)
+    def beaker_major_versions
+      metadata.requirements_with_major_versions.flat_map do |requirement, versions|
+        versions.sort.reverse.filter_map do |version|
+          next if requirement_name_version_below_minimum?(version)
-        {
-          name: "Puppet #{version}",
-          value: version,
-          collection: "puppet#{version}",
-        }
-      end.compact
+          label = (requirement == 'openvox') ? 'OpenVox' : requirement.capitalize
+          {
+            name: "#{label} #{version}",
+            value: version,
+            collection: "#{requirement}#{version}",
+            requirement: requirement,
+          }
+        end
+      end
     end
     def puppet_unit_test_matrix
-      metadata.puppet_major_versions.sort.reverse.map do |puppet|
+      majors = metadata.requirements_with_major_versions.first[1]
+      majors.sort.reverse.map do |puppet|
         ruby = PuppetMetadata::AIO::PUPPET_RUBY_VERSIONS[puppet]
         next unless ruby
-        next if puppet_version_below_minimum?(puppet)
+        next if requirement_name_version_below_minimum?(puppet)
         {
           puppet: puppet,
@@ -50,17 +55,17 @@ module PuppetMetadata
     end
     def beaker_os_releases(at = nil)
-      majors = puppet_major_versions
+      majors = beaker_major_versions
       distro_puppet_version = {
         name: 'Distro Puppet',
         value: nil, # We don't know the version and since it's rolling, it can be anything
         collection: 'none',
+        requirement: 'puppet',
       }
       metadata.operatingsystems.each do |os, releases|
         case os
         when 'Archlinux', 'Gentoo'
+          # both currently only ship puppet, not openvox yet
           yield [os, 'rolling', distro_puppet_version]
         else
           releases&.each do |release|
@@ -78,7 +83,7 @@ module PuppetMetadata
             end
             majors.each do |puppet_version|
-              if AIO.has_aio_build?(os, release, puppet_version[:value])
+              if AIO.has_aio_build?(os, release, puppet_version[:value], puppet_version[:requirement])
                 yield [os, release, puppet_version]
               elsif PuppetMetadata::OperatingSystem.os_release_puppet_version(os, release) == puppet_version[:value]
                 yield [os, release, distro_puppet_version.merge(value: puppet_version[:value])]
@@ -92,15 +97,15 @@ module PuppetMetadata
     def puppet_beaker_test_matrix(at)
       matrix_include = []
-      beaker_os_releases(at) do |os, release, puppet_version|
-        next if puppet_version_below_minimum?(puppet_version[:value])
+      beaker_os_releases(at) do |os, release, implementation|
+        next if requirement_name_version_below_minimum?(implementation[:value])
-        setfile = os_release_to_beaker_setfile(os, release, puppet_version[:collection])
+        setfile = os_release_to_beaker_setfile(os, release, implementation[:collection])
         next unless setfile
-        name = "#{puppet_version[:name]} - #{setfile[1]}"
+        name = "#{implementation[:name]} - #{setfile[1]}"
         env = {
-          'BEAKER_PUPPET_COLLECTION' => puppet_version[:collection],
+          'BEAKER_PUPPET_COLLECTION' => implementation[:collection],
           'BEAKER_SETFILE' => setfile[0],
         }
@@ -123,7 +128,7 @@ module PuppetMetadata
       matrix_include
     end
-    def puppet_version_below_minimum?(version)
+    def requirement_name_version_below_minimum?(version)
       return false unless version && options[:minimum_major_puppet_version]
       Gem::Version.new(version) < Gem::Version.new(options[:minimum_major_puppet_version])

data/lib/puppet_metadata/metadata.rb CHANGED Viewed

@@ -20,6 +20,8 @@ module PuppetMetadata
   # An abstraction over Puppet metadata
   class Metadata
+    SUPPORTED_REQUIREMENTS = ['openvox', 'puppet'].freeze
     attr_reader :metadata
     # @param [Hash[String, Any]] metadata
@@ -137,21 +139,27 @@ module PuppetMetadata
       matches?(requirements[name], version)
     end
+    def requirements_with_major_versions
+      SUPPORTED_REQUIREMENTS.filter_map do |requirement|
+        majors = major_versions(requirement)
+        [requirement, majors] unless majors.empty?
+      end.to_h
+    end
     # @return [Array[Integer]] Supported major Puppet versions
     # @see #requirements
-    def puppet_major_versions
-      requirement = requirements['puppet']
-      raise Exception, 'No Puppet requirement found' unless requirement
+    def major_versions(requirement_name)
+      requirement = requirements[requirement_name]
+      return [] unless requirement
-      # Current latest major is 7. It is highly recommended that modules
-      # actually specify exact bounds, but this prevents an infinite loop.
-      end_major = (requirement.end == SemanticPuppet::Version::MAX) ? 7 : requirement.end.major
+      major_version_for_requirement(requirement)
+    end
-      (requirement.begin.major..end_major).select do |major|
-        requirement.include?(SemanticPuppet::Version.new(major, 0,
-                                                         0)) || requirement.include?(SemanticPuppet::Version.new(major,
-                                                                                                                 99, 99))
-      end
+    def major_versions!(requirement_name)
+      requirement = requirements[requirement_name]
+      raise Exception, "No '#{requirement_name}' requirement found'" unless requirement
+      major_version_for_requirement(requirement)
     end
     # A hash representation of the dependencies
@@ -194,6 +202,16 @@ module PuppetMetadata
     private
+    def major_version_for_requirement(requirement)
+      # Current latest major is 8. It is highly recommended that modules
+      # actually specify exact bounds, but this prevents an infinite loop.
+      end_major = (requirement.end == SemanticPuppet::Version::MAX) ? 8 : requirement.end.major
+      (requirement.begin.major..end_major).select do |major|
+        requirement.include?(SemanticPuppet::Version.new(major, 0, 0)) || requirement.include?(SemanticPuppet::Version.new(major, 99, 99))
+      end
+    end
     def build_version_requirement_hash(array)
       return {} if array.nil?

data/lib/puppet_metadata/operatingsystem.rb CHANGED Viewed

@@ -18,6 +18,31 @@ module PuppetMetadata
         '9' => '2032-05-31',
         '8' => '2029-05-31',
       },
+      'Amazon' => {
+        # Amazon Linux AMI
+        # https://aws.amazon.com/amazon-linux-ami/
+        '2018.03' => '2023-12-31',
+        '2017.09' => '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',
+        # Amazon Linux 2
+        # https://aws.amazon.com/amazon-linux-2/faqs/
+        '2.0' => '2026-06-30',
+        # Amazon Linux 2023
+        # https://docs.aws.amazon.com/linux/al2023/ug/release-cadence.html
+        '2023' => '2027-06-30',
+      },
       # https://endoflife.software/operating-systems/linux/centos
       # https://endoflife.date/centos-stream
       'CentOS' => {
@@ -33,6 +58,7 @@ module PuppetMetadata
       'Debian' => {
         # EOL is extended life cycle, not standard support
         # https://github.com/voxpupuli/voxpupuli.github.io/pull/386
+        '13' => '2030-08-09',
         '12' => '2028-06-30',
         '11' => '2026-08-31',
         '10' => '2022-09-10',
@@ -56,8 +82,8 @@ module PuppetMetadata
       # https://docs.fedoraproject.org/en-US/releases/eol/
       'Fedora' => {
         '41' => nil,
-        '40' => nil,
-        '39' => nil,
+        '40' => '2025-05-13',
+        '39' => '2024-11-26',
         '38' => '2024-05-21',
         '37' => '2023-12-05',
         '36' => '2023-05-16',
@@ -125,6 +151,23 @@ module PuppetMetadata
         '9' => '2032-05-31',
         '8' => '2029-05-31',
       },
+      # https://scientificlinux.org/category/uncategorized/scientific-linux-end-of-life/
+      'Scientific' => {
+        '8' => '2024-06-30', # This is not really a Scientific release, but I have seen it in module metadata ..
+        '7' => '2024-06-30',
+        '6' => '2020-11-30',
+        '5' => '2017-03-31',
+        '4' => '2012-02-29',
+        '3' => '2010-10-30',
+      },
+      # https://www.suse.com/lifecycle/#product-suse-linux-enterprise-server
+      # General support end dates, not LTSS
+      'SLES' => {
+        '15' => '2031-07-31',
+        '12' => '2024-10-31',
+        '11' => '2019-03-31',
+        '10' => '2013-07-31',
+      },
       # https://endoflife.software/operating-systems/linux/ubuntu
       'Ubuntu' => {
         '24.04' => '2029-04-30',

metadata CHANGED Viewed

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_metadata
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Vox Pupuli
 - Ewoud Kohl van Wijngaarden
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metadata-json-lint
@@ -113,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +157,6 @@ homepage: https://github.com/voxpupuli/puppet_metadata
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -178,8 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Data structures for the Puppet Metadata
 test_files: []