beaker 4.38.1 → 4.39.0

data/lib/beaker/dsl/helpers/host_helpers.rb

@@ -83,7 +83,7 @@ module Beaker
             @result = host.exec(command_object, opts)
 
             # Also, let additional checking be performed by the caller.
-            if block_given?
+            if block
               case block.arity
                 #block with arity of 0, just hand back yourself
                 when 0
@@ -193,7 +193,7 @@ module Beaker
         # @return [Result] Returns the result of the SCP operation
         def scp_to host, from_path, to_path, opts = {}
           block_on host do | host |
-            if host['platform'] =~ /windows/ && to_path.match('`cygpath')
+            if host['platform'].include?('windows') && to_path.match('`cygpath')
               result = on host, "echo #{to_path}"
               to_path = result.raw_output.chomp
             end
@@ -215,7 +215,7 @@ module Beaker
         # @return [Result] Returns the result of the rsync operation
         def rsync_to host, from_path, to_path, opts = {}
           block_on host do | host |
-            if host['platform'] =~ /windows/ && to_path.match('`cygpath')
+            if host['platform'].include?('windows') && to_path.match('`cygpath')
               result = host.echo "#{to_path}"
               to_path = result.raw_output.chomp
             end
@@ -268,7 +268,7 @@ module Beaker
           FileUtils.mkdir_p(targetdir)
           scp_from(host, from_path, targetdir, opts)
           # scp_from does succeed on a non-existant file, checking if the file/folder actually exists
-          if not File.exists?(filename)
+          if not File.exist?(filename)
             raise IOError, "No such file or directory - #{filename}"
           end
           create_tarball(archive_root, archive_name)
@@ -348,7 +348,7 @@ module Beaker
           block_on hosts, opts do |host|
             script_path = "beaker_powershell_script_#{Time.now.to_i}.ps1"
             create_remote_file(host, script_path, powershell_script, opts)
-            native_path = script_path.gsub(/\//, "\\")
+            native_path = script_path.tr('/', "\\")
             on host, powershell("", {"File" => native_path }), opts
           end
 
@@ -491,7 +491,7 @@ module Beaker
         #
         # @return [Boolean] Whether the file exists on the host (using `test -f`)
         def file_exists_on(host, file_path)
-          if host['platform'] =~ /windows/
+          if host[:platform].include?('windows')
             command = %(Test-Path #{file_path})
 
             if file_path.include?(':')
@@ -516,7 +516,7 @@ module Beaker
         #
         # @return [Boolean] Whether the directory exists on the host (using `test -d`)
         def directory_exists_on(host, dir_path)
-          if host['platform'] =~ /windows/
+          if host[:platform].include?('windows')
             dir_path = "#{dir_path}\\" unless (dir_path[-1].chr == '\\')
 
             command = Command.new(%{IF exist "#{dir_path}" ( exit 0 ) ELSE ( exit 1 )}, [], { :cmdexe => true })
@@ -535,7 +535,7 @@ module Beaker
         # @return [Boolean] Whether the symlink exists on the host (using `test -L`)
         def link_exists_on(host, link_path)
           # Links are weird on windows, fall back to seeing if the file exists
-          return file_exists_on(host, link_path) if host['platform'] =~ /windows/
+          return file_exists_on(host, link_path) if host[:platform].include?('windows')
 
           return on(host, Command.new(%(test -L "#{link_path}"), accept_all_exit_codes: true)).exit_code.zero?
         end
@@ -551,8 +551,8 @@ module Beaker
 
           split_path = win_ads_path(file_path)
           if file_exists_on(host, split_path[:path])
-            if host['platform'] =~ /windows/
-              file_path.gsub!('/', '\\')
+            if host[:platform].include?('windows')
+              file_path.tr!('/', '\\')
 
               command = %{Get-Content -Raw -Path #{file_path}}
               command += %{ -Stream #{split_path[:ads]}} if split_path[:ads]
@@ -580,7 +580,7 @@ module Beaker
           on host, "curl --tlsv1 %s" % cmd, opts, &block
         end
 
-        def curl_with_retries(desc, host, url, desired_exit_codes, max_retries = 60, retry_interval = 1)
+        def curl_with_retries(_desc, host, url, desired_exit_codes, max_retries = 60, retry_interval = 1)
           opts = {
             :desired_exit_codes => desired_exit_codes,
             :max_retries => max_retries,

data/lib/beaker/dsl/helpers/web_helpers.rb

@@ -57,7 +57,7 @@ module Beaker
           base_url.chomp!('/')
           src = "#{base_url}/#{file_name}"
           dst = File.join(dst_dir, file_name)
-          if options[:cache_files_locally] && File.exists?(dst)
+          if options[:cache_files_locally] && File.exist?(dst)
             logger.notify "Already fetched #{dst}"
           else
             logger.notify "Fetching: #{src}"
@@ -69,7 +69,7 @@ module Beaker
                 end
               end
             rescue OpenURI::HTTPError => e
-              if e.message =~ /404.*/
+              if /404.*/.match?(e.message)
                 raise "Failed to fetch_remote_file '#{src}' (#{e.message})"
               else
                 raise e
@@ -92,7 +92,7 @@ module Beaker
         # @!visibility private
         def fetch_http_dir(url, dst_dir)
           logger.notify "fetch_http_dir (url: #{url}, dst_dir #{dst_dir})"
-          if url[-1, 1] !~ /\//
+          if !url.end_with?('/')
             url += '/'
           end
           url = URI.parse(url)

data/lib/beaker/dsl/outcomes.rb

@@ -19,18 +19,18 @@ module Beaker
       # Raise this class if it is determined that a test case should not
       # be executed because the feature in question is still a
       # "Work in Progress"
-      class PendingTest < Exception; end
+      class PendingTest < RuntimeError; end
 
       # Raise this class if execution should be stopped because the test
       # is not applicable within a given environment.
-      class SkipTest    < Exception; end
+      class SkipTest    < RuntimeError; end
 
       # Raise this class if some criteria has been met that proves a failure.
-      class FailTest    < Exception; end
+      class FailTest    < RuntimeError; end
 
       # Raise this class if execution should stop because enough criteria has
       # shown itself to pass the test.
-      class PassTest    < Exception; end
+      class PassTest    < RuntimeError; end
 
 
       # Raises FailTest Exception and logs an error message

data/lib/beaker/dsl/roles.rb

@@ -139,7 +139,7 @@ module Beaker
           return !version_is_less(version, '4.0') if version && !version.empty?
         end
         return true if host[:roles] && host[:roles].include?('aio')
-        return true if host[:type] && !!(host[:type] =~ /(\A|-)aio(\Z|-)/ )
+        return true if host[:type] && /(\A|-)aio(\Z|-)/.match(host[:type])
         false
       end
 
@@ -175,7 +175,7 @@ module Beaker
           end
         else
           if not respond_to? role
-            if role !~ /\A[[:alpha:]]+[a-zA-Z0-9_]*[!?=]?\Z/
+            if !/\A[[:alpha:]]+[a-zA-Z0-9_]*[!?=]?\Z/.match?(role)
               raise ArgumentError, "Role name format error for '#{role}'.  Allowed characters are: \na-Z\n0-9 (as long as not at the beginning of name)\n'_'\n'?', '!' and '=' (only as individual last character at end of name)"
             end
             self.class.send :define_method, role.to_s do

data/lib/beaker/dsl/structure.rb

@@ -37,7 +37,7 @@ module Beaker
       def step step_name, &block
         logger.notify "\n* #{step_name}\n"
         set_current_step_name(step_name)
-        if block_given?
+        if block
           begin
             logger.with_indent do
               yield
@@ -58,7 +58,7 @@ module Beaker
               else
                 logger.info("Exception raised during step execution and debug-errors option is set, entering pry. Exception was: #{e.inspect}")
                 logger.info("HINT: Use the pry 'backtrace' and 'up' commands to navigate to the test code")
-                binding.pry
+                binding.pry # rubocop:disable Lint/Debugger
               end
             end
             raise e
@@ -128,7 +128,7 @@ module Beaker
       # @param [String] my_name The name of the test to be logged.
       # @param [Proc] block The actions to be performed during this test.
       #
-      def test_name my_name, &block
+      def test_name my_name
         logger.notify "\n#{my_name}\n"
         set_current_test_name(my_name)
         if block_given?
@@ -190,17 +190,17 @@ module Beaker
       #                       a {Beaker::Assertions} (i.e., if the assert
       #                       passes)
       # @author Chris Cowell-Shah (<tt>ccs@puppetlabs.com</tt>)
-      def expect_failure(explanation, &block)
+      def expect_failure(explanation)
         begin
           yield if block_given?  # code block should contain an assert that you expect to fail
-        rescue Beaker::DSL::Assertions, Minitest::Assertion => failed_assertion
+        rescue Beaker::DSL::Assertions, Minitest::Assertion => e
           # Yay! The assert in the code block failed, as expected.
           # Swallow the failure so the test passes.
           logger.notify 'An assertion was expected to fail, and did. ' +
                           'This is probably due to a known product bug, ' +
                           'and is probably not a problem. ' +
                           "Additional info: '#{explanation}' " +
-                          "Failed assertion: '#{failed_assertion}'"
+                          "Failed assertion: '#{e}'"
           return
         end
         # Uh-oh! The assert in the code block unexpectedly passed.
@@ -304,7 +304,7 @@ module Beaker
       # TestCase#hosts is reset after block has executed.
       #
       # @see #confine
-      def confine_block(type, criteria, host_array = nil, &block)
+      def confine_block(type, criteria, host_array = nil)
         host_array = Array( host_array || hosts )
         original_hosts = self.hosts.dup
         confine(type, criteria, host_array)
@@ -314,7 +314,7 @@ module Beaker
       rescue Beaker::DSL::Outcomes::SkipTest => e
         # I don't like this much, but adding options to confine is a breaking change
         # to the DSL that would involve a major version bump
-        if e.message !~ /No suitable hosts found/
+        if !e.message.include?('No suitable hosts found')
           # a skip generated from the provided block, pass it up the chain
           raise e
         end
@@ -340,7 +340,7 @@ module Beaker
       #   should return true if the host matches this additional criteria.
       #
       # @return [Array<Host>] Returns an array of hosts that meet the provided criteria
-      def select_hosts(criteria, host_array = nil, &block)
+      def select_hosts(criteria, host_array = nil)
         hosts_to_select_from = host_array || hosts
         criteria.each_pair do |property, value|
           hosts_to_select_from = hosts_to_select_from.select do |host|
@@ -364,7 +364,7 @@ module Beaker
           when String
             true_false = host[property.to_s].include? value
           when Regexp
-            true_false = host[property.to_s] =~ value
+            true_false = value.match?(host[property.to_s])
           end
           true_false
         end

data/lib/beaker/host/aix/group.rb

@@ -1,7 +1,7 @@
 module Aix::Group
   include Beaker::CommandFactory
 
-  def group_list(&block)
+  def group_list()
     execute("lsgroup -a ALL") do |result|
       yield result if block_given?
 
@@ -9,9 +9,9 @@ module Aix::Group
     end
   end
 
-  def group_get(name, &block)
+  def group_get(name)
     execute("lsgroup #{name}") do |result|
-      fail_test "failed to get group #{name}" unless result.stdout =~ /^#{name} id/
+      fail_test "failed to get group #{name}" unless /^#{name} id/.match?(result.stdout)
 
       yield result if block_given?
       result

data/lib/beaker/host/aix/user.rb

@@ -1,7 +1,7 @@
 module Aix::User
   include Beaker::CommandFactory
 
-  def user_list(&block)
+  def user_list()
     execute("lsuser ALL") do |result|
       users = []
       result.stdout.each_line do |line|
@@ -14,9 +14,9 @@ module Aix::User
     end
   end
 
-  def user_get(name, &block)
+  def user_get(name)
     execute("lsuser #{name}") do |result|
-      fail_test "failed to get user #{name}" unless result.stdout =~  /^#{name} id/
+      fail_test "failed to get user #{name}" unless /^#{name} id/.match?(result.stdout)
 
       yield result if block_given?
       result

data/lib/beaker/host/cisco.rb

@@ -34,7 +34,7 @@ module Cisco
     #
     # @return nil
     def scp_post_operations(scp_file_actual, scp_file_target)
-      if self[:platform] =~ /cisco_nexus/
+      if self[:platform].include?('cisco_nexus')
         execute( "mv #{scp_file_actual} #{scp_file_target}" )
       end
       nil
@@ -47,10 +47,10 @@ module Cisco
     # @return [String] path, changed if needed due to host
     #   constraints
     def scp_path(path)
-      if self[:platform] =~ /cisco_nexus/
+      if self[:platform].include?('cisco_nexus')
         @home_dir ||= execute( 'pwd' )
         answer = "#{@home_dir}/#{File.basename( path )}"
-        answer << '/' if path =~ /\/$/
+        answer << '/' if /\/$/.match?(path)
         return answer
       end
       path
@@ -81,9 +81,9 @@ module Cisco
     # @param [Hash] opts optional parameters
     #
     # @return [String] Command string as needed for this host
-    def prepend_commands(command = '', user_pc = '', opts = {})
+    def prepend_commands(command = '', user_pc = '', _opts = {})
       return user_pc unless command.index('vsh').nil?
-      if self[:platform] =~ /cisco_nexus/
+      if self[:platform].include?('cisco_nexus')
         return user_pc unless command.index('ntpdate').nil?
       end
 
@@ -105,10 +105,10 @@ module Cisco
     # @param [Hash] opts optional parameters
     #
     # @return [String] Command string as needed for this host
-    def append_commands(command = '', user_ac = '', opts = {})
+    def append_commands(command = '', _user_ac = '', _opts = {})
       command.gsub('"') {'\\"'}
       # vsh commands, ntpdate or when user is root commands do not require an appended `"`
-      return '"' unless command =~ /ntpdate|\/isan\/bin\/vsh/ || self[:user] == 'root'
+      return '"' unless /ntpdate|\/isan\/bin\/vsh/.match?(command) || self[:user] == 'root'
     end
 
     # Construct the environment string for this command
@@ -128,13 +128,13 @@ module Cisco
       env_array = self.environment_variable_string_pair_array( env )
       environment_string = env_array.join(' ')
 
-      if self[:platform] =~ /cisco_nexus/
+      if self[:platform].include?('cisco_nexus')
         prestring << " export"
       else
         prestring << " env"
       end
       environment_string = "#{prestring} #{environment_string}"
-      environment_string << ';' if prestring =~ /export/
+      environment_string << ';' if prestring.include?('export')
       environment_string
     end
 
@@ -145,7 +145,7 @@ module Cisco
     #   this will be raised with the appropriate message
     def validate_setup
       msg = nil
-      if self[:platform] =~ /cisco_nexus/
+      if self[:platform].include?('cisco_nexus')
         if !self[:vrf]
           msg = 'Cisco Nexus hosts must be provided with a :vrf value.'
         end
@@ -153,7 +153,7 @@ module Cisco
           msg = 'Cisco hosts must be provided with a :user value'
         end
       end
-      if self[:platform] =~ /cisco_ios_xr/
+      if self[:platform].include?('cisco_ios_xr')
         if !self[:user]
           msg = 'Cisco hosts must be provided with a :user value'
         end

data/lib/beaker/host/eos.rb

@@ -18,7 +18,7 @@ module Eos
     #   puppet_agent_version) is either not passed or set to nil
     #
     # @return [String, String] Path to the directory and filename of the package, respectively
-    def puppet_agent_dev_package_info( puppet_collection = nil, puppet_agent_version = nil, opts = {} )
+    def puppet_agent_dev_package_info( puppet_collection = nil, puppet_agent_version = nil, _opts = {} )
       error_message = "Must provide %s argument to get puppet agent dev package information"
       raise ArgumentError, error_message % "puppet_collection" unless puppet_collection
       raise ArgumentError, error_message % "puppet_agent_version" unless puppet_agent_version
@@ -38,7 +38,7 @@ module Eos
     #   about location, so that parameter is ignored
     #
     # @return [Result] The result of copying that file to the host
-    def get_remote_file( remote_url, host_directory = '' )
+    def get_remote_file( remote_url, _host_directory = '' )
       commands = ['enable', "copy #{remote_url} extension:"]
       command = commands.join("\n")
       execute("Cli -c '#{command}'")

data/lib/beaker/host/mac/exec.rb

@@ -21,7 +21,7 @@ module Mac::Exec
   #   (from {#ssh_service_restart})
   def ssh_permit_user_environment
     ssh_config_file = '/etc/sshd_config'
-    ssh_config_file = '/private/etc/ssh/sshd_config' if self['platform'] =~ /^osx-/
+    ssh_config_file = '/private/etc/ssh/sshd_config' if /^osx-/.match?(self['platform'])
 
     exec(Beaker::Command.new("echo '\nPermitUserEnvironment yes' >> #{ssh_config_file}"))
     ssh_service_restart()

data/lib/beaker/host/mac/group.rb

@@ -6,11 +6,11 @@ module Mac::Group
   # @param [Proc] block Additional actions or insertions
   #
   # @return [Array<String>] The list of group names on the system
-  def group_list(&block)
+  def group_list()
     execute('dscacheutil -q group') do |result|
       groups = []
       result.stdout.each_line do |line|
-        groups << line.split(': ')[1].strip if line =~ /^name:/
+        groups << line.split(': ')[1].strip if /^name:/.match?(line)
       end
 
       yield result if block_given?
@@ -28,9 +28,9 @@ module Mac::Group
   # @return [String] Group information in /etc/group format
   # @raise [FailTest] Raises an Assertion failure if it can't find the name
   #                   queried for in the returned block
-  def group_get(name, &block)
+  def group_get(name)
     execute("dscacheutil -q group -a name #{name}") do |result|
-      fail_test "failed to get group #{name}" unless result.stdout =~ /^name: #{name}/
+      fail_test "failed to get group #{name}" unless /^name: #{name}/.match?(result.stdout)
       gi = Hash.new  # group info
       result.stdout.each_line { |line|
         pieces = line.split(': ')
@@ -52,7 +52,7 @@ module Mac::Group
     gid = -1
     execute("dscacheutil -q group -a name #{name}") do |result|
       result.stdout.each_line { |line|
-        if line =~ /^gid:/
+        if /^gid:/.match?(line)
           gid = (line[5, line.length - 5]).chomp
           break
         end
@@ -65,10 +65,10 @@ module Mac::Group
   #
   # @param [String] name Name of the group
   # @param [Proc] block Additional actions or insertions
-  def group_present(name, &block)
+  def group_present(name)
     group_exists = false
     execute("dscacheutil -q group -a name #{name}") do |result|
-      group_exists = result.stdout =~  /^name: #{name}/
+      group_exists = result.stdout.start_with?("name: #{name}")
     end
 
     return if group_exists

data/lib/beaker/host/mac/pkg.rb

@@ -5,7 +5,7 @@ module Mac::Pkg
     raise "Package #{name} cannot be queried on #{self}"
   end
 
-  def install_package(name, cmdline_args = '', version = nil)
+  def install_package(name, _cmdline_args = '', _version = nil)
     generic_install_dmg("#{name}.dmg", name, "#{name}.pkg")
   end
 
@@ -28,7 +28,7 @@ module Mac::Pkg
     execute("installer -pkg /Volumes/#{pkg_base}/#{pkg_name} -target /")
   end
 
-  def uninstall_package(name, cmdline_args = '')
+  def uninstall_package(name, _cmdline_args = '')
     raise "Package #{name} cannot be uninstalled on #{self}"
   end
 
@@ -37,7 +37,7 @@ module Mac::Pkg
   # @param [String] name          The name of the package to update
   # @param [String] cmdline_args  Additional command line arguments for
   #                               the package manager
-  def upgrade_package(name, cmdline_args = '')
+  def upgrade_package(name, _cmdline_args = '')
       raise "Package #{name} cannot be upgraded on #{self}"
   end
 
@@ -48,7 +48,7 @@ module Mac::Pkg
   #
   # @note See {Beaker::DSL::Helpers::HostHelpers#deploy_package_repo} for info on
   #       params
-  def deploy_package_repo(path, name, version)
+  def deploy_package_repo(_path, _name, _version)
     raise "Package repo cannot be deployed on #{self}; the platform is not supported"
   end
 
@@ -116,7 +116,7 @@ module Mac::Pkg
     error_message = "Must provide %s argument to get puppet agent dev package information"
     raise ArgumentError, error_message % "puppet_collection" unless puppet_collection
 
-    variant, version, arch, codename = self['platform'].to_array
+    variant, version, arch, _codename = self['platform'].to_array
     release_file = "/repos/apple/#{version}/#{puppet_collection}/#{arch}/puppet-agent-*"
 
     # macOS puppet-agent tarballs haven't always included arch
@@ -142,7 +142,7 @@ module Mac::Pkg
   #
   # @return nil
   def pe_puppet_agent_promoted_package_install(
-    onhost_copy_base, onhost_copied_download, onhost_copied_file, download_file, opts
+    onhost_copy_base, onhost_copied_download, onhost_copied_file, _download_file, _opts
   )
     execute("tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}")
     # move to better location

data/lib/beaker/host/mac/user.rb

@@ -6,11 +6,11 @@ module Mac::User
   # @param [Proc] block Additional actions or insertions
   #
   # @return [Array<String>] The list of user names on the system
-  def user_list(&block)
+  def user_list()
     execute('dscacheutil -q user') do |result|
       users = []
       result.stdout.each_line do |line|
-        users << line.split(': ')[1].strip if line =~ /^name:/
+        users << line.split(': ')[1].strip if /^name:/.match?(line)
       end
 
       yield result if block_given?
@@ -31,9 +31,9 @@ module Mac::User
   # @return [Result] User information in /etc/passwd format
   # @raise [FailTest] Raises an Assertion failure if it can't find the name
   #                   queried for in the returned block
-  def user_get(name, &block)
+  def user_get(name)
     execute("id -P #{name}") do |result|
-      fail_test "failed to get user #{name}" unless result.stdout =~  /^#{name}:/
+      fail_test "failed to get user #{name}" unless /^#{name}:/.match?(result.stdout)
 
       yield result if block_given?
       result
@@ -44,10 +44,10 @@ module Mac::User
   #
   # @param [String] name Name of the user
   # @param [Proc] block Additional actions or insertions
-  def user_present(name, &block)
+  def user_present(name)
     user_exists = false
     execute("dscacheutil -q user -a name #{name}") do |result|
-       user_exists = result.stdout =~  /^name: #{name}/
+      user_exists = result.stdout.start_with?("name: #{name}")
     end
 
     return if user_exists

data/lib/beaker/host/pswindows/exec.rb

@@ -21,7 +21,7 @@ module PSWindows::Exec
 
   def rm_rf path
     # ensure that we have the right slashes for windows
-    path = path.gsub(/\//, '\\')
+    path = path.tr('/', '\\')
     execute(%(del /s /q "#{path}"))
   end
 
@@ -31,8 +31,8 @@ module PSWindows::Exec
   # @param [Boolean] rm Remove the destination prior to move
   def mv(orig, dest, rm=true)
     # ensure that we have the right slashes for windows
-    orig = orig.gsub(/\//,'\\')
-    dest = dest.gsub(/\//,'\\')
+    orig = orig.tr('/','\\')
+    dest = dest.tr('/','\\')
     rm_rf dest unless !rm
     execute("move /y #{orig} #{dest}")
   end
@@ -104,7 +104,7 @@ module PSWindows::Exec
   # @param [String] dir The directory structure to create on the host
   # @return [Boolean] True, if directory construction succeeded, otherwise False
   def mkdir_p dir
-    normalized_path = dir.gsub('/','\\')
+    normalized_path = dir.tr('/','\\')
     result = exec(powershell("New-Item -Path '#{normalized_path}' -ItemType 'directory'"),
                   :acceptable_exit_codes => [0, 1])
     result.exit_code == 0
@@ -118,7 +118,7 @@ module PSWindows::Exec
   def add_env_var key, val
     key = key.to_s.upcase
     #see if the key/value pair already exists
-    cur_val = subbed_val = get_env_var(key, true)
+    cur_val = get_env_var(key, true)
     subbed_val = cur_val.gsub(/#{Regexp.escape(val.gsub(/'|"/, ''))}/, '')
     if cur_val.empty?
       exec(powershell("[Environment]::SetEnvironmentVariable('#{key}', '#{val}', 'Machine')"))
@@ -137,7 +137,7 @@ module PSWindows::Exec
   def delete_env_var key, val
     key = key.to_s.upcase
     #get the current value of the key
-    cur_val = subbed_val = get_env_var(key, true)
+    cur_val = get_env_var(key, true)
     subbed_val = (cur_val.split(';') - [val.gsub(/'|"/, '')]).join(';')
     if subbed_val != cur_val
       #remove the current key value
@@ -159,7 +159,7 @@ module PSWindows::Exec
     if val.empty?
       return ''
     else
-      val = val.split(/\n/)[0] # only take the first result
+      val = val.split("\n")[0] # only take the first result
       if clean
         val.gsub(/#{key}=/i,'')
       else
@@ -185,7 +185,7 @@ module PSWindows::Exec
     env_array = self.environment_variable_string_pair_array( env )
 
     environment_string = ''
-    env_array.each_with_index do |env|
+    env_array.each do |env|
       environment_string += "set \"#{env}\" && "
     end
     environment_string

data/lib/beaker/host/pswindows/file.rb

@@ -1,7 +1,7 @@
 module PSWindows::File
   include Beaker::CommandFactory
 
-  def tmpfile(name = '')
+  def tmpfile(_name = '')
     result = exec(powershell('[System.IO.Path]::GetTempFileName()'))
     result.stdout.chomp()
   end

data/lib/beaker/host/pswindows/group.rb

@@ -1,7 +1,7 @@
 module PSWindows::Group
   include Beaker::CommandFactory
 
-  def group_list(&block)
+  def group_list()
     execute('cmd /c echo "" | wmic group where localaccount="true" get name /format:value') do |result|
       groups = []
       result.stdout.each_line do |line|
@@ -14,7 +14,7 @@ module PSWindows::Group
     end
   end
 
-  def group_get(name, &block)
+  def group_get(name)
     execute("net localgroup \"#{name}\"") do |result|
       fail_test "failed to get group #{name}" if result.exit_code != 0
 
@@ -23,7 +23,7 @@ module PSWindows::Group
     end
   end
 
-  def group_gid(name)
+  def group_gid(_name)
     raise NotImplementedError, "Can't retrieve group gid on a Windows host"
   end