Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ inherit_from: .rubocop_todo.yml

inherit_gem:
voxpupuli-rubocop: rubocop.yml

AllCops:
TargetRubyVersion: 3.2
41 changes: 24 additions & 17 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2024-05-28 09:54:02 UTC using RuboCop version 1.63.5.
# `rubocop --auto-gen-config --no-auto-gen-timestamp`
# using RuboCop version 1.75.8.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand All @@ -20,20 +20,15 @@ Lint/MissingSuper:
- 'lib/beaker/hypervisor/vagrant.rb'

# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
Lint/NonDeterministicRequireOrder:
Naming/AccessorMethodName:
Exclude:
- 'spec/spec_helper.rb'
- 'lib/beaker/hypervisor/vagrant.rb'

# Offense count: 2
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: AutoCorrect.
Lint/UselessAssignment:
Exclude:
- 'spec/beaker/vagrant_spec.rb'

# Offense count: 1
Naming/AccessorMethodName:
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle, BlockForwardingName.
# SupportedStyles: anonymous, explicit
Naming/BlockForwarding:
Exclude:
- 'lib/beaker/hypervisor/vagrant.rb'

Expand All @@ -59,7 +54,7 @@ Performance/RedundantMerge:
Exclude:
- 'spec/beaker/vagrant_custom_spec.rb'

# Offense count: 2
# Offense count: 1
# This cop supports unsafe autocorrection (--autocorrect-all).
Performance/StringInclude:
Exclude:
Expand Down Expand Up @@ -149,6 +144,16 @@ Rake/Desc:
Exclude:
- 'Rakefile'

# Offense count: 2
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowOnlyRestArgument, UseAnonymousForwarding, RedundantRestArgumentNames, RedundantKeywordRestArgumentNames, RedundantBlockArgumentNames.
# RedundantRestArgumentNames: args, arguments
# RedundantKeywordRestArgumentNames: kwargs, options, opts
# RedundantBlockArgumentNames: blk, block, proc
Style/ArgumentsForwarding:
Exclude:
- 'lib/beaker/hypervisor/vagrant.rb'

# Offense count: 7
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowOnConstant, AllowOnSelfClass.
Expand All @@ -159,8 +164,10 @@ Style/CaseEquality:

# Offense count: 8
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyle.
# Configuration parameters: EnforcedStyle, EnforcedStyleForClasses, EnforcedStyleForModules.
# SupportedStyles: nested, compact
# SupportedStylesForClasses: ~, nested, compact
# SupportedStylesForModules: ~, nested, compact
Style/ClassAndModuleChildren:
Exclude:
- 'lib/beaker/hypervisor/vagrant/mount_folder.rb'
Expand Down Expand Up @@ -194,7 +201,7 @@ Style/EnvHome:
Exclude:
- 'Rakefile'

# Offense count: 23
# Offense count: 22
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: always, always_true, never
Expand Down Expand Up @@ -252,7 +259,7 @@ Style/StringConcatenation:

# Offense count: 24
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
# URISchemes: http, https
Layout/LineLength:
Max: 222
8 changes: 4 additions & 4 deletions beaker-vagrant.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ Gem::Specification.new do |s|
s.description = 'For use for the Beaker acceptance testing tool'
s.license = 'Apache-2.0'

s.required_ruby_version = Gem::Requirement.new('>= 2.7')
s.required_ruby_version = Gem::Requirement.new('>= 3.2', '< 4')

s.files = `git ls-files`.split("\n")
s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
s.require_paths = ['lib']

# Testing dependencies
s.add_development_dependency 'fakefs', '>= 0.6', '< 3.0'
s.add_development_dependency 'fakefs', '>= 0.6', '< 4'
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 'voxpupuli-rubocop', '~> 2.8.0'
s.add_development_dependency 'voxpupuli-rubocop', '~> 4.1.0'

s.add_runtime_dependency 'beaker', '>= 4', '< 8'
s.add_dependency 'beaker', '>= 4', '< 8'
end
4 changes: 2 additions & 2 deletions spec/beaker/vagrant_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ module Beaker
end

it 'raises an error if path is not set on shell_provisioner' do
path = vagrant.instance_variable_get(:@vagrant_path)
vagrant.instance_variable_get(:@vagrant_path)

hosts = make_hosts({ shell_provisioner: {} }, 1)
expect do
Expand All @@ -194,7 +194,7 @@ module Beaker
end

it 'raises an error if path is EMPTY on shell_provisioner' do
path = vagrant.instance_variable_get(:@vagrant_path)
vagrant.instance_variable_get(:@vagrant_path)

empty_shell_path = ''
hosts = make_hosts({
Expand Down