capistrano-provisioning 0.0.6 → 0.0.7

data/README.mdown

@@ -155,6 +155,12 @@ Which would mean that running:
 
 ... would add Bob, Joe and Rupert to the web cluster, with the appropriate groups.
 
+To only install specific users, specify them in a hosts variable:
+
+    cap system1:web install_users USERS='bob'
+
+This will only install bob - useful for if you're just adding one user and don't want to do a fullscale pass of all the keys. Note, though, that this user still needs to be defined within the recipe.
+
 #### Inheriting default users
 
 By default, namespaces do _not_ inherit default users from the namespace above. If you want this inheritance, it's easy:

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/capistrano-provisioning.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capistrano-provisioning}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Phillips"]
-  s.date = %q{2010-06-29}
+  s.date = %q{2010-06-30}
   s.description = %q{Capistrano Provisioning is an extension to Capistrano that allows you to define clusters of servers and run provisioning tasks on them, such as installing users. It is a replacement for the fabric gem (http://rubygems.org/gems/fabric).}
   s.email = %q{sam@samdanavia.com}
   s.extra_rdoc_files = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "pkg/capistrano-provisioning-0.0.1.gem",
      "pkg/capistrano-provisioning-0.0.3.gem",
      "pkg/capistrano-provisioning-0.0.4.gem",
+     "pkg/capistrano-provisioning-0.0.6.gem",
      "spec/cluster_spec.rb",
      "spec/namespaces_spec.rb",
      "spec/recipes_spec.rb",

data/lib/capistrano-provisioning/cluster.rb

@@ -13,22 +13,24 @@ module CapistranoProvisioning
       add_cluster_cap_task
     end
     
-    def install_users
-      ensure_users      
-
+    def install_users(specified_users = [])
+      ensure_users
+      
       self.servers.each do |server|
         self.users.each do |user|
+          next unless specified_users.empty? or specified_users.include?(user.name)
           user.install(:server => server)
         end
       end
     end
     
-    def preview_users
+    def preview_users(specified_users = [])
       ensure_users
 
       self.servers.each do |server|
         puts "#{server}: "
         self.users.each do |user|
+          next unless specified_users.empty? or specified_users.include?(user.name)
           groups = user.groups.empty? ? '' : "(#{user.groups.join(', ')})"
           puts "\t#{user.name} #{groups}"
         end

data/lib/capistrano-provisioning/recipes.rb

@@ -27,14 +27,19 @@ Capistrano::Configuration.instance(:must_exist).load do
   desc "Installs the specified users on the cluster"
   task :install_users do
     @clusters.each do |cluster|
-      cluster.install_users
+      cluster.install_users(user_list)
     end
   end
   
   task :preview_users do
     puts "The following users will be added: "
     @clusters.each do |cluster|
-      cluster.preview_users
+      cluster.preview_users(user_list)
     end
   end
+  
+  def user_list
+    return [] if ENV["USERS"].nil?
+    ENV["USERS"].split(/, ?/)
+  end
 end

data/spec/cluster_spec.rb

@@ -64,19 +64,32 @@ describe CapistranoProvisioning::Cluster do
       user_names.should include('bob', 'juan')
       user_names.should_not include('sam', 'david')
     end
+
+    context "installation" do
+      let(:test_user) { CapistranoProvisioning::User.new(:name => 'test_user') }
+      let(:test_user_2) { CapistranoProvisioning::User.new(:name => 'test_user_2') }
+
+      before(:each) do
+        test_user.stub!(:key => 'test key')
+        test_user_2.stub!(:key => 'test key 2')
+
+        cluster.servers = 'host1.example.com'
+        cluster.add_users [test_user, test_user_2]
+      end
   
-    it "should install users" do
-      test_user, test_user_2 = user.dup, user.dup
-      
-      test_user.stub!(:key => 'test key')
-      test_user.should_receive(:install)
-      
-      test_user_2.stub!(:key => 'test key 2')
-      test_user_2.should_receive(:install)
-      
-      cluster.servers = 'host1.example.com'
-      cluster.add_users [test_user, test_user_2]
-      cluster.install_users
+      it "should install all users when no specific users are passed" do
+        test_user.should_receive(:install)      
+        test_user_2.should_receive(:install)  
+
+        cluster.install_users
+      end
+    
+      it "should install only specified users when specific users are passed" do
+        test_user.should_receive(:install)      
+        test_user_2.should_not_receive(:install)  
+
+        cluster.install_users('test_user')
+      end
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Sam Phillips
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 +01:00
+date: 2010-06-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,6 +70,7 @@ files:
 - pkg/capistrano-provisioning-0.0.1.gem
 - pkg/capistrano-provisioning-0.0.3.gem
 - pkg/capistrano-provisioning-0.0.4.gem
+- pkg/capistrano-provisioning-0.0.6.gem
 - spec/cluster_spec.rb
 - spec/namespaces_spec.rb
 - spec/recipes_spec.rb