Resolve cookstyle and foodcritic warnings

Signed-off-by: Tim Smith <tsmith@chef.io>
chef-boneyard · May 26, 2016 · 1cd4aab · 1cd4aab
1 parent d4f1f47
commit 1cd4aab
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 22 deletions.
diff --git a/.foodcritic b/.foodcritic
@@ -1,2 +1 @@
-~FC005
-~FC015
+~FC016
diff --git a/recipes/service.rb b/recipes/service.rb
@@ -19,7 +19,7 @@
 #
 
 if platform_family?('windows')
-  include_recipe "push-jobs::service_windows"
+  include_recipe 'push-jobs::service_windows'
 elsif node['push_jobs']['init_style'] == 'runit'
   push_jobs_service_runit 'push-jobs' do
     action [:start, :enable]

diff --git a/resources/service_runit.rb b/resources/service_runit.rb
@@ -35,7 +35,7 @@
   runit_service 'chef-push-jobs-client' do
     supports status: true
     action :stop
-    only_if { ::File.exist?("/etc/sv/chef-push-jobs-client/run") }
+    only_if { ::File.exist?('/etc/sv/chef-push-jobs-client/run') }
   end
 end
 
@@ -59,11 +59,10 @@
   runit_service 'chef-push-jobs-client' do
     supports status: true
     action :disable
-    only_if { ::File.exist?("/etc/sv/chef-push-jobs-client/run") }
+    only_if { ::File.exist?('/etc/sv/chef-push-jobs-client/run') }
   end
 end
 
-
 action_class.class_eval do
   def create_init
     include_recipe 'runit'

diff --git a/resources/service_systemd.rb b/resources/service_systemd.rb
@@ -46,7 +46,7 @@
   service 'chef-push-jobs-client' do
     supports status: true
     action :stop
-    only_if { ::File.exist?("/etc/systemd/system/chef-push-jobs.service") }
+    only_if { ::File.exist?('/etc/systemd/system/chef-push-jobs.service') }
   end
 end
 
@@ -61,7 +61,7 @@
   service 'chef-push-jobs-client' do
     supports status: true
     action :disable
-    only_if { ::File.exist?("/etc/systemd/system/chef-push-jobs.service") }
+    only_if { ::File.exist?('/etc/systemd/system/chef-push-jobs.service') }
   end
 end
 
@@ -71,7 +71,7 @@
   service 'chef-push-jobs-client' do
     supports status: true
     action :enable
-    only_if { ::File.exist?("/etc/systemd/system/chef-push-jobs.service") }
+    only_if { ::File.exist?('/etc/systemd/system/chef-push-jobs.service') }
     subscribes :restart, "template[#{PushJobsHelper.config_path}]"
   end
 end
@@ -85,14 +85,12 @@ def create_init
       action :nothing
     end
 
-    template "/etc/systemd/system/chef-push-jobs-client.service" do
+    template '/etc/systemd/system/chef-push-jobs-client.service' do
       source 'init_systemd.erb'
       cookbook 'push-jobs'
-      variables ({
-        :cli_command => PushJobsHelper.cli_command(node)
-      })
+      variables cli_command: PushJobsHelper.cli_command(node)
       notifies :run, 'execute[reload_unit_file]', :immediately
-      notifies :restart, "service[chef-push-jobs-client]", :immediately
+      notifies :restart, 'service[chef-push-jobs-client]', :immediately
     end
 
     # systemd is cool like this

diff --git a/resources/service_upstart.rb b/resources/service_upstart.rb
@@ -38,7 +38,7 @@
   service 'chef-push-jobs' do
     supports status: true
     action :stop
-    only_if { ::File.exist?("/etc/init/chef-push-jobs.conf") }
+    only_if { ::File.exist?('/etc/init/chef-push-jobs.conf') }
   end
 end
 
@@ -55,7 +55,7 @@
   service 'chef-push-jobs' do
     supports status: true
     action :enable
-    only_if { ::File.exist?("/etc/init/chef-push-jobs.conf") }
+    only_if { ::File.exist?('/etc/init/chef-push-jobs.conf') }
     subscribes :restart, "template[#{PushJobsHelper.config_path}]"
   end
 end
@@ -64,7 +64,7 @@
   service 'chef-push-jobs' do
     supports status: true
     action :disable
-    only_if { ::File.exist?("/etc/init/chef-push-jobs.conf") }
+    only_if { ::File.exist?('/etc/init/chef-push-jobs.conf') }
   end
 end
 
@@ -77,13 +77,11 @@ def create_init
       action :nothing
     end
 
-    template "/etc/init/chef-push-jobs.conf" do
+    template '/etc/init/chef-push-jobs.conf' do
       source 'init_upstart.erb'
       cookbook 'push-jobs'
-      variables ({
-        :cli_command => PushJobsHelper.cli_command(node)
-      })
-      notifies :restart, "service[chef-push-jobs]", :immediately
+      variables cli_command: PushJobsHelper.cli_command(node)
+      notifies :restart, 'service[chef-push-jobs]', :immediately
     end
   end
 end