Merge branch 'CHEF-2856'

2 files changed, 31 insertions, 11 deletions

diff --git a/chef/lib/chef/provider/group/gpasswd.rb b/chef/lib/chef/provider/group/gpasswd.rb
index 6dfe597179..78100dcec3 100644
--- a/chef/lib/chef/provider/group/gpasswd.rb
+++ b/chef/lib/chef/provider/group/gpasswd.rb
@@ -33,19 +33,24 @@ class Chef
         end
 
         def modify_group_members
-          unless @new_resource.members.empty?
             if(@new_resource.append)
-              @new_resource.members.each do |member|
-                Chef::Log.debug("#{@new_resource} appending member #{member} to group #{@new_resource.group_name}")
-                shell_out!("gpasswd -a #{member} #{@new_resource.group_name}")
+              unless @new_resource.members.empty?
+                @new_resource.members.each do |member|
+                  Chef::Log.debug("#{@new_resource} appending member #{member} to group #{@new_resource.group_name}")
+                  shell_out!("gpasswd -a #{member} #{@new_resource.group_name}")
+                end
+              else
+                Chef::Log.debug("#{@new_resource} not changing group members, the group has no members to add")
               end
             else
-              Chef::Log.debug("#{@new_resource} setting group members to #{@new_resource.members.join(', ')}")
-              shell_out!("gpasswd -M #{@new_resource.members.join(',')} #{@new_resource.group_name}")
+              unless @new_resource.members.empty?
+                Chef::Log.debug("#{@new_resource} setting group members to #{@new_resource.members.join(', ')}")
+                shell_out!("gpasswd -M #{@new_resource.members.join(',')} #{@new_resource.group_name}")
+              else
+                Chef::Log.debug("#{@new_resource} setting group members to: none")
+                shell_out!("gpasswd -M \"\" #{@new_resource.group_name}")
+              end
             end
-          else
-            Chef::Log.debug("#{@new_resource} not changing group members, the group has no members")
-          end
         end
       end
     end
diff --git a/chef/spec/unit/provider/group/gpasswd_spec.rb b/chef/spec/unit/provider/group/gpasswd_spec.rb
index 5c0357bf91..d75c6485a8 100644
--- a/chef/spec/unit/provider/group/gpasswd_spec.rb
+++ b/chef/spec/unit/provider/group/gpasswd_spec.rb
@@ -71,13 +71,28 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
       @current_resource = @new_resource.dup
       @provider.current_resource = @new_resource
     end
-    describe "when no group members are specified" do
+
+    describe "when no group members are specified and append is not set" do
+      before do
+        @new_resource.append(false)
+        @new_resource.members([])
+      end
+
+      it "logs a message and sets group's members to 'none'" do
+        Chef::Log.should_receive(:debug).with("group[wheel] setting group members to: none")
+        @provider.should_receive(:shell_out!).with("gpasswd -M \"\" wheel")
+        @provider.modify_group_members
+      end
+    end
+
+    describe "when no group members are specified and append is set" do
       before do
+        @new_resource.append(true)
         @new_resource.members([])
       end
 
       it "logs a message and does not modify group membership" do
-        Chef::Log.should_receive(:debug).with("group[wheel] not changing group members, the group has no members")
+        Chef::Log.should_receive(:debug).with("group[wheel] not changing group members, the group has no members to add")
         @provider.should_not_receive(:shell_out!)
         @provider.modify_group_members
       end