puppet_metadata 1.10.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68bedde8f6ea8a9ec17503af06a802c698f01778c67c9e9d5ad4a94a607ae8c9
-  data.tar.gz: 9e0681df7996aeb6238a8527b053d136004c3616de2b81389b7a8e045a5fbf1c
+  metadata.gz: 0764d746b3167ac13197106bbff4b5c0be055c96f512aa5e43461bb4aa69ccc5
+  data.tar.gz: 04635ef0d16094eb0728c6c8ae49ed6f63daa141e8fd434d9a58e8f6805273ee
 SHA512:
-  metadata.gz: c46ae6d205020e08d950d9c67c237b5a8e1ddf97ab07c304f429b0457ec68c6f1df09f9ef8f7232f10ff6e3179827d30db16a464ab35b89919d5c6f26c09ef49
-  data.tar.gz: 1a5bac401ba8acce959f7c1e5bf415eff67f6b46513b810c74bd7befc61f87be8b772aaee42ba009668a80a001e52e9302095e7ea0834f698e83bcd1e0433cde
+  metadata.gz: b6881e7df1e75a1324915a1cba67040cec62bbc7e6852aaefd14953345d3eed760fb9dcede23d97e2435624642dfb9d4f858bc9fe8c1ee8f852dcdae5672250b
+  data.tar.gz: 16c8b9c86ff5c4e8006e759972da86c69cdcc1fd5276435560cee6030425d53ea40369599e384f7da76f5bcd991adb942261faf20e7587979d85c7bb72edd3e3

data/README.md

@@ -15,60 +15,66 @@ The gem intends to provide an abstraction over Puppet's metadata.json file. Its
 To get outputs [usable in Github Actions](https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions), there is the `metadata2gha` command available. This generates based on metadata.json, such as [Beaker](https://github.com/voxpupuli/beaker) setfiles, Puppet major versions and a Puppet unit test matrix.
 
 ```console
-$ metadata2gha-beaker
-beaker_setfiles=[{"name":"CentOS 7","value":"centos7-64"},{"name":"CentOS 8","value":"centos8-64"},{"name":"Debian 10","value":"debian10-64"},{"name":"Ubuntu 18.04","value":"ubuntu1804-64"}]
-puppet_major_versions=[{"name":"Puppet 6","value":6,"collection":"puppet6"},{"name":"Puppet 5","value":5,"collection":"puppet5"}]
-puppet_unit_test_matrix=[{"puppet":6,"ruby":"2.5"},{"puppet":5,"ruby":"2.4"}]
+$ metadata2gha
+puppet_major_versions=[{"name":"Puppet 7","value":7,"collection":"puppet7"},{"name":"Puppet 6","value":6,"collection":"puppet6"}]
+puppet_unit_test_matrix=[{"puppet":7,"ruby":"2.7"},{"puppet":6,"ruby":"2.5"}]
+github_action_test_matrix=[{"setfile":{"name":"Debian 11","value":"debian11-64"},"puppet":{"name":"Puppet 7","value":7,"collection":"puppet7"}},{"setfile":{"name":"Debian 11","value":"debian11-64"},"puppet":{"name":"Puppet 6","value":6,"collection":"puppet6"}}]
 ```
 
-Beaker setfiles formatted for readability:
+Puppet major versions formatted for readability:
 ```json
 [
   {
-    "name": "CentOS 7",
-    "value": "centos7-64"
-  },
-  {
-    "name": "CentOS 8",
-    "value": "centos8-64"
+    "name": "Puppet 7",
+    "value": 7,
+    "collection": "puppet7"
   },
   {
-    "name": "Debian 10",
-    "value": "debian10-64"
-  },
-  {
-    "name": "Ubuntu 18.04",
-    "value": "ubuntu1804-64"
+    "name": "Puppet 6",
+    "value": 6,
+    "collection": "puppet6"
   }
 ]
 ```
 
-Puppet major versions formatted for readability:
+Puppet unit test matrix formatted for readability:
 ```json
 [
   {
-    "name": "Puppet 6",
-    "value": 6,
-    "collection": "puppet6"
+    "puppet": 7,
+    "ruby": "2.7"
   },
   {
-    "name": "Puppet 5",
-    "value": 5,
-    "collection": "puppet5"
+    "puppet": 6,
+    "ruby": "2.5"
   }
 ]
 ```
 
-Puppet unit test matrix formatted for readability:
+GitHub Action test matrix formatted for readability
 ```json
 [
   {
-    "puppet": 6,
-    "ruby": "2.5"
+    "setfile": {
+      "name": "Debian 11",
+      "value": "debian11-64"
+    },
+    "puppet": {
+      "name": "Puppet 7",
+      "value": 7,
+      "collection": "puppet7"
+    }
   },
   {
-    "puppet": 5,
-    "ruby": "2.4"
+    "setfile": {
+      "name": "Debian 11",
+      "value": "debian11-64"
+    },
+    "puppet": {
+      "name": "Puppet 6",
+      "value": 6,
+      "collection": "puppet6"
+    }
   }
 ]
 ```

data/lib/puppet_metadata/aio.rb

@@ -14,9 +14,9 @@ module PuppetMetadata
       'RedHat' => {
         '5' => 5..7,
         '6' => 5..7,
-        '7' => 5..7,
-        '8' => 5..7,
-        '9' => 6..7,
+        '7' => 5..8,
+        '8' => 5..8,
+        '9' => 6..8,
       },
       'Fedora' => {
         '26' => [5],
@@ -27,26 +27,27 @@ module PuppetMetadata
         '31' => 5..7,
         '32' => 6..7,
         '34' => 6..7,
+        '36' => 7-8,
       },
       'SLES' => {
         '11' => [7],
-        '12' => [7],
-        '15' => [7],
+        '12' => 7..8,
+        '15' => 7..8,
       },
       # deb-based
       'Debian' => {
         '7' => [5],
         '8' => 5..6,
         '9' => 5..7,
-        '10' => 5..7,
-        '11' => 6..7,
+        '10' => 5..8,
+        '11' => 6..8,
       },
       'Ubuntu' => {
         '14.04' => 5..6,
         '16.04' => 5..7,
-        '18.04' => 5..7,
-        '20.04' => 6..7,
-        '22.04' => 6..7,
+        '18.04' => 5..8,
+        '20.04' => 6..8,
+        '22.04' => 6..8,
       },
     }.freeze
 
@@ -55,6 +56,7 @@ module PuppetMetadata
       5 => '2.4',
       6 => '2.5',
       7 => '2.7',
+      8 => '3.2',
     }.freeze
 
     class << self

data/lib/puppet_metadata/beaker.rb

@@ -71,7 +71,7 @@ module PuppetMetadata
       # Return whether a Beaker setfile can be generated for the given OS
       # @param [String] os The operating system
       def os_supported?(os)
-        ['Archlinux', 'CentOS', 'Fedora', 'Debian', 'Ubuntu'].include?(os)
+        ['Archlinux', 'CentOS', 'Fedora', 'Debian', 'Ubuntu', 'Rocky', 'AlmaLinux'].include?(os)
       end
 
       private

data/lib/puppet_metadata/github_actions.rb

@@ -13,7 +13,6 @@ module PuppetMetadata
     # @return [Hash[Symbol, Any]] The outputs for Github Actions
     def outputs
       {
-        beaker_setfiles: beaker_setfiles,
         puppet_major_versions: puppet_major_versions,
         puppet_unit_test_matrix: puppet_unit_test_matrix,
         github_action_test_matrix: github_action_test_matrix,
@@ -22,18 +21,6 @@ module PuppetMetadata
 
     private
 
-
-    def beaker_setfiles
-      setfiles = []
-      metadata.beaker_setfiles(use_fqdn: options[:beaker_use_fqdn], pidfile_workaround: options[:beaker_pidfile_workaround], domain: options[:domain]) do |setfile, name|
-        setfiles << {
-          name: name,
-          value: setfile,
-        }
-      end
-      setfiles
-    end
-
     def puppet_major_versions
       metadata.puppet_major_versions.sort.reverse.map do |version|
         next if puppet_version_below_minimum?(version)

data/lib/puppet_metadata/metadata.rb

@@ -188,25 +188,6 @@ module PuppetMetadata
       PuppetMetadata::GithubActions.new(self, options)
     end
 
-    # @param [Boolean] use_fqdn
-    #   Whether to set the hostname to a fully qualified domain name (deprecated, use domain)
-    # @param [Boolean] pidfile_workaround
-    #   Whether to apply the Docker pidfile workaround
-    # @param [String] domain
-    #   Enforce a domain to be appended to the hostname, making it an FQDN
-    # @yieldparam [String] setfile
-    #   The supported setfile configurations
-    # @see PuppetMetadata::Beaker#os_release_to_setfile
-    def beaker_setfiles(use_fqdn: false, pidfile_workaround: false, domain: nil)
-      operatingsystems.each do |os, releases|
-        next unless PuppetMetadata::Beaker.os_supported?(os)
-        releases&.each do |release|
-          setfile = PuppetMetadata::Beaker.os_release_to_setfile(os, release, use_fqdn: use_fqdn, pidfile_workaround: pidfile_workaround, domain: domain)
-          yield setfile if setfile
-        end
-      end
-    end
-
     private
 
     def build_version_requirement_hash(array)

data/lib/puppet_metadata/operatingsystem.rb

@@ -115,7 +115,7 @@ module PuppetMetadata
         '19.10' => '2020-07-15',
         '19.04' => '2020-01-15',
         '18.10' => '2019-07-15',
-        '18.04' => '2023-04-15',
+        '18.04' => '2023-05-31',
         '17.10' => '2018-07-15',
         '17.04' => '2018-01-15',
         '16.10' => '2017-07-20',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_metadata
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 2023-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metadata-json-lint
@@ -132,7 +132,7 @@ files:
 - lib/puppet_metadata/github_actions.rb
 - lib/puppet_metadata/metadata.rb
 - lib/puppet_metadata/operatingsystem.rb
-homepage: http://github.com/voxpupuli/puppet_metadata
+homepage: https://github.com/voxpupuli/puppet_metadata
 licenses:
 - Apache-2.0
 metadata: {}