From 199e7deed563edac10c9e0a84f7ec6e4f96ecbc8 Mon Sep 17 00:00:00 2001 From: Timo Goebel Date: Wed, 24 Apr 2019 13:41:31 +0200 Subject: [PATCH] use os provided bundler version --- lib/kitchen/verifier/serverspec.rb | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/kitchen/verifier/serverspec.rb b/lib/kitchen/verifier/serverspec.rb index bc0b715..860abad 100644 --- a/lib/kitchen/verifier/serverspec.rb +++ b/lib/kitchen/verifier/serverspec.rb @@ -170,14 +170,20 @@ def install_command def install_bundler if config[:remote_exec] <<-INSTALL - if [ \"$(#{sudo('gem')} list bundler -i)\" = \"true\" ]; then - echo "Bundler already installed" + if [ -f /etc/centos-release ] || [ -f /etc/redhat-release ] || [ -f /etc/oracle-release ]; then + echo '-----> Installing os provided bundler package' + #{sudo_env('yum')} -y install rubygem-bundler else - if [ \"$(#{sudo('gem')} list bundler -i)\" = \"false\" ]; then - #{sudo_env('gem')} install #{gem_proxy_parm} --no-ri --no-rdoc bundler + echo '-----> Installing bundler via rubygems' + if [ \"$(#{sudo('gem')} list bundler -i)\" = \"true\" ]; then + echo "Bundler already installed" else - echo "ERROR: Ruby not installed correctly" - exit 1 + if [ \"$(#{sudo('gem')} list bundler -i)\" = \"false\" ]; then + #{sudo_env('gem')} install #{gem_proxy_parm} --no-ri --no-rdoc bundler + else + echo "ERROR: Ruby not installed correctly" + exit 1 + fi fi fi INSTALL