capistrano-hivequeen 0.4.0 → 0.4.1

data/capistrano-hivequeen.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'capistrano-hivequeen'
-  s.version           = '0.4.0'
-  s.date              = '2011-10-04'
+  s.version           = '0.4.1'
+  s.date              = '2011-10-05'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

data/lib/capistrano/hivequeen/deploy.rb

@@ -1,24 +1,26 @@
-# Symlink shared config files
-after "deploy:update_code", "deploy:symlink_shared_config"
-namespace :deploy do
-  desc "[internal] Symlink shared config files to current release"
-  task :symlink_shared_config do
-    run "ln -nfs #{shared_path}/config/* #{latest_release}/config"
+Capistrano::Configuration.instance.load do
+  # Symlink shared config files
+  after "deploy:update_code", "deploy:symlink_shared_config"
+  namespace :deploy do
+    desc "[internal] Symlink shared config files to current release"
+    task :symlink_shared_config do
+      run "ln -nfs #{shared_path}/config/* #{latest_release}/config"
+    end
   end
-end
 
-desc "Deploy without migrations"
-task(:hotfix) { deploy.default }
+  desc "Deploy without migrations"
+  task(:hotfix) { deploy.default }
 
-namespace :deploy do
-  desc "[internal] Original Capistrano task. Don't run this."
-  task :cold do
-    # Nothing. Use :cold task below
+  namespace :deploy do
+    desc "[internal] Original Capistrano task. Don't run this."
+    task :cold do
+      # Nothing. Use :cold task below
+    end
   end
-end
 
-desc "Deploy for the first time. Runs setup and deploy:migrations"
-task :cold do
-  setup
-  deploy.migrations
+  desc "Deploy for the first time. Runs setup and deploy:migrations"
+  task :cold do
+    setup
+    deploy.migrations
+  end
 end

data/lib/capistrano/hivequeen/setup.rb

@@ -1,19 +1,35 @@
 # Capistrano tasks for Chef
-namespace :deploy do
-  desc "[internal] Original Capistrano task. Don't run this."
-  task(:setup) do
-    # Nothing, run setup task below
+
+Capistrano::Configuration.instance.load do
+
+  # Resets the user for a block
+  # Based on http://www.pgrs.net/2008/08/06/switching-users-during-a-capistrano-deploy/
+  def as_user(new_user=nil)
+    logger.trace "Using the current user account"
+    old_user = user
+    set :user, new_user
+    close_sessions
+    yield
+    set :user, old_user
+    close_sessions
   end
-end
 
-desc "Run chef-client on all servers"
-task :setup do
-  logger.trace "Using the current user account"
-  orig_user = user
-  set :user, nil # Use current user account
-  sudo "chef-client"
+  def close_sessions
+    sessions.values.each { |session| session.close }
+    sessions.clear
+  end
 
-  # Reset user
-  logger.trace "Resetting user to #{orig_user}"
-  set :user, orig_user
+  namespace :deploy do
+    desc "[internal] Original Capistrano task. Don't run this."
+    task(:setup) do
+      # Nothing, run setup task below
+    end
+  end
+
+  desc "Run chef-client on all servers"
+  task :setup do
+    as_user do
+      sudo "chef-client"
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-hivequeen
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Aaron Suggs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 -04:00
+date: 2011-10-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency