Rubocop: Fix more Style cops

beaker.gemspec

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'beaker/version'

lib/beaker/command.rb

@@ -128,8 +128,8 @@ def args_string args = @args
   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)
     end
@@ -162,7 +162,7 @@ def initialize platform, expression, filename, opts = {}
         command << " > #{temp_file} && mv #{temp_file} #{filename} && rm -f #{temp_file}"
       end
       args = []
-      opts['ENV'] ||= Hash.new
+      opts['ENV'] ||= {}
       super(command, args, opts)
     end
   end

lib/beaker/dsl/helpers.rb

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 ['host', 'test', 'web', 'hocon'].each do |lib|
   require "beaker/dsl/helpers/#{lib}_helpers"
 end

lib/beaker/dsl/helpers/hocon_helpers.rb

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 require 'hocon/parser/config_document_factory'
 require 'hocon/config_value_factory'
 

lib/beaker/host/mac/group.rb

@@ -31,7 +31,7 @@ def group_list
   def group_get(name)
     execute("dscacheutil -q group -a name #{name}") do |result|
       fail_test "failed to get group #{name}" unless /^name: #{name}/.match?(result.stdout)
-      gi = Hash.new # group info
+      gi = {} # group info
       result.stdout.each_line do |line|
         pieces = line.split(': ')
         gi[pieces[0].to_sym] = pieces[1].strip if pieces[1] != nil

lib/beaker/host/pswindows/exec.rb

@@ -219,8 +219,7 @@ def environment_variable_string_pair_array env
   # Overrides the {Windows::Exec#ssh_permit_user_environment} method,
   # since no steps are needed in this setup to allow user ssh environments
   # to work.
-  def ssh_permit_user_environment
-  end
+  def ssh_permit_user_environment; end
 
   # Sets the user SSH environment.
   #

lib/beaker/host/unix.rb

@@ -54,8 +54,6 @@ def skip_set_env?
       case self['platform'].variant
       when /^(f5|netscaler)$/
         "no puppet-agent package for network device platform '#{self['platform'].variant}'"
-      else
-        nil
       end
     end
 

lib/beaker/tasks/quick_start.rb

@@ -71,7 +71,7 @@
   task :run_test, [:hypervisor] => ["beaker_quickstart:gen_hosts", 'beaker_quickstart:gen_pre_suite',
                                     'beaker_quickstart:gen_smoke_test',] do |_t, args|
     hypervisor = args[:hypervisor] ||= 'vagrant'
-    system_args             = Hash.new
+    system_args             = {}
     system_args[:hosts]     = "acceptance/config/default_#{hypervisor}_hosts.yaml"
     system_args[:pre_suite] = 'acceptance/setup/default_pre_suite.rb'
     system_args[:tests]     = 'acceptance/tests/default_smoke_test.rb'

lib/beaker/test_suite.rb

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 require 'fileutils'
 ['test_case', 'logger', 'test_suite_result'].each do |lib|
   require "beaker/#{lib}"

lib/beaker/test_suite_result.rb

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 require 'fileutils'
 ['test_case', 'logger', 'test_suite', 'logger_junit'].each do |lib|
   require "beaker/#{lib}"

spec/beaker/command_spec.rb

@@ -5,11 +5,11 @@ module Beaker
     subject(:cmd) { described_class.new(command, args, options) }
 
     let(:command) { @command || '/bin/ls' }
-    let(:args)    { @args    || Array.new }
-    let(:options) { @options || Hash.new  }
+    let(:args)    { @args    || [] }
+    let(:options) { @options || {} }
 
     let(:host)    do
-      h = Hash.new
+      h = {}
       allow(h).to receive(:environment_string).and_return('')
       h
     end
@@ -94,10 +94,10 @@ module Beaker
     subject(:cmd) { described_class.new(command, args, options) }
 
     let(:command) { @command || '/bin/ls' }
-    let(:args)    { @args    || Array.new }
-    let(:options) { @options || Hash.new  }
+    let(:args)    { @args    || [] }
+    let(:options) { @options || {} }
 
-    let(:host)    { Hash.new }
+    let(:host)    { {} }
 
     it 'returns a simple string passed in' do
       @command = "pants"
@@ -119,7 +119,7 @@ module Beaker
     subject(:cmd)     { described_class.new(platform, expression, filename, options) }
 
     let(:host)        do
-      h = Hash.new
+      h = {}
       allow(h).to receive(:environment_string).and_return('')
       allow(h).to receive(:prepend_commands).and_return('')
       allow(h).to receive(:append_commands).and_return('')
@@ -128,7 +128,7 @@ module Beaker
     let(:platform)    { @platform   || 'unix' }
     let(:expression)  { @expression || 's/b/s/' }
     let(:filename)    { @filename   || '/fakefile' }
-    let(:options)     { @options    || Hash.new }
+    let(:options)     { @options    || {} }
 
     it 'forms a basic sed command correctly' do
       expect(cmd.cmd_line host).to be === "sed -i -e \"#{expression}\" #{filename}"

spec/beaker/dsl/roles_spec.rb

@@ -6,8 +6,8 @@ class ClassMixedWithDSLRoles
 end
 
 describe ClassMixedWithDSLRoles do
-  let(:hosts)      { @hosts || Hash.new }
-  let(:options)    { @options || Hash.new }
+  let(:hosts)      { @hosts || {} }
+  let(:options)    { @options || {} }
   let(:agent1)     { make_host('agent1',     { :roles => ['agent'] }) }
   let(:agent2)     { make_host('agent2',     { :roles => ['agent'] }) }
   let(:a_and_dash) { make_host('a_and_dash', { :roles => ['agent', 'dashboard'] }) }

spec/beaker/logger_junit_spec.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require 'spec_helper'
 
 module Beaker

spec/beaker/logger_spec.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require 'spec_helper'
 
 module Beaker

spec/beaker/network_manager_spec.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require 'spec_helper'
 
 module Beaker

spec/beaker/perf_spec.rb

@@ -15,8 +15,8 @@ module Beaker
       end
 
       it 'creates a new Perf object' do
-        hosts = Array.new
-        options = Hash.new
+        hosts = []
+        options = {}
         options[:log_level] = :debug
         my_logger = Beaker::Logger.new(options)
         options[:logger] = my_logger

spec/beaker/shared/host_manager_spec.rb

@@ -129,7 +129,7 @@ module Shared
           myhosts = host_handler.run_block_on(hosts, nil, { :run_in_parallel => true }) do |host|
             # kind of hacky workaround to remove logger which contains a singleton method injected by rspec
 
-            host.instance_eval("remove_instance_variable(:@logger)")
+            host.instance_eval("remove_instance_variable(:@logger)", __FILE__, __LINE__)
             host
           end
 

spec/beaker/test_suite_spec.rb

@@ -12,7 +12,7 @@ module Beaker
       let(:sh_test)  { File.expand_path(test_dir + '/my_shell_file.sh')   }
 
       it 'fails without test files' do
-        expect { described_class.new('name', 'hosts', Hash.new, Time.now, :stop_on_error) }.to raise_error
+        expect { described_class.new('name', 'hosts', {}, Time.now, :stop_on_error) }.to raise_error
       end
 
       it 'includes specific files as test file when explicitly passed' do