From 9669a92dc8ff96b202d52bf510429449bbd6ef67 Mon Sep 17 00:00:00 2001
From: Mikhail Zholobov <legal90@gmail.com>
Date: Wed, 18 Jan 2017 16:42:19 +0200
Subject: [PATCH] Fix foodcritic offenses

---
 .foodcritic                         | 3 ++-
 libraries/consul_config.rb          | 4 ++--
 libraries/consul_definition.rb      | 4 ++--
 libraries/consul_service.rb         | 2 +-
 libraries/consul_service_windows.rb | 7 +++----
 libraries/consul_watch.rb           | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.foodcritic b/.foodcritic
index 2aeb36d3..76524578 100644
--- a/.foodcritic
+++ b/.foodcritic
@@ -1 +1,2 @@
--t ~FC001 -t ~FC054
+~FC019
+~FC044
diff --git a/libraries/consul_config.rb b/libraries/consul_config.rb
index 570a374d..304604a9 100644
--- a/libraries/consul_config.rb
+++ b/libraries/consul_config.rb
@@ -195,7 +195,7 @@ def tls?
           [::File.dirname(new_resource.path), new_resource.config_dir].each do |dir|
             directory dir do
               recursive true
-              unless node.platform?('windows')
+              unless platform?('windows')
                 owner new_resource.owner
                 group new_resource.group
                 mode '0755'
@@ -205,7 +205,7 @@ def tls?
           end
 
           file new_resource.path do
-            unless node.platform?('windows')
+            unless platform?('windows')
               owner new_resource.owner
               group new_resource.group
               mode '0640'
diff --git a/libraries/consul_definition.rb b/libraries/consul_definition.rb
index f8a4da5b..cf5115f4 100644
--- a/libraries/consul_definition.rb
+++ b/libraries/consul_definition.rb
@@ -45,7 +45,7 @@ def to_json
         notifying_block do
           directory ::File.dirname(new_resource.path) do
             recursive true
-            unless node.platform?('windows')
+            unless platform?('windows')
               owner new_resource.user
               group new_resource.group
               mode '0755'
@@ -57,7 +57,7 @@ def to_json
 
           file new_resource.path do
             content new_resource.to_json
-            unless node.platform?('windows')
+            unless platform?('windows')
               owner new_resource.user
               group new_resource.group
               mode '0640'
diff --git a/libraries/consul_service.rb b/libraries/consul_service.rb
index 700123d3..a4b10814 100644
--- a/libraries/consul_service.rb
+++ b/libraries/consul_service.rb
@@ -90,7 +90,7 @@ def service_options(service)
         service.options(:sysvinit, template: 'consul:sysvinit.service.erb')
         service.options(:upstart, template: 'consul:upstart.service.erb', executable: new_resource.program)
 
-        if node.platform_family?('rhel') && node.platform_version.to_i == 6
+        if platform_family?('rhel') && node['platform_version'].to_i == 6
           service.provider(:sysvinit)
         end
       end
diff --git a/libraries/consul_service_windows.rb b/libraries/consul_service_windows.rb
index 1c283aff..72968cd7 100644
--- a/libraries/consul_service_windows.rb
+++ b/libraries/consul_service_windows.rb
@@ -54,10 +54,9 @@ def action_enable
             end
             # Check if the service is running, but don't bother if we're already
             # changing some nssm parameters
-            unless nssm_service_status?(%w(SERVICE_RUNNING)) && mismatch_params.empty?
-              powershell_script 'Trigger consul restart' do
-                code 'restart-service consul'
-              end
+            powershell_script 'Trigger consul restart' do
+              code 'restart-service consul'
+              not_if { nssm_service_status?(%w(SERVICE_RUNNING)) && mismatch_params.empty? }
             end
           end
         end
diff --git a/libraries/consul_watch.rb b/libraries/consul_watch.rb
index 1bd2aabb..6886742c 100644
--- a/libraries/consul_watch.rb
+++ b/libraries/consul_watch.rb
@@ -43,7 +43,7 @@ def to_json
         notifying_block do
           directory ::File.dirname(new_resource.path) do
             recursive true
-            unless node.platform?('windows')
+            unless platform?('windows')
               owner new_resource.user
               group new_resource.group
               mode '0755'
@@ -52,7 +52,7 @@ def to_json
 
           file new_resource.path do
             content new_resource.to_json
-            unless node.platform?('windows')
+            unless platform?('windows')
               owner new_resource.user
               group new_resource.group
               mode '0640'