beaker 4.40.2 → 5.0.0

data/acceptance/tests/subcommands/destroy.rb

@@ -1,5 +1,4 @@
 test_name 'use the destroy subcommand' do
-
   def delete_root_folder_contents
     on default, 'rm -rf /root/* /root/.beaker'
   end
@@ -24,26 +23,25 @@ test_name 'use the destroy subcommand' do
   end
 
   step 'ensure that `beaker destroy` destroys vmpooler configuration' do
-     delete_root_folder_contents
-     result = on(default, "beaker init --hosts centos6-64")
-     assert_match(/Writing configured options to disk/, result.stdout)
-     assert_equal(0, result.exit_code, "`beaker init` should return a zero exit code")
-     step 'ensure destroy fails to run against an unprovisioned environment' do
-       result = on(default, "beaker destroy", :accept_all_exit_codes => true)
-       assert_match(/Please provision an environment/, result.stdout)
-       assert_equal(1, result.exit_code, "`beaker destroy` should return a non zero exit code")
-     end
-     step 'ensure provision provisions, validates, and configures new hosts' do
-       result = on(default, "beaker provision")
-       assert_match(/Using available host/, result.stdout)
-       assert_equal(0, result.exit_code, "`beaker provision` should return a zero exit code")
-     end
-     step 'ensure destroy will destroy a provisioned environment' do
-       result = on(default, 'beaker destroy')
-       assert_match(/Handing/, result.stdout)
-       assert_equal(0, result.exit_code, "`beaker destroy` should return a zero exit code")
-     end
+    delete_root_folder_contents
+    result = on(default, "beaker init --hosts centos6-64")
+    assert_match(/Writing configured options to disk/, result.stdout)
+    assert_equal(0, result.exit_code, "`beaker init` should return a zero exit code")
+    step 'ensure destroy fails to run against an unprovisioned environment' do
+      result = on(default, "beaker destroy", :accept_all_exit_codes => true)
+      assert_match(/Please provision an environment/, result.stdout)
+      assert_equal(1, result.exit_code, "`beaker destroy` should return a non zero exit code")
+    end
+    step 'ensure provision provisions, validates, and configures new hosts' do
+      result = on(default, "beaker provision")
+      assert_match(/Using available host/, result.stdout)
+      assert_equal(0, result.exit_code, "`beaker provision` should return a zero exit code")
+    end
+    step 'ensure destroy will destroy a provisioned environment' do
+      result = on(default, 'beaker destroy')
+      assert_match(/Handing/, result.stdout)
+      assert_equal(0, result.exit_code, "`beaker destroy` should return a zero exit code")
+    end
     delete_root_folder_contents
   end
-
 end

data/acceptance/tests/subcommands/exec.rb

@@ -1,5 +1,4 @@
 test_name 'use the exec subcommand' do
-
   def delete_root_folder_contents
     on default, 'rm -rf /root/* /root/.beaker'
   end

data/acceptance/tests/subcommands/init.rb

@@ -1,5 +1,4 @@
 test_name 'use the init subcommand' do
-
   SubcommandUtil = Beaker::Subcommands::SubcommandUtil
   def delete_root_folder_contents
     on default, 'rm -rf /root/* /root/.beaker'
@@ -17,8 +16,8 @@ test_name 'use the init subcommand' do
     subcommand_state = on(default, "cat #{SubcommandUtil::SUBCOMMAND_STATE}").stdout
     parsed_options = YAML.parse(subcommand_options).to_ruby
     assert(parsed_options["HOSTS"].count == 1)
-    assert(parsed_options.class == Hash)
-    assert(YAML.parse(subcommand_state).to_ruby.class == Hash)
+    assert(parsed_options.instance_of?(Hash))
+    assert(YAML.parse(subcommand_state).to_ruby.instance_of?(Hash))
   end
 
   step 'ensure beaker init saves beaker-run arguments to the subcommand_options.yaml' do

data/acceptance/tests/subcommands/provision.rb

@@ -1,5 +1,4 @@
 test_name 'use the provision subcommand' do
-
   SubcommandUtil = Beaker::Subcommands::SubcommandUtil
 
   def delete_root_folder_contents

data/beaker.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'beaker/version'
@@ -14,17 +13,15 @@ Gem::Specification.new do |s|
   s.license     = 'Apache-2.0'
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  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.4')
+  s.required_ruby_version = Gem::Requirement.new('>= 2.7')
 
   # Testing dependencies
-  s.add_development_dependency 'fakefs', '~> 1.0'
+  s.add_development_dependency 'fakefs', '~> 2.4'
   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 'yard', '~> 0.9.11'
@@ -40,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'net-scp', '>= 1.2', '< 5.0'
   s.add_runtime_dependency 'net-ssh', '>= 5.0'
 
-  s.add_runtime_dependency 'in-parallel', '>= 0.1', '< 2'
+  s.add_runtime_dependency 'in-parallel', '>= 0.1', '< 2.0'
   s.add_runtime_dependency 'rsync', '~> 1.0.9'
   s.add_runtime_dependency 'thor', ['>= 1.0.1', '< 2.0']
 

data/docs/concepts/argument_processing_and_precedence.md

@@ -149,8 +149,6 @@ Usage: beaker [options...]
                                      (default: false)
         --repo-proxy                 Proxy packaging repositories on ubuntu, debian, cumulus and solaris-11
                                      (default: false)
-        --add-el-extras              Add Extra Packages for Enterprise Linux (EPEL) repository to el-* hosts
-                                     (default: false)
         --package-proxy URL          Set proxy url for package managers (yum and apt)
         --[no-]validate              Validate that SUTs are correctly provisioned before running tests
                                      (default: true)
@@ -217,7 +215,7 @@ Values already included in Beaker as defaults for required arguments.
           :preserve_hosts         => 'never',
           :root_keys              => false,
           :quiet                  => false,
-          :project_root           => File.expand_path(File.join(File.dirname(__FILE__), "../")),
+          :project_root           => File.expand_path(File.join(__dir__, "../")),
           :xml_dir                => 'junit',
           :xml_file               => 'beaker_junit.xml',
           :xml_time               => 'beaker_times.xml',
@@ -234,17 +232,10 @@ Values already included in Beaker as defaults for required arguments.
           :fail_mode              => 'slow',
           :accept_all_exit_codes  => false,
           :timesync               => false,
-          :disable_iptables       => false,
           :set_env                => true,
           :disable_updates        => true,
           :repo_proxy             => false,
           :package_proxy          => false,
-          :add_el_extras          => false,
-          :epel_url               => "http://mirrors.kernel.org/fedora-epel",
-          :epel_arch              => "i386",
-          :epel_7_pkg             => "epel-release-7-6.noarch.rpm",
-          :epel_6_pkg             => "epel-release-6-8.noarch.rpm",
-          :epel_5_pkg             => "epel-release-5-4.noarch.rpm",
           :consoleport            => 443,
           :pe_dir                 => '/opt/enterprise/dists',
           :pe_version_file        => 'LATEST',

data/docs/how_to/debug_beaker_tests.md

@@ -267,18 +267,18 @@ Now try `beaker run -t test.rb --debug-errors` This will enter a pry or debug co
         39:   logger.notify "\n* #{step_name}\n"
         40:   set_current_step_name(step_name)
         41:   if block_given?
-        42:     logger.step_in()
-        43:     begin
-        44:       yield
-        45:     rescue Exception => e
-        46:       if(@options.has_key?(:debug_errors) && @options[:debug_errors] == true)
-        47:         logger.info("Exception raised during step execution and debug-errors option is set, entering pry. Exception was: #{e.inspect}")
-        48:         logger.info("HINT: Use the pry 'backtrace' and 'up' commands to navigate to the test code")
-        49:         binding.pry
-        50:       end
-     => 51:       raise e
-        52:     end
-        53:     logger.step_out()
+        42:     logger.with_indent do
+        43:       begin
+        44:         yield
+        45:       rescue Exception => e
+        46:         if(@options.has_key?(:debug_errors) && @options[:debug_errors] == true)
+        47:           logger.info("Exception raised during step execution and debug-errors option is set, entering pry. Exception was: #{e.inspect}")
+        48:           logger.info("HINT: Use the pry 'backtrace' and 'up' commands to navigate to the test code")
+        49:           binding.pry
+        50:         end
+     => 51:         raise e
+        52:       end
+        53:     end
         54:   end
         55: end
 

data/docs/how_to/hosts/eos.md

@@ -2,20 +2,10 @@
 
 EOS is the network device OS from Arista. You can get more details from their [product page](https://www.arista.com/en/products/eos).
 
+It reaches out to the EOS-specific host code for any information that it needs. You can check out [these methods](blob/master/lib/beaker/host/eos.rb) if you need more information about this.
+
 # Hypervisors
 
 EOS has only been developed and tested as a [vmpooler](https://github.com/puppetlabs/vmpooler) host.
 
 This doesn't mean that it can't be used in another hypervisor, but that Beaker doesn't specifically deal with the details of that hypervisor in creating EOS hosts, if there is anything specific to EOS that will need to be done in provisioning steps.
-
-# Installation Methods
-
-## Puppet Enterprise
-
-`install_pe` should "just work".
-
-## Open Source
-
-In order to install a puppet-agent against an EOS host, you'll have to use the [`install_puppet_agent_dev_repo_on`](blob/master/lib/beaker/dsl/install_utils/foss_utils.rb#L1085) method.
-
-It reaches out to the EOS-specific host code for any information that it needs. You can check out [these methods](blob/master/lib/beaker/host/eos.rb) if you need more information about this.

data/docs/how_to/install_puppet.md

@@ -35,21 +35,3 @@ For our different Open Source variants, check out the sections just below, which
 ### Released Open Source Puppet Agents
 
 To install a released version of Puppet Agent, beaker provides the [`install_puppet_agent_on`](http://www.rubydoc.info/gems/beaker/Beaker/DSL/InstallUtils/FOSSUtils#install_puppet_agent_on-instance_method) method. Please checkout the Rubydocs for more info on this method.
-
-### Development Open Source Puppet Agents
-
-To install a development build of Puppet Agent, beaker provides the [`install_puppet_agent_dev_repo_on`](http://www.rubydoc.info/gems/beaker/Beaker/DSL/InstallUtils/FOSSUtils#install_puppet_agent_dev_repo_on-instance_method) method. Please checkout the Rubydocs for more info on this method.
-
-### PE Promoted Agent Installs
-
-If you're using this method, then you're going to be downloading the installer from a URL configured like so:
-
-```ruby
-http://pm.puppetlabs.com/puppet-agent/#{ pe_version }/#{ puppet_agent_version }/repos
-```
-
-`pe_version` is a variable that you can provide using either the host or global property `:pe_ver`. This is usually done in the hosts file, and will default to `4.0.0-rc1` if nothing is specified.
-
-`puppet_agent_version` is a variable you can provide the value of through the same methods as `pe_version` above. It will default to `latest`.
-
-Beaker's DSL method to install from this location is [`install_puppet_agent_pe_promoted_repo_on`](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/InstallUtils/FOSSUtils#install_puppet_agent_pe_promoted_repo_on-instance_method). Follow the link to get API-level docs on this method for more info.

data/docs/how_to/the_beaker_dsl.md

@@ -24,7 +24,6 @@ To be used for confirming the result of a test is as expected.  Beaker include a
 
 * [Minitest assertions](http://docs.seattlerb.org/minitest/Minitest/Assertions.html)
 * [assert_output](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Assertions#assert_output-instance_method)
-* [assert_no_match](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Assertions#assert_no_match-instance_method)
 
 ## Helpers
 
@@ -42,7 +41,6 @@ DSL methods for host manipulation.
 * [scp_from](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Helpers/HostHelpers#scp_from-instance_method)
 * [scp_to](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Helpers/HostHelpers#scp_to-instance_method)
 * [rsync_to](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Helpers/HostHelpers#rsync_to-instance_method)
-* [deploy_package_repo](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Helpers/HostHelpers#deploy_package_repo-instance_method)
 * [create_remote_file](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Helpers/HostHelpers#create_remote_file-instance_method)
 * [run_script_on](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Helpers/HostHelpers#run_script_on-instance_method)
 * [run_script](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Helpers/HostHelpers#run_script-instance_method)

data/lib/beaker/cli.rb

@@ -1,15 +1,17 @@
 module Beaker
   class CLI
-    VERSION_STRING =
-"      wWWWw
+    VERSION_STRING = <<-'ART'
+      wWWWw
       |o o|
       | O |  %s!
-      |(\")|
-     / \\X/ \\
+      |(")|
+     / \X/ \
     |   V   |
-    |   |   | "
+    |   |   |
+    ART
 
     attr_reader :logger, :options, :network_manager
+
     def initialize
       @timestamp = Time.now
       # Initialize a logger object prior to parsing; this should be overwritten whence
@@ -44,7 +46,7 @@ module Beaker
         exit(0)
       end
 
-      #add additional paths to the LOAD_PATH
+      # add additional paths to the LOAD_PATH
       if not @options[:load_path].empty?
         @options[:load_path].each do |path|
           $LOAD_PATH << File.expand_path(path)
@@ -67,7 +69,7 @@ module Beaker
     # Provision, validate and configure all hosts as defined in the hosts file
     def provision
       begin
-        @hosts =  []
+        @hosts = []
         initialize_network_manager
         @network_manager.proxy_package_manager
         @network_manager.validate
@@ -78,7 +80,7 @@ module Beaker
       self
     end
 
-    #Initialize the network manager so it can initialize hosts for testing for subcommands
+    # Initialize the network manager so it can initialize hosts for testing for subcommands
     def initialize_network_manager
       begin
         @network_manager = Beaker::NetworkManager.new(@options, @logger)
@@ -104,31 +106,29 @@ module Beaker
         end
 
         # Setup perf monitoring if needed
-        if /(aggressive)|(normal)/.match?(@options[:collect_perf_data].to_s)
-          @perf = Beaker::Perf.new( @hosts, @options )
-        end
+        @perf = Beaker::Perf.new(@hosts, @options) if /(aggressive)|(normal)/.match?(@options[:collect_perf_data].to_s)
 
-        #pre acceptance  phase
+        # pre acceptance  phase
         run_suite(:pre_suite, :fast)
 
-        #testing phase
+        # testing phase
         begin
           run_suite(:tests, @options[:fail_mode])
-        #post acceptance phase
+        # post acceptance phase
         rescue => e
-          #post acceptance on failure
-          #run post-suite if we are in fail-slow mode
+          # post acceptance on failure
+          # run post-suite if we are in fail-slow mode
           if @options[:fail_mode].to_s.include?('slow')
             run_suite(:post_suite)
             @perf.print_perf_info if defined? @perf
           end
           raise e
         else
-          #post acceptance on success
+          # post acceptance on success
           run_suite(:post_suite)
           @perf.print_perf_info if defined? @perf
         end
-      #cleanup phase
+      # cleanup phase
       rescue => e
         begin
           run_suite(:pre_cleanup)
@@ -137,17 +137,15 @@ module Beaker
           @logger.error "Failed running the pre-cleanup suite."
         end
 
-        #cleanup on error
+        # cleanup on error
         if /(never)|(onpass)/.match?(@options[:preserve_hosts].to_s)
           @logger.notify "Cleanup: cleaning up after failed run"
-          if @network_manager
-            @network_manager.cleanup
-          end
+          @network_manager.cleanup if @network_manager
         else
           preserve_hosts_file
         end
 
-        print_reproduction_info( :error )
+        print_reproduction_info(:error)
 
         @logger.error "Failed running the test suite."
         puts ''
@@ -160,25 +158,21 @@ module Beaker
           @logger.error "Failed running the pre-cleanup suite."
         end
 
-        #cleanup on success
+        # cleanup on success
         if /(never)|(onfail)/.match?(@options[:preserve_hosts].to_s)
           @logger.notify "Cleanup: cleaning up after successful run"
-          if @network_manager
-            @network_manager.cleanup
-          end
+          @network_manager.cleanup if @network_manager
         else
           preserve_hosts_file
         end
 
-        if @logger.is_debug?
-          print_reproduction_info( :debug )
-        end
+        print_reproduction_info(:debug) if @logger.is_debug?
       end
     end
 
-    #Run the provided test suite
-    #@param [Symbol] suite_name The test suite to execute
-    #@param [String] failure_strategy How to proceed after a test failure, 'fast' = stop running tests immediately, 'slow' =
+    # Run the provided test suite
+    # @param [Symbol] suite_name The test suite to execute
+    # @param [String] failure_strategy How to proceed after a test failure, 'fast' = stop running tests immediately, 'slow' =
     #                                 continue to execute tests.
     def run_suite(suite_name, failure_strategy = nil)
       if (@options[suite_name].empty?)
@@ -195,9 +189,7 @@ module Beaker
     def configured_options
       result = Beaker::Options::OptionsHash.new
       @attribution.each do |attribute, setter|
-        if setter != 'preset'
-          result[attribute] = @options[attribute]
-        end
+        result[attribute] = @options[attribute] if setter != 'preset'
       end
       result
     end
@@ -223,7 +215,7 @@ module Beaker
       hosts_yaml['HOSTS'] = combined_instance_and_options_hosts
       hosts_yaml['CONFIG'] = Beaker::Options::OptionsHash.new.merge(hosts_yaml['CONFIG'] || {})
       # save the rest of the options, excepting the HOSTS that we have already processed
-      hosts_yaml['CONFIG'] = hosts_yaml['CONFIG'].merge(@options.reject{ |k,_v| dontpreserve.match?(k) })
+      hosts_yaml['CONFIG'] = hosts_yaml['CONFIG'].merge(@options.reject { |k, _v| dontpreserve.match?(k) })
       # remove copy of HOSTS information
       hosts_yaml['CONFIG']['provision'] = false
       File.open(preserved_hosts_filename, 'w') do |file|
@@ -247,7 +239,7 @@ module Beaker
           end
         end
       end
-     newly_keyed_hosts_entries
+      newly_keyed_hosts_entries
     end
 
     # Prints all information required to reproduce the current run & results to the log
@@ -255,9 +247,9 @@ module Beaker
     # @see #print_command_line
     #
     # @return nil
-    def print_reproduction_info( log_level = :debug )
-      print_command_line( log_level )
-      print_env_vars_affecting_beaker( log_level )
+    def print_reproduction_info(log_level = :debug)
+      print_command_line(log_level)
+      print_env_vars_affecting_beaker(log_level)
     end
 
     # Prints Environment variables affecting the beaker run (those that
@@ -267,24 +259,23 @@ module Beaker
     #     print_env_vars_affecting_beaker :error
     #
     # @return nil
-    def print_env_vars_affecting_beaker( log_level )
-      non_beaker_env_vars =  [ 'BUNDLE_PATH', 'BUNDLE_BIN', 'GEM_HOME', 'GEM_PATH', 'RUBYLIB', 'PATH']
-      env_var_map = non_beaker_env_vars.inject({}) do |memo, possibly_set_vars|
-        set_var = Array(possibly_set_vars).detect {|possible_var| ENV[possible_var] }
-        memo[set_var] = ENV[set_var] if set_var
-        memo
+    def print_env_vars_affecting_beaker(log_level)
+      non_beaker_env_vars = %w[BUNDLE_PATH BUNDLE_BIN GEM_HOME GEM_PATH RUBYLIB PATH]
+      env_var_map = non_beaker_env_vars.each_with_object({}) do |possibly_set_vars, memo|
+        set_var = Array(possibly_set_vars).detect { |possible_var| ENV.fetch(possible_var, nil) }
+        memo[set_var] = ENV.fetch(set_var, nil) if set_var
       end
 
       env_var_map = env_var_map.merge(Beaker::Options::Presets.new.env_vars)
 
-      @logger.send( log_level, "\nImportant ENV variables that may have affected your run:" )
+      @logger.send(log_level, "\nImportant ENV variables that may have affected your run:")
       env_var_map.each_pair do |var, value|
         if value.is_a?(Hash)
-          value.each_pair do | subvar, subvalue |
-            @logger.send( log_level, "    #{subvar}\t\t#{subvalue}" )
+          value.each_pair do |subvar, subvalue|
+            @logger.send(log_level, "    #{subvar}\t\t#{subvalue}")
           end
         else
-          @logger.send( log_level, "    #{var}\t\t#{value}" )
+          @logger.send(log_level, "    #{var}\t\t#{value}")
         end
       end
     end
@@ -300,27 +291,27 @@ module Beaker
     #     Please contact @electrical or the Puppet QE Team for more info, or for requests to support this.
     #
     # @return nil
-    def print_command_line( log_level = :debug )
+    def print_command_line(log_level = :debug)
       @logger.send(log_level, "\nYou can reproduce this run with:\n")
       @logger.send(log_level, @options[:command_line])
-      if @options[:hosts_preserved_yaml_file]
-        set_docker_warning = false
-        has_supported_hypervisor = false
-        @hosts.each do |host|
-          case host[:hypervisor]
-          when /vagrant|fusion|vmpooler|vcloud/
-            has_supported_hypervisor = true
-          when /docker/
-            set_docker_warning = true
-          end
-        end
-        if has_supported_hypervisor
-          reproducing_command = build_hosts_preserved_reproducing_command(@options[:command_line], @options[:hosts_preserved_yaml_file])
-          @logger.send(log_level, "\nYou can re-run commands against the already provisioned SUT(s) with:\n")
-          @logger.send(log_level, '(docker support is untested for this feature. please reference the docs for more info)') if set_docker_warning
-          @logger.send(log_level, reproducing_command)
+      return unless @options[:hosts_preserved_yaml_file]
+
+      set_docker_warning = false
+      has_supported_hypervisor = false
+      @hosts.each do |host|
+        case host[:hypervisor]
+        when /vagrant|fusion|vmpooler|vcloud/
+          has_supported_hypervisor = true
+        when /docker/
+          set_docker_warning = true
         end
       end
+      return unless has_supported_hypervisor
+
+      reproducing_command = build_hosts_preserved_reproducing_command(@options[:command_line], @options[:hosts_preserved_yaml_file])
+      @logger.send(log_level, "\nYou can re-run commands against the already provisioned SUT(s) with:\n")
+      @logger.send(log_level, '(docker support is untested for this feature. please reference the docs for more info)') if set_docker_warning
+      @logger.send(log_level, reproducing_command)
     end
 
     # provides a new version of the command given, edited for re-use with a

data/lib/beaker/command.rb

@@ -4,7 +4,6 @@ module Beaker
   #
   # @api public
   class Command
-
     # A string representing the (possibly) incomplete command
     attr_accessor :command
 
@@ -56,11 +55,8 @@ module Beaker
       # this is deprecated and will not allow you to use a command line
       # option of `--environment`, please use ENV instead.
       [:ENV, :environment, 'environment', 'ENV'].each do |k|
-         if @options[k].is_a?(Hash)
-           @environment = @environment.merge(@options.delete(k))
-         end
+        @environment = @environment.merge(@options.delete(k)) if @options[k].is_a?(Hash)
       end
-
     end
 
     # @param [Host]   host An object that implements {Beaker::Host}'s
@@ -71,17 +67,17 @@ module Beaker
     #
     # @return [String] This returns the fully formed command line invocation.
     def cmd_line host, cmd = @command, env = @environment, pc = @prepend_cmds, ac = @append_cmds
-      env_string = host.environment_string( env )
-      prepend_commands = host.prepend_commands( cmd, pc, :cmd_exe => @cmdexe )
-      append_commands = host.append_commands( cmd, ac, :cmd_exe => @cmdexe )
+      env_string = host.environment_string(env)
+      prepend_commands = host.prepend_commands(cmd, pc, :cmd_exe => @cmdexe)
+      append_commands = host.append_commands(cmd, ac, :cmd_exe => @cmdexe)
 
       # This will cause things like `puppet -t -v agent` which is maybe bad.
-      if host[:platform]&.include?('cisco_ios_xr')
-        cmd_line_array = [prepend_commands, env_string, cmd, options_string, args_string, append_commands]
-      else
-        cmd_line_array = [env_string, prepend_commands, cmd, options_string, args_string, append_commands]
-      end
-      cmd_line_array.compact.reject( &:empty? ).join( ' ' )
+      cmd_line_array = if host[:platform]&.include?('cisco_ios_xr')
+                         [prepend_commands, env_string, cmd, options_string, args_string, append_commands]
+                       else
+                         [env_string, prepend_commands, cmd, options_string, args_string, append_commands]
+                       end
+      cmd_line_array.compact.reject(&:empty?).join(' ')
     end
 
     # @param [Hash] opts These are the options that the command takes
@@ -99,9 +95,9 @@ module Beaker
         end
       end
 
-      short_flags, long_flags = flags.partition {|flag| flag.to_s.length == 1 }
-      parsed_short_flags = short_flags.map {|f| "-#{f}" }
-      parsed_long_flags = long_flags.map {|f| "--#{f}" }
+      short_flags, long_flags = flags.partition { |flag| flag.to_s.length == 1 }
+      parsed_short_flags = short_flags.map { |f| "-#{f}" }
+      parsed_long_flags = long_flags.map { |f| "--#{f}" }
 
       short_opts, long_opts = {}, {}
       options.each_key do |key|
@@ -111,8 +107,8 @@ module Beaker
           long_opts[key] = options[key]
         end
       end
-      parsed_short_opts = short_opts.map {|k,v| "-#{k}=#{v}" }
-      parsed_long_opts = long_opts.map {|k,v| "--#{k}=#{v}" }
+      parsed_short_opts = short_opts.map { |k, v| "-#{k}=#{v}" }
+      parsed_long_opts = long_opts.map { |k, v| "--#{k}=#{v}" }
 
       return (parsed_short_flags +
               parsed_long_flags +
@@ -125,18 +121,15 @@ module Beaker
     def args_string args = @args
       args.flatten.compact.join(' ')
     end
-
-
-
   end
 
   class PuppetCommand < Command
     def initialize *args
       command = "puppet #{args.shift}"
-      opts = args.last.is_a?(Hash) ? args.pop : Hash.new
-      opts['ENV'] ||= Hash.new
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+      opts['ENV'] ||= {}
       opts[:cmdexe] = true
-      super( command, args, opts )
+      super(command, args, opts)
     end
   end
 
@@ -147,7 +140,6 @@ module Beaker
   end
 
   class SedCommand < Command
-
     # sets up a SedCommand for a particular platform
     #
     # the purpose is to abstract away platform-dependent details of the sed command
@@ -168,8 +160,8 @@ module Beaker
         command << " > #{temp_file} && mv #{temp_file} #{filename} && rm -f #{temp_file}"
       end
       args = []
-      opts['ENV'] ||= Hash.new
-      super( command, args, opts )
+      opts['ENV'] ||= {}
+      super(command, args, opts)
     end
   end
 end

data/lib/beaker/command_factory.rb

@@ -3,7 +3,7 @@ require 'minitest/test'
 module Beaker
   module CommandFactory
     include Minitest::Assertions
-    #Why do we need this accessor?
+    # Why do we need this accessor?
     # https://github.com/seattlerb/minitest/blob/master/lib/minitest/assertions.rb#L8-L12
     # Protocol: Nearly everything here boils up to +assert+, which
     # expects to be able to increment an instance accessor named
@@ -11,6 +11,7 @@ module Beaker
     # provided by the thing including Assertions. See Minitest::Runnable
     # for an example.
     attr_writer :assertions
+
     def assertions
       @assertions || 0
     end
@@ -27,7 +28,7 @@ module Beaker
     #
     # @api private
     # @return [String] Stdout from command execution
-    def execute(command, options={})
+    def execute(command, options = {})
       cmd_create_options = {}
       exec_opts = options.dup
       cmd_create_options[:prepend_cmds] = exec_opts.delete(:prepend_cmds) || nil