fabric 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/fabric.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fabric}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Phillips"]
-  s.date = %q{2010-03-24}
+  s.date = %q{2010-03-29}
   s.default_executable = %q{fab}
   s.description = %q{Fabric is a small ruby app to perform tasks on servers via SSH. Built around net/ssh and taking heavy inspiration from Capistrano, it allows you to create policies for server management and perform sysadmin tasks without the need for a process/daemon/dependency or even ruby being installed on the remote server.}
   s.email = %q{sam.phillips@setfiremedia.com}

data/lib/fabric/account.rb

@@ -23,9 +23,7 @@ class Account
   end
   
   def add_to_groups
-    self.user.groups.each do |group|
-      self.server.execute_command("sudo /usr/sbin/usermod -G#{group.name} #{self.user.name}")
-    end
+    self.server.execute_command("sudo /usr/sbin/usermod -a -G #{self.user.groups.collect(&:name).join(',')} #{self.user.name}")
   end
   
   protected

data/spec/classes/account_spec.rb

@@ -29,22 +29,47 @@ describe Account do
     end
   end
   
-  describe "with a user in a group" do
+  describe "with", User do
     before(:each) do
       @account.add_user
-      @user.groups.new(:name => TEST_GROUP)
-      @server.execute_command("sudo /usr/sbin/groupadd #{TEST_GROUP}")
     end
     
-    after(:each) do
-      @server.execute_command("sudo /usr/sbin/groupdel #{TEST_GROUP}")
-    end
+    describe "with a primary group" do
+      before(:each) do
+        @user.groups.new(:name => TEST_GROUP)
+        @server.execute_command("sudo /usr/sbin/groupadd #{TEST_GROUP}")        
+      end
+
+      after(:each) do
+        @server.execute_command("sudo /usr/sbin/groupdel #{TEST_GROUP}")
+      end
 
-    it "should add the user to that group" do
-      @account.add_to_groups
+      it "should add the user to that group only" do
+        @account.add_to_groups
 
-      @server.execute_command("groups #{@user.name}")
-      @server.output.should =~ / ?#{TEST_GROUP} ?/
+        @server.execute_command("groups #{@user.name}")
+        @server.output.should =~ / ?#{TEST_GROUP} ?/
+        @server.output.should_not =~ / ?#{TEST_SECONDARY_GROUP} ?/
+      end
+      
+      describe "and a secondary group" do
+        before(:each) do
+          @user.groups.new(:name => TEST_SECONDARY_GROUP)
+          @server.execute_command("sudo /usr/sbin/groupadd #{TEST_SECONDARY_GROUP}")
+        end
+        
+        after(:each) do
+          @server.execute_command("sudo /usr/sbin/groupdel #{TEST_SECONDARY_GROUP}")          
+        end
+
+        it "should add the user to those groups" do
+          @account.add_to_groups
+
+          @server.execute_command("groups #{@user.name}")
+          @server.output.should =~ / ?#{TEST_GROUP} ?/
+          @server.output.should =~ / ?#{TEST_SECONDARY_GROUP} ?/
+        end
+      end
     end
   end
   

data/spec/spec_helper.rb

@@ -14,6 +14,7 @@ TEST_RUNNER = Fabric::Test.settings['runner']
 TEST_USER = Fabric::Test.settings['user']
 TEST_DOOMED_USER = Fabric::Test.settings['doomed_user']
 TEST_GROUP = Fabric::Test.settings['group']
+TEST_SECONDARY_GROUP = Fabric::Test.settings['secondary_group']
 
 Spec::Runner.configure do |config|
   config.before(:suite) do 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fabric
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Sam Phillips
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-24 00:00:00 +00:00
+date: 2010-03-29 00:00:00 +01:00
 default_executable: fab
 dependencies: 
 - !ruby/object:Gem::Dependency