capistrano-exts 1.10.1 → 1.10.2

data/.todo

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<todo version="0.1.20">
+    <note priority="high" time="1316510985">
+        Add skip_table_on_sync configuration, if defined, we should not replace these tables on the target's database.
+    </note>
+    <note priority="medium" time="1316510717">
+        Add a postgresql receipt (The postgresql receipt should have the same tasks defined in mysql)
+    </note>
+    <note priority="medium" time="1316510864">
+        Abstract mysql_* and postgresql_* so either can be used by calling 'cap db:*'
+    </note>
+    <note priority="medium" time="1316510880">
+        Add tests using Vagrant (branch vagrant)
+    </note>
+</todo>

data/.travis.yml

@@ -1,6 +1,7 @@
 script: "rake spec"
 rvm:
   - 1.9.2
+  - 1.9.3
   # - jruby
 notifications:
   recipients:

data/Gemfile

@@ -1,4 +1,21 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in capistrano-exts.gemspec
-gemspec
+gemspec
+
+platforms :ruby do
+  # Require rbconfig to figure out the target OS
+  require 'rbconfig'
+
+  unless ENV['TRAVIS']
+    if RbConfig::CONFIG['target_os'] =~ /darwin/i
+      gem 'rb-fsevent', require: false
+      gem 'ruby-growl', require: false
+      gem 'growl', require: false
+    end
+    if RbConfig::CONFIG['target_os'] =~ /linux/i
+      gem 'rb-inotify', require: false
+      gem 'libnotify', require: false
+    end
+  end
+end

data/README.md

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

data/TODO

@@ -0,0 +1,11 @@
+- 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)
+
+- Abstract mysql_* and postgresql_* so either can be used by calling 'cap db:*'
+  (added Tue Sep 20 11:27:44 2011, incomplete, priority medium)
+
+- Add tests using Vagrant (branch vagrant)
+  (added Tue Sep 20 11:28:00 2011, incomplete, priority medium)

data/capistrano-exts.gemspec

@@ -18,27 +18,26 @@ help you import/export database and contents as well as sync one stage with
 another.
 EOD
 
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   # Run-time dependencies
-  s.add_dependency('capistrano', '>=2.8.0')
-  s.add_dependency('i18n', '>=0.6.0')
-  s.add_dependency('activesupport', '>=3.1.0')
+  s.add_dependency('capistrano', '~>2.8.0')
+  s.add_dependency('i18n', '~>0.6.0')
+  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')
+  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')
 
   # 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('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')
 end

data/examples/rails_passenger/deploy/development.rb

@@ -77,6 +77,10 @@ set :rvm_ruby_string, "1.9.3"
 #   'public/sitemap.xml',
 #   'public/robots.txt',
 # ]
+
+# Link config files
+set :configuration_files, ['database.yml']
+
 #
 #
 #############

data/examples/rails_passenger/deploy/production.rb

@@ -78,6 +78,9 @@ set :rvm_ruby_string, "1.9.3"
 #   'public/robots.txt',
 # ]
 
+# Link config files
+set :configuration_files, ['database.yml']
+
 #
 #
 #############

data/examples/rails_passenger/deploy/staging.rb

@@ -78,6 +78,9 @@ set :rvm_ruby_string, "1.9.3"
 #   'public/robots.txt',
 # ]
 
+# Link config files
+set :configuration_files, ['database.yml']
+
 #
 #
 #############

data/examples/rails_reverse_proxy/deploy/development.rb

@@ -78,6 +78,9 @@ set :rvm_ruby_string, "1.9.3"
 #   'public/robots.txt',
 # ]
 
+# Link config files
+set :configuration_files, ['database.yml']
+
 #
 #
 #############

data/examples/rails_reverse_proxy/deploy/production.rb

@@ -78,6 +78,9 @@ set :rvm_ruby_string, "1.9.3"
 #   'public/robots.txt',
 # ]
 
+# Link config files
+set :configuration_files, ['database.yml']
+
 #
 #
 #############

data/examples/rails_reverse_proxy/deploy/staging.rb

@@ -78,6 +78,9 @@ set :rvm_ruby_string, "1.9.3"
 #   'public/robots.txt',
 # ]
 
+# Link config files
+set :configuration_files, ['database.yml']
+
 #
 #
 #############

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

@@ -20,7 +20,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "Fix permissions"
     task :fix_permissions, :roles => :app do
-      unless exists?(:app_owner) or exists?(:app_group)
+      if exists?(:app_owner) or exists?(:app_group)
         run <<-CMD
           #{try_sudo} chown -R \
             #{fetch :app_owner, 'www-data'}:#{fetch :app_group, 'www-data'} \

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

@@ -334,6 +334,27 @@ Capistrano::Configuration.instance(:must_exist).load do
           end
         end
       end
+
+      desc "Create database.yml in shared path"
+      task :write_database_yml, :roles => :db, :except => { :no_release => true } do
+        mysql_credentials = fetch :mysql_credentials
+
+        db_config = <<-EOF
+production:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  pool: 10
+  database: #{fetch :mysql_db_name}
+  username: #{mysql_credentials[:user]}
+  password: #{mysql_credentials[:pass]}
+EOF
+
+        run <<-CMD
+          mkdir -p #{shared_path}/config
+        CMD
+        put db_config, "#{shared_path}/config/database.yml"
+      end
     end
   end
 
@@ -347,4 +368,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   before "mysql:print_credentials", "mysql:credentials"
   before "mysql:print_root_credentials", "mysql:root_credentials"
+
+  # Write database.yml to shared path when using rails
+  after  "mysql:write_credentials", "mysql:write_database_yml" if exists?(:capistrano_extensions) and capistrano_extensions.include?(:rails)
 end

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

@@ -15,7 +15,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :rails do
     desc "Install configuration files"
     task :install_configuration_files, :roles => :app do
-      unless exists?(:configuration_files)
+      if exists?(:configuration_files)
         fetch(:configuration_files).each { |configuration_file| link_config_file(configuration_file) }
       end
     end

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

@@ -75,6 +75,9 @@ set :rvm_ruby_string, "1.9.3"
 #   'public/robots.txt',
 # ]
 
+# Link config files
+# set :configuration_files, ['database.yml']
+
 #
 #
 #############

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

@@ -21,6 +21,34 @@ server {
   index <%= @indexes.join(' ') %>;
 <% end %>
 
+  # This allows people to use images and css in their maintenance.html file
+  if ($request_filename ~* \.(css|jpg|gif|png)$) {
+    break;
+  }
+  # Rewrite all the requests to the maintenance.html page if it exists.
+  if (-f $document_root/system/maintenance.html) {
+    return 503;
+  }
+  # with 503 error code
+  location @503 {
+    rewrite  ^(.*)$  /system/maintenance.html break;
+  }
+
+<% if passenger? %>
+  passenger_enabled on;
+
+  # Rails errors
+  error_page 404 /404.html;
+  error_page 500 502 504 /500.html;
+  error_page 503 @503;
+
+  <% if mod_rewrite? %>
+  # this serves static files that exist without running other rewrite tests
+  if (-f $request_filename) {
+    break;
+  }
+  <% end %>
+<% else %>
   location / {
   <% if mod_rewrite? %>
     # this serves static files that exist without running other rewrite tests
@@ -46,6 +74,7 @@ server {
       deny  all;
     }
   <% end if @denied_access.present? %>
+<% end %>
 
 <% if php_fpm? %>
   location ~ .php$ {
@@ -78,10 +107,6 @@ server {
   <% end %>
   }
 <% end %>
-
-<% if passenger? %>
-  passenger_enabled on;
-<% end %>
 }
 
 <% if reverse_proxy? %>

data/lib/capistrano-exts/version.rb

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

data/spec/rendered_templates/nginx_passenger.conf

@@ -0,0 +1,34 @@
+server {
+  listen 80;
+  server_name technogate.fr www.technogate.fr;
+
+  root /home/vhosts/technogate/public;
+
+  # This allows people to use images and css in their maintenance.html file
+  if ($request_filename ~* \.(css|jpg|gif|png)$) {
+    break;
+  }
+  # Rewrite all the requests to the maintenance.html page if it exists.
+  if (-f $document_root/system/maintenance.html) {
+    return 503;
+  }
+  # with 503 error code
+  location @503 {
+    rewrite  ^(.*)$  /system/maintenance.html break;
+  }
+
+  passenger_enabled on;
+
+  # Rails errors
+  error_page 404 /404.html;
+  error_page 500 502 504 /500.html;
+  error_page 503 @503;
+
+  
+  # this serves static files that exist without running other rewrite tests
+  if (-f $request_filename) {
+    break;
+  }
+  
+
+}

data/spec/rendered_templates/nginx_php_fpm.conf

@@ -6,6 +6,19 @@ server {
 
   index index.php index.html;
 
+  # This allows people to use images and css in their maintenance.html file
+  if ($request_filename ~* \.(css|jpg|gif|png)$) {
+    break;
+  }
+  # Rewrite all the requests to the maintenance.html page if it exists.
+  if (-f $document_root/system/maintenance.html) {
+    return 503;
+  }
+  # with 503 error code
+  location @503 {
+    rewrite  ^(.*)$  /system/maintenance.html break;
+  }
+
   location / {
   
     # this serves static files that exist without running other rewrite tests

data/spec/rendered_templates/nginx_reverse_proxy_address.conf

@@ -0,0 +1,46 @@
+server {
+  listen 80;
+  server_name technogate.fr www.technogate.fr;
+
+  # This allows people to use images and css in their maintenance.html file
+  if ($request_filename ~* \.(css|jpg|gif|png)$) {
+    break;
+  }
+  # Rewrite all the requests to the maintenance.html page if it exists.
+  if (-f $document_root/system/maintenance.html) {
+    return 503;
+  }
+  # with 503 error code
+  location @503 {
+    rewrite  ^(.*)$  /system/maintenance.html break;
+  }
+
+  location / {
+  
+    # this serves static files that exist without running other rewrite tests
+    if (-f $request_filename) {
+      expires 30d;
+      break;
+    }
+
+    # this sends all non-existing file or directory requests to index.php
+    if (!-e $request_filename) {
+      rewrite ^(.+)$ /index.php?q=$1 last;
+    }
+  
+
+  
+    proxy_pass http://technogate_reverse_proxy;
+    proxy_set_header Host $host;
+  
+  }
+
+  
+
+}
+
+upstream technogate_reverse_proxy {
+
+  server localhost:8080 fail_timeout=0;
+
+}

data/spec/rendered_templates/nginx_reverse_proxy_socket.conf

@@ -0,0 +1,46 @@
+server {
+  listen 80;
+  server_name technogate.fr www.technogate.fr;
+
+  # This allows people to use images and css in their maintenance.html file
+  if ($request_filename ~* \.(css|jpg|gif|png)$) {
+    break;
+  }
+  # Rewrite all the requests to the maintenance.html page if it exists.
+  if (-f $document_root/system/maintenance.html) {
+    return 503;
+  }
+  # with 503 error code
+  location @503 {
+    rewrite  ^(.*)$  /system/maintenance.html break;
+  }
+
+  location / {
+  
+    # this serves static files that exist without running other rewrite tests
+    if (-f $request_filename) {
+      expires 30d;
+      break;
+    }
+
+    # this sends all non-existing file or directory requests to index.php
+    if (!-e $request_filename) {
+      rewrite ^(.+)$ /index.php?q=$1 last;
+    }
+  
+
+  
+    proxy_pass http://technogate_reverse_proxy;
+    proxy_set_header Host $host;
+  
+  }
+
+  
+
+}
+
+upstream technogate_reverse_proxy {
+
+  server unix:/home/vhosts/technogate/tmp/unicorn.sock;
+
+}

data/spec/requests/nginx_spec.rb

@@ -28,11 +28,62 @@ describe Nginx do
   end
 
   describe ":passenger" do
+    subject { Nginx.new :passenger}
 
+    before(:each) do
+      @application_url  = %w(technogate.fr www.technogate.fr)
+      @application      = 'technogate'
+      @public_path      = '/home/vhosts/technogate/public'
+
+      subject.application_url = @application_url
+      subject.application     = @application
+      subject.public_path     = @public_path
+    end
+
+    it "should render the correct file" do
+      expected_result = File.read File.join(RENDERED_TEMPLATES_PATH, 'nginx_passenger.conf')
+      subject.render.should == expected_result
+    end
+  end
+
+  describe ":reverse_proxy socket" do
+    subject { Nginx.new :reverse_proxy}
+
+    before(:each) do
+      @application_url      = %w(technogate.fr www.technogate.fr)
+      @application          = 'technogate'
+      @reverse_proxy_socket = '/home/vhosts/technogate/tmp/unicorn.sock'
+
+      subject.application_url       = @application_url
+      subject.application           = @application
+      subject.reverse_proxy_socket  = @reverse_proxy_socket
+    end
+
+    it "should render the correct file" do
+      expected_result = File.read File.join(RENDERED_TEMPLATES_PATH, 'nginx_reverse_proxy_socket.conf')
+      subject.render.should == expected_result
+    end
   end
 
-  describe ":reverse_proxy" do
+  describe ":reverse_proxy address" do
+    subject { Nginx.new :reverse_proxy}
 
+    before(:each) do
+      @application_url              = %w(technogate.fr www.technogate.fr)
+      @application                  = 'technogate'
+      @reverse_proxy_server_address = 'localhost'
+      @reverse_proxy_server_port    = '8080'
+
+      subject.application_url               = @application_url
+      subject.application                   = @application
+      subject.reverse_proxy_server_address  = @reverse_proxy_server_address
+      subject.reverse_proxy_server_port     = @reverse_proxy_server_port
+    end
+
+    it "should render the correct file" do
+      expected_result = File.read File.join(RENDERED_TEMPLATES_PATH, 'nginx_reverse_proxy_address.conf')
+      subject.render.should == expected_result
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exts
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,85 +9,85 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-13 00:00:00.000000000 Z
+date: 2011-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2153671420 !ruby/object:Gem::Requirement
+  requirement: &2153266900 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153671420
+  version_requirements: *2153266900
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153670920 !ruby/object:Gem::Requirement
+  requirement: &2153265780 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153670920
+  version_requirements: *2153265780
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153670460 !ruby/object:Gem::Requirement
+  requirement: &2153264640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153670460
+  version_requirements: *2153264640
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2153670000 !ruby/object:Gem::Requirement
+  requirement: &2153249860 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2153670000
+  version_requirements: *2153249860
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2153481480 !ruby/object:Gem::Requirement
+  requirement: &2153247580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2153481480
+  version_requirements: *2153247580
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2153480060 !ruby/object:Gem::Requirement
+  requirement: &2153246300 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2153480060
+  version_requirements: *2153246300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153478140 !ruby/object:Gem::Requirement
+  requirement: &2153245320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153478140
+  version_requirements: *2153245320
 description: ! 'Capistrano exts is a set of helper tasks to help with the initial
   server
 
@@ -109,6 +109,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .todo
 - .travis.yml
 - ChangeLog
 - Gemfile
@@ -116,6 +117,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- TODO
 - capistrano-exts.gemspec
 - examples/php_fpm/deploy.rb
 - examples/php_fpm/deploy/development.rb
@@ -155,7 +157,10 @@ files:
 - lib/capistrano-exts/templates/multistage.rb
 - lib/capistrano-exts/templates/web_servers/nginx.conf.erb
 - lib/capistrano-exts/version.rb
+- spec/rendered_templates/nginx_passenger.conf
 - spec/rendered_templates/nginx_php_fpm.conf
+- spec/rendered_templates/nginx_reverse_proxy_address.conf
+- spec/rendered_templates/nginx_reverse_proxy_socket.conf
 - spec/requests/nginx_spec.rb
 - spec/servers/web_server/nginx_spec.rb
 - spec/spec_helper.rb
@@ -170,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -185,7 +190,10 @@ specification_version: 3
 summary: Set of helper tasks to help with the initial server configuration and application
   provisioning.
 test_files:
+- spec/rendered_templates/nginx_passenger.conf
 - spec/rendered_templates/nginx_php_fpm.conf
+- spec/rendered_templates/nginx_reverse_proxy_address.conf
+- spec/rendered_templates/nginx_reverse_proxy_socket.conf
 - spec/requests/nginx_spec.rb
 - spec/servers/web_server/nginx_spec.rb
 - spec/spec_helper.rb