beaker-hostgenerator 2.1.0 → 2.2.1

data/lib/beaker-hostgenerator/generator.rb

@@ -29,9 +29,7 @@ module BeakerHostGenerator
 
       tokens.each do |token|
         if is_ostype_token?(token, bhg_version)
-          if nodeid[ostype] == 1 and ostype != nil
-            raise "Error: no nodes generated for #{ostype}"
-          end
+          raise "Error: no nodes generated for #{ostype}" if nodeid[ostype] == 1 and !ostype.nil?
 
           ostype = token
           next
@@ -52,7 +50,7 @@ module BeakerHostGenerator
         # Delegate to the hypervisor
         hypervisor = BeakerHostGenerator::Hypervisor.create(node_info, options)
         host_config = hypervisor.generate_node(node_info, host_config, bhg_version)
-        config['CONFIG'].deeper_merge!(hypervisor.global_config())
+        config['CONFIG'].deeper_merge!(hypervisor.global_config)
 
         # Merge in any arbitrary key-value host settings. Treat the 'hostname'
         # setting specially, and don't merge it in as an arbitrary setting.
@@ -61,7 +59,7 @@ module BeakerHostGenerator
           arbitrary_settings.has_key?('hostname')
         host_config.merge!(arbitrary_settings)
 
-        if PE_USE_WIN32 && ostype =~ /windows/ && node_info['bits'] == "64"
+        if PE_USE_WIN32 && ostype =~ /windows/ && node_info['bits'] == '64'
           host_config['ruby_arch'] = 'x86'
           host_config['install_32'] = true
         end
@@ -77,9 +75,7 @@ module BeakerHostGenerator
         decoded = prepare(options[:global_config])
         # Support for strings without '{}' was introduced, so just double
         # check here to ensure that we pass in values surrounded by '{}'.
-        if !decoded.start_with?('{')
-          decoded = "{#{decoded}}"
-        end
+        decoded = "{#{decoded}}" unless decoded.start_with?('{')
         global_config = settings_string_to_map(decoded)
         config['CONFIG'].deeper_merge!(global_config)
       end
@@ -87,7 +83,7 @@ module BeakerHostGenerator
       # Munge non-string scalar values into proper data types
       unstringify_values!(config)
 
-      return config
+      config
     end
 
     def get_host_roles(node_info)
@@ -101,22 +97,22 @@ module BeakerHostGenerator
         roles << role
       end
 
-      return roles
+      roles
     end
 
     private
 
     def generate_host_roles!(host_config, node_info, options)
-      if not options[:disable_default_role]
-        host_config['roles'] = ['agent']
-      else
-        host_config['roles'] = []
-      end
+      host_config['roles'] = if options[:disable_default_role]
+                               []
+                             else
+                               ['agent']
+                             end
 
       host_config['roles'].concat get_host_roles(node_info)
       host_config['roles'].uniq!
 
-      if not options[:disable_role_config]
+      unless options[:disable_role_config]
         host_config['roles'].each do |role|
           host_config.deeper_merge! get_role_config(role)
         end
@@ -145,12 +141,16 @@ module BeakerHostGenerator
     # converted to true/false.
     # The only valid boolean-strings are "true" and "false".
     def unstringify_value(value)
-      result = Integer(value) rescue value
+      result = begin
+        Integer(value)
+      rescue StandardError
+        value
+      end
       if value == 'true'
         result = true
       elsif value == 'false'
         result = false
-      elsif value.kind_of?(Array)
+      elsif value.is_a?(Array)
         value.each_with_index do |v, i|
           result[i] = unstringify_value(v)
         end

data/lib/beaker-hostgenerator/hypervisor/abs.rb

@@ -24,7 +24,7 @@ module BeakerHostGenerator
 
         case node_info['ostype']
         when /^(almalinux|centos|redhat|rocky)/
-          base_config['template'] ||= base_config['platform'].gsub(/^el/, $1)
+          base_config['template'] ||= base_config['platform'].gsub(/^el/, ::Regexp.last_match(1))
         when /^fedora/
           base_config['template'] ||= base_config['platform']
         when /^ubuntu/

data/lib/beaker-hostgenerator/hypervisor/docker.rb

@@ -9,35 +9,78 @@ module BeakerHostGenerator
 
       def generate_node(node_info, base_config, bhg_version)
         base_config['docker_cmd'] = ['/sbin/init']
-        base_config['image'] = node_info['ostype'].sub(/(\d)/, ':\1')
-        case node_info['ostype']
+
+        ostype = node_info['ostype']
+
+        if (commands = image_commands(ostype))
+          base_config['docker_image_commands'] = commands
+        end
+
+        base_config['image'] = image(ostype)
+        base_config['image'].prepend('amd64/') if node_info['bits'] == '64' && !base_config['image'].start_with?('quay.io/')
+
+        base_generate_node(node_info, base_config, bhg_version, :docker)
+      end
+
+      private
+
+      def image(ostype)
+        image = ostype.sub(/(\d)/, ':\1')
+
+        case ostype
+        when /^centos/
+          version = ostype.delete_prefix('centos')
+          tag = (version.to_i >= 8) ? "stream#{version}" : "centos#{version}"
+          image = "quay.io/centos/centos:#{tag}"
         when /^oracle/
-          base_config['image'].sub!(/\w+/, 'oraclelinux')
+          image.sub!(/\w+/, 'oraclelinux')
         when /^opensuse/
-          base_config['image'].sub!(/(\w+)/, '\1/leap')
+          image.sub!(/(\w+)/, '\1/leap')
         when /^ubuntu/
-          base_config['image'].sub!(/(\d{2})/, '\1.')
+          image.sub!(/(\d{2})/, '\1.')
         when /^rocky/
-          base_config['image'].sub!(/(\w+)/, 'rockylinux')
+          image.sub!(/(\w+)/, 'rockylinux')
         when /^alma/
-          base_config['image'].sub!(/(\w+)/, 'almalinux')
+          image.sub!(/(\w+)/, 'almalinux')
         end
 
-        if node_info['bits'] == '64'
-          base_config['image'] = "amd64/#{base_config['image']}"
-        end
+        image
+      end
 
-        case node_info['ostype']
+      def image_commands(ostype)
+        case ostype
+        when /^(almalinux|centos|rocky)/
+          [
+            'cp /bin/true /sbin/agetty',
+            el_package_install_command(ostype.delete_prefix(Regexp.last_match(1)).to_i),
+          ]
+        when /^debian/
+          [
+            'cp /bin/true /sbin/agetty',
+            'rm -f /usr/sbin/policy-rc.d',
+            'apt-get update && apt-get install -y cron locales-all net-tools wget gnupg',
+          ]
+        when /^opensuse/
+          [
+            'cp /bin/true /sbin/agetty',
+            'zypper install -y cron iproute2 tar wget which',
+          ]
         when /^ubuntu/
-          base_config['docker_image_commands'] = [
+          [
             'cp /bin/true /sbin/agetty',
             'apt-get install -y net-tools wget locales iproute2 gnupg',
             'locale-gen en_US.UTF-8',
             'echo LANG=en_US.UTF-8 > /etc/default/locale',
           ]
         end
+      end
 
-        return base_generate_node(node_info, base_config, bhg_version, :docker)
+      def el_package_install_command(version)
+        if version >= 8
+          'dnf install -y crontabs initscripts iproute openssl wget which glibc-langpack-en hostname'
+        else
+          'yum intall -y crontabs initscripts iproute openssl wget which sysvinit-tools tar ss'
+        end
       end
     end
   end

data/lib/beaker-hostgenerator/hypervisor/hcloud.rb

@@ -11,14 +11,14 @@ module BeakerHostGenerator
         # ostype is ubuntu2204, debian10, rocky9
         os, version = node_info['ostype'].split(/(\D+)/).reject!(&:empty?)
         base_config['image'] = case os
-        when 'ubuntu'
-          "#{os}-#{version[0, 2]}.#{version[2, 2]}"
-        when 'centos'
-          version.to_i == 7 ? "#{os}-#{version}" : "#{os}-stream-#{version}"
-        else
-          "#{os}-#{version}"
-        end
-        return base_generate_node(node_info, base_config, bhg_version, :hcloud)
+                               when 'ubuntu'
+                                 "#{os}-#{version[0, 2]}.#{version[2, 2]}"
+                               when 'centos'
+                                 (version.to_i == 7) ? "#{os}-#{version}" : "#{os}-stream-#{version}"
+                               else
+                                 "#{os}-#{version}"
+                               end
+        base_generate_node(node_info, base_config, bhg_version, :hcloud)
       end
     end
   end

data/lib/beaker-hostgenerator/hypervisor/unknown.rb

@@ -7,7 +7,7 @@ module BeakerHostGenerator::Hypervisor
     include BeakerHostGenerator::Data
 
     def generate_node(node_info, base_config, bhg_version)
-      return base_generate_node(node_info, base_config, bhg_version, :general)
+      base_generate_node(node_info, base_config, bhg_version, :general)
     end
   end
 end

data/lib/beaker-hostgenerator/hypervisor/vagrant.rb

@@ -8,18 +8,18 @@ module BeakerHostGenerator
       include BeakerHostGenerator::Data
 
       def generate_node(node_info, base_config, bhg_version)
-        if node_info['ostype'] =~ /^centos/
-          base_config['box'] = node_info['ostype'].sub(/(\d)/, '/\1')
-        elsif node_info['ostype'] =~ /^fedora/
-          base_config['box'] = node_info['ostype'].sub(/(\d)/, '/\1') + '-cloud-base'
-        else
-          base_config['box'] = "generic/#{node_info['ostype']}"
-        end
+        base_config['box'] = if node_info['ostype'] =~ /^centos/
+                               node_info['ostype'].sub(/(\d)/, '/\1')
+                             elsif node_info['ostype'] =~ /^fedora/
+                               node_info['ostype'].sub(/(\d)/, '/\1') + '-cloud-base'
+                             else
+                               "generic/#{node_info['ostype']}"
+                             end
 
         # We don't use this by default
         base_config['synced_folder'] = 'disabled'
 
-        return base_generate_node(node_info, base_config, bhg_version, :vagrant)
+        base_generate_node(node_info, base_config, bhg_version, :vagrant)
       end
     end
   end

data/lib/beaker-hostgenerator/hypervisor/vmpooler.rb

@@ -18,24 +18,23 @@ module BeakerHostGenerator
         base_config = base_generate_node(node_info, base_config, bhg_version, :vmpooler)
 
         case node_info['ostype']
-        when /^(almalinux|centos|redhat|rocky)/
-          base_config['template'] ||= base_config['platform'].gsub(/^el/, $1)
-        when /^fedora/
+        when /^(almalinux|centos|oracle|redhat|rocky|scientific)/
+          base_config['template'] ||= base_config['platform'].gsub(/^el/, ::Regexp.last_match(1))
+        when /^fedora/, /^opensuse/, /^panos/
           base_config['template'] ||= base_config['platform']
-        when /^ubuntu/
+        when /^(debian|ubuntu)/
+          os = Regexp.last_match(1)
           arch = case node_info['bits']
                  when '64'
                    'x86_64'
                  when '32'
                    'i386'
-                 else
-                   nil
                  end
 
-          base_config['template'] ||= "#{node_info['ostype'].sub('ubuntu', 'ubuntu-')}-#{arch}" if arch
+          base_config['template'] ||= "#{node_info['ostype'].sub(os, "#{os}-")}-#{arch}" if arch
         end
 
-        return base_config
+        base_config
       end
     end
   end

data/lib/beaker-hostgenerator/hypervisor.rb

@@ -37,7 +37,7 @@ module BeakerHostGenerator
     #
     # @returns [Hash{String=>Hypervisor::Interface}] A map of hypervisor names
     #                                                and their implementations.
-    def self.builtin_hypervisors()
+    def self.builtin_hypervisors
       {
         'vmpooler' => BeakerHostGenerator::Hypervisor::Vmpooler,
         'vagrant' => BeakerHostGenerator::Hypervisor::Vagrant,
@@ -60,7 +60,7 @@ module BeakerHostGenerator
       # This will only be called if the hypervisor is used for a node, in which
       # case the returned map will be merged in with global configuration from
       # other hypervisors.
-      def global_config()
+      def global_config
         {}
       end
 
@@ -84,7 +84,7 @@ module BeakerHostGenerator
       #
       # @param [Integer] bhg_version The version of OS info to use when building
       #                              up the node definition.
-      def generate_node(node_info, base_config, bhg_version)
+      def generate_node(_node_info, _base_config, _bhg_version)
         raise "Method 'generate_node' not implemented!"
       end
 
@@ -98,7 +98,7 @@ module BeakerHostGenerator
 
         base_config['hypervisor'] = @name
 
-        return base_config
+        base_config
       end
     end
   end

data/lib/beaker-hostgenerator/parser.rb

@@ -1,6 +1,7 @@
 require 'beaker-hostgenerator/data'
 require 'beaker-hostgenerator/exceptions'
 require 'cgi'
+require 'strscan'
 
 module BeakerHostGenerator
   # Functions for parsing the raw user input host layout string and turning
@@ -62,7 +63,7 @@ module BeakerHostGenerator
     #   * agent
     #   * database
     #
-    NODE_REGEX = /\A(?<bits>[A-Z0-9]+|\d+)((?<arbitrary_roles>([[:lower:]_]*|\,)*)\.)?(?<roles>[uacldfm]*)(?<host_settings>\{[[:print:]]*\})?\Z/
+    NODE_REGEX = /\A(?<bits>[A-Z0-9]+|\d+)((?<arbitrary_roles>([[:lower:]_]*|,)*)\.)?(?<roles>[uacldfm]*)(?<host_settings>\{[[:print:]]*\})?\Z/
 
     module_function
 
@@ -137,13 +138,7 @@ module BeakerHostGenerator
     # @param [Integer] bhg_version The version of OS info to use when testing
     #                  for whether the token represent an OS platform.
     def is_ostype_token?(token, bhg_version)
-      BeakerHostGenerator::Data.get_platforms(bhg_version).each do |platform|
-        ostype = platform.split('-')[0]
-        if ostype == token
-          return true
-        end
-      end
-      return false
+      BeakerHostGenerator::Data.get_platforms(bhg_version).any? { |platform| platform.split('-')[0] == token }
     end
 
     # Converts a string token that represents a node (and not an OS type) into
@@ -168,28 +163,20 @@ module BeakerHostGenerator
       node_info = NODE_REGEX.match(token)
 
       if node_info
-        node_info = Hash[node_info.names.zip(node_info.captures)]
+        node_info = node_info.names.zip(node_info.captures).to_h
       else
         raise BeakerHostGenerator::Exceptions::InvalidNodeSpecError.new,
               "Invalid node_info token: #{token}"
       end
+      node_info['arbitrary_roles'] = if node_info['arbitrary_roles']
+                                       node_info['arbitrary_roles'].split(',') || ''
+                                     else
+                                       # Default to empty list to avoid having to check for nil elsewhere
+                                       []
+                                     end
+      node_info['host_settings'] = node_info['host_settings'] ? settings_string_to_map(node_info['host_settings']) : {}
 
-      if node_info['arbitrary_roles']
-        node_info['arbitrary_roles'] =
-          node_info['arbitrary_roles'].split(',') || ''
-      else
-        # Default to empty list to avoid having to check for nil elsewhere
-        node_info['arbitrary_roles'] = []
-      end
-
-      if node_info['host_settings']
-        node_info['host_settings'] =
-          settings_string_to_map(node_info['host_settings'])
-      else
-        node_info['host_settings'] = {}
-      end
-
-      return node_info
+      node_info
     end
 
     # Transforms the arbitrary host settings map from a string representation
@@ -228,7 +215,7 @@ module BeakerHostGenerator
 
         break if blob.nil?
 
-        if stringscan.pos() == 1
+        if stringscan.pos == 1
           object = {}
           object_depth.push(object)
           next
@@ -251,7 +238,7 @@ module BeakerHostGenerator
           next
         end
 
-        if blob == ']' or blob == '}'
+        if [']', '}'].include?(blob)
           object_depth.pop
           current_depth = current_depth.pred
           next
@@ -263,11 +250,11 @@ module BeakerHostGenerator
         if blob[-2] == '='
           raise Beaker::HostGenerator::Exceptions::InvalidNodeSpecError unless blob.end_with?('{', '[')
 
-          if blob[-1] == '{'
-            current_object[blob[0..-3]] = {}
-          else
-            current_object[blob[0..-3]] = []
-          end
+          current_object[blob[0..-3]] = if blob[-1] == '{'
+                                          {}
+                                        else
+                                          []
+                                        end
           object_depth.push(current_object[blob[0..-3]])
           current_depth = current_depth.next
           next
@@ -288,9 +275,7 @@ module BeakerHostGenerator
           next
         end
 
-        if blob == ','
-          next
-        end
+        next if blob == ','
 
         if blob[-1] == ','
           if current_type == Hash
@@ -308,18 +293,18 @@ module BeakerHostGenerator
           end
         end
 
-        if blob[-1] == ']'
-          current_object.push(blob[0..-2])
-          object_depth.pop
-          current_depth = current_depth.pred
-          next
-        end
+        next unless blob[-1] == ']'
+
+        current_object.push(blob[0..-2])
+        object_depth.pop
+        current_depth = current_depth.pred
+        next
       end
 
       object
     rescue Exception
       raise BeakerHostGenerator::Exceptions::InvalidNodeSpecError,
-        "Malformed host settings: #{host_settings}"
+            "Malformed host settings: #{host_settings}"
     end
   end
 end

data/lib/beaker-hostgenerator/roles.rb

@@ -11,10 +11,9 @@ module BeakerHostGenerator
     }
 
     CM_CONFIG = { 'main' => {
-                    'dns_alt_names' => 'puppet',
-                    'environmentpath' => '/etc/puppetlabs/puppet/environments',
-                  },
-                }
+      'dns_alt_names' => 'puppet',
+      'environmentpath' => '/etc/puppetlabs/puppet/environments',
+    } }
 
     ROLE_CONFIG = {
       'compile_master' => CM_CONFIG,

data/lib/beaker-hostgenerator/util.rb

@@ -7,7 +7,7 @@ module BeakerHostGenerator
   module Utils
     module_function
 
-    def pe_dir(version, family = nil)
+    def pe_dir(version, _family = nil)
       BeakerHostGenerator::Data.pe_dir(version)
     end
 
@@ -15,7 +15,7 @@ module BeakerHostGenerator
       vmpooler_hypervisor = BeakerHostGenerator::Hypervisor::Vmpooler.new
       config = {}
       config.deeper_merge! BeakerHostGenerator::Data.BASE_CONFIG
-      config['CONFIG'].deeper_merge! vmpooler_hypervisor.global_config()
+      config['CONFIG'].deeper_merge! vmpooler_hypervisor.global_config
 
       hosts.each do |host|
         config['HOSTS'][host.node_name] = {
@@ -25,12 +25,10 @@ module BeakerHostGenerator
         }
       end
 
-      File.open(path, 'w') do |file|
-        file.write(config.to_yaml)
-      end
+      File.write(path, config.to_yaml)
     end
 
-    def get_platforms(hypervisor_type = 'vmpooler', bhg_version = 0)
+    def get_platforms(_hypervisor_type = 'vmpooler', bhg_version = 0)
       BeakerHostGenerator::Data.get_platforms(bhg_version)
     end
 

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '2.1.0'
+    STRING = '2.2.1'
   end
 end

data/lib/beaker-hostgenerator.rb

@@ -1,7 +1,7 @@
 # Load libraries.
 
 module BeakerHostGenerator
-      require 'beaker-hostgenerator/cli'
-      require 'beaker-hostgenerator/data'
-      require 'beaker-hostgenerator/generator'
+  require 'beaker-hostgenerator/cli'
+  require 'beaker-hostgenerator/data'
+  require 'beaker-hostgenerator/generator'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-02 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -37,16 +37,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.18'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -93,44 +93,16 @@ dependencies:
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +165,7 @@ files:
 - lib/beaker-hostgenerator/version.rb
 homepage: https://github.com/puppetlabs/beaker-hostgenerator
 licenses:
-- Apache2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []