ms_deploy 0.2.5 → 0.3.0

data/lib/ms_deploy/recipes/nginx.rb

@@ -27,7 +27,7 @@ Capistrano::Configuration.instance.load do
       run "sudo /etc/init.d/nginx restart"
     end
 
-    task :setup do
+    task :setup, :roles => :web do
       protocol = fetch(:protocol, nil).to_s
       template_path = File.expand_path('../../templates/vhost.erb', __FILE__)
       vars = {
@@ -50,32 +50,61 @@ Capistrano::Configuration.instance.load do
       if protocol.nil? or protocol == 'http' or protocol == 'both'
         config_path = "#{shared_path}/config/#{application}_vhost.conf"
 
-        put(render_erb_template(template_path, vars), config_path)
-        sudo "rm -f /etc/nginx/sites-enabled/#{application}_#{stage}.conf"
-        sudo "ln -s #{config_path} /etc/nginx/sites-enabled/#{application}_#{stage}.conf"
-      end
-      if protocol == 'https' or protocol == 'both'
-        vars.merge!({'protocol' => 'https'})
+        sites_path = fetch(:nginx_sites_enabled_path, "/etc/nginx/sites-enabled")
+
+        if protocol.nil? or protocol == 'http' or protocol == 'both'
+          config_path = "#{shared_path}/config/#{application}_vhost.conf"
+
+          put(render_erb_template(template_path, vars), config_path)
+
+          with_user(fetch(:setup_user, user)) do
+            try_sudo "rm -f #{sites_path}/#{application}_#{stage}.conf"
+            try_sudo "ln -s #{config_path} #{sites_path}/#{application}_#{stage}.conf"
+          end
+        end
+        if protocol == 'https' or protocol == 'both'
+          vars.merge!({'protocol' => 'https'})
+
+          config_path = "#{shared_path}/config/#{application}_ssl_vhost.conf"
 
-        config_path = "#{shared_path}/config/#{application}_ssl_vhost.conf"
+          put(render_erb_template(template_path, vars), config_path)
 
-        put(render_erb_template(template_path, vars), config_path)
-        sudo "rm -f /etc/nginx/sites-enabled/#{application}_#{stage}_ssl.conf"
-        sudo "ln -s #{config_path} /etc/nginx/sites-enabled/#{application}_#{stage}_ssl.conf"
+          with_user(fetch(:setup_user, user)) do
+            try_sudo "rm -f #{sites_path}/#{application}_#{stage}_ssl.conf"
+            try_sudo "ln -s #{config_path} #{sites_path}/#{application}_#{stage}_ssl.conf"
+          end
+        end
       end
     end
 
     task :uninstall do
       protocol = fetch(:protocol, nil)
+      sites_path = fetch(:nginx_sites_enabled_path, "/etc/nginx/sites-enabled")
 
-      if protocol.blank? or protocol == 'http' or protocol == 'both'
-        sudo "rm -f /etc/nginx/sites-enabled/#{application}_#{stage}.conf"
-      elsif protocol == 'https' or protocol == 'both'
-        sudo "rm -f /etc/nginx/sites-enabled/#{application}_#{stage}_ssl.conf"
+      with_user(fetch(:setup_user, user)) do
+        if protocol.blank? or protocol == 'http' or protocol == 'both'
+          try_sudo "rm -f #{sites_path}/#{application}_#{stage}.conf"
+        elsif protocol == 'https' or protocol == 'both'
+          try_sudo "rm -f #{sites_path}/#{application}_#{stage}_ssl.conf"
+        end
       end
     end
   end
 
   after :"deploy:setup", :"nginx:setup";
 
+  def with_user(new_user, &block)
+    old_user = user
+    set :user, new_user
+    close_sessions
+    yield
+    set :user, old_user
+    close_sessions
+  end
+
+  def close_sessions
+    sessions.values.each { |session| session.close }
+    sessions.clear
+  end
+
 end

data/lib/ms_deploy/recipes/rbenv.rb

@@ -2,6 +2,6 @@ Capistrano::Configuration.instance.load do
   abort "You must set :user before using defaults" unless fetch(:user)
 
   set :default_environment, {
-      'PATH' => "/home/#{user}/.rbenv/shims:/home/#{user}/.rbenv/bin:$PATH"
+      'PATH' => "/home/#{fetch(:user)}/.rbenv/shims:/home/#{fetch(:user)}/.rbenv/bin:$PATH"
   }
 end

data/lib/ms_deploy/recipes/setup.rb

@@ -2,7 +2,7 @@ Capistrano::Configuration.instance.load do
 
   namespace :deploy do
     namespace :prepare do
-      task :create_config_files do
+      task :create_config_files, :roles => :app do
         run "mkdir -p #{shared_path}/config/"
         config_file_to_setup.each do |config_file|
           put(File.read(config_file_path(config_file)), "#{shared_path}/config/#{config_file}", :via => :scp)
@@ -10,11 +10,11 @@ Capistrano::Configuration.instance.load do
       end
 
       desc "Set up shared directory structure"
-      task :create_shared_folders do
+      task :create_shared_folders, :roles => :app do
         directories_to_create.each { |directory| run "mkdir -p #{directory}" }
       end
 
-      task :database do
+      task :database, :roles => :db do
         _cset :db_admin_user, 'root'
         _cset :db_admin_password, Capistrano::CLI.password_prompt("Type your mysql password for user '#{db_admin_user}' (not set if empty): ")
         _cset :db_name, application.gsub(/\W+/, '')[0..5] + '_' + rails_env.to_s

data/lib/ms_deploy/recipes/unicorn.rb

@@ -11,7 +11,7 @@ Capistrano::Configuration.instance.load do
 
   namespace :unicorn do
     desc "Setup unicorn"
-    task :setup, :except => { :no_release => true } do
+    task :setup, :roles => :app, :except => { :no_release => true } do
     run "mkdir -p \"#{shared_path}/config/unicorn\""
       config_path = "#{shared_path}/config/unicorn/#{stage}.rb"
       template_path = File.expand_path('../../templates/unicorn/unicorn.rb.erb', __FILE__)
@@ -30,4 +30,14 @@ Capistrano::Configuration.instance.load do
   end
 
   after :"deploy:setup", :"unicorn:setup";
+
+  namespace :deploy do
+    task :start, :roles => :app do
+      unicorn.start
+    end
+
+    task :stop, :roles => :app do
+      unicorn.stop
+    end
+  end
 end

data/lib/ms_deploy/version.rb

@@ -1,3 +1,3 @@
 module MsDeploy
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ms_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-18 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemcutter