beaker-hostgenerator 2.1.0 → 2.2.1

data/Rakefile

@@ -4,22 +4,22 @@ require 'rake/testtask'
 namespace :test do
   namespace :spec do
     task :minitest do
-      desc "Run minitest tests"
+      desc 'Run minitest tests'
       Rake::TestTask.new do |task|
-        task.libs << %w(test lib)
+        task.libs << %w[test lib]
         task.test_files = FileList['test/test*.rb']
         task.verbose = true
       end
     end
 
-    desc "Run spec tests"
+    desc 'Run spec tests'
     RSpec::Core::RakeTask.new(:run) do |t|
       t.rspec_opts = ['--color']
       t.pattern = 'spec/'
       t.ruby_opts = '-Itest'
     end
 
-    desc "Run spec tests with coverage"
+    desc 'Run spec tests with coverage'
     RSpec::Core::RakeTask.new(:coverage) do |t|
       ENV['BEAKER_TEMPLATE_COVERAGE'] = 'y'
       t.rspec_opts = ['--color']
@@ -29,7 +29,7 @@ namespace :test do
 end
 
 namespace :generate do
-  desc "Generate test fixtures."
+  desc 'Generate test fixtures.'
   task :fixtures do
     $LOAD_PATH.unshift(
       File.join(Dir.pwd, 'lib'),
@@ -49,8 +49,8 @@ end
 task 'test:spec' => ['test:spec:run', 'test:spec:minitest']
 
 # global defaults
-task :test => 'test:spec'
-task :default => :test
+task test: 'test:spec'
+task default: :test
 
 begin
   require 'github_changelog_generator/task'
@@ -69,7 +69,7 @@ begin
       puts 'Fixing line endings...'
       changelog_file = File.join(__dir__, 'CHANGELOG.md')
       changelog_txt = File.read(changelog_file)
-      new_contents = changelog_txt.gsub(/\r\n/, "\n")
+      new_contents = changelog_txt.gsub("\r\n", "\n")
       File.open(changelog_file, 'w') { |file| file.puts new_contents }
     end
   end

data/beaker-hostgenerator.gemspec

@@ -1,37 +1,33 @@
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 require 'beaker-hostgenerator/version'
 
 Gem::Specification.new do |s|
-  s.name        = "beaker-hostgenerator"
+  s.name        = 'beaker-hostgenerator'
   s.version     = BeakerHostGenerator::Version::STRING
-  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
-The beaker-hostgenerator tool will take a Beaker SUT (System Under Test) spec as
-its first positional argument and use that to generate a Beaker host
-configuration file.
-eos
-  s.license     = 'Apache2'
+  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
+    The beaker-hostgenerator tool will take a Beaker SUT (System Under Test) spec as
+    its first positional argument and use that to generate a Beaker host
+    configuration file.
+  eos
+  s.license = 'Apache-2.0'
 
   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.require_paths = ["lib"]
+  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 'minitest', '~> 5.18'
   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'
-
-  # Documentation dependencies
-  s.add_development_dependency 'thin'
-  s.add_development_dependency 'yard'
+  s.add_development_dependency 'rspec-its', '~> 1.3'
 
   # Run time dependencies
   s.add_runtime_dependency 'deep_merge', '~> 1.0'

data/lib/beaker-hostgenerator/cli.rb

@@ -24,52 +24,52 @@ module BeakerHostGenerator
       argv.push('--help') if argv.empty?
 
       optparse = OptionParser.new do |opts|
-        opts.banner = <<-eos
-Usage: beaker-hostgenerator [options] <layout>
+        opts.banner = <<~eos
+          Usage: beaker-hostgenerator [options] <layout>
 
- where <layout> takes the following form:
-  <platform>-<arch>[[<arbitrary-roles>,[...]].]<roles>[{<arbitrary-settings>,[...]}][-<arch>[[<arbitrary-roles>,[...]].]<roles>[{<arbitrary-settings>,[...]}]][-<layout>]
+           where <layout> takes the following form:
+            <platform>-<arch>[[<arbitrary-roles>,[...]].]<roles>[{<arbitrary-settings>,[...]}][-<arch>[[<arbitrary-roles>,[...]].]<roles>[{<arbitrary-settings>,[...]}]][-<layout>]
 
- examples:
-  centos9-64mdca-64a
-   1 CentOS 9 64 bit node with roles = master, database, agent, dashboard
-   1 CentOS 9 64 bit node with roles = agent
+           examples:
+            centos9-64mdca-64a
+             1 CentOS 9 64 bit node with roles = master, database, agent, dashboard
+             1 CentOS 9 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
+            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
 
-  debian11-64m-windows2019_core-64a
-   1 Debian 11 64 bit node with roles = master
-   1 Windows 2019 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:
-  centos9-64compile_master,another_role.ma
-   1 CentOS 9 64 bit node with roles = master, agent, compile_master, another_role
+           example with arbitrary roles:
+            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:
-  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 with arbitrary host settings:
+            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:
-  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 9 64 bit node with roles = agent and the default hypervisor
+           example of a list within arbitrary host settings:
+            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 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 centos9-64ma > host.cfg
+           Generally, it is expected that beaker-hostgenerator output will be redirected to a file, for example:
+            beaker-hostgenerator centos9-64ma > host.cfg
 
- This can then be used in a Beaker call instead of a static Beaker config.
+           This can then be used in a Beaker call instead of a static Beaker config.
 
-            eos
+        eos
 
         opts.on('-l',
                 '--list',
@@ -79,7 +79,7 @@ Usage: beaker-hostgenerator [options] <layout>
         end
 
         opts.on('--templates-only',
-               'Generate a reduced output including only the templates from each host.') do
+                'Generate a reduced output including only the templates from each host.') do
           @options[:templates_only] = true
         end
 
@@ -110,7 +110,7 @@ Usage: beaker-hostgenerator [options] <layout>
         end
 
         opts.on('--disable-role-config',
-                "Do not include role-specific configuration.") do
+                'Do not include role-specific configuration.') do
           @options[:disable_role_config] = true
         end
 
@@ -120,19 +120,17 @@ Usage: beaker-hostgenerator [options] <layout>
         end
 
         opts.on('--osinfo-version MAJOR_VERSION',
-                "Use OSINFO for specified beaker-hostgenerator version. " <<
-                "Allows early access to future version of OSINFO data structure " <<
-                "used to generate host configs.") do |version|
+                'Use OSINFO for specified beaker-hostgenerator version. ' <<
+                'Allows early access to future version of OSINFO data structure ' <<
+                'used to generate host configs.') do |version|
           version = version.to_i
-          if not [0, 1].include? version
-              raise "Invalid beaker-hostgenerator version: #{version}"
-          end
+          raise "Invalid beaker-hostgenerator version: #{version}" unless [0, 1].include? version
 
           @options[:osinfo_version] = version
         end
 
         opts.on('--global-config KEYVALUE_STRING',
-                "General configuration settings to be included as-is in the " <<
+                'General configuration settings to be included as-is in the ' <<
                 "CONFIG section. Value should be in the form '{key=value,...}'.") do |p|
           @options[:global_config] = p
         end
@@ -204,7 +202,7 @@ Usage: beaker-hostgenerator [options] <layout>
       result << "\n\n"
 
       result << "built-in beaker-hostgenerator hypervisors:\n"
-      BeakerHostGenerator::Hypervisor.builtin_hypervisors().keys.each do |k|
+      BeakerHostGenerator::Hypervisor.builtin_hypervisors.each_key do |k|
         result << "   #{k}\n"
       end