Skip to content

Use Mash to handle string and symbol keys #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Annih wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use Mash to handle string and symbol keys #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions resources/facl.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
action :set do
raise "Cannot set ACL because File #{new_resource.path} does not exist!" unless ::File.exist?(new_resource.path)

new_resource.facl = {
user: new_resource.user.is_a?(String) ? {:'' => new_resource.user} : new_resource.user,
group: new_resource.group.is_a?(String) ? {:'' => new_resource.group} : new_resource.group,
other: new_resource.other.is_a?(String) ? {:'' => new_resource.other} : new_resource.other,
mask: new_resource.mask.is_a?(String) ? {:'' => new_resource.mask} : new_resource.mask,
new_resource.facl = ::Mash.new(
user: new_resource.user.is_a?(String) ? {'' => new_resource.user} : new_resource.user,
group: new_resource.group.is_a?(String) ? {'' => new_resource.group} : new_resource.group,
other: new_resource.other.is_a?(String) ? {'' => new_resource.other} : new_resource.other,
mask: new_resource.mask.is_a?(String) ? {'' => new_resource.mask} : new_resource.mask,
default: new_resource.default,
}
)
# If there are no default acl entries for things, specify blank hashes so diff_facl works
[:user, :group, :other, :mask].each do |symbol|
new_resource.facl[:default][symbol] = {} unless new_resource.facl[:default].key?(symbol)
Expand All @@ -65,7 +65,7 @@
changes_required = diff_facl(current_resource.facl, new_resource.facl)
# Don't try to remove parts of the base ACL, it cannot be removed.
[:user, :group, :other, :mask].each do |symbol|
changes_required[symbol].delete_if { |key,value| key.eql?(:'') and value.eql?(:remove) } if changes_required[symbol]
changes_required[symbol].delete_if { |key,value| key.eql?('') and value.eql?(:remove) } if changes_required[symbol]
end
Chef::Log.debug("Changes Required: #{changes_required}")
default = changes_required.delete(:default)
Expand All @@ -91,7 +91,7 @@
end

def facl_to_hash(string)
facl = { default: {}, user: {}, group: {}, mask: {}, other: {} }
facl = ::Mash.new(default: {}, user: {}, group: {}, mask: {}, other: {})
string.each_line do |line|
next unless line =~ /^(default|user|group|mask|other):/
l = line.split(':')
Expand All @@ -108,7 +108,7 @@ def facl_to_hash(string)
end

def diff_facl(cur_r, new_r)
diff = {}
diff = ::Mash.new
(cur_r.keys - new_r.keys).each do |k|
diff[k] = :remove
end
Expand Down