capistrano-exts 1.0.0 → 1.0.1

data/.travis.yml

@@ -0,0 +1,7 @@
+script: "rake spec"
+rvm:
+  - 1.9.2
+  # - jruby
+notifications:
+  recipients:
+    - wael.nasreddine@gmail.com

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in capistrano-exts.gemspec
-gemspec
+gemspec

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Wael Nasreddine <wael.nasreddine@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,72 @@
+Capistrano Extensions [![Build Status](http://travis-ci.org/TechnoGate/capistrano-exts.png)](http://travis-ci.org/TechnoGate/capistrano-exts)
+=====
+This gem provides some useful capistrano tasks, for preparing the server,
+the database and the application without ever SSH'ing to the destination server,
+it also provides multistage functionality just like [capistano-ext](https://github.com/capistrano/capistrano-ext)
+gem, in fact the included multistage file is a modified version of capistrano-ext
+
+Installation
+------------
+
+Install the gem
+
+```ruby
+gem install capistrano-ext
+```
+
+or add it to your Gemfile
+
+```ruby
+gem 'capistrano-ext', '>=1.0.0'
+```
+
+Setup
+-----
+First make sure you have capified your project, if not then run the following command on the root of your project:
+
+```bash
+$ capify .
+```
+
+Then open up __config/deploy.rb__ and add the following to the top of the file
+
+```ruby
+# Stages
+# Stages can be really anything you want
+set :stages, [:development, :staging, :production]
+set :default_stage, :development
+
+# Capistrano extensions
+# Valid extensions: :multistage, :git, :deploy, :mysql, :rails, :contao, :god, :unicorn, :servers
+set :capistrano_extensions, [:multistage, :git, :deploy, :mysql, :rails, :servers]
+```
+
+Then run the command
+
+```bash
+$ cap multistage:prepare
+```
+
+Then edit the files found at __config/deploy/*.rb__, that's it you're ready..
+
+Usage
+-----
+
+The server can be prepared by running:
+
+```bash
+$ cap deploy:server:prepare deploy:setup
+```
+
+Deploy with
+
+```bash
+$ cap deploy
+```
+
+That's pretty much it
+
+
+License
+-------
+This code is free to use under the terms of the MIT license.

data/capistrano-exts.gemspec

@@ -24,12 +24,16 @@ Gem::Specification.new do |s|
   s.add_dependency('activesupport', '>=3.1.0')
 
   # Development dependencies
+  s.add_development_dependency('guard', '>=0.6.2')
+  s.add_development_dependency('guard-bundler', '>=0.1.3')
+  s.add_development_dependency('guard-rspec', '>=0.4.3')
+
+  # Install this gem manually to get growl notifications on Mac OS X
+  # s.add_development_dependency('growl_notify', '0.0.1')
+
+  # Development / Test dependencies
   s.add_development_dependency('rspec', '>=2.6.0')
   s.add_development_dependency('mocha', '>=0.2.12')
   s.add_development_dependency('factory_girl', '>=2.0.5')
   s.add_development_dependency('faker19', '>=1.0.5')
-  s.add_development_dependency('guard', '>=0.6.2')
-  s.add_development_dependency('guard-bundler', '>=0.1.3')
-  s.add_development_dependency('guard-rspec', '>=0.4.3')
-  s.add_development_dependency('growl_notify', '0.0.1')
 end

data/examples/php_fpm/deploy/development.rb

@@ -92,9 +92,9 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :rails_passenger, :php_fpm
+# => :rails_reverse_proxy, :passenger, :php_fpm
 # => :rails_reverse_proxy is used for unicorn (Rack apps)
-# => :rails_passenger runs rails apps
+# => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #
 # For Apache

data/examples/php_fpm/deploy/production.rb

@@ -92,9 +92,9 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :rails_passenger, :php_fpm
+# => :rails_reverse_proxy, :passenger, :php_fpm
 # => :rails_reverse_proxy is used for unicorn (Rack apps)
-# => :rails_passenger runs rails apps
+# => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #
 # For Apache

data/examples/php_fpm/deploy/staging.rb

@@ -92,9 +92,9 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :rails_passenger, :php_fpm
+# => :rails_reverse_proxy, :passenger, :php_fpm
 # => :rails_reverse_proxy is used for unicorn (Rack apps)
-# => :rails_passenger runs rails apps
+# => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #
 # For Apache

data/examples/php_fpm/deploy.rb

@@ -15,7 +15,7 @@ set :stages, [:development, :staging, :production]
 set :default_stage, :development
 
 # Capistrano extensions
-set :capistrano_extensions, [:multistage, :git, :base, :mysql, :contao, :servers]
+set :capistrano_extensions, [:multistage, :git, :deploy, :mysql, :contao, :servers]
 
 default_run_options[:pty] = true
 ssh_options[:forward_agent] = true

data/examples/rails_passenger/deploy/development.rb

@@ -92,14 +92,14 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :rails_passenger, :php_fpm
+# => :rails_reverse_proxy, :passenger, :php_fpm
 # => :rails_reverse_proxy is used for unicorn (Rack apps)
-# => :rails_passenger runs rails apps
+# => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #
 # For Apache
 # =>
-set :web_server_mode, :rails_passenger
+set :web_server_mode, :passenger
 
 # Server mode specific configurations
 # Uncomment and edit the one depending on the enabled mode

data/examples/rails_passenger/deploy/production.rb

@@ -92,14 +92,14 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :rails_passenger, :php_fpm
+# => :rails_reverse_proxy, :passenger, :php_fpm
 # => :rails_reverse_proxy is used for unicorn (Rack apps)
-# => :rails_passenger runs rails apps
+# => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #
 # For Apache
 # =>
-set :web_server_mode, :rails_passenger
+set :web_server_mode, :passenger
 
 # Server mode specific configurations
 # Uncomment and edit the one depending on the enabled mode

data/examples/rails_passenger/deploy/staging.rb

@@ -92,14 +92,14 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :rails_passenger, :php_fpm
+# => :rails_reverse_proxy, :passenger, :php_fpm
 # => :rails_reverse_proxy is used for unicorn (Rack apps)
-# => :rails_passenger runs rails apps
+# => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #
 # For Apache
 # =>
-set :web_server_mode, :rails_passenger
+set :web_server_mode, :passenger
 
 # Server mode specific configurations
 # Uncomment and edit the one depending on the enabled mode

data/examples/rails_passenger/deploy.rb

@@ -15,7 +15,7 @@ set :stages, [:development, :staging, :production]
 set :default_stage, :development
 
 # Capistrano extensions
-set :capistrano_extensions, [:multistage, :git, :base, :mysql, :contao, :servers]
+set :capistrano_extensions, [:multistage, :git, :deploy, :mysql, :rails, :servers]
 
 default_run_options[:pty] = true
 ssh_options[:forward_agent] = true

data/examples/rails_reverse_proxy/deploy/development.rb

@@ -92,9 +92,9 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :rails_passenger, :php_fpm
+# => :rails_reverse_proxy, :passenger, :php_fpm
 # => :rails_reverse_proxy is used for unicorn (Rack apps)
-# => :rails_passenger runs rails apps
+# => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #
 # For Apache

data/examples/rails_reverse_proxy/deploy/production.rb

@@ -92,9 +92,9 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :rails_passenger, :php_fpm
+# => :rails_reverse_proxy, :passenger, :php_fpm
 # => :rails_reverse_proxy is used for unicorn (Rack apps)
-# => :rails_passenger runs rails apps
+# => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #
 # For Apache

data/examples/rails_reverse_proxy/deploy/staging.rb

@@ -92,9 +92,9 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :rails_passenger, :php_fpm
+# => :rails_reverse_proxy, :passenger, :php_fpm
 # => :rails_reverse_proxy is used for unicorn (Rack apps)
-# => :rails_passenger runs rails apps
+# => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #
 # For Apache

data/examples/rails_reverse_proxy/deploy.rb

@@ -15,7 +15,7 @@ set :stages, [:development, :staging, :production]
 set :default_stage, :development
 
 # Capistrano extensions
-set :capistrano_extensions, [:multistage, :git, :base, :mysql, :contao, :servers]
+set :capistrano_extensions, [:multistage, :git, :deploy, :mysql, :rails, :servers]
 
 default_run_options[:pty] = true
 ssh_options[:forward_agent] = true

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

@@ -1,5 +1,5 @@
 require 'capistrano'
-require 'capistrano-exts/receipts/base'
+require 'capistrano-exts/receipts/deploy'
 require 'capistrano-exts/receipts/mysql'
 
 # Verify that Capistrano is version 2
@@ -58,13 +58,6 @@ Capistrano::Configuration.instance(:must_exist).load do
         #{try_sudo} ln -nsf #{fetch :shared_path}/log #{fetch :latest_release}/log
       CMD
     end
-
-    task :fix_permissions, :roles => :app, :except => { :no_release => true } do
-      run <<-CMD
-        #{try_sudo} chown -R www-data:www-data #{deploy_to} &&
-        #{try_sudo} chmod -R g+w #{latest_release}
-      CMD
-    end
   end
 
   # Dependencies
@@ -73,7 +66,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   after "contao:setup_localconfig", "mysql:create_db"
   after "deploy:finalize_update", "contao:fix_links"
   after "contao:fix_links", "deploy:cleanup"
-  after "deploy:restart", "contao:fix_permissions"
+  after "deploy:restart", "deploy:fix_permissions"
 
   # Mysql Credentials
   before "contao:setup_localconfig", "mysql:credentials"

data/lib/capistrano-exts/receipts/{base.rb → deploy.rb}

@@ -15,6 +15,20 @@ Capistrano::Configuration.instance(:must_exist).load do
         exit
       end
     end
+
+    desc "Fix permissions"
+    task :fix_permissions, :roles => :app do
+      unless exists?(:app_owner) or exists?(:app_group)
+        run <<-CMD
+          #{try_sudo} chown -R \
+            #{fetch :app_owner}:#{fetch :app_group} \
+            #{fetch :deploy_to}/releases \
+            #{fetch :deploy_to}/shared
+        CMD
+      end
+
+      run "chmod -R g+w #{fetch :latest_release}" if fetch(:group_writable, true)
+    end
   end
 
   # Dependencies

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

@@ -1,6 +1,6 @@
 require 'capistrano'
 require 'highline'
-require 'capistrano-exts/receipts/base'
+require 'capistrano-exts/receipts/deploy'
 
 # Verify that Capistrano is version 2
 unless Capistrano::Configuration.respond_to?(:instance)

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

@@ -1,5 +1,5 @@
 require 'capistrano'
-require 'capistrano-exts/receipts/base'
+require 'capistrano-exts/receipts/deploy'
 
 # Verify that Capistrano is version 2
 unless Capistrano::Configuration.respond_to?(:instance)

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

@@ -1,31 +1,28 @@
 require 'capistrano'
-require 'capistrano-exts/receipts/base'
+require 'capistrano-exts/receipts/deploy'
 
 # Verify that Capistrano is version 2
 unless Capistrano::Configuration.respond_to?(:instance)
   abort "This extension requires Capistrano 2"
 end
 
+# TODO:
+# => Replace the vars with a call to fetch
+# => Add the vars to examples and the template so it is visible
+
 Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :rails do
     desc "Install configuration files"
     task :install_configuration_files, :roles => :app do
-      unless configuration_files.blank?
-        configuration_files.each { |configuration_file| link_config_file(configuration_file) }
+      unless exists?(:configuration_files)
+        fetch(:configuration_files).each { |configuration_file| link_config_file(configuration_file) }
       end
     end
 
     desc "Install rvm config file"
     task :install_rvmrc_file, :roles => :app do
-      link_file(File.join(shared_path, 'rvmrc'), File.join(release_path, '.rvmrc'))
-    end
-
-    desc "Fix permissions"
-    task :fix_permissions, :roles => :app do
-      unless app_owner.blank? or app_group.blank?
-        run "#{try_sudo} chown -R #{app_owner}:#{app_group} #{deploy_to}"
-      end
+      link_file(File.join(fetch(:shared_path), 'rvmrc'), File.join(fetch(:release_path), '.rvmrc'))
     end
   end
 
@@ -37,7 +34,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   after "deploy:finalize_update", "rails:install_configuration_files"
   after "rails:install_configuration_files", "rails:install_rvmrc_file"
-  after "deploy:restart", "rails:fix_permissions"
+  after "deploy:restart", "deploy:fix_permissions"
 
   # Capistrano is broken
   # See: https://github.com/capistrano/capistrano/issues/81

data/lib/capistrano-exts/receipts/servers/web_server/apache.rb

@@ -37,14 +37,14 @@ Capistrano::Configuration.instance(:must_exist).load do
           desc "Restart apache web server"
           task :restart do
             run <<-CMD
-              #{try_sudo} #{apache_init_path} restart
+              #{try_sudo} #{fetch :apache_init_path} restart
             CMD
           end
 
           desc "Resload apache web server"
           task :reload do
             run <<-CMD
-              #{try_sudo} #{apache_init_path} reload
+              #{try_sudo} #{fetch :apache_init_path} reload
             CMD
           end
 

data/lib/capistrano-exts/receipts/servers/web_server/nginx.rb

@@ -63,14 +63,14 @@ Capistrano::Configuration.instance(:must_exist).load do
           desc "Restart nginx web server"
           task :restart do
             run <<-CMD
-              #{try_sudo} #{nginx_init_path} restart
+              #{try_sudo} #{fetch :nginx_init_path} restart
             CMD
           end
 
           desc "Resload nginx web server"
           task :reload do
             run <<-CMD
-              #{try_sudo} #{nginx_init_path} reload
+              #{try_sudo} #{fetch :nginx_init_path} reload
             CMD
           end
 

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

@@ -2,7 +2,7 @@
 
 # Requirements
 require 'capistrano'
-require 'capistrano-exts/receipts/base'
+require 'capistrano-exts/receipts/deploy'
 require 'capistrano-exts/receipts/mysql'
 require 'capistrano-exts/receipts/servers/web_server'
 require 'capistrano-exts/receipts/servers/db_server'

data/lib/capistrano-exts/servers/web_server/nginx.rb

@@ -5,7 +5,7 @@ module Capistrano
     module Server
       class Nginx < WebServer
 
-        AVAILABLE_MODES = [:rails_passenger, :rails_reverse_proxy, :php_fpm]
+        AVAILABLE_MODES = [:passenger, :rails_reverse_proxy, :php_fpm]
         NGINX_TEMPLATE_PATH = ROOT_PATH + '/capistrano-exts/templates/web_servers/nginx.conf.erb'
 
         def initialize(mode, template_path = NGINX_TEMPLATE_PATH)

data/lib/capistrano-exts/servers/web_server.rb

@@ -35,7 +35,7 @@ module Capistrano
           end
 
           def passenger?
-            @mode == :rails_passenger
+            @mode == :passenger
           end
 
           def php_build_with_force_cgi_redirect?
@@ -51,13 +51,37 @@ module Capistrano
             end
 
             if php_fpm?
-              [:php_fpm_host, :php_fpm_port, :public_path].each do |var|
+              [:php_fpm_host, :php_fpm_port].each do |var|
                 unless instance_variable_get("@#{var.to_s}")
                   raise ArgumentError, "#{var.to_s} is required, please define it."
                 end
               end
             end
 
+            if reverse_proxy?
+              if @reverse_proxy_server_address.blank? and @reverse_proxy_server_port.blank? and @reverse_proxy_socket.blank?
+                raise ArgumentError, "None of the address, port or socket has been defined."
+              end
+
+              if @reverse_proxy_server_address.present? and @reverse_proxy_server_port.blank?
+                raise ArgumentError, "reverse_proxy_server_address is defined but reverse_proxy_server_port is not please define it."
+              end
+
+              if @reverse_proxy_server_port.present? and @reverse_proxy_server_address.blank?
+                raise ArgumentError, "reverse_proxy_server_port is defined but reverse_proxy_server_address is not please define it."
+              end
+
+              if @reverse_proxy_server_address.present? and @reverse_proxy_server_port.present? and @reverse_proxy_socket.present?
+                raise ArgumentError, "you should not define reverse_proxy_server_address, reverse_proxy_server_port and reverse_proxy_socket."
+              end
+            end
+
+            if passenger? or php_fpm?
+              if @public_path.blank?
+                raise ArgumentError, "public_path is required, please define it."
+              end
+            end
+
           end
 
       end

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

@@ -5,6 +5,10 @@ role :web, 'root@nasreddine.com:22'
 role :app, 'root@nasreddine.com:22'
 role :db, 'root@nasreddine.com:22', primary: true
 
+# Permissions (ownership)
+set :app_owner, 'www'
+set :app_group, 'www'
+
 # The project's branch to use
 # Uncomment and edit this if you're using git, for other SCM's please refer
 # to capistrano's documentation
@@ -89,9 +93,9 @@ set :web_server_mod_rewrite, true
 # Valid options:
 #
 # For Nginx:
-# => :rails_reverse_proxy, :rails_passenger, :php_fpm
+# => :rails_reverse_proxy, :passenger, :php_fpm
 # => :rails_reverse_proxy is used for unicorn (Rack apps)
-# => :rails_passenger runs rails apps
+# => :passenger runs rails apps
 # => :php_fpm is used to deliver websites written using PHP
 #
 # For Apache

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

@@ -88,7 +88,7 @@ upstream <%= @application %>_reverse_proxy {
   server <%= @reverse_proxy_server_address %>:<%= @reverse_proxy_server_port %> fail_timeout=0;
 <% end %>
 
-<% if @reverse_proxy_socket.blank? %>
+<% if @reverse_proxy_socket.present? %>
   server unix:<%= @reverse_proxy_socket %>;
 <% end %>
 }

data/lib/capistrano-exts/version.rb

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

data/spec/requests/nginx_spec.rb

@@ -27,7 +27,7 @@ describe Nginx do
     end
   end
 
-  describe ":rails_passenger" do
+  describe ":passenger" do
 
   end
 

data/spec/servers/web_server/nginx_spec.rb

@@ -21,12 +21,16 @@ describe Nginx do
       subject { Nginx.new :php_fpm }
 
       before(:each) do
-        subject.application_url = %w(example.com www.example.com)
+        subject.application_url = %w{example.com www.example.com}
         subject.application = 'example'
         subject.php_fpm_host = 'localhost'
         subject.php_fpm_port = 60313
         subject.public_path = '/path/to/application'
-        subject.indexes = %w(index.php)
+        subject.indexes = %w{index.php}
+      end
+
+      it "should have php_fpm enabled" do
+        subject.send(:php_fpm?).should be_true
       end
 
       it "should require an 'application_url'" do
@@ -58,24 +62,72 @@ describe Nginx do
       end
     end
 
-    describe ":rails_passenger" do
-      subject { Nginx.new :rails_passenger }
+    describe ":passenger" do
+      subject { Nginx.new :passenger }
+
+      before(:each) do
+        subject.application_url = %w{example.com www.example.com}
+        subject.application = 'example'
+        subject.public_path = '/path/to/application'
+      end
 
-      it "should require 'public_path'"
+      it "should require 'public_path'" do
+        subject.public_path = nil
+        lambda {
+          subject.render
+        }.should raise_error(ArgumentError, "public_path is required, please define it.")
+      end
 
-      it "should have passenger enabled"
+      it "should have passenger enabled" do
+        subject.send(:passenger?).should be_true
+      end
     end
 
     describe ":rails_reverse_proxy" do
       subject { Nginx.new :rails_reverse_proxy }
 
-      it "should require 'reverse_proxy_server_address'"
+      before(:each) do
+        subject.application_url = %w{example.com www.example.com}
+        subject.application = 'example'
+        subject.reverse_proxy_server_address = 'localhost'
+        subject.reverse_proxy_server_port = 8080
+      end
 
-      it "should require 'reverse_proxy_server_port'"
+      it "should have reverse_proxy enabled" do
+        subject.send(:reverse_proxy?).should be_true
+      end
 
-      it "should require 'reverse_proxy_socket'"
+      it "should require 'reverse_proxy_server_address' and 'reverse_proxy_server_port' or 'reverse_proxy_socket'" do
+        subject.reverse_proxy_server_address = nil
+        subject.reverse_proxy_server_port = nil
+        lambda {
+          subject.render
+        }.should raise_error(ArgumentError, "None of the address, port or socket has been defined.")
+      end
+
+      it "should force defining reverse_proxy_server_port if reverse_proxy_server_address is defined" do
+        subject.reverse_proxy_server_address = 'localhost'
+        subject.reverse_proxy_server_port = nil
 
-      it "should have reverse_proxy enabled"
+        lambda {
+          subject.render
+        }.should raise_error(ArgumentError, "reverse_proxy_server_address is defined but reverse_proxy_server_port is not please define it.")
+      end
+
+      it "should force defining reverse_proxy_server_address if reverse_proxy_server_port is defined" do
+        subject.reverse_proxy_server_address = nil
+        subject.reverse_proxy_server_port = 8080
+        lambda {
+          subject.render
+        }.should raise_error(ArgumentError, "reverse_proxy_server_port is defined but reverse_proxy_server_address is not please define it.")
+      end
+
+      it "shouldn't allow defining both reverse_proxy_server_address and reverse_proxy_socket or reverse_proxy_server_port and reverse_proxy_socket" do
+        subject.reverse_proxy_socket = '/tmp/socket'
+        lambda {
+          subject.render
+        }.should raise_error(ArgumentError, "you should not define reverse_proxy_server_address, reverse_proxy_server_port and reverse_proxy_socket.")
+      end
     end
   end
 
@@ -84,12 +136,12 @@ describe Nginx do
       subject { Nginx.new :php_fpm }
 
       before(:each) do
-        subject.application_url = %w(example.com www.example.com)
+        subject.application_url = %w{example.com www.example.com}
         subject.application = 'example'
         subject.php_fpm_host = 'localhost'
         subject.php_fpm_port = 60313
         subject.public_path = '/path/to/application'
-        subject.indexes = %w(index.php)
+        subject.indexes = %w{index.php}
       end
 
       it "should render 'public_path'" do |variable|
@@ -123,12 +175,12 @@ describe Nginx do
       end
 
       it "should render 'application_url'" do
-        subject.application_url = %w(technogate.fr www.technogate.fr)
+        subject.application_url = %w{technogate.fr www.technogate.fr}
         subject.render.should =~ %r{server_name\s+technogate.fr www.technogate.fr;}
       end
 
       it "should render 'indexes'" do
-        subject.indexes = %w(index.php index.html)
+        subject.indexes = %w{index.php index.html}
         subject.render.should =~ %r{index\s+index.php index.html;}
       end
 
@@ -158,22 +210,47 @@ describe Nginx do
       end
     end
 
-    describe ":rails_passenger" do
-      subject { Nginx.new :rails_passenger }
+    describe ":passenger" do
+      subject { Nginx.new :passenger }
 
-      it "should render 'application'"
+      before(:each) do
+        subject.application_url = %w{example.com www.example.com}
+        subject.application = 'example'
+        subject.public_path = '/path/to/application'
+      end
 
-      it "should have passenger enabled"
+      it "should render 'application_url'" do
+        subject.application_url = %w{technogate.fr www.technogate.fr}
+        subject.render.should =~ %r{technogate.fr www.technogate.fr}
+      end
     end
 
     describe ":rails_reverse_proxy" do
       subject { Nginx.new :rails_reverse_proxy }
 
-      it "should render 'reverse_proxy_server_address'"
+      before(:each) do
+        subject.application_url = %w{example.com www.example.com}
+        subject.application = 'example'
+        subject.reverse_proxy_server_address = 'localhost'
+        subject.reverse_proxy_server_port = 8080
+      end
 
-      it "should render 'reverse_proxy_server_port'"
+      it "should render 'reverse_proxy_server_address'" do
+        subject.reverse_proxy_server_address = 'web_proxy'
+        subject.render.should =~ /upstream example_reverse_proxy .+server web_proxy:8080 fail_timeout=0;.+/m
+      end
 
-      it "should render 'reverse_proxy_socket'"
+      it "should render 'reverse_proxy_server_port'" do
+        subject.reverse_proxy_server_port = 6565
+        subject.render.should =~ /upstream example_reverse_proxy .+server localhost:6565 fail_timeout=0;.+/m
+      end
+
+      it "should render 'reverse_proxy_socket'" do
+        subject.reverse_proxy_server_address = nil
+        subject.reverse_proxy_server_port = nil
+        subject.reverse_proxy_socket = "/tmp/socket"
+        subject.render.should =~ /upstream example_reverse_proxy .+server unix:\/tmp\/socket;.+/m
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exts
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-02 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2153828600 !ruby/object:Gem::Requirement
+  requirement: &2156371700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153828600
+  version_requirements: *2156371700
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153827300 !ruby/object:Gem::Requirement
+  requirement: &2156370900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153827300
+  version_requirements: *2156370900
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153825980 !ruby/object:Gem::Requirement
+  requirement: &2156370320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,95 +43,84 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153825980
+  version_requirements: *2156370320
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2153824960 !ruby/object:Gem::Requirement
+  name: guard
+  requirement: &2156384460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2153824960
+  version_requirements: *2156384460
 - !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &2153823840 !ruby/object:Gem::Requirement
+  name: guard-bundler
+  requirement: &2156382840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.12
+        version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2153823840
+  version_requirements: *2156382840
 - !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: &2153822780 !ruby/object:Gem::Requirement
+  name: guard-rspec
+  requirement: &2156382080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2153822780
+  version_requirements: *2156382080
 - !ruby/object:Gem::Dependency
-  name: faker19
-  requirement: &2153821860 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &2156381120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153821860
+  version_requirements: *2156381120
 - !ruby/object:Gem::Dependency
-  name: guard
-  requirement: &2153820720 !ruby/object:Gem::Requirement
+  name: mocha
+  requirement: &2156380360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.2.12
   type: :development
   prerelease: false
-  version_requirements: *2153820720
+  version_requirements: *2156380360
 - !ruby/object:Gem::Dependency
-  name: guard-bundler
-  requirement: &2153819920 !ruby/object:Gem::Requirement
+  name: factory_girl
+  requirement: &2156379840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 2.0.5
   type: :development
   prerelease: false
-  version_requirements: *2153819920
+  version_requirements: *2156379840
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: &2153819160 !ruby/object:Gem::Requirement
+  name: faker19
+  requirement: &2156379320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.3
-  type: :development
-  prerelease: false
-  version_requirements: *2153819160
-- !ruby/object:Gem::Dependency
-  name: growl_notify
-  requirement: &2153818460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 1.0.5
   type: :development
   prerelease: false
-  version_requirements: *2153818460
+  version_requirements: *2156379320
 description: Handy extensions for Capistrano
 email:
 - wael.nasreddine@gmail.com
@@ -141,8 +129,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Guardfile
+- MIT-LICENSE
+- README.md
 - Rakefile
 - capistrano-exts.gemspec
 - examples/php_fpm/deploy.rb
@@ -161,8 +152,8 @@ files:
 - lib/capistrano-exts/core_ext.rb
 - lib/capistrano-exts/core_ext/string/filters.rb
 - lib/capistrano-exts/receipts.rb
-- lib/capistrano-exts/receipts/base.rb
 - lib/capistrano-exts/receipts/contao.rb
+- lib/capistrano-exts/receipts/deploy.rb
 - lib/capistrano-exts/receipts/functions.rb
 - lib/capistrano-exts/receipts/git.rb
 - lib/capistrano-exts/receipts/god.rb
@@ -187,7 +178,6 @@ files:
 - spec/servers/web_server/nginx_spec.rb
 - spec/spec_helper.rb
 - spec/support/factories.rb
-has_rdoc: true
 homepage: https://github.com/Extensions/capistrano-exts
 licenses: []
 post_install_message: 
@@ -208,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: capistrano-exts
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Handy extensions for Capistrano