capistrano-exts 1.5.0 → 1.5.1

data/README.md

@@ -17,7 +17,7 @@ gem install capistrano-exts
 or add it to your Gemfile
 
 ```ruby
-gem 'capistrano-exts', '>=1.5.0'
+gem 'capistrano-exts', '>=1.5.1'
 ```
 
 Setup

data/examples/php_fpm/deploy/development.rb

@@ -74,6 +74,9 @@ set :contents_folder, {
 # Mysql
 #
 
+# Where is located the primary database folder?
+set :mysql_db_server,                         'localhost'
+
 # What is the database name for this project/stage ?
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 

data/examples/php_fpm/deploy/production.rb

@@ -74,6 +74,9 @@ set :contents_folder, {
 # Mysql
 #
 
+# Where is located the primary database folder?
+set :mysql_db_server,                         'localhost'
+
 # What is the database name for this project/stage ?
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 

data/examples/php_fpm/deploy/staging.rb

@@ -74,6 +74,9 @@ set :contents_folder, {
 # Mysql
 #
 
+# Where is located the primary database folder?
+set :mysql_db_server,                         'localhost'
+
 # What is the database name for this project/stage ?
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 

data/examples/rails_passenger/deploy/development.rb

@@ -75,6 +75,9 @@ set :rvm_ruby_string, "1.9.3"
 # Mysql
 #
 
+# Where is located the primary database folder?
+set :mysql_db_server,                         'localhost'
+
 # What is the database name for this project/stage ?
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 

data/examples/rails_passenger/deploy/production.rb

@@ -75,6 +75,9 @@ set :rvm_ruby_string, "1.9.3"
 # Mysql
 #
 
+# Where is located the primary database folder?
+set :mysql_db_server,                         'localhost'
+
 # What is the database name for this project/stage ?
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 

data/examples/rails_passenger/deploy/staging.rb

@@ -75,6 +75,9 @@ set :rvm_ruby_string, "1.9.3"
 # Mysql
 #
 
+# Where is located the primary database folder?
+set :mysql_db_server,                         'localhost'
+
 # What is the database name for this project/stage ?
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 

data/examples/rails_reverse_proxy/deploy/development.rb

@@ -75,6 +75,9 @@ set :rvm_ruby_string, "1.9.3"
 # Mysql
 #
 
+# Where is located the primary database folder?
+set :mysql_db_server,                         'localhost'
+
 # What is the database name for this project/stage ?
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 

data/examples/rails_reverse_proxy/deploy/production.rb

@@ -75,6 +75,9 @@ set :rvm_ruby_string, "1.9.3"
 # Mysql
 #
 
+# Where is located the primary database folder?
+set :mysql_db_server,                         'localhost'
+
 # What is the database name for this project/stage ?
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 

data/examples/rails_reverse_proxy/deploy/staging.rb

@@ -75,6 +75,9 @@ set :rvm_ruby_string, "1.9.3"
 # Mysql
 #
 
+# Where is located the primary database folder?
+set :mysql_db_server,                         'localhost'
+
 # What is the database name for this project/stage ?
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 

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

@@ -75,7 +75,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       # Create a tarball of the contents folder
       run <<-CMD
         cd #{shared_path}/shared_contents &&
-        tar czf /tmp/#{File.basename export_filename} --exclude='*~' --exclude='*.tmp' --exclude='*.bak' *
+        tar chzf /tmp/#{File.basename export_filename} --exclude='*~' --exclude='*.tmp' --exclude='*.bak' *
       CMD
 
       # Tranfer the contents to the local system

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

@@ -32,26 +32,34 @@ Capistrano::Configuration.instance(:must_exist).load do
       run "chmod -R g+w #{fetch :latest_release}" if fetch(:group_writable, true)
     end
 
-    desc "[internal] Symlink htdocs"
-    task :symlink_htdocs do
+    desc "[internal] Symlink public folder"
+    task :symlink_public_folders, :roles => :web, :except => { :no_release => true } do
       deploy_to = fetch :deploy_to
-      if remote_file_exists?("#{deploy_to}/htdocs")
-        begin
-          run <<-CMD
-            #{try_sudo} mv #{deploy_to}/htdocs #{deploy_to}/old_htdocs &&
-            #{try_sudo} ln -nsf #{fetch :public_path} #{deploy_to}/htdocs
-          CMD
-        rescue Capistrano::CommandError
-          puts "WARNING: I couldn't replace the old htdocs please do so manually"
+
+      ['htdocs', 'httpdocs', 'www'].each do |folder|
+        if remote_file_exists?("#{deploy_to}/#{folder}")
+          begin
+            # Make sure the old folder exists
+            run <<-CMD
+              mkdir -p #{deploy_to}/old
+            CMD
+
+            run <<-CMD
+              #{try_sudo} mv #{deploy_to}/#{folder} #{deploy_to}/old/#{folder} &&
+              #{try_sudo} ln -nsf #{fetch :public_path} #{deploy_to}/#{folder}
+            CMD
+          rescue Capistrano::CommandError
+            puts "WARNING: I couldn't replace the old htdocs please do so manually"
+          end
         end
       end
 
-      puts "The htdocs folder has been moved to old_htdocs"
+      puts "The public folders has been moved to the old folder"
     end
   end
 
   # Dependencies
   before "deploy", "deploy:check_if_remote_ready"
   after "deploy:restart", "deploy:fix_permissions"
-  after "deploy:setup", "deploy:symlink_htdocs"
+  after "deploy:setup", "deploy:symlink_public_folders"
 end

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

@@ -8,7 +8,7 @@ unless Capistrano::Configuration.respond_to?(:instance)
 end
 
 Capistrano::Configuration.instance(:must_exist).load do
-  namespace :deploy do
+  namespace :git do
     desc "Check if the branch is ready"
     task :check_if_branch_is_ready, :roles => :app, :except => { :no_release => true } do
       unless `git rev-parse #{branch}` == `git rev-parse origin/#{branch}`
@@ -32,6 +32,6 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
 
   # Dependencies
-  before "deploy", "deploy:check_if_branch_is_ready"
-  after "deploy:check_if_branch_is_ready", "deploy:check_revision"
+  before "deploy", "git:check_if_branch_is_ready"
+  after "git:check_if_branch_is_ready", "git:check_revision"
 end

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

@@ -116,7 +116,7 @@ Capistrano::Configuration.instance(:must_exist).load do
           CMD
 
           set :mysql_credentials, {
-            host: find_servers(:roles => :db, primary: true).first.to_s.gsub(/^(.*@)?([^:]*)(:.*)?$/, '\2'),
+            host: fetch(:mysql_db_server, 'localhost'),
             user: mysql_db_user,
             pass: fetch(:mysql_db_pass),
           }
@@ -292,10 +292,10 @@ Capistrano::Configuration.instance(:must_exist).load do
         if mysql_credentials.blank? or mysql_credentials[:user].blank? or mysql_credentials[:pass].blank?
           mysql_credentials = {
             host: ask("What is the hostname used to access the database",
-                      default: mysql_credentials.try(:[], :host) || 'localhost',
+                      default: mysql_credentials.try(:[], :host) || fetch(:mysql_db_server, 'localhost'),
                       validate: /.+/),
             user: ask("What is the username used to access the database",
-                      default: mysql_credentials.try(:[], :user),
+                      default: mysql_credentials.try(:[], :user) || fetch(:mysql_db_user),
                       validate: /.+/),
             pass: ask("What is the password used to access the database",
                       default: mysql_credentials.try(:[], :pass),
@@ -370,7 +370,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         if mysql_root_credentials.blank? or mysql_root_credentials[:user].blank? or mysql_root_credentials[:pass].blank?
           mysql_root_credentials = {
             host: ask("What is the hostname used to access the database",
-                      default: mysql_root_credentials.try(:[], :host) || 'localhost',
+                      default: mysql_root_credentials.try(:[], :host) || fetch(:mysql_db_server, 'localhost'),
                       validate: /.+/),
             user: ask("What is the username used to access the database",
                       default: mysql_root_credentials.try(:[], :user),

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

@@ -72,6 +72,9 @@ set :rvm_ruby_string, "1.9.3"
 # Mysql
 #
 
+# Where is located the primary database folder?
+set :mysql_db_server,                         'localhost'
+
 # What is the database name for this project/stage ?
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 

data/lib/capistrano-exts/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exts
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-06 00:00:00.000000000 Z
+date: 2011-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2152402160 !ruby/object:Gem::Requirement
+  requirement: &2156458100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152402160
+  version_requirements: *2156458100
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152612760 !ruby/object:Gem::Requirement
+  requirement: &2156456100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152612760
+  version_requirements: *2156456100
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152626900 !ruby/object:Gem::Requirement
+  requirement: &2156454120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152626900
+  version_requirements: *2156454120
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2152622900 !ruby/object:Gem::Requirement
+  requirement: &2156452240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2152622900
+  version_requirements: *2156452240
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2152619820 !ruby/object:Gem::Requirement
+  requirement: &2156451180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2152619820
+  version_requirements: *2156451180
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2152670800 !ruby/object:Gem::Requirement
+  requirement: &2156469200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2152670800
+  version_requirements: *2156469200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152665220 !ruby/object:Gem::Requirement
+  requirement: &2156467860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2152665220
+  version_requirements: *2156467860
 description: Handy extensions for Capistrano
 email:
 - wael.nasreddine@gmail.com