From: Tom Hughes <tom@compton.nu>
Date: Tue, 3 Feb 2015 18:00:48 +0000 (+0000)
Subject: More rubocop cleanup
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/df9f0c894c0a33506475703c70a32c1dd6fe5144

More rubocop cleanup
---

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index fd40acb79..e819633a2 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -46,20 +46,11 @@ Style/AccessModifierIndentation:
 Style/Documentation:
   Enabled: false
 
-# Offense count: 2
-Style/EmptyElse:
-  Enabled: false
-
 # Offense count: 32
 # Configuration parameters: Exclude.
 Style/FileName:
   Enabled: false
 
-# Offense count: 1
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Enabled: false
-
 # Offense count: 3116
 # Cop supports --auto-correct.
 # Configuration parameters: SupportedStyles.
diff --git a/cookbooks/chef/libraries/remote_directory.rb b/cookbooks/chef/libraries/remote_directory.rb
index 32dacc500..65cb9c86d 100644
--- a/cookbooks/chef/libraries/remote_directory.rb
+++ b/cookbooks/chef/libraries/remote_directory.rb
@@ -11,15 +11,16 @@ class Chef
           files_transferred << ::File.dirname(::File.join(@new_resource.path, cookbook_file_relative_path))
           files_transferred << ::File.join(@new_resource.path, cookbook_file_relative_path)
         end
-        if @new_resource.purge
-          files_to_purge = Set.new(
-                                   Dir.glob(::File.join(@new_resource.path, '**', '*'), ::File::FNM_DOTMATCH).select do |name|
-                                     name !~ /(?:^|#{Regexp.escape(::File::SEPARATOR)})\.\.?$/
-                                   end
-                                   )
-          files_to_purge = files_to_purge - files_transferred
-          purge_unmanaged_files(files_to_purge)
-        end
+
+        return unless @new_resource.purge
+
+        files_to_purge = Set.new(
+          Dir.glob(::File.join(@new_resource.path, '**', '*'), ::File::FNM_DOTMATCH).select do |name|
+            name !~ /(?:^|#{Regexp.escape(::File::SEPARATOR)})\.\.?$/
+          end
+        )
+        files_to_purge = files_to_purge - files_transferred
+        purge_unmanaged_files(files_to_purge)
       end
     end
   end
diff --git a/cookbooks/munin/providers/plugin.rb b/cookbooks/munin/providers/plugin.rb
index c058524b9..193983471 100644
--- a/cookbooks/munin/providers/plugin.rb
+++ b/cookbooks/munin/providers/plugin.rb
@@ -79,8 +79,6 @@ def target_path
     "/usr/local/share/munin/plugins/#{target}"
   when ::File.exist?("/usr/share/munin/plugins/#{target}")
     "/usr/share/munin/plugins/#{target}"
-  else
-    nil
   end
 end