Pet rubocop

Author: smortex

lib/puppet/util/puppetdb_validator.rb

@@ -63,6 +63,6 @@ def attempt_connection
     end
   rescue StandardError => e
     log_error(e.message)
-    return false
+    false
   end
 end

spec/acceptance/basic_spec.rb

@@ -7,7 +7,7 @@
     # No point diagnosing any more if the module wasn't copied properly
     shell('ls /etc/puppetlabs/code/modules/puppetdb') do |r|
       r.exit_code.should be_zero
-      r.stdout.should =~ %r{metadata\.json}
+      r.stdout.should include('metadata.json')
       r.stderr.should == ''
     end
   end

spec/spec_helper_acceptance.rb

@@ -60,7 +60,7 @@ def build_url(platform)
 end
 
 hosts.each do |host|
-  if host['platform'] =~ %r{debian}
+  if %r{debian}.match?(host['platform'])
     on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
   end
   # install_puppet
@@ -81,7 +81,7 @@ def build_url(platform)
     relver = Regexp.last_match(1)
     on host, "rpm -ivh #{build_url('fedora')}#{relver}.noarch.rpm"
     on host, 'yum install -y puppetserver'
-  elsif host['platform'] =~ %r{(ubuntu|debian)}
+  elsif %r{(ubuntu|debian)}.match?(host['platform'])
     unless host.check_for_package 'curl'
       on host, 'apt-get install -y curl'
     end
@@ -121,15 +121,15 @@ def build_url(platform)
                              'puppet7'
                            end
 install_puppet_agent_on(hosts, opts) unless ENV['BEAKER_provision'] == 'no'
-install_ca_certs unless ENV['PUPPET_INSTALL_TYPE'] =~ %r{pe}i
+install_ca_certs unless %r{pe}i.match?(ENV['PUPPET_INSTALL_TYPE'])
 install_module_on(hosts)
 install_module_dependencies_on(hosts)
 
 RSpec.configure do |c|
   # Readable test descriptions
   c.formatter = :documentation
   hosts.each do |host|
-    if host[:platform] =~ %r{el-7-x86_64} && host[:hypervisor] =~ %r{docker}
+    if host[:platform].include('el-7-x86_64') && host[:hypervisor].include('docker')
       on(host, "sed -i '/nodocs/d' /etc/yum.conf")
     end
   end