lint fixes

manifests/api/config.pp

@@ -15,10 +15,10 @@
   }
 
   file { '/etc/sensu/conf.d/api.json':
-    ensure  => $ensure,
-    owner   => 'sensu',
-    group   => 'sensu',
-    mode    => '0440',
+    ensure => $ensure,
+    owner  => 'sensu',
+    group  => 'sensu',
+    mode   => '0440',
   }
 
   sensu_api_config { $::fqdn:

manifests/check.pp

@@ -112,11 +112,11 @@
   $check_name = regsubst(regsubst($name, ' ', '_', 'G'), '[\(\)]', '', 'G')
 
   file { "/etc/sensu/conf.d/checks/${check_name}.json":
-    ensure  => $ensure,
-    owner   => 'sensu',
-    group   => 'sensu',
-    mode    => '0440',
-    before  => Sensu_check[$check_name],
+    ensure => $ensure,
+    owner  => 'sensu',
+    group  => 'sensu',
+    mode   => '0440',
+    before => Sensu_check[$check_name],
   }
 
   sensu_check { $check_name:

manifests/client/config.pp

@@ -15,10 +15,10 @@
   }
 
   file { '/etc/sensu/conf.d/client.json':
-    ensure  => $ensure,
-    owner   => 'sensu',
-    group   => 'sensu',
-    mode    => '0444',
+    ensure => $ensure,
+    owner  => 'sensu',
+    group  => 'sensu',
+    mode   => '0444',
   }
 
   sensu_client_config { $::fqdn:

manifests/config.pp

@@ -18,26 +18,26 @@
 #   Default: undef
 #
 define sensu::config (
-  $ensure       = 'present',
-  $config       = undef,
-  $event        = undef,
+  $ensure = 'present',
+  $config = undef,
+  $event  = undef,
 ) {
 
   validate_re($ensure, ['^present$', '^absent$'] )
 
   file { "/etc/sensu/conf.d/checks/config_${name}.json":
-    ensure  => $ensure,
-    owner   => 'sensu',
-    group   => 'sensu',
-    mode    => '0444',
-    before  => Sensu_check[$name],
+    ensure => $ensure,
+    owner  => 'sensu',
+    group  => 'sensu',
+    mode   => '0444',
+    before => Sensu_check[$name],
   }
 
   sensu_check_config { $name:
-    ensure  => $ensure,
-    config  => $config,
-    event   => $event,
-    notify  => Class['sensu::client::service'],
+    ensure => $ensure,
+    config => $config,
+    event  => $event,
+    notify => Class['sensu::client::service'],
   }
 
 }

manifests/filter.pp

@@ -34,16 +34,16 @@
   }
 
   file { "/etc/sensu/conf.d/filters/${name}.json":
-    ensure  => $ensure,
-    owner   => 'sensu',
-    group   => 'sensu',
-    mode    => '0444',
+    ensure => $ensure,
+    owner  => 'sensu',
+    group  => 'sensu',
+    mode   => '0444',
   }
 
   sensu_filter { $name:
-    ensure      => $ensure,
-    negate      => $negate,
-    attributes  => $attributes,
+    ensure     => $ensure,
+    negate     => $negate,
+    attributes => $attributes,
   }
 
 }

manifests/handler.pp

@@ -34,7 +34,7 @@
 #
 # [*pipe*]
 #   Hash.  Pipe information used when type=transport
-#   Keys: name, type, options 
+#   Keys: name, type, options
 #   Default: undef
 #
 # [*socket*]
@@ -116,16 +116,16 @@
     $handler = "${install_path}/${filename}"
 
     $file_ensure = $ensure ? {
-      'absent'  => 'absent',
-      default   => 'file'
+      'absent' => 'absent',
+      default  => 'file'
     }
 
     file { $handler:
-      ensure  => $file_ensure,
-      owner   => 'sensu',
-      group   => 'sensu',
-      mode    => '0555',
-      source  => $source,
+      ensure => $file_ensure,
+      owner  => 'sensu',
+      group  => 'sensu',
+      mode   => '0555',
+      source => $source,
     }
 
     $command_real = $command ? {
@@ -137,27 +137,27 @@
   }
 
   file { "/etc/sensu/conf.d/handlers/${name}.json":
-    ensure  => $ensure,
-    owner   => 'sensu',
-    group   => 'sensu',
-    mode    => '0444',
-    before  => Sensu_handler[$name],
+    ensure => $ensure,
+    owner  => 'sensu',
+    group  => 'sensu',
+    mode   => '0444',
+    before => Sensu_handler[$name],
   }
 
   sensu_handler { $name:
-    ensure       => $ensure,
-    type         => $type,
-    command      => $command_real,
-    handlers     => $handlers,
-    severities   => $severities,
-    exchange     => $exchange,
-    pipe         => $pipe,
-    socket       => $socket,
-    mutator      => $mutator,
-    filters      => $filters,
-    config       => $config,
-    notify       => $notify_services,
-    require      => File['/etc/sensu/conf.d/handlers'],
+    ensure     => $ensure,
+    type       => $type,
+    command    => $command_real,
+    handlers   => $handlers,
+    severities => $severities,
+    exchange   => $exchange,
+    pipe       => $pipe,
+    socket     => $socket,
+    mutator    => $mutator,
+    filters    => $filters,
+    config     => $config,
+    notify     => $notify_services,
+    require    => File['/etc/sensu/conf.d/handlers'],
   }
 
 }

manifests/package.pp

@@ -36,12 +36,14 @@
     ensure  => $sensu::version,
   }
 
+  $gem_provider = $sensu::use_embedded_ruby ? {
+    true    => 'sensu_gem',
+    default => 'gem',
+  }
+
   package { 'sensu-plugin' :
     ensure   => $sensu::sensu_plugin_version,
-    provider => $sensu::use_embedded_ruby ? {
-      true    => 'sensu_gem',
-      default => 'gem',
-    }
+    provider => $gem_provider,
   }
 
   file { '/etc/default/sensu':
@@ -92,8 +94,8 @@
     }
 
     group { 'sensu':
-      ensure  => 'present',
-      system  => true,
+      ensure => 'present',
+      system => true,
     }
   }
 

manifests/plugin.pp

@@ -104,7 +104,7 @@
     }
     'package':    {
       package { $name:
-        ensure  => $pkg_version
+        ensure => $pkg_version
       }
     }
     default:      {
@@ -115,10 +115,10 @@
 }
 # This is to verify the install_dir exists without duplicate declarations
 define define_plugins_dir (
-  $path = $name,
   $force,
   $purge,
   $recurse,
+  $path = $name,
 ) {
   if ! defined(File[$path]) {
     file { $path:

manifests/rabbitmq/config.pp

@@ -62,11 +62,11 @@
   }
 
   file { '/etc/sensu/conf.d/rabbitmq.json':
-    ensure  => $ensure,
-    owner   => 'sensu',
-    group   => 'sensu',
-    mode    => '0440',
-    before  => Sensu_rabbitmq_config[$::fqdn],
+    ensure => $ensure,
+    owner  => 'sensu',
+    group  => 'sensu',
+    mode   => '0440',
+    before => Sensu_rabbitmq_config[$::fqdn],
   }
 
   sensu_rabbitmq_config { $::fqdn:

manifests/redis/config.pp

@@ -15,16 +15,16 @@
   }
 
   file { '/etc/sensu/conf.d/redis.json':
-    ensure  => $ensure,
-    owner   => 'sensu',
-    group   => 'sensu',
-    mode    => '0444',
+    ensure => $ensure,
+    owner  => 'sensu',
+    group  => 'sensu',
+    mode   => '0444',
   }
 
   sensu_redis_config { $::fqdn:
-    ensure  => $ensure,
-    host    => $sensu::redis_host,
-    port    => $sensu::redis_port,
+    ensure => $ensure,
+    host   => $sensu::redis_host,
+    port   => $sensu::redis_port,
   }
 
 }

manifests/subscription.pp

@@ -21,17 +21,17 @@
   validate_re($ensure, ['^present$', '^absent$'] )
 
   file { "/etc/sensu/conf.d/subscription_${name}.json":
-    ensure  => $ensure,
-    owner   => 'sensu',
-    group   => 'sensu',
-    mode    => '0444',
-    before  => Sensu_client_subscription[$name],
+    ensure => $ensure,
+    owner  => 'sensu',
+    group  => 'sensu',
+    mode   => '0444',
+    before => Sensu_client_subscription[$name],
   }
 
   sensu_client_subscription { $name:
-    ensure  => $ensure,
-    custom  => $custom,
-    notify  => Class['sensu::client::service'],
+    ensure => $ensure,
+    custom => $custom,
+    notify => Class['sensu::client::service'],
   }
 
 }

tests/sensu-client.pp

@@ -1,7 +1,7 @@
 class { 'sensu':
-  rabbitmq_password  => 'correct-horse-battery-staple',
-  rabbitmq_host      => '192.168.56.10',
+  rabbitmq_password => 'correct-horse-battery-staple',
+  rabbitmq_host     => '192.168.56.10',
   rabbitmq_vhost    => '/sensu',
-  subscriptions      => 'all',
-  client_address     => "$::ipaddress_eth1",
+  subscriptions     => 'all',
+  client_address    => $::ipaddress_eth1,
 }

tests/sensu-server.pp

@@ -9,7 +9,7 @@
     api               => true,
     api_user          => 'admin',
     api_password      => 'secret',
-    client_address    => "$::ipaddress_eth1",
+    client_address    => $::ipaddress_eth1,
   }
 
   sensu::handler { 'default':