Merge pull request #41 from alexjfisher/rubocop_gaurd_clauses

Rubocop: Fix Style/GuardClause

lib/puppet/provider/posix_acl/posixacl.rb

@@ -12,14 +12,14 @@ def exists?
   end
 
   def unset_perm(perm, path)
-    # Don't try to unset mode bits, it don't make sense!
-    unless perm =~ %r{^(((u(ser)?)|(g(roup)?)|(m(ask)?)|(o(ther)?)):):}
-      perm = perm.split(':')[0..-2].join(':')
-      if check_recursive
-        setfacl('-R', '-n', '-x', perm, path)
-      else
-        setfacl('-n', '-x', perm, path)
-      end
+    # Don't try to unset mode bits, it doesn't make sense!
+    return if perm =~ %r{^(((u(ser)?)|(g(roup)?)|(m(ask)?)|(o(ther)?)):):}
+
+    perm = perm.split(':')[0..-2].join(':')
+    if check_recursive
+      setfacl('-R', '-n', '-x', perm, path)
+    else
+      setfacl('-n', '-x', perm, path)
     end
   end
 

lib/puppet/type/posix_acl.rb

@@ -183,18 +183,12 @@ def insync?(is)
     munge do |acl|
       r = ''
       a = acl.split ':', -1 # -1 keeps trailing empty fields.
-      if a.length < 3
-        raise ArgumentError, "Too few fields.  At least 3 required, got #{a.length}."
-      elsif a.length > 4
-        raise ArgumentError, "Too many fields.  At most 4 allowed, got #{a.length}."
-      end
+      raise ArgumentError, "Too few fields.  At least 3 required, got #{a.length}." if a.length < 3
+      raise ArgumentError, "Too many fields.  At most 4 allowed, got #{a.length}."  if a.length > 4
       if a.length == 4
         d = a.shift
-        if d == 'd' || d == 'default'
-          r << 'default:'
-        else
-          raise ArgumentError, %(First field of 4 must be "d" or "default", got "#{d}".)
-        end
+        raise ArgumentError, %(First field of 4 must be "d" or "default", got "#{d}".) unless %w[d default].include?(d)
+        r << 'default:'
       end
       t = a.shift # Copy the type.
       r << case t