Rubocop fixes

This commit addresses Rubocop offenses from:

- Performance/StringInclude
- Style/TernaryParentheses

Author: mhashizume

acceptance/helpers.rb

@@ -334,7 +334,7 @@ def wait_for_installation_pid(host)
         return
       end
 
-      unless %r{windows}.match?(host['platform'])
+      unless host['platform'].include?('windows')
         step '(Agent) waiting for upgrade pid file to be created...' do
           retry_on(host, "cat #{upgrade_pidfile}", { max_retries: 5, retry_interval: 2 })
         end
@@ -355,7 +355,7 @@ def remove_installed_agent(host)
       end
 
       step "Teardown: (Agent) Uninstall the puppet-agent package on agent #{host_to_info_s(host)}" do
-        if %r{windows}.match?(host['platform'])
+        if host['platform'].include?('windows')
           install_dir = on(host, 'facter.bat env_windows_installdir').output.tr('\\', '/').chomp
           scp_to(host, "#{SUPPORTING_FILES}/uninstall.ps1", 'uninstall.ps1')
           on(host, 'rm -rf C:/ProgramData/PuppetLabs')

spec/classes/puppet_agent_spec.rb

@@ -26,7 +26,7 @@ def redhat_familly_supported_os
 
   def global_facts(facts, os)
     facts.merge(
-      if %r{sles}.match?(os)
+      if os.include?('sles')
         {
           is_pe: true,
           env_temp_variable: '/tmp',
@@ -36,17 +36,17 @@ def global_facts(facts, os)
         {
           env_temp_variable: '/tmp',
         }
-      elsif %r{solaris}.match?(os)
+      elsif os.include?('solaris')
         {
           is_pe: true,
           puppet_agent_pid: 298,
         }
-      elsif %r{aix}.match?(os)
+      elsif os.include?('aix')
         {
           is_pe: true,
           platform_tag: "aix-#{AIX_VERSION[facts.dig(:os, 'release', 'major')]}-power",
         }
-      elsif %r{windows}.match?(os)
+      elsif os.include?('windows')
         {
           puppet_agent_appdata: 'C:\\ProgramData',
           puppet_confdir: 'C:\\ProgramData\\Puppetlabs\\puppet\\etc',
@@ -291,7 +291,7 @@ def global_facts(facts, os)
             end
 
             let(:expected_package_install_options) do
-              if %r{aix}.match?(os)
+              if os.include?('aix')
                 ['--ignoreos', 'OPTION1=value1', 'OPTION2=value2']
               else
                 ['OPTION1=value1', 'OPTION2=value2']
@@ -307,7 +307,7 @@ def global_facts(facts, os)
               it { is_expected.to contain_package('puppet-agent') .with_install_options(expected_package_install_options) }
             end
 
-            if %r{solaris-10}.match?(os)
+            if os.include?('solaris-10')
               it do
                 is_expected.to contain_exec('solaris_install script')
                   .with_command(
@@ -349,7 +349,7 @@ def global_facts(facts, os)
               it { is_expected.to contain_package('puppet-agent').with_ensure(package_version) }
             end
 
-            unless %r{windows}.match?(os)
+            unless os.include?('windows')
               unless %r{sles|solaris|aix}.match?(os)
                 it { is_expected.to contain_class('puppet_agent::service').that_requires('Class[puppet_agent::configure]') }
               end

spec/spec_helper_acceptance.rb

@@ -130,7 +130,7 @@ def teardown_puppet_on(host)
     clean_repo = ''
   end
 
-  if %r{windows}.match?(host['platform'])
+  if host['platform'].include?('windows')
     install_dir = on(host, 'facter.bat env_windows_installdir').output.tr('\\', '/').chomp
     scp_to host, "#{TEST_FILES}/uninstall.ps1", 'uninstall.ps1'
     on host, 'rm -rf C:/ProgramData/PuppetLabs'

task_spec/spec/acceptance/init_spec.rb

@@ -19,7 +19,7 @@ def bolt_config
   def bolt_inventory
     host_data = hosts_to_inventory
     host_data['targets'].each do |node_data|
-      node_data['config']['winrm']['connect-timeout'] = 120 if %r{win}.match?(target_platform)
+      node_data['config']['winrm']['connect-timeout'] = 120 if target_platform.include?('win')
     end
 
     host_data
@@ -97,7 +97,7 @@ def log_output_errors(result)
 
     # extra request is needed on windows hosts
     # this will fail with "execution expired"
-    run_task('puppet_agent::version', 'target', {}) if %r{win}.match?(target_platform)
+    run_task('puppet_agent::version', 'target', {}) if target_platform.include?('win')
 
     # Test the agent isn't already installed and that the version task works
     results = run_task('puppet_agent::version', 'target', {})
@@ -131,7 +131,7 @@ def log_output_errors(result)
     end
 
     # Check that puppet agent service has been stopped due to 'stop_service' parameter set to true
-    service = if %r{win}.match?(target_platform)
+    service = if target_platform.include?('win')
                 run_command('c:/"program files"/"puppet labs"/puppet/bin/puppet resource service puppet', 'target')
               else
                 run_command('/opt/puppetlabs/bin/puppet resource service puppet', 'target')
@@ -190,7 +190,7 @@ def log_output_errors(result)
     end
 
     # Puppet Agent can't be upgraded on Windows nodes while 'puppet agent' service or 'pxp-agent' service are running
-    if %r{win}.match?(target_platform)
+    if target_platform.include?('win')
       # Try to upgrade from puppet6 to puppet7 but fail due to puppet agent service already running
       results = run_task('puppet_agent::install', 'target', { 'collection' => 'puppet7', 'version' => 'latest' })
       results.each do |res|

tasks/facts_diff.rb

@@ -49,7 +49,7 @@ def run
     run_result = Puppet::Util::Execution.execute(command, options)
 
     minified_run_result = run_result.delete("\n").delete(' ')
-    minified_run_result == '{}' ? 'No differences found' : run_result
+    (minified_run_result == '{}') ? 'No differences found' : run_result
   end
 
   private

tasks/run.rb

@@ -138,11 +138,11 @@ def config_print(*keys)
   end
 
   def noop(params)
-    params['noop'] == true ? '--noop' : ''
+    (params['noop'] == true) ? '--noop' : ''
   end
 
   def environment(params)
-    params['environment'].length > 1 ? "--environment=#{params['environment']}" : ''
+    (params['environment'].length > 1) ? "--environment=#{params['environment']}" : ''
   end
 
   # Attempts to run the Puppet agent, returning the mtime for the last run report