Merge pull request #226 from voxpupuli/dependabot/bundler/voxpupuli-r…

…ubocop-tw-2.0 Update voxpupuli-rubocop requirement from ~> 1.2 to ~> 2.0
puppetlabs · Jul 14, 2023 · 638dc99 · 638dc99
2 parents cd9e45c + ec4b778
commit 638dc99
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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'

diff --git 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
@@ -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"