puppet_metadata 4.6.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c6b227acc94c9c68da32eed52aebd0bf2c3e7c47fe604d377f1e2389df0a68c
-  data.tar.gz: cf77d1e5835cce701514e32ef2cf04295949262426b067fd632f74f5c7347214
+  metadata.gz: 9c64a608ea05e55de8fd0497587009102dbaa9c422a5f91e0b4942f0e5ea6fe9
+  data.tar.gz: 2775892df0cdbc8dd88ee5f95d2ac2cb31ec6d992341f45a50fed8214ae661b6
 SHA512:
-  metadata.gz: f0554c4a17dc0fc9c99cc41d4c5e224cb86c28d68f81c9e6cc8ffeeb576ee6a371b7f5a69016e1f0c16985f00461a4f90844f928cfeb107480e2045f7e577e9e
-  data.tar.gz: 5534c09575ba2b2cf2e6c6efffed2f27676138dbc59f4d785e7dfe041ef2463e2b8983b0b3e35ae43c4969cde252ab02d838aec7ac40d557586c9ca7149d7143
+  metadata.gz: 425dd0d57a1742d73c2ffdabfd88749948c4534f3d2267decff11e4dc5fda1acf66b8ffe8a63bd4f9a5286592e8b396ccb510f1398c9ff2cbd5f34a5381c41f4
+  data.tar.gz: 7aa0d2a21b5384d736cadc0ed9b6ae5cafeff7c5c7a6bacba5b13b075d9f2b8a0ee6d3e579b5800bae6f32d4331c9921adfca9b5f8d746376cb073e06db27865

data/lib/puppet_metadata/aio.rb

@@ -12,21 +12,11 @@ module PuppetMetadata
     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,31 +27,23 @@ 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
 
     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)

data/lib/puppet_metadata/github_actions.rb

@@ -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|
@@ -80,6 +85,7 @@ module PuppetMetadata
             majors.each do |puppet_version|
               if AIO.has_aio_build?(os, release, puppet_version[:value])
                 yield [os, release, puppet_version]
+              # TODO: also match requirement here
               elsif PuppetMetadata::OperatingSystem.os_release_puppet_version(os, release) == puppet_version[:value]
                 yield [os, release, distro_puppet_version.merge(value: puppet_version[:value])]
               end
@@ -92,15 +98,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 +129,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

@@ -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?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_metadata
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-24 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metadata-json-lint