capistrano-provisioning 0.0.4 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.6

data/capistrano-provisioning.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capistrano-provisioning}
-  s.version = "0.0.4"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Phillips"]
-  s.date = %q{2010-06-16}
+  s.date = %q{2010-06-29}
   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 = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
      "pkg/capistrano-provisioning-0.0.0.gem",
      "pkg/capistrano-provisioning-0.0.1.gem",
      "pkg/capistrano-provisioning-0.0.3.gem",
+     "pkg/capistrano-provisioning-0.0.4.gem",
      "spec/cluster_spec.rb",
      "spec/namespaces_spec.rb",
      "spec/recipes_spec.rb",

data/lib/capistrano-provisioning/user.rb

@@ -13,12 +13,15 @@ module CapistranoProvisioning
       abort "Aborting - Cannot install user #{self.name} as no server specified" unless opts[:server]
       abort "Aborting - Could not find key for #{self.name} at #{local_key_file_path}" unless key
 
-      logger.debug "installing #{self.name} on #{opts[:server]}"    
+      self.server = opts[:server]
 
-      self.create_account_on_server(opts[:server]) unless self.account_exists?(opts[:server])
-      self.create_ssh_config_directory(opts[:server])
-      self.update_authorized_keys(opts[:server])
-      self.add_account_to_groups(opts[:server])
+      logger.debug "installing #{self.name} on #{self.server}"    
+
+      self.create_account_on_server unless self.account_exists?
+      self.create_ssh_config_directory
+      self.update_authorized_keys
+      self.set_ssh_config_permissions
+      self.add_account_to_groups
     end
     
     def groups
@@ -26,7 +29,9 @@ module CapistranoProvisioning
     end
     
     protected
-    def account_exists?(server)
+    attr_accessor :server
+
+    def account_exists?(server = self.server)
       begin
         if capture("id #{self.name}", :hosts => server)
           true
@@ -43,35 +48,36 @@ module CapistranoProvisioning
       File.read(local_key_file_path) if File.exists?(local_key_file_path) 
     end
 
-    def create_account_on_server(server)
+    def create_account_on_server(server = self.server)
       run "#{sudo} /usr/sbin/useradd -m #{name}", :pty => true, :hosts => server
     end
     
-    def add_account_to_groups(server)
+    def add_account_to_groups(server = self.server)
       self.groups.each do |group|
         run "#{sudo} /usr/sbin/usermod -a -G#{group} #{self.name}", :pty => true, :hosts => server
       end
     end
     
-    def create_ssh_config_directory(server)
+    def create_ssh_config_directory(server = self.server)
       # Actual dirt
       commands = <<-COMMANDS
         sudo su root -c 'if [ ! -d #{ssh_config_directory_path} ]; then
           sudo mkdir #{ssh_config_directory_path};
         fi';
-        #{sudo} chown #{name} #{ssh_config_directory_path} &&
-        #{sudo} chmod 700 #{ssh_config_directory_path}
       COMMANDS
       
       run commands, :pty => true, :hosts => server
     end
     
-    def update_authorized_keys(server)
-      commands = <<-COMMANDS
-        #{sudo} touch #{authorized_keys_file_path} &&
-        echo '#{key}' | sudo tee #{authorized_keys_file_path}
-      COMMANDS
-      run commands, :pty => true, :hosts => server
+    def update_authorized_keys(server = self.server)
+      tmp_location = "/tmp/#{self.name}.pub"
+      put key, tmp_location
+      run "#{sudo} mv #{tmp_location} #{authorized_keys_file_path}", :pty => true, :hosts => server
+    end
+    
+    def set_ssh_config_permissions(server = self.server)
+      run "#{sudo} chown -R #{name} #{ssh_config_directory_path}", :pty => true, :hosts => server
+      run "#{sudo} chmod -R 700 #{ssh_config_directory_path}", :pty => true, :hosts => server
     end
     
     def authorized_keys_file_path
@@ -94,6 +100,12 @@ module CapistranoProvisioning
     protected
     # This isn't the best way to get to the run/logger stuff in this class -
     # need to figure out a better way to do this, or a way to not need to.
+    
+
+
+    def put(data, path, options={})
+      self.config.put(data, path, options)
+    end
 
     def sudo(*parameters, &block)
       self.config.sudo(*parameters, &block)

data/spec/recipes_spec.rb

@@ -1,17 +1,48 @@
 require 'spec_helper'
 
-# TODO: Not sure how to test this yet
+# Fake a running instance of Capistrano
+Capistrano::Configuration.instance = Capistrano::Configuration.new
+require 'capistrano-provisioning/recipes'
 
-describe "Recipes" do  
+describe "Recipes" do
+  let(:config)      { Capistrano::Configuration.instance }
+  
   context "namespace" do
-    it "should create an :all task which loads all servers in that namespace"    
+    it "should create an :all task which loads all servers in that namespace" do
+      pending("Currently failing due to inheritance confusion")
+
+      config.load do
+        namespace :test_namespace do
+          cluster :test_cluster, 'cluster1.example.com'
+        end
+      end
+      
+      puts config.tasks.keys.inspect.gsub("<", '&lt;')
+      config.namespaces.should include(:test_namespace)
+      config.tasks.keys.should include(:test_namespace)
+    end
   end
 
-  context "cluster definition" do
-    it "should create a task to set the servers"
-    
-    it "should create a task to bootstrap the servers"
+  context "global" do    
+    it "should create a task to bootstrap the servers" do
+      config.tasks.keys.should include(:run_bootstrap)
+    end
+
+    it "should create a task to install users on the servers" do
+      config.tasks.keys.should include(:install_users)
+    end
     
-    it "should create a task to install users on the servers"
+    it "should create a task to preview users that will be installed" do
+      config.tasks.keys.should include(:install_users)      
+    end
+  end
+
+  context "cluster definition" do
+    it "should create a task to set the servers" do
+      pending("Currently failing due to inheritance confusion")
+
+      config.cluster :test_cluster
+      config.tasks.keys.should include(:test_cluster)
+    end
   end
 end

metadata

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