beaker-hostgenerator 1.18.1 → 2.0.0

data/Gemfile

@@ -10,7 +10,15 @@ group :release do
   gem 'github_changelog_generator', :require => false
 end
 
-group :coverage, optional: ENV['COVERAGE']!='yes' do
-  gem 'simplecov-console', :require => false
+group :coverage, optional: ENV['COVERAGE'] != 'yes' do
   gem 'codecov', :require => false
+  gem 'simplecov-console', :require => false
+end
+
+group :rubocop do
+  gem 'rubocop', '~> 1.50.2'
+  gem 'rubocop-minitest', '~> 0.30.0'
+  gem 'rubocop-performance', '~> 1.17.1'
+  gem 'rubocop-rake', '~> 0.6.0'
+  gem 'rubocop-rspec', '~> 2.20.0'
 end

data/README.md

@@ -59,7 +59,7 @@ Below are some example usages of `beaker-hostgenerator`.
 ### Simple two-host layout
 
 ```
-$ beaker-hostgenerator centos6-64mdca-32a
+$ beaker-hostgenerator centos9-64mdca-64a
 ```
 
 Will generate
@@ -67,27 +67,27 @@ Will generate
 ```yaml
 ---
 HOSTS:
-  centos6-64-1:
+  centos9-64-1:
     pe_dir:
     pe_ver:
     pe_upgrade_dir:
     pe_upgrade_ver:
     hypervisor: vmpooler
-    platform: el-6-x86_64
-    template: centos-6-x86_64
+    platform: el-9-x86_64
+    template: centos-9-x86_64
     roles:
     - agent
     - master
     - database
     - dashboard
-  centos6-32-2:
+  centos9-64-2:
     pe_dir:
     pe_ver:
     pe_upgrade_dir:
     pe_upgrade_ver:
     hypervisor: vmpooler
-    platform: el-6-i386
-    template: centos-6-i386
+    platform: el-9-x86_64
+    template: centos-9-x86_64
     roles:
     - agent
 CONFIG:
@@ -99,7 +99,7 @@ CONFIG:
 ### Single host with Arbitrary Roles
 
 ```
-$ beaker-hostgenerator centos6-32compile_master,another_role.ma
+$ beaker-hostgenerator centos9-64compile_master,another_role.ma
 ```
 
 Will generate
@@ -107,14 +107,14 @@ Will generate
 ```yaml
 ---
 HOSTS:
-  centos6-32-1:
+  centos9-64-1:
     pe_dir:
     pe_ver:
     pe_upgrade_dir:
     pe_upgrade_ver:
     hypervisor: vmpooler
-    platform: el-6-i386
-    template: centos-6-i386
+    platform: el-9-x86_64
+    template: centos-9-x86_64
     roles:
     - agent
     - master
@@ -133,7 +133,7 @@ CONFIG:
 ### Two hosts with multiple hypervisors and arbitrary host settings
 
 ```
-$ beaker-hostgenerator centos6-64m{hypervisor=none\,hostname=static-master}-redhat7-64a{somekey=some-value}
+$ beaker-hostgenerator centos9-64m{hypervisor=none\,hostname=static-master}-redhat7-64a{somekey=some-value}
 ```
 
 Will generate
@@ -146,7 +146,7 @@ HOSTS:
     pe_ver:
     pe_upgrade_dir:
     pe_upgrade_ver:
-    platform: el-6-x86_64
+    platform: el-9-x86_64
     hypervisor: none
     roles:
     - agent
@@ -171,7 +171,7 @@ CONFIG:
 ### Two hosts with arbitrary host settings with arbitrary lists
 
 ```
-$ beaker-hostgenerator centos6-64m{disks=\[16\]}-redhat7-64a{disks=\[8\,16\]}
+$ beaker-hostgenerator centos9-64m{disks=\[16\]}-redhat7-64a{disks=\[8\,16\]}
 ```
 
 Will generate
@@ -179,12 +179,12 @@ Will generate
 ```yaml
 ---
 HOSTS:
-  centos6-64-1:
+  centos9-64-1:
     pe_dir:
     pe_ver:
     pe_upgrade_dir:
     pe_upgrade_ver:
-    platform: el-6-x86_64
+    platform: el-9-x86_64
     hypervisor: vmpooler
     disks:
     - 16
@@ -287,7 +287,7 @@ The term "custom" in this case signifies that it's not a built-in hypervisor
 ourselves as there isn't any built-in configuration for our hypervisor.
 
 ```
-$ beaker-hostgenerator --hypervisor=custom --global={custom_api=http://api.custom.net} centos6-64
+$ beaker-hostgenerator --hypervisor=custom --global={custom_api=http://api.custom.net} centos9-64
 ```
 
 Will generate
@@ -295,12 +295,12 @@ Will generate
 ```yaml
 ---
 HOSTS:
-  centos6-64-1:
+  centos9-64-1:
     pe_dir:
     pe_ver:
     pe_upgrade_dir:
     pe_upgrade_ver:
-    platform: el-6-x86_64
+    platform: el-9-x86_64
     hypervisor: custom
     roles:
     - agent
@@ -328,13 +328,13 @@ arbitrary settings, which means the following characters:
 For a full URL encoding reference see: http://www.w3schools.com/tags/ref_urlencode.asp
 
 ```
-$ beaker-hostgenerator centos6-64mcd-aix53-POWERfa%7Bhypervisor=aix%2Cvmhostname=pe-aix-53-acceptance.delivery.puppetlabs.net%7D
+$ beaker-hostgenerator centos9-64mcd-aix53-POWERfa%7Bhypervisor=aix%2Cvmhostname=pe-aix-53-acceptance.delivery.puppetlabs.net%7D
 ```
 
 Is equivalent to
 
 ```
-$ beaker-hostgenerator centos6-64mcd-aix53-POWERfa{hypervisor=aix,vmhostname=pe-aix-53-acceptance.delivery.puppetlabs.net}
+$ beaker-hostgenerator centos9-64mcd-aix53-POWERfa{hypervisor=aix,vmhostname=pe-aix-53-acceptance.delivery.puppetlabs.net}
 ```
 
 And will generate
@@ -342,14 +342,14 @@ And will generate
 ```yaml
 ---
 HOSTS:
-  centos6-64-1:
+  centos9-64-1:
     pe_dir:
     pe_ver:
     pe_upgrade_dir:
     pe_upgrade_ver:
     hypervisor: vmpooler
-    platform: el-6-x86_64
-    template: centos-6-x86_64
+    platform: el-9-x86_64
+    template: centos-9-x86_64
     roles:
     - agent
     - master
@@ -388,18 +388,18 @@ follows:
 
 ```yaml
 ---
-arguments_string: "--pe_dir /opt/hello centos6-64mdc"
+arguments_string: "--pe_dir /opt/hello centos9-64mdc"
 environment_variables: {}
 expected_hash:
   HOSTS:
-    centos6-64-1:
+    centos9-64-1:
       pe_dir: "/opt/hello"
       pe_ver: 
       pe_upgrade_dir: 
       pe_upgrade_ver: 
       hypervisor: vmpooler
-      platform: centos-6-x86_64
-      template: centos-6-x86_64
+      platform: el-9-x86_64
+      template: centos-9-x86_64
       roles:
       - agent
       - master

data/Rakefile

@@ -2,9 +2,7 @@ require 'rspec/core/rake_task'
 require 'rake/testtask'
 
 namespace :test do
-
   namespace :spec do
-
     task :minitest do
       desc "Run minitest tests"
       Rake::TestTask.new do |task|
@@ -27,9 +25,7 @@ namespace :test do
       t.rspec_opts = ['--color']
       t.pattern = 'spec/'
     end
-
   end
-
 end
 
 namespace :generate do
@@ -37,7 +33,7 @@ namespace :generate do
   task :fixtures do
     $LOAD_PATH.unshift(
       File.join(Dir.pwd, 'lib'),
-      File.join(Dir.pwd, 'test')
+      File.join(Dir.pwd, 'test'),
     )
     require 'beaker-hostgenerator'
     require 'util/generator_helpers'
@@ -60,7 +56,7 @@ begin
   require 'github_changelog_generator/task'
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file."
-    config.exclude_labels = %w[duplicate question invalid wontfix wont-fix modulesync skip-changelog]
+    config.exclude_labels = %w[duplicate question invalid wontfix wont-fix modulesync skip-changelog dependencies]
     config.user = 'voxpupuli'
     config.project = 'beaker-hostgenerator'
     config.future_release = Gem::Specification.load("#{config.project}.gemspec").version
@@ -79,3 +75,14 @@ begin
   end
 rescue LoadError
 end
+
+begin
+  require 'rubocop/rake_task'
+rescue LoadError
+  # RuboCop is an optional group
+else
+  RuboCop::RakeTask.new(:rubocop) do |task|
+    # These make the rubocop experience maybe slightly less terrible
+    task.options = ['--display-cop-names', '--display-style-guide', '--extra-details']
+  end
+end

data/beaker-hostgenerator.gemspec

@@ -4,8 +4,8 @@ require 'beaker-hostgenerator/version'
 Gem::Specification.new do |s|
   s.name        = "beaker-hostgenerator"
   s.version     = BeakerHostGenerator::Version::STRING
-  s.authors     = ["Branan Purvine-Riley", "Wayne Warren", "Nate Wolfe"]
-  s.email       = ["qe-team@puppet.com"]
+  s.authors     = ["Branan Purvine-Riley", "Wayne Warren", "Nate Wolfe", "Vox Pupuli"]
+  s.email       = ["pmc@voxpupuli.org"]
   s.homepage    = "https://github.com/puppetlabs/beaker-hostgenerator"
   s.summary     = "Beaker Host Generator Utility"
   s.description = <<-eos
@@ -16,20 +16,22 @@ eos
   s.license     = 'Apache2'
 
   s.files         = `git ls-files`.split("\n").reject { |f| f.match(/^(test|spec)/) }
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = Gem::Requirement.new('>= 2.7')
+
   # Testing dependencies
+  s.add_development_dependency 'fakefs', '>= 0.6', '< 3.0'
   s.add_development_dependency 'minitest'
+  s.add_development_dependency 'pry', '~> 0.10'
+  s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its'
-  s.add_development_dependency 'fakefs', '>= 0.6', '< 2.0'
-  s.add_development_dependency 'rake', '~> 13.0'
-  s.add_development_dependency 'pry', '~> 0.10'
 
   # Documentation dependencies
-  s.add_development_dependency 'yard'
   s.add_development_dependency 'thin'
+  s.add_development_dependency 'yard'
 
   # Run time dependencies
   s.add_runtime_dependency 'deep_merge', '~> 1.0'

data/lib/beaker-hostgenerator/abs_support.rb

@@ -8,17 +8,17 @@ module BeakerHostGenerator
     #
     # For example, given the following config (parts omitted for brevity):
     #    {"HOSTS"=>
-    #     {"centos6-64-1"=>
-    #        {"template"=>"centos-6-x86_64", ...},
+    #     {"centos9-64-1"=>
+    #        {"template"=>"centos-9-x86_64", ...},
     #      "redhat7-64-1"=>
     #        {"template"=>"redhat-7-x86_64", ...},
-    #      "centos6-64-2"=>
-    #        {"template"=>"centos-6-x86_64", ...}},
+    #      "centos9-64-2"=>
+    #        {"template"=>"centos-9-x86_64", ...}},
     #     ...
     #    }}
     #
     # Returns the following map:
-    #     {"centos-6-x86_64"=>2, "redhat-7-x86_64"=>1}
+    #     {"centos-9-x86_64"=>2, "redhat-7-x86_64"=>1}
     #
     def extract_templates(config)
       templates_hosts = config['HOSTS'].values.group_by { |h| h['template'] }

data/lib/beaker-hostgenerator/cli.rb

@@ -31,41 +31,41 @@ Usage: beaker-hostgenerator [options] <layout>
   <platform>-<arch>[[<arbitrary-roles>,[...]].]<roles>[{<arbitrary-settings>,[...]}][-<arch>[[<arbitrary-roles>,[...]].]<roles>[{<arbitrary-settings>,[...]}]][-<layout>]
 
  examples:
-  centos6-64mdca-32a
-   1 CentOS 6 64 bit node with roles = master, database, agent, dashboard
-   1 CentOS 6 32 bit node with roles = agent
+  centos9-64mdca-64a
+   1 CentOS 9 64 bit node with roles = master, database, agent, dashboard
+   1 CentOS 9 64 bit node with roles = agent
 
-  debian8-64m-32ad-32ac-centos6-64a
-   1 Debian 8 64 bit node with roles = master
-   1 Debian 8 32 bit node with roles = agent, database
-   1 Debian 8 32 bit node with roles = agent, dashboard
-   1 CentOS 6 64 bit node with roles = agent
+  debian11-64m-64ad-64ac-centos9-64a
+   1 Debian 11 64 bit node with roles = master
+   1 Debian 11 64 bit node with roles = agent, database
+   1 Debian 11 64 bit node with roles = agent, dashboard
+   1 CentOS 9 64 bit node with roles = agent
 
-  debian8-64m-windows8-64a
-   1 Debian 8 64 bit node with roles = master
-   1 Windows 8 64 bit node with roles = agent
+  debian11-64m-windows2019_core-64a
+   1 Debian 11 64 bit node with roles = master
+   1 Windows 2019 64 bit node with roles = agent
 
  example with arbitrary roles:
-  centos6-32compile_master,another_role.ma
-   1 CentOS 6 32 bit node with roles = master, agent, compile_master, another_role
+  centos9-64compile_master,another_role.ma
+   1 CentOS 9 64 bit node with roles = master, agent, compile_master, another_role
 
  example with arbitrary host settings:
-  centos6-64m{hypervisor=none\\,hostname=static1\\,my-key=my-value}-32a
-   1 CentOS 6 64 bit node with roles = master, hypervisor = none, node name = static1, and my-key = my-value
-   1 CentOS 6 32 bit node with roles = agent and the default hypervisor
+  centos9-64m{hypervisor=none\\,hostname=static1\\,my-key=my-value}-64a
+   1 CentOS 9 64 bit node with roles = master, hypervisor = none, node name = static1, and my-key = my-value
+   1 CentOS 9 64 bit node with roles = agent and the default hypervisor
 
  example of a list within arbitrary host settings:
-  centos6-64m{hostname=static1\\,disks=[8,16],my-list=[my-value1]}-32a
-   1 CentOS 6 64 bit node with roles = master, node name = static1 and lists:
+  centos9-64m{hostname=static1\\,disks=[8,16],my-list=[my-value1]}-64a
+   1 CentOS 9 64 bit node with roles = master, node name = static1 and lists:
       disks:
          - 8
          - 16
        my-list:
          - my-value1
-   1 CentOS 6 32 bit node with roles = agent and the default hypervisor
+   1 CentOS 9 64 bit node with roles = agent and the default hypervisor
 
  Generally, it is expected that beaker-hostgenerator output will be redirected to a file, for example:
-  beaker-hostgenerator centos6-64ma > host.cfg
+  beaker-hostgenerator centos9-64ma > host.cfg
 
  This can then be used in a Beaker call instead of a static Beaker config.
 
@@ -198,7 +198,7 @@ Usage: beaker-hostgenerator [options] <layout>
       result << "\n\n"
 
       result << "built-in beaker-hostgenerator host roles:\n"
-      BeakerHostGenerator::Roles::ROLES.each do |k,v|
+      BeakerHostGenerator::Roles::ROLES.each do |k, v|
         result << "   #{k} => #{v}\n"
       end
       result << "\n\n"