puppet_metadata 3.0.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e9d1c84b47834137907ffd323ba3c70c3813acc98b7b3baeaf2351a48b0d268
-  data.tar.gz: 7886a9e107fd780278bc3c94e083ae24bdfc0547d0347d6b144a9a5c61612484
+  metadata.gz: 4eeb2df8e93dc5c1eff89ca619a29ca8862bd8c98b3b3862273d05c053a2019c
+  data.tar.gz: 9cdb5e2c21fc08c2cba8a9c42ddcec33e0fe326e6b478380e79007c34aeaf1f2
 SHA512:
-  metadata.gz: 13ba21af9df52daa794b49571de0b8019a8f3da764f7945aa422c21f3c3041c03a00f89e3f2e48a60f3d6cd8ef4b60607f7ad3aa0d0d7fe18b433c9ab2b9635f
-  data.tar.gz: 33742d5addb4d89e784a44d1c3252cf6119a73405c450351d74f6e6da617c9b0f321dc3ff4687fec07459d4a06d432bf8e0203bec3fe5b5b10e825598dc940c4
+  metadata.gz: 8a637579127e64447e244511f5ba2d459c00fa4587d9e321a32c427ca0e71901088bb67c56d725067b6a3bafaaaa3df898a474803685a05eb6efe6024da612c0
+  data.tar.gz: cd7fa183863692be6a0efbbcb46473ace449f11b832490c173d397084c28666b5d83c7ac26e0a56d5d1619b744395e56e1ce08970ae8781b939c32426d9573f6

data/bin/metadata2gha

@@ -9,7 +9,7 @@ options = {
   beaker_use_fqdn: false,
   beaker_pidfile_workaround: false,
   domain: nil,
-  minimum_major_puppet_version: nil
+  minimum_major_puppet_version: nil,
 }
 
 OptionParser.new do |opts|
@@ -26,25 +26,23 @@ OptionParser.new do |opts|
 
   opts.banner = "Usage: #{$0} [options] metadata"
 
-  opts.on("--[no-]use-fqdn", "Generate beaker setfiles with a FQDN") { |opt| options[:beaker_use_fqdn] = opt }
-  opts.on("--pidfile-workaround VALUE", "Generate the systemd PIDFile workaround to work around a docker bug", PidfileWorkaround) { |opt| options[:beaker_pidfile_workaround] = opt }
-  opts.on("-d", "--domain VALUE", "the domain for the box, only used when --use-fqdn is set to true") { |opt| options[:domain] = opt }
-  opts.on("--minimum-major-puppet-version VERSION", "Don't create actions for Puppet versions less than this major version") { |opt| options[:minimum_major_puppet_version] = opt }
+  opts.on('--[no-]use-fqdn', 'Generate beaker setfiles with a FQDN') { |opt| options[:beaker_use_fqdn] = opt }
+  opts.on('--pidfile-workaround VALUE', 'Generate the systemd PIDFile workaround to work around a docker bug', PidfileWorkaround) { |opt| options[:beaker_pidfile_workaround] = opt }
+  opts.on('-d', '--domain VALUE', 'the domain for the box, only used when --use-fqdn is set to true') { |opt| options[:domain] = opt }
+  opts.on('--minimum-major-puppet-version VERSION', "Don't create actions for Puppet versions less than this major version") { |opt| options[:minimum_major_puppet_version] = opt }
 end.parse!
 
 filename = ARGV[0]
-if filename.nil? || filename.empty?
-  filename = 'metadata.json'
-end
+filename = 'metadata.json' if filename.nil? || filename.empty?
 
 begin
   metadata = PuppetMetadata.read(filename)
 rescue StandardError => e
-  STDERR.puts "Failed to read #{filename}: #{e}"
+  warn "Failed to read #{filename}: #{e}"
   exit 2
 end
 
-github_output = !ENV['GITHUB_OUTPUT'].nil? ? File.open(ENV['GITHUB_OUTPUT'], 'a') : $stdout
+github_output = ENV['GITHUB_OUTPUT'].nil? ? $stdout : File.open(ENV.fetch('GITHUB_OUTPUT', nil), 'a')
 metadata.github_actions(options).outputs.each do |name, value|
   github_output.write("#{name}=#{value.to_json}\n")
 end

data/lib/puppet_metadata/aio.rb

@@ -1,12 +1,12 @@
 module PuppetMetadata
   class AIO
     COMPATIBLE = {
-      'AlmaLinux'   => 'RedHat',
-      'Amazon'      => 'RedHat',
-      'CentOS'      => 'RedHat',
+      'AlmaLinux' => 'RedHat',
+      'Amazon' => 'RedHat',
+      'CentOS' => 'RedHat',
       'OracleLinux' => 'RedHat',
-      'Rocky'       => 'RedHat',
-      'Scientific'  => 'RedHat',
+      'Rocky' => 'RedHat',
+      'Scientific' => 'RedHat',
     }.freeze
 
     BUILDS = {

data/lib/puppet_metadata/beaker.rb

@@ -21,6 +21,18 @@ module PuppetMetadata
       'CentOS' => ['8'],
     }.freeze
     class << self
+      # modifies the operating system name to suit beaker-hostgenerator
+      # @param [String] os
+      # @return [String] the modified OS name
+      def adjusted_os(os)
+        case os
+        when 'OracleLinux'
+          'oracle'
+        else
+          os.downcase
+        end
+      end
+
       # Convert an Operating System name with a release to a Beaker setfile
       #
       # @param [String] os
@@ -46,8 +58,10 @@ module PuppetMetadata
       def os_release_to_setfile(os, release, use_fqdn: false, pidfile_workaround: false, domain: nil, puppet_version: nil)
         return unless os_supported?(os)
 
-        name = "#{os.downcase}#{release.tr('.', '')}-64"
-        hostname = puppet_version != nil ? "#{name}-#{puppet_version}" : name
+        aos = adjusted_os(os)
+
+        name = "#{aos}#{release.tr('.', '')}-64"
+        hostname = (puppet_version.nil? && puppet_version != 'none') ? name : "#{name}-#{puppet_version}"
         domain ||= 'example.com' if use_fqdn
 
         options = {}
@@ -71,7 +85,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', 'Rocky', 'AlmaLinux'].include?(os)
+        %w[Archlinux CentOS Fedora Debian Ubuntu Rocky AlmaLinux OracleLinux].include?(os)
       end
 
       private

data/lib/puppet_metadata/github_actions.rb

@@ -1,7 +1,6 @@
 module PuppetMetadata
   class GithubActions
-    attr_reader :metadata
-    attr_reader :options
+    attr_reader :metadata, :options
 
     # @param [PuppetMetadata::Metadata] metadata
     # @param [Hash] options
@@ -49,14 +48,20 @@ module PuppetMetadata
     def beaker_os_releases
       majors = puppet_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',
+      }
+
       metadata.operatingsystems.each do |os, releases|
         case os
         when 'Archlinux', 'Gentoo'
-          yield [os, 'rolling', majors.max_by { |v| v[:value] }]
+          yield [os, 'rolling', distro_puppet_version]
         else
           releases&.each do |release|
             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]) # rubocop:disable Style/IfUnlessModifier
                 yield [os, release, puppet_version]
               end
             end
@@ -80,7 +85,7 @@ module PuppetMetadata
             name: setfile[1],
             value: setfile[0],
           },
-          puppet: puppet_version
+          puppet: puppet_version,
         }
       end
 
@@ -88,7 +93,7 @@ module PuppetMetadata
     end
 
     def puppet_version_below_minimum?(version)
-      return false unless options[:minimum_major_puppet_version]
+      return false unless version && options[:minimum_major_puppet_version]
 
       Gem::Version.new(version) < Gem::Version.new(options[:minimum_major_puppet_version])
     end

data/lib/puppet_metadata/metadata.rb

@@ -35,7 +35,7 @@ module PuppetMetadata
       if validate
         require 'metadata_json_lint'
         schema_errors = MetadataJsonLint::Schema.new.validate(metadata)
-        raise InvalidMetadataException.new(schema_errors) if schema_errors.any?
+        raise InvalidMetadataException, schema_errors if schema_errors.any?
       end
 
       @metadata = metadata
@@ -67,10 +67,11 @@ module PuppetMetadata
 
         supported = metadata['operatingsystem_support'].map do |os|
           next unless os['operatingsystem']
+
           [os['operatingsystem'], os['operatingsystemrelease']]
         end
 
-        Hash[supported.compact]
+        supported.compact.to_h
       end
     end
 
@@ -98,11 +99,12 @@ module PuppetMetadata
 
       unsupported = operatingsystems.map do |os, rels|
         next unless rels
+
         eol = rels.select { |rel| OperatingSystem.eol?(os, rel, at) }
         [os, eol] if eol.any?
       end
 
-      Hash[unsupported.compact]
+      unsupported.compact.to_h
     end
 
     # A hash representation of the requirements
@@ -143,10 +145,12 @@ module PuppetMetadata
 
       # 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
+      end_major = (requirement.end == SemanticPuppet::Version::MAX) ? 7 : 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))
+        requirement.include?(SemanticPuppet::Version.new(major, 0,
+                                                         0)) || requirement.include?(SemanticPuppet::Version.new(major,
+                                                                                                                 99, 99))
       end
     end
 
@@ -197,11 +201,12 @@ module PuppetMetadata
 
       reqs = array.map do |requirement|
         next unless requirement['name']
+
         version_requirement = requirement['version_requirement'] || '>= 0'
         [requirement['name'], SemanticPuppet::VersionRange.parse(version_requirement)]
       end
 
-      Hash[reqs.compact]
+      reqs.compact.to_h
     end
 
     def matches?(required_version, provided_version)

data/lib/puppet_metadata/operatingsystem.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 
 module PuppetMetadata
@@ -43,6 +45,12 @@ module PuppetMetadata
         '2.2' => '2003-06-30',
         '2.1' => '2000-09-30',
       },
+      # https://endoflife.date/oraclelinux
+      'OracleLinux' => {
+        '9' => '2032-06-30',
+        '8' => '2029-07-01',
+        '7' => '2024-07-01',
+      },
       # https://endoflife.software/operating-systems/linux/fedora
       'Fedora' => {
         '32' => nil,
@@ -157,8 +165,10 @@ module PuppetMetadata
       def eol_date(operatingsystem, release)
         releases = EOL_DATES[operatingsystem]
         return unless releases
+
         date = releases[release]
         return unless date
+
         Date.parse(date)
       end
 
@@ -193,8 +203,8 @@ module PuppetMetadata
       def supported_releases(operatingsystem)
         releases = EOL_DATES[operatingsystem]
         today = Date.today
-        releases.select { |release, eol_date| !eol_date || Date.parse(eol_date) > today }.keys.
-          sort_by { |release| Gem::Version.new(release) }
+        releases.select { |_release, eol_date| !eol_date || Date.parse(eol_date) > today }.keys
+                .sort_by { |release| Gem::Version.new(release) }
       end
     end
   end

data/lib/puppet_metadata.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A module that provides abstractions around Puppet's metadata format.
 module PuppetMetadata
   autoload :AIO, 'puppet_metadata/aio'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_metadata
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-29 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metadata-json-lint
@@ -59,6 +59,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -88,19 +102,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: voxpupuli-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +161,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '2.7'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="