capistrano-exts 1.13.1 → 1.13.2

data/.todo

@@ -1,13 +1,16 @@
 <?xml version="1.0"?>
 <todo version="0.1.20">
-    <note priority="veryhigh" time="1316597225" done="1316600338">
+    <note priority="veryhigh" time="1316597225" done="1316681063">
         Rename deploy:folders to deploy:setup:folders
         <comment>
             Can't be done, setup is a task
         </comment>
     </note>
-    <note priority="high" time="1316510985">
+    <note priority="high" time="1316510985" done="1316681073">
         Add skip_table_on_sync configuration, if defined, we should not replace these tables on the target's database.
+        <comment>
+            Done in f2f0d1e4b53a6597c848de61df99470bd9a5f0b6
+        </comment>
     </note>
     <note priority="medium" time="1316510717">
         Add a postgresql receipt (The postgresql receipt should have the same tasks defined in mysql)
@@ -21,4 +24,7 @@
     <note priority="medium" time="1316594507">
         In the nginx template file, we need to define the error pages dynamically and not in a hardcoded way.
     </note>
+    <note priority="medium" time="1316681020">
+        Unicorn and God should have the roles dynamic, for instance it's common sence that it should be ran on the :web role, however my server requires it on the :app and not the :web.
+    </note>
 </todo>

data/README.md

@@ -18,7 +18,7 @@ gem install capistrano-exts
 or add it to your Gemfile
 
 ```ruby
-gem 'capistrano-exts', '>=1.13.1', :require => false
+gem 'capistrano-exts', '>=1.13.2', :require => false
 ```
 
 # Setup

data/TODO

@@ -1,6 +1,3 @@
-- Add skip_table_on_sync configuration, if defined, we should not replace these tables on the target's database.
-  (added Tue Sep 20 11:29:45 2011, incomplete, priority high)
-
 - Add a postgresql receipt (The postgresql receipt should have the same tasks defined in mysql)
   (added Tue Sep 20 11:25:17 2011, incomplete, priority medium)
 
@@ -12,3 +9,6 @@
 
 - In the nginx template file, we need to define the error pages dynamically and not in a hardcoded way.
   (added Wed Sep 21 10:41:47 2011, incomplete, priority medium)
+
+- Unicorn and God should have the roles dynamic, for instance it's common sence that it should be ran on the :web role, however my server requires it on the :app and not the :web.
+  (added Thu Sep 22 10:43:40 2011, incomplete, priority medium)

data/examples/php_fpm/deploy/development.rb

@@ -295,7 +295,7 @@ set :rvm_ruby_string, "1.9.2"
 
 # where's god config ?
 # Default: "#{fetch :current_path}/config/god.rb"
-# set :god_config, -> { "#{fetch :current_path}/config/unicorn.rb" }
+# set :god_config, -> { "#{fetch :current_path}/config/god.rb" }
 
 #
 #

data/examples/php_fpm/deploy/production.rb

@@ -294,7 +294,7 @@ set :rvm_ruby_string, "1.9.2"
 
 # where's god config ?
 # Default: "#{fetch :current_path}/config/god.rb"
-# set :god_config, -> { "#{fetch :current_path}/config/unicorn.rb" }
+# set :god_config, -> { "#{fetch :current_path}/config/god.rb" }
 
 #
 #

data/examples/php_fpm/deploy/staging.rb

@@ -294,7 +294,7 @@ set :rvm_ruby_string, "1.9.2"
 
 # where's god config ?
 # Default: "#{fetch :current_path}/config/god.rb"
-# set :god_config, -> { "#{fetch :current_path}/config/unicorn.rb" }
+# set :god_config, -> { "#{fetch :current_path}/config/god.rb" }
 
 #
 #

data/examples/rails_passenger/deploy/development.rb

@@ -295,7 +295,7 @@ set :rvm_ruby_string, "1.9.2"
 
 # where's god config ?
 # Default: "#{fetch :current_path}/config/god.rb"
-# set :god_config, -> { "#{fetch :current_path}/config/unicorn.rb" }
+# set :god_config, -> { "#{fetch :current_path}/config/god.rb" }
 
 #
 #

data/examples/rails_passenger/deploy/production.rb

@@ -295,7 +295,7 @@ set :rvm_ruby_string, "1.9.2"
 
 # where's god config ?
 # Default: "#{fetch :current_path}/config/god.rb"
-# set :god_config, -> { "#{fetch :current_path}/config/unicorn.rb" }
+# set :god_config, -> { "#{fetch :current_path}/config/god.rb" }
 
 #
 #

data/examples/rails_passenger/deploy/staging.rb

@@ -295,7 +295,7 @@ set :rvm_ruby_string, "1.9.2"
 
 # where's god config ?
 # Default: "#{fetch :current_path}/config/god.rb"
-# set :god_config, -> { "#{fetch :current_path}/config/unicorn.rb" }
+# set :god_config, -> { "#{fetch :current_path}/config/god.rb" }
 
 #
 #

data/examples/rails_reverse_proxy/deploy/development.rb

@@ -295,7 +295,7 @@ set :rvm_ruby_string, "1.9.2"
 
 # where's god config ?
 # Default: "#{fetch :current_path}/config/god.rb"
-# set :god_config, -> { "#{fetch :current_path}/config/unicorn.rb" }
+# set :god_config, -> { "#{fetch :current_path}/config/god.rb" }
 
 #
 #

data/examples/rails_reverse_proxy/deploy/production.rb

@@ -308,7 +308,7 @@ set :rvm_ruby_string, "1.9.2"
 
 # where's god config ?
 # Default: "#{fetch :current_path}/config/god.rb"
-# set :god_config, -> { "#{fetch :current_path}/config/unicorn.rb" }
+# set :god_config, -> { "#{fetch :current_path}/config/god.rb" }
 
 #
 #

data/examples/rails_reverse_proxy/deploy/staging.rb

@@ -308,7 +308,7 @@ set :rvm_ruby_string, "1.9.2"
 
 # where's god config ?
 # Default: "#{fetch :current_path}/config/god.rb"
-# set :god_config, -> { "#{fetch :current_path}/config/unicorn.rb" }
+# set :god_config, -> { "#{fetch :current_path}/config/god.rb" }
 
 #
 #

data/lib/capistrano-exts/receipts/deploy.rb

@@ -36,7 +36,9 @@ Capistrano::Configuration.instance(:must_exist).load do
         #{try_sudo} mkdir -p #{fetch :deploy_to} &&
         #{try_sudo} mkdir -p #{backup_path} &&
         #{try_sudo} mkdir -p #{fetch :shared_path}/items &&
-        #{try_sudo} mkdir -p #{shared_path}/__system__
+        #{try_sudo} mkdir -p #{fetch :shared_path}/__system__ &&
+        #{try_sudo} mkdir -p #{fetch :shared_path}/config &&
+        #{try_sudo} mkdir -p #{fetch :shared_path}/items
       CMD
 
       if exists? :logs_path

data/lib/capistrano-exts/receipts/functions.rb

@@ -145,4 +145,10 @@ password: #{credentials[:pass]}
       end
     end
   end
+
+  # Tries bundle exec
+  # TODO: Do some real work here
+  def try_bundle_exec
+    "bundle exec"
+  end
 end

data/lib/capistrano-exts/receipts/god.rb

@@ -6,25 +6,25 @@ end
 Capistrano::Configuration.instance(:must_exist).load do
   namespace :god do
     desc "start god, this starts up unicorn server"
-    task :start, :roles => :web, :except => {:no_release => true} do
+    task :start, :roles => :app, :except => {:no_release => true} do
       logs_path = fetch(:logs_path)
-      god_config = fetch(:god_config, "#{fetch :current_path}/config/unicorn.rb")
+      god_config = fetch(:god_config, "#{fetch :current_path}/config/god.rb")
       god_binary = fetch(:god_binary, 'god')
-      run "cd #{current_path} && #{god_binary} -c #{god_config} --log #{logs_path}/god.log --no-syslog --log-level warn"
+      run "cd #{current_path} && #{try_bundle_exec} #{god_binary} -c #{god_config} --log #{logs_path}/god.log --no-syslog --log-level warn"
     end
 
     desc "stop god, this shutdowns unicorn server"
-    task :stop, :roles => :web, :except => {:no_release => true} do
-      run "cd #{current_path} && #{god_binary} terminate"
+    task :stop, :roles => :app, :except => {:no_release => true} do
+      run "cd #{current_path} && #{try_bundle_exec} #{god_binary} terminate"
     end
 
     desc "restart god, this restarts the unicorn server"
-    task :restart, :roles => :web, :except => {:no_release => true} do
-      run "cd #{current_path} && #{god_binary} restart"
+    task :restart, :roles => :app, :except => {:no_release => true} do
+      run "cd #{current_path} && #{try_bundle_exec} #{god_binary} restart"
     end
 
     desc "check if god is already running"
-    task :check_if_running, :roles => :web, :except => {:no_release => true} do
+    task :check_if_running, :roles => :app, :except => {:no_release => true} do
       'true' ==  capture("if #{god_binary} status; then echo 'true'; fi").strip
     end
   end

data/lib/capistrano-exts/receipts/rails.rb

@@ -44,7 +44,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
 
   # Database.yml file
-  after "files:config_files", "rails:write_database_yml"
+  after "deploy:folders", "rails:write_database_yml"
   before "rails:write_database_yml", "mysql:credentials"
 
   # Restart the server

data/lib/capistrano-exts/receipts/rvm.rb

@@ -50,13 +50,19 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :install_shell_wrapper do
       if exists?(:enable_rvm) && fetch(:enable_rvm) == true
         shell_contents = <<-EOS
-  #!/bin/sh
-  if test -d "#{fetch :rvm_path}"
-  then
-    #{fetch :rvm_shell} "$@"
-  else
-    exec bash "$@"
-  fi
+#!/bin/sh
+
+if test -f /etc/profile
+then
+  . /etc/profile
+fi
+
+if test -d "#{fetch :rvm_path}"
+then
+  #{fetch :rvm_shell} "$@"
+else
+  exec bash "$@"
+fi
         EOS
 
         rvm_shell_wrapper_path = "/tmp/rvm_shell_wrapper.sh"

data/lib/capistrano-exts/receipts/unicorn.rb

@@ -6,7 +6,7 @@ end
 Capistrano::Configuration.instance(:must_exist).load do
   namespace :unicorn do
     desc "[internal] Setup unicorn"
-    task :setup, :roles => :web, :except => {:no_release => true} do
+    task :setup, :roles => :app, :except => {:no_release => true} do
       unicorn_pid = fetch(:unicorn_pid, "#{fetch :shared_path}/pids/unicorn.pid")
 
       # Create the pids folder
@@ -16,31 +16,33 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     desc "start unicorn"
-    task :start, :roles => :web, :except => {:no_release => true} do
+    task :start, :roles => :app, :except => {:no_release => true} do
       unicorn_binary = fetch(:unicorn_binary, 'unicorn_rails')
       unicorn_config = fetch(:unicorn_config, "#{fetch :current_path}/config/unicorn.rb")
       rails_env = fetch(:rails_env, 'production')
-      run "cd #{fetch :current_path} && #{unicorn_binary} -c #{unicorn_config} -E #{rails_env} -D"
+      run "cd #{fetch :current_path} && #{try_bundle_exec} #{unicorn_binary} -c #{unicorn_config} -E #{rails_env} -D"
     end
 
     desc "stop unicorn"
-    task :stop, :roles => :web, :except => {:no_release => true} do
-      unicorn_pid = fetch(:unicorn_pid, )
+    task :stop, :roles => :app, :except => {:no_release => true} do
+      unicorn_pid = fetch(:unicorn_pid, "#{fetch :shared_path}/pids/unicorn.pid")
       run "#{try_sudo} kill `cat #{unicorn_pid}`"
     end
 
     desc "unicorn reload"
-    task :reload, :roles => :web, :except => {:no_release => true} do
+    task :reload, :roles => :app, :except => {:no_release => true} do
+      unicorn_pid = fetch(:unicorn_pid, "#{fetch :shared_path}/pids/unicorn.pid")
       run "#{try_sudo} kill -s USR2 `cat #{unicorn_pid}`"
     end
 
     desc "graceful stop unicorn"
-    task :graceful_stop, :roles => :web, :except => {:no_release => true} do
+    task :graceful_stop, :roles => :app, :except => {:no_release => true} do
+      unicorn_pid = fetch(:unicorn_pid, "#{fetch :shared_path}/pids/unicorn.pid")
       run "#{try_sudo} kill -s QUIT `cat #{unicorn_pid}`"
     end
 
     desc "restart unicorn"
-    task :restart, :roles => :web, :except => {:no_release => true} do
+    task :restart, :roles => :app, :except => {:no_release => true} do
       stop
       start
     end

data/lib/capistrano-exts/templates/multistage.rb

@@ -290,7 +290,7 @@ set :rvm_ruby_string, "1.9.2"
 
 # where's god config ?
 # Default: "#{fetch :current_path}/config/god.rb"
-# set :god_config, -> { "#{fetch :current_path}/config/unicorn.rb" }
+# set :god_config, -> { "#{fetch :current_path}/config/god.rb" }
 
 #
 #

data/lib/capistrano-exts/templates/web_servers/nginx.conf.erb

@@ -35,11 +35,11 @@ server {
     return 503;
   }
 
-  # Catch the 503 error and send it to the @503 location
-  error_page 503 @503;
+  # Catch the 503 error and send it to the @maintenance location
+  error_page 503 @maintenance;
 
-  # The @503 location
-  location @503 {
+  # The @maintenance location
+  location @maintenance {
     # Nginx will refuse POST requests to a static file and will throw a 405 error
     # So we need to catch that and display again our maintenance page
     error_page 405 = /__system__/maintenance/index.html;

data/lib/capistrano-exts/version.rb

@@ -3,7 +3,7 @@ module Capistrano
     module Version #:nodoc:
       MAJOR = 1
       MINOR = 13
-      TINY = 1
+      TINY = 2
 
       ARRAY  = [MAJOR, MINOR, TINY]
       STRING = ARRAY.join(".")

data/lib/capistrano-exts.rb

@@ -7,6 +7,12 @@ $: << ROOT_PATH if File.directory?(ROOT_PATH) and not $:.include?(ROOT_PATH)
 # Require our core extensions
 require 'capistrano-exts/core_ext'
 
+# Require requested receipts
+require 'capistrano-exts/receipts' if defined?(Capistrano::Configuration)
+
+# Require all servers
+Dir["#{ROOT_PATH}/capistrano-exts/servers/*.rb"].each { |f| require f }
+
 # require Capistrano colors
 require 'capistrano_colors'
 require 'capistrano/logger'
@@ -19,10 +25,4 @@ Capistrano::Logger.add_color_matcher({ :match => /adapter:|hostname:|username:|p
 Capistrano::Logger.add_color_matcher({ :match => /WARNING:/, :color => :yellow, :level => Capistrano::Logger::INFO, :prio => -20 })
 
 # Errors
-Capistrano::Logger.add_color_matcher({ :match => /ERROR:/, :color => :red, :level => Capistrano::Logger::IMPORTANT, :prio => -20 })
-
-# Require requested receipts
-require 'capistrano-exts/receipts' if defined?(Capistrano::Configuration)
-
-# Require all servers
-Dir["#{ROOT_PATH}/capistrano-exts/servers/*.rb"].each { |f| require f }
+Capistrano::Logger.add_color_matcher({ :match => /ERROR:/, :color => :red, :level => Capistrano::Logger::IMPORTANT, :prio => -20 })

data/spec/rendered_templates/nginx_passenger.conf

@@ -18,11 +18,11 @@ server {
     return 503;
   }
 
-  # Catch the 503 error and send it to the @503 location
-  error_page 503 @503;
+  # Catch the 503 error and send it to the @maintenance location
+  error_page 503 @maintenance;
 
-  # The @503 location
-  location @503 {
+  # The @maintenance location
+  location @maintenance {
     # Nginx will refuse POST requests to a static file and will throw a 405 error
     # So we need to catch that and display again our maintenance page
     error_page 405 = /__system__/maintenance/index.html;

data/spec/rendered_templates/nginx_php_fpm.conf

@@ -20,11 +20,11 @@ server {
     return 503;
   }
 
-  # Catch the 503 error and send it to the @503 location
-  error_page 503 @503;
+  # Catch the 503 error and send it to the @maintenance location
+  error_page 503 @maintenance;
 
-  # The @503 location
-  location @503 {
+  # The @maintenance location
+  location @maintenance {
     # Nginx will refuse POST requests to a static file and will throw a 405 error
     # So we need to catch that and display again our maintenance page
     error_page 405 = /__system__/maintenance/index.html;

data/spec/rendered_templates/nginx_reverse_proxy_address.conf

@@ -16,11 +16,11 @@ server {
     return 503;
   }
 
-  # Catch the 503 error and send it to the @503 location
-  error_page 503 @503;
+  # Catch the 503 error and send it to the @maintenance location
+  error_page 503 @maintenance;
 
-  # The @503 location
-  location @503 {
+  # The @maintenance location
+  location @maintenance {
     # Nginx will refuse POST requests to a static file and will throw a 405 error
     # So we need to catch that and display again our maintenance page
     error_page 405 = /__system__/maintenance/index.html;

data/spec/rendered_templates/nginx_reverse_proxy_socket.conf

@@ -16,11 +16,11 @@ server {
     return 503;
   }
 
-  # Catch the 503 error and send it to the @503 location
-  error_page 503 @503;
+  # Catch the 503 error and send it to the @maintenance location
+  error_page 503 @maintenance;
 
-  # The @503 location
-  location @503 {
+  # The @maintenance location
+  location @maintenance {
     # Nginx will refuse POST requests to a static file and will throw a 405 error
     # So we need to catch that and display again our maintenance page
     error_page 405 = /__system__/maintenance/index.html;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exts
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-21 00:00:00.000000000 Z
+date: 2011-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2153620640 !ruby/object:Gem::Requirement
+  requirement: &2152862420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153620640
+  version_requirements: *2152862420
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &2153620180 !ruby/object:Gem::Requirement
+  requirement: &2152857600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153620180
+  version_requirements: *2152857600
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153619600 !ruby/object:Gem::Requirement
+  requirement: &2157929640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153619600
+  version_requirements: *2157929640
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153619140 !ruby/object:Gem::Requirement
+  requirement: &2157929180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153619140
+  version_requirements: *2157929180
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2153618660 !ruby/object:Gem::Requirement
+  requirement: &2157928720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2153618660
+  version_requirements: *2157928720
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2153618200 !ruby/object:Gem::Requirement
+  requirement: &2157928260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2153618200
+  version_requirements: *2157928260
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2153617700 !ruby/object:Gem::Requirement
+  requirement: &2157927800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2153617700
+  version_requirements: *2157927800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153617220 !ruby/object:Gem::Requirement
+  requirement: &2157927340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153617220
+  version_requirements: *2157927340
 description: ! 'Capistrano exts is a set of helper tasks to help with the initial
   server