From 48b5e49005c1d62590f4c8a5c83b3181c9f6008e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 13:14:00 +0000 Subject: [PATCH 1/2] Update voxpupuli-rubocop requirement from ~> 1.2 to ~> 2.0 Updates the requirements on [voxpupuli-rubocop](https://github.com/voxpupuli/voxpupuli-rubocop) to permit the latest version. - [Changelog](https://github.com/voxpupuli/voxpupuli-rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/voxpupuli/voxpupuli-rubocop/compare/v1.2.0...v2.0.0) --- updated-dependencies: - dependency-name: voxpupuli-rubocop dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- beaker-puppet.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beaker-puppet.gemspec b/beaker-puppet.gemspec index ab988fa..0c54115 100644 --- a/beaker-puppet.gemspec +++ b/beaker-puppet.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'rake', '~> 13.0' s.add_development_dependency 'rspec', '~> 3.0' s.add_development_dependency 'rspec-its', '~> 1.3' - s.add_development_dependency 'voxpupuli-rubocop', '~> 1.2' + s.add_development_dependency 'voxpupuli-rubocop', '~> 2.0' # Acceptance Testing Dependencies s.add_development_dependency 'beaker-vmpooler', '~> 1.4' From ec4b778ff188edfc09fcf9c1611ed0ca981ad0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Fri, 14 Jul 2023 06:22:00 -1000 Subject: [PATCH 2/2] Auto-correct Rubocop offenses --- lib/beaker-puppet/install_utils/foss_utils.rb | 4 ++-- setup/gem/010_GemInstall.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/beaker-puppet/install_utils/foss_utils.rb b/lib/beaker-puppet/install_utils/foss_utils.rb index 7460c84..b9bcc2c 100644 --- a/lib/beaker-puppet/install_utils/foss_utils.rb +++ b/lib/beaker-puppet/install_utils/foss_utils.rb @@ -98,8 +98,8 @@ def build_git_url(project_name, git_fork = nil, git_server = nil, git_protocol = git_protocol = 'https://' end - repo = git_server == 'github.com' ? "#{git_fork}/#{project_name}.git" : "#{git_fork}-#{project_name}.git" - git_protocol == 'git@' ? "#{git_protocol}#{git_server}:#{repo}" : "#{git_protocol}#{git_server}/#{repo}" + repo = (git_server == 'github.com') ? "#{git_fork}/#{project_name}.git" : "#{git_fork}-#{project_name}.git" + (git_protocol == 'git@') ? "#{git_protocol}#{git_server}:#{repo}" : "#{git_protocol}#{git_server}/#{repo}" end alias build_giturl build_git_url diff --git a/setup/gem/010_GemInstall.rb b/setup/gem/010_GemInstall.rb index be7d17a..663d345 100644 --- a/setup/gem/010_GemInstall.rb +++ b/setup/gem/010_GemInstall.rb @@ -19,7 +19,7 @@ on(agent, "rm -rf '#{default_dir}'") arch = agent[:ruby_arch] || 'x86' - gem_arch = arch == 'x64' ? 'x64-mingw32' : 'x86-mingw32' + gem_arch = (arch == 'x64') ? 'x64-mingw32' : 'x86-mingw32' url = "#{base_url}/puppet-#{gem_version}-#{gem_arch}.gem" else url = "#{base_url}/puppet-#{gem_version}.gem"