(maint) Corrective changes

- Fixes made to spec tests
- onlyif commands corrected
- remove unnecessary shell_escapes
- variable used in place of replicated assignment
- $_file_path neatened

Author: david22swan

manifests/custom_config.pp

@@ -90,11 +90,12 @@
     $notifies = undef
   }
 
+  $_file_path = "${confdir}/${_filename}"
   $_file_mode = pick($file_mode, $apache::file_mode)
 
   file { "apache_${name}":
     ensure    => $ensure,
-    path      => "${confdir}/${_filename}",
+    path      => $_file_path,
     owner     => $owner,
     group     => $group,
     mode      => $_file_mode,
@@ -115,7 +116,7 @@
       require     => Anchor['::apache::modules_set_up'],
     }
 
-    $remove_command = ['/bin/rm', shell_escape(join([$confdir, $_filename], '/'))]
+    $remove_command = ['/bin/rm', $_file_path]
     exec { "remove ${name} if invalid":
       command     => $remove_command,
       unless      => [$verify_command],

manifests/mpm/disable_mpm_event.pp

@@ -1,25 +1,25 @@
 # @summary disable Apache-Module event
 class apache::mpm::disable_mpm_event {
   $event_command = ['/usr/sbin/a2dismod', 'event']
-  $event_onlyif = ['/usr/bin/test', '-e', shell_escape(join([$apache::mod_enable_dir, 'event.load'],'/'))]
+  $event_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'event.load'],'/')]]
   exec { '/usr/sbin/a2dismod event':
     command => $event_command,
     onlyif  => $event_onlyif,
     require => Package['httpd'],
     before  => Class['apache::service'],
   }
 
-  $event_load_command = ['/bin/rm', shell_escape(join([$apache::mod_enable_dir, 'event_event.load'],'/'))]
-  $event_load_onlyif = ['/usr/bin/test', '-e', shell_escape(join([$apache::mod_enable_dir, 'event_event.load'],'/'))]
+  $event_load_command = ['/bin/rm', join([$apache::mod_enable_dir, 'event_event.load'],'/')]
+  $event_load_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'event_event.load'],'/')]]
   exec { 'remove distribution event load file':
     command => $event_load_command,
     onlyif  => $event_load_onlyif,
     require => Package['httpd'],
     before  => Class['apache::service'],
   }
 
-  $event_conf_command = ['/bin/rm', shell_escape(join([$apache::mod_enable_dir, 'event_event.conf'],'/'))]
-  $event_conf_onlyif = ['/usr/bin/test', '-e', shell_escape(join([$apache::mod_enable_dir, 'event_event.conf'],'/'))]
+  $event_conf_command = ['/bin/rm', join([$apache::mod_enable_dir, 'event_event.conf'],'/')]
+  $event_conf_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'event_event.conf'],'/')]]
   exec { 'remove distribution event conf file':
     command => $event_conf_command,
     onlyif  => $event_conf_onlyif,

manifests/mpm/disable_mpm_prefork.pp

@@ -1,7 +1,7 @@
 # @summary disable Apache-Module prefork
 class apache::mpm::disable_mpm_prefork {
   $prefork_command = ['/usr/sbin/a2dismod', 'prefork']
-  $prefork_onlyif = ['/usr/bin/test', '-e', shell_escape(join([$apache::mod_enable_dir, 'prefork.load'],'/'))]
+  $prefork_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'prefork.load'],'/')]]
   exec { '/usr/sbin/a2dismod prefork':
     command => $prefork_command,
     onlyif  => $prefork_onlyif,

manifests/mpm/disable_mpm_worker.pp

@@ -1,7 +1,7 @@
 # @summary disable Apache-Module worker
 class apache::mpm::disable_mpm_worker {
   $worker_command = ['/usr/sbin/a2dismod', 'worker']
-  $worker_onlyif = ['/usr/bin/test', '-e', shell_escape(join([$apache::mod_enable_dir, 'worker.load'],'/'))]
+  $worker_onlyif = [['/usr/bin/test', '-e', join([$apache::mod_enable_dir, 'worker.load'],'/')]]
   exec { '/usr/sbin/a2dismod worker':
     command => $worker_command,
     onlyif  => $worker_onlyif,

spec/defines/custom_config_spec.rb

@@ -21,14 +21,14 @@
 
     it {
       is_expected.to contain_exec('syntax verification for rspec')
-        .with('refreshonly' => 'true', 'command' => '/usr/sbin/apachectl -t')
+        .with('refreshonly' => 'true', 'command' => ['/usr/sbin/apachectl -t'])
         .that_subscribes_to('File[apache_rspec]')
         .that_notifies('Class[Apache::Service]')
         .that_comes_before('Exec[remove rspec if invalid]')
     }
     it {
       is_expected.to contain_exec('remove rspec if invalid')
-        .with('unless' => '/usr/sbin/apachectl -t', 'refreshonly' => 'true')
+        .with('unless' => ['/usr/sbin/apachectl -t'], 'refreshonly' => 'true')
         .that_subscribes_to('File[apache_rspec]')
     }
     it {
@@ -51,8 +51,8 @@
       is_expected.to contain_exec('syntax verification for rspec').with('command' => '/bin/true')
     }
     it {
-      is_expected.to contain_exec('remove rspec if invalid').with('command' => '/bin/rm /dne/30-rspec.conf',
-                                                                  'unless' => '/bin/true')
+      is_expected.to contain_exec('remove rspec if invalid').with('command' => ['/bin/rm', '/dne/30-rspec.conf'],
+                                                                  'unless' => ['/bin/true'])
     }
     it {
       is_expected.to contain_file('apache_rspec')