beaker-puppet 1.29.0 → 2.0.0

data/CHANGELOG.md

@@ -2,6 +2,37 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.0.0](https://github.com/voxpupuli/beaker-puppet/tree/2.0.0) (2023-05-05)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.29.0...2.0.0)
+
+**Breaking changes:**
+
+- Drop Ruby 2.4/2.5/2.6 & GCG: Add faraday-retry dep [\#218](https://github.com/voxpupuli/beaker-puppet/pull/218) ([bastelfreak](https://github.com/bastelfreak))
+- add support for recent FreeBSD versions; Drop FreeBSD 9/10 support [\#207](https://github.com/voxpupuli/beaker-puppet/pull/207) ([evgeni](https://github.com/evgeni))
+- Removes deprecated network device platforms [\#205](https://github.com/voxpupuli/beaker-puppet/pull/205) ([mhashizume](https://github.com/mhashizume))
+
+**Implemented enhancements:**
+
+- Implement RuboCop [\#212](https://github.com/voxpupuli/beaker-puppet/pull/212) ([bastelfreak](https://github.com/bastelfreak))
+- \(maint\) Call `exist?` instead of `exists?` [\#204](https://github.com/voxpupuli/beaker-puppet/pull/204) ([mhashizume](https://github.com/mhashizume))
+
+**Fixed bugs:**
+
+- configure defaults on FreeBSD [\#210](https://github.com/voxpupuli/beaker-puppet/pull/210) ([evgeni](https://github.com/evgeni))
+
+**Merged pull requests:**
+
+- Update fakefs requirement from \>= 0.6, \< 2.0 to \>= 0.6, \< 3.0 [\#222](https://github.com/voxpupuli/beaker-puppet/pull/222) ([dependabot[bot]](https://github.com/apps/dependabot))
+- rubocop: fix layout cops [\#221](https://github.com/voxpupuli/beaker-puppet/pull/221) ([bastelfreak](https://github.com/bastelfreak))
+- rubocop: fix style violations [\#220](https://github.com/voxpupuli/beaker-puppet/pull/220) ([bastelfreak](https://github.com/bastelfreak))
+- CI: Build gems with strictness and verbosity & dependencies: Add version constraints [\#219](https://github.com/voxpupuli/beaker-puppet/pull/219) ([bastelfreak](https://github.com/bastelfreak))
+- CI: apply Vox Pupuli best practices [\#217](https://github.com/voxpupuli/beaker-puppet/pull/217) ([bastelfreak](https://github.com/bastelfreak))
+- Drop in-parallel dependency [\#214](https://github.com/voxpupuli/beaker-puppet/pull/214) ([ekohl](https://github.com/ekohl))
+- Bump actions/checkout from 2 to 3 [\#211](https://github.com/voxpupuli/beaker-puppet/pull/211) ([dependabot[bot]](https://github.com/apps/dependabot))
+- tests: Always set the platform as a Beaker::Platform instance [\#209](https://github.com/voxpupuli/beaker-puppet/pull/209) ([ekohl](https://github.com/ekohl))
+- dependabot: check for github actions [\#208](https://github.com/voxpupuli/beaker-puppet/pull/208) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [1.29.0](https://github.com/voxpupuli/beaker-puppet/tree/1.29.0) (2022-11-02)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.28.0...1.29.0)

data/Gemfile

@@ -1,28 +1,13 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 gemspec
 
-def location_for(place, fake_version = nil)
-  if place =~ /^(git:[^#]*)#(.*)/
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
-  elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
-  else
-    [place, { :require => false }]
-  end
-end
-
-
-group :test do
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || ['>= 4.30.0', '< 5.0.0'])
-  gem "beaker-abs", *location_for(ENV['ABS_VERSION'] || '~> 0.4.0')
-end
-
 group :release do
+  gem 'faraday-retry', require: false
   gem 'github_changelog_generator', require: false
 end
 
-group :coverage, optional: ENV['COVERAGE']!='yes' do
-  gem 'simplecov-console', :require => false
-  gem 'codecov', :require => false
+group :coverage, optional: ENV['COVERAGE'] != 'yes' do
+  gem 'codecov', require: false
+  gem 'simplecov-console', require: false
 end

data/Rakefile

@@ -2,74 +2,69 @@ require 'rspec/core/rake_task'
 require 'securerandom'
 require 'beaker-hostgenerator'
 
-
 namespace :test do
-
   namespace :spec do
-
-    desc "Run spec tests"
+    desc 'Run spec tests'
     RSpec::Core::RakeTask.new(:run) do |t|
       t.rspec_opts = ['--color']
       t.pattern = 'spec/'
     end
 
-    desc "Run spec tests with coverage"
+    desc 'Run spec tests with coverage'
     RSpec::Core::RakeTask.new(:coverage) do |t|
       ENV['BEAKER_PUPPET_COVERAGE'] = 'y'
       t.rspec_opts = ['--color']
       t.pattern = 'spec/'
     end
-
   end
 
   namespace :acceptance do
-    USAGE = <<-EOS
-You may set BEAKER_HOSTS=config/nodes/foo.yaml or include it in an acceptance-options.rb for Beaker,
-or specify TEST_TARGET in a form beaker-hostgenerator accepts, e.g. ubuntu1504-64a.
-You may override the default master test target by specifying MASTER_TEST_TARGET.
-You may set TESTS=path/to/test,and/more/tests.
-You may set additional Beaker OPTIONS='--more --options'
-If there is a Beaker options hash in a ./acceptance/local_options.rb, it will be included.
-Commandline options set through the above environment variables will override settings in this file.
+    USAGE = <<~EOS
+      You may set BEAKER_HOSTS=config/nodes/foo.yaml or include it in an acceptance-options.rb for Beaker,
+      or specify TEST_TARGET in a form beaker-hostgenerator accepts, e.g. ubuntu1504-64a.
+      You may override the default master test target by specifying MASTER_TEST_TARGET.
+      You may set TESTS=path/to/test,and/more/tests.
+      You may set additional Beaker OPTIONS='--more --options'
+      If there is a Beaker options hash in a ./acceptance/local_options.rb, it will be included.
+      Commandline options set through the above environment variables will override settings in this file.
     EOS
 
-    desc <<-EOS
-Run the puppet beaker acceptance tests on a puppet gem install.
-#{USAGE}
+    desc <<~EOS
+      Run the puppet beaker acceptance tests on a puppet gem install.
+      #{USAGE}
     EOS
-    task :gem  => 'gen_hosts' do
+    task gem: 'gen_hosts' do
       beaker_test(:gem)
     end
 
-    desc <<-EOS
-Run the puppet beaker acceptance tests on a puppet git install.
-#{USAGE}
+    desc <<~EOS
+      Run the puppet beaker acceptance tests on a puppet git install.
+      #{USAGE}
     EOS
-    task :git  => 'gen_hosts' do
+    task git: 'gen_hosts' do
       beaker_test(:git)
     end
 
-    desc <<-EOS
-Run the puppet beaker acceptance tests on a puppet package install.
-#{USAGE}
+    desc <<~EOS
+      Run the puppet beaker acceptance tests on a puppet package install.
+      #{USAGE}
     EOS
-    task :pkg => 'gen_hosts' do
+    task pkg: 'gen_hosts' do
       beaker_test(:pkg)
     end
 
-    desc <<-EOS
-Run the puppet beaker acceptance tests on a base system (no install).
-#{USAGE}
+    desc <<~EOS
+      Run the puppet beaker acceptance tests on a base system (no install).
+      #{USAGE}
     EOS
-    task :base => 'gen_hosts' do
-      beaker_test()
+    task base: 'gen_hosts' do
+      beaker_test
     end
 
     desc 'Generate Beaker Host Config File'
     task :gen_hosts do
-      if hosts_file_env
-        next
-      end
+      next if hosts_file_env
+
       cli = BeakerHostGenerator::CLI.new([test_targets])
       FileUtils.mkdir_p('tmp') # -p ignores when dir already exists
       File.open("tmp/#{HOSTS_FILE}", 'w') do |fh|
@@ -77,20 +72,18 @@ Run the puppet beaker acceptance tests on a base system (no install).
       end
     end
 
-    def hosts_opt(use_preserved_hosts=false)
+    def hosts_opt(use_preserved_hosts = false)
       if use_preserved_hosts
         "--hosts=#{HOSTS_PRESERVED}"
+      elsif hosts_file_env
+        "--hosts=#{hosts_file_env}"
       else
-        if hosts_file_env
-          "--hosts=#{hosts_file_env}"
-        else
-          "--hosts=tmp/#{HOSTS_FILE}"
-        end
+        "--hosts=tmp/#{HOSTS_FILE}"
       end
     end
 
     def hosts_file_env
-      ENV['BEAKER_HOSTS']
+      ENV.fetch('BEAKER_HOSTS', nil)
     end
 
     def agent_target
@@ -106,53 +99,52 @@ Run the puppet beaker acceptance tests on a base system (no install).
     end
 
     HOSTS_FILE = "#{test_targets}-#{SecureRandom.uuid}.yaml"
-    HOSTS_PRESERVED  = 'log/latest/hosts_preserved.yml'
+    HOSTS_PRESERVED = 'log/latest/hosts_preserved.yml'
 
     def beaker_test(mode = :base, options = {})
-
       preserved_hosts_mode = options[:hosts] == HOSTS_PRESERVED
       final_options = HarnessOptions.final_options(mode, options)
 
-      options_opt  = ""
+      options_opt = ''
       # preserved hosts can not be used with an options file (BKR-670)
       #   one can still use OPTIONS
 
-      if !preserved_hosts_mode
+      unless preserved_hosts_mode
         options_file = 'merged_options.rb'
         options_opt  = "--options-file=#{options_file}"
         File.open(options_file, 'w') do |merged|
-          merged.puts <<-EOS
-# Copy this file to local_options.rb and adjust as needed if you wish to run
-# with some local overrides.
+          merged.puts <<~EOS
+            # Copy this file to local_options.rb and adjust as needed if you wish to run
+            # with some local overrides.
           EOS
           merged.puts(final_options)
         end
       end
 
-      tests = ENV['TESTS'] || ENV['TEST']
-      tests_opt = ""
+      tests = ENV['TESTS'] || ENV.fetch('TEST', nil)
+      tests_opt = ''
       tests_opt = "--tests=#{tests}" if tests
 
       overriding_options = ENV['OPTIONS'].to_s
 
       args = [options_opt, hosts_opt(preserved_hosts_mode), tests_opt,
-              *overriding_options.split(' ')].compact
+              *overriding_options.split(' '),].compact
 
-      sh("beaker", *args)
+      sh('beaker', *args)
     end
 
     module HarnessOptions
       defaults = {
-        :tests  => ['tests'],
-        :log_level => 'debug',
-        :preserve_hosts => 'onfail',
+        tests: ['tests'],
+        log_level: 'debug',
+        preserve_hosts: 'onfail',
       }
 
       DEFAULTS = defaults
 
       def self.get_options(file_path)
         puts "Attempting to merge config file: #{file_path}"
-        if File.exists? file_path
+        if File.exist? file_path
           options = eval(File.read(file_path), binding)
         else
           puts "No options file found at #{File.expand_path(file_path)}... skipping"
@@ -175,11 +167,8 @@ Run the puppet beaker acceptance tests on a base system (no install).
         final_options.merge!(intermediary_options)
         final_options.merge!(local_overrides)
       end
-
     end
-
   end
-
 end
 
 # namespace-named default tasks.
@@ -189,124 +178,30 @@ task 'test:spec' => 'test:spec:run'
 task 'test:acceptance' => 'test:acceptance:quick'
 
 # global defaults
-task :test => 'test:spec'
-task :default => :test
-
-###########################################################
-#
-#   Documentation Tasks
-#
-###########################################################
-DOCS_DAEMON = "yard server --reload --daemon --server thin"
-FOREGROUND_SERVER = 'bundle exec yard server --reload --verbose --server thin lib/beaker'
-
-def running?( cmdline )
-  ps = `ps -ef`
-  found = ps.lines.grep( /#{Regexp.quote( cmdline )}/ )
-  if found.length > 1
-    raise StandardError, "Found multiple YARD Servers. Don't know what to do."
-  end
-
-  yes = found.empty? ? false : true
-  return yes, found.first
-end
-
-def pid_from( output )
-  output.squeeze(' ').strip.split(' ')[1]
-end
-
-desc 'Start the documentation server in the foreground'
-task :docs => 'docs:clear' do
-  original_dir = Dir.pwd
-  Dir.chdir( File.expand_path(File.dirname(__FILE__)) )
-  sh FOREGROUND_SERVER
-  Dir.chdir( original_dir )
-end
-
-namespace :docs do
-
-  desc 'Clear the generated documentation cache'
-  task :clear do
-    original_dir = Dir.pwd
-    Dir.chdir( File.expand_path(File.dirname(__FILE__)) )
-    sh 'rm -rf docs'
-    Dir.chdir( original_dir )
-  end
-
-  desc 'Generate static documentation'
-  task :gen => 'docs:clear' do
-    original_dir = Dir.pwd
-    Dir.chdir( File.expand_path(File.dirname(__FILE__)) )
-    output = `bundle exec yard doc`
-    puts output
-    if output =~ /\[warn\]|\[error\]/
-      fail "Errors/Warnings during yard documentation generation"
-    end
-    Dir.chdir( original_dir )
-  end
-
-  desc 'Run the documentation server in the background, alias `bg`'
-  task :background => 'docs:clear' do
-    yes, output = running?( DOCS_DAEMON )
-    if yes
-      puts "Not starting a new YARD Server..."
-      puts "Found one running with pid #{pid_from( output )}."
-    else
-      original_dir = Dir.pwd
-      Dir.chdir( File.expand_path(File.dirname(__FILE__)) )
-      sh "bundle exec #{DOCS_DAEMON}"
-      Dir.chdir( original_dir )
-    end
-  end
-
-  task(:bg) { Rake::Task['docs:background'].invoke }
-
-  desc 'Check the status of the documentation server'
-  task :status do
-    yes, output = running?( DOCS_DAEMON )
-    if yes
-      pid = pid_from( output )
-      puts "Found a YARD Server running with pid #{pid}"
-    else
-      puts "Could not find a running YARD Server."
-    end
-  end
-
-  desc "Stop a running YARD Server"
-  task :stop do
-    yes, output = running?( DOCS_DAEMON )
-    if yes
-      pid = pid_from( output )
-      puts "Found a YARD Server running with pid #{pid}"
-      `kill #{pid}`
-      puts "Stopping..."
-      yes, output = running?( DOCS_DAEMON )
-      if yes
-        `kill -9 #{pid}`
-        yes, output = running?( DOCS_DAEMON )
-        if yes
-          puts "Could not Stop Server!"
-        else
-          puts "Server stopped."
-        end
-      else
-        puts "Server stopped."
-      end
-    else
-      puts "Could not find a running YARD Server"
-    end
-  end
-end
+task test: 'test:spec'
+task default: :test
 
 begin
   require 'github_changelog_generator/task'
-
+rescue LoadError
+  # GCG is an optional group
+else
   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 skip-changelog}
+    config.exclude_labels = %w[duplicate question invalid wontfix wont-fix skip-changelog]
     config.user = 'voxpupuli'
     config.project = 'beaker-puppet'
     config.future_release = "#{Gem::Specification.load("#{config.project}.gemspec").version}"
   end
+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/acceptance/config/acceptance-options.rb

@@ -1,6 +1,6 @@
 {
-  :load_path => File.join('acceptance', 'lib'),
-  :ssh => {
-    :keys => ["id_rsa_acceptance", "#{ENV['HOME']}/.ssh/id_rsa-acceptance"],
+  load_path: File.join('acceptance', 'lib'),
+  ssh: {
+    keys: ['id_rsa_acceptance', "#{ENV.fetch('HOME', nil)}/.ssh/id_rsa-acceptance"],
   },
 }

data/acceptance/config/gem/acceptance-options.rb

@@ -1,9 +1,9 @@
 {
-    :type                 => 'foss',
-    :add_el_extras        => 'true',
-    :is_puppetserver      => false,
-    :puppetservice        => 'puppet.service',
-    :pre_suite            => 'acceptance/pre_suite/gem/install.rb',
-    :tests                => 'acceptance/tests',
-    :'master-start-curl-retries' => 30,
-}.merge(eval File.read('acceptance/config/acceptance-options.rb'))
+  type: 'foss',
+  add_el_extras: 'true',
+  is_puppetserver: false,
+  puppetservice: 'puppet.service',
+  pre_suite: 'acceptance/pre_suite/gem/install.rb',
+  tests: 'acceptance/tests',
+  'master-start-curl-retries': 30,
+}.merge(eval(File.read('acceptance/config/acceptance-options.rb')))

data/acceptance/config/git/acceptance-options.rb

@@ -1,9 +1,9 @@
 {
-    :type                 => 'foss',
-    :add_el_extras        => 'true',
-    :is_puppetserver      => false,
-    :puppetservice        => 'puppet.service',
-    :pre_suite            => 'acceptance/pre_suite/git/install.rb',
-    :tests                => 'acceptance/tests',
-    :'master-start-curl-retries' => 30,
-}.merge(eval File.read('acceptance/config/acceptance-options.rb'))
+  type: 'foss',
+  add_el_extras: 'true',
+  is_puppetserver: false,
+  puppetservice: 'puppet.service',
+  pre_suite: 'acceptance/pre_suite/git/install.rb',
+  tests: 'acceptance/tests',
+  'master-start-curl-retries': 30,
+}.merge(eval(File.read('acceptance/config/acceptance-options.rb')))

data/acceptance/config/pkg/acceptance-options.rb

@@ -1,8 +1,8 @@
 {
-    :type                 => 'foss',
-    :is_puppetserver      => false,
-    :puppetservice        => 'puppet.service',
-    :pre_suite            => 'acceptance/pre_suite/pkg/install.rb',
-    :tests                => 'acceptance/tests',
-    :'master-start-curl-retries' => 30,
-}.merge(eval File.read('acceptance/config/acceptance-options.rb'))
+  type: 'foss',
+  is_puppetserver: false,
+  puppetservice: 'puppet.service',
+  pre_suite: 'acceptance/pre_suite/pkg/install.rb',
+  tests: 'acceptance/tests',
+  'master-start-curl-retries': 30,
+}.merge(eval(File.read('acceptance/config/acceptance-options.rb')))

data/acceptance/pre_suite/gem/install.rb

@@ -1,10 +1,10 @@
 require 'beaker-puppet'
 
 hosts.each do |host|
-  install_puppet_from_gem(host, {:version => '3.8.7'})
-  unless host['platform'] =~ /windows/
-    on(host, "touch #{File.join(host.puppet['confdir'],'puppet.conf')}")
-    on(host, puppet('resource user puppet ensure=present'))
-    on(host, puppet('resource group puppet ensure=present'))
-  end
+  install_puppet_from_gem(host, { version: '3.8.7' })
+  next if host['platform'] =~ /windows/
+
+  on(host, "touch #{File.join(host.puppet['confdir'], 'puppet.conf')}")
+  on(host, puppet('resource user puppet ensure=present'))
+  on(host, puppet('resource group puppet ensure=present'))
 end

data/acceptance/pre_suite/git/install.rb

@@ -5,27 +5,27 @@ test_name 'Puppet git pre-suite'
 install = [
   'facter#2.1.0',
   'hiera#1.3.4',
-  'puppet#3.8.7'
+  'puppet#3.8.7',
 ]
 
 PACKAGES = {
-  :redhat => [
+  redhat: [
     'git',
     'ruby',
     'rubygem-json', # :add_el_extras is required to find this package
   ],
-  :debian => [
-    ['git', 'git-core'],
+  debian: [
+    %w[git git-core],
     'ruby',
   ],
-  :debian_ruby18 => [
+  debian_ruby18: [
     'libjson-ruby',
   ],
-  :solaris_11 => [
+  solaris_11: [
     ['git', 'developer/versioning/git'],
     ['ruby', 'runtime/ruby-18'],
   ],
-  :solaris_10 => [
+  solaris_10: [
     'coreutils',
     'curl', # update curl to fix "CURLOPT_SSL_VERIFYHOST no longer supports 1 as value!" issue
     'git',
@@ -33,16 +33,16 @@ PACKAGES = {
     'ruby19_dev',
     'gcc4core',
   ],
-  :windows => [
+  windows: [
     'git',
-  # there isn't a need for json on windows because it is bundled in ruby 1.9
+    # there isn't a need for json on windows because it is bundled in ruby 1.9
   ],
-  :sles => [
+  sles: [
     'git-core',
-  ]
+  ],
 }
 
-install_packages_on(hosts, PACKAGES, :check_if_exists => true)
+install_packages_on(hosts, PACKAGES, check_if_exists: true)
 
 hosts.each do |host|
   case host['platform']
@@ -57,11 +57,11 @@ hosts.each do |host|
                end
 
     step "#{host} Install ruby from git using revision #{revision}"
-    # TODO remove this step once we are installing puppet from msi packages
-    install_from_git(host, "/opt/puppet-git-repos",
-                     :name => 'puppet-win32-ruby',
-                     :path => build_giturl('puppet-win32-ruby'),
-                     :rev  => revision)
+    # TODO: remove this step once we are installing puppet from msi packages
+    install_from_git(host, '/opt/puppet-git-repos',
+                     name: 'puppet-win32-ruby',
+                     path: build_giturl('puppet-win32-ruby'),
+                     rev: revision)
     on host, 'cd /opt/puppet-git-repos/puppet-win32-ruby; cp -r ruby/* /'
     on host, 'cd /lib; icacls ruby /grant "Everyone:(OI)(CI)(RX)"'
     on host, 'cd /lib; icacls ruby /reset /T'
@@ -85,9 +85,9 @@ hosts.each do |host|
   repos.each do |repo|
     install_from_git(host, SourcePath, repo)
   end
-  unless host['platform'] =~ /windows/
-    on(host, "touch #{File.join(host.puppet['confdir'],'puppet.conf')}")
-    on(host, puppet('resource user puppet ensure=present'))
-    on(host, puppet('resource group puppet ensure=present'))
-  end
+  next if host['platform'] =~ /windows/
+
+  on(host, "touch #{File.join(host.puppet['confdir'], 'puppet.conf')}")
+  on(host, puppet('resource user puppet ensure=present'))
+  on(host, puppet('resource group puppet ensure=present'))
 end

data/acceptance/pre_suite/pkg/install.rb

@@ -4,9 +4,9 @@ require 'beaker-puppet'
 # all versions are required for osx
 hosts.each do |host|
   install_puppet_on(host, {
-    :version        => ENV['BEAKER_PUPPET_VERSION'] || '5.5.20',
-    :puppet_agent_version => ENV['BEAKER_PUPPET_AGENT_VERSION'] || '5.5.20'
-  })
+                      version: ENV['BEAKER_PUPPET_VERSION'] || '5.5.20',
+                      puppet_agent_version: ENV['BEAKER_PUPPET_AGENT_VERSION'] || '5.5.20',
+                    })
 
   on(host, puppet('resource user puppet ensure=present'))
   on(host, puppet('resource group puppet ensure=present'))

data/acceptance/tests/backwards_compatible.rb

@@ -1,19 +1,18 @@
 test_name 'backwards compatible test' do
-
   step 'calls the new FOSSUtils even if I require & include the old path' do
     require 'beaker/dsl/install_utils/foss_utils'
-    assert( !Beaker::DSL::InstallUtils::FOSSUtils::SourcePath.nil? )
-    assert( Beaker::DSL::InstallUtils::FOSSUtils.method_defined?(:lookup_in_env) )
+    assert(!Beaker::DSL::InstallUtils::FOSSUtils::SourcePath.nil?)
+    assert(Beaker::DSL::InstallUtils::FOSSUtils.method_defined?(:lookup_in_env))
   end
 
   step 'require old Helpers path, get helpers from new location' do
     require 'beaker/dsl/helpers/puppet_helpers'
-    assert( Beaker::DSL::Helpers::PuppetHelpers.method_defined?(:puppet_user) )
-    assert( Beaker::DSL::Helpers::PuppetHelpers.method_defined?(:resolve_hostname_on) )
+    assert(Beaker::DSL::Helpers::PuppetHelpers.method_defined?(:puppet_user))
+    assert(Beaker::DSL::Helpers::PuppetHelpers.method_defined?(:resolve_hostname_on))
   end
 
   step 'require old Helpers module, get from new location' do
     require 'beaker/dsl/helpers'
-    assert( Beaker::DSL::Helpers.is_a?( Module ) )
+    assert(Beaker::DSL::Helpers.is_a?(Module))
   end
-end
+end