summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Edwards <adamed@opscode.com>2014-01-10 11:32:36 -0800
committeradamedx <adamed@opscode.com>2014-01-13 12:32:40 -0800
commit3c72cf95e9289387d315a13982c1799313e1f156 (patch)
treee331145fe00d7a29f318261052884d1f112c1796
parent2dadf2a7574b02634ddb6434a67214b594e4bc89 (diff)
downloadchef-3c72cf95e9289387d315a13982c1799313e1f156.tar.gz
Rename method to reflect predicate usage from code review feedback
-rw-r--r--lib/chef/provider/group.rb6
-rw-r--r--lib/chef/provider/group/windows.rb6
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/chef/provider/group.rb b/lib/chef/provider/group.rb
index 2768de00eb..f01677b3ac 100644
--- a/lib/chef/provider/group.rb
+++ b/lib/chef/provider/group.rb
@@ -91,7 +91,7 @@ class Chef
if(@new_resource.append)
missing_members = []
@new_resource.members.each do |member|
- next if find_current_group_member(member)
+ next if has_current_group_member?(member)
missing_members << member
end
if missing_members.length > 0
@@ -100,7 +100,7 @@ class Chef
members_to_be_removed = []
@new_resource.excluded_members.each do |member|
- if find_current_group_member(member)
+ if has_current_group_member?(member)
members_to_be_removed << member
end
end
@@ -116,7 +116,7 @@ class Chef
!@change_desc.empty?
end
- def find_current_group_member(member)
+ def has_current_group_member?(member)
@current_resource.members.include?(member)
end
diff --git a/lib/chef/provider/group/windows.rb b/lib/chef/provider/group/windows.rb
index 13ba8f24cb..84c800c57e 100644
--- a/lib/chef/provider/group/windows.rb
+++ b/lib/chef/provider/group/windows.rb
@@ -59,7 +59,7 @@ class Chef
if @new_resource.append
members_to_be_added = [ ]
@new_resource.members.each do |member|
- members_to_be_added << member if ! find_current_group_member(member)
+ members_to_be_added << member if ! has_current_group_member?(member)
end
# local_add_members will raise ERROR_MEMBER_IN_ALIAS if a
@@ -69,7 +69,7 @@ class Chef
members_to_be_removed = [ ]
@new_resource.excluded_members.each do |member|
member_sid = local_group_name_to_sid(member)
- members_to_be_removed << member if find_current_group_member(member)
+ members_to_be_removed << member if has_current_group_member?(member)
end
@net_group.local_delete_members(members_to_be_removed) unless members_to_be_removed.empty?
else
@@ -77,7 +77,7 @@ class Chef
end
end
- def find_current_group_member(member)
+ def has_current_group_member?(member)
member_sid = local_group_name_to_sid(member)
@current_resource.members.include?(member_sid)
end