capistrano-exts 1.3.6 → 1.4.0

data/README.md

@@ -17,7 +17,7 @@ gem install capistrano-exts
 or add it to your Gemfile
 
 ```ruby
-gem 'capistrano-exts', '>=1.3.6'
+gem 'capistrano-exts', '>=1.4.0'
 ```
 
 Setup
@@ -37,14 +37,14 @@ set :stages, [:development, :staging, :production]
 set :default_stage, :development
 
 # Capistrano extensions
-# Valid extensions: :multistage, :git, :deploy, :mysql, :rails, :contao, :god, :unicorn, :servers
+# Valid extensions: :multistage, :git, :deploy, :mysql, :rails, :contao, :contents, :god, :unicorn, :servers
 set :capistrano_extensions, [:multistage, :git, :deploy, :mysql, :rails, :servers]
 ```
 
 Then run the command
 
 ```bash
-$ cap multistage:prepare
+$ cap multistage:setup
 ```
 
 Then edit the files found at __config/deploy/*.rb__, that's it you're ready..
@@ -55,7 +55,7 @@ Usage
 The server can be prepared by running:
 
 ```bash
-$ cap deploy:server:prepare deploy:setup
+$ cap deploy:server:setup deploy:setup
 ```
 
 Deploy with

data/examples/php_fpm/deploy/development.rb

@@ -51,7 +51,24 @@ set :deploy_via,  :remote_cache
 set :keep_releases, 5
 
 # Using RVM? Set this to the ruby version/gemset to use
-set :rvm_ruby_string, "1.9.2"
+set :rvm_ruby_string, "1.9.3"
+
+#############
+# Contents
+#
+
+# Here you can set all the contents folders, a content folder is a shared folder
+# public or private but the contents are shared between all releases.
+# The contents_folders is a hash of key/value where the key is the name of the folder
+# created under 'shared_path/contents' and symlinked to the value (absolute path)
+# you can use public_path/current_path/deploy_to etc...
+set :contents_folder, {
+                        'contenu' => "#{fetch :public_path}/tl_files/durable/contenu",
+                      }
+
+#
+#
+#############
 
 #############
 # Mysql
@@ -61,7 +78,7 @@ set :rvm_ruby_string, "1.9.2"
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 
 # What is the database user ?
-# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: This is only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_db_user,                           -> { "#{fetch :application}" }
 
 # Where the database credentials are stored on the server ?
@@ -80,7 +97,7 @@ set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
 
 # Where can we find root credentials ?
-# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: These options are only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
 
 # Define the regex / match that will be ran against the contents of the file above to fetch the hostname
@@ -172,19 +189,6 @@ set :php_fpm_port, '9000'
 # => What is the path to the socket file
 # set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
-#
-#
-#############
-
-#############
-# Contao
-#
-
-# Where do you store contao contents ?
-# The contents are stored in the shared path because they are uploaded from
-# contao's admin section
-set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
-
 #
 #
 #############

data/examples/php_fpm/deploy/production.rb

@@ -51,7 +51,24 @@ set :deploy_via,  :remote_cache
 set :keep_releases, 5
 
 # Using RVM? Set this to the ruby version/gemset to use
-set :rvm_ruby_string, "1.9.2"
+set :rvm_ruby_string, "1.9.3"
+
+#############
+# Contents
+#
+
+# Here you can set all the contents folders, a content folder is a shared folder
+# public or private but the contents are shared between all releases.
+# The contents_folders is a hash of key/value where the key is the name of the folder
+# created under 'shared_path/contents' and symlinked to the value (absolute path)
+# you can use public_path/current_path/deploy_to etc...
+set :contents_folder, {
+                        'contenu' => "#{fetch :public_path}/tl_files/durable/contenu",
+                      }
+
+#
+#
+#############
 
 #############
 # Mysql
@@ -61,7 +78,7 @@ set :rvm_ruby_string, "1.9.2"
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 
 # What is the database user ?
-# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: This is only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_db_user,                           -> { "#{fetch :application}" }
 
 # Where the database credentials are stored on the server ?
@@ -80,7 +97,7 @@ set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
 
 # Where can we find root credentials ?
-# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: These options are only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
 
 # Define the regex / match that will be ran against the contents of the file above to fetch the hostname
@@ -172,19 +189,6 @@ set :php_fpm_port, '9000'
 # => What is the path to the socket file
 # set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
-#
-#
-#############
-
-#############
-# Contao
-#
-
-# Where do you store contao contents ?
-# The contents are stored in the shared path because they are uploaded from
-# contao's admin section
-set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
-
 #
 #
 #############

data/examples/php_fpm/deploy/staging.rb

@@ -51,7 +51,24 @@ set :deploy_via,  :remote_cache
 set :keep_releases, 5
 
 # Using RVM? Set this to the ruby version/gemset to use
-set :rvm_ruby_string, "1.9.2"
+set :rvm_ruby_string, "1.9.3"
+
+#############
+# Contents
+#
+
+# Here you can set all the contents folders, a content folder is a shared folder
+# public or private but the contents are shared between all releases.
+# The contents_folders is a hash of key/value where the key is the name of the folder
+# created under 'shared_path/contents' and symlinked to the value (absolute path)
+# you can use public_path/current_path/deploy_to etc...
+set :contents_folder, {
+                        'contenu' => "#{fetch :public_path}/tl_files/durable/contenu",
+                      }
+
+#
+#
+#############
 
 #############
 # Mysql
@@ -61,7 +78,7 @@ set :rvm_ruby_string, "1.9.2"
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 
 # What is the database user ?
-# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: This is only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_db_user,                           -> { "#{fetch :application}" }
 
 # Where the database credentials are stored on the server ?
@@ -80,7 +97,7 @@ set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
 
 # Where can we find root credentials ?
-# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: These options are only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
 
 # Define the regex / match that will be ran against the contents of the file above to fetch the hostname
@@ -172,19 +189,6 @@ set :php_fpm_port, '9000'
 # => What is the path to the socket file
 # set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
-#
-#
-#############
-
-#############
-# Contao
-#
-
-# Where do you store contao contents ?
-# The contents are stored in the shared path because they are uploaded from
-# contao's admin section
-set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
-
 #
 #
 #############

data/examples/rails_passenger/deploy/development.rb

@@ -51,7 +51,25 @@ set :deploy_via,  :remote_cache
 set :keep_releases, 5
 
 # Using RVM? Set this to the ruby version/gemset to use
-set :rvm_ruby_string, "1.9.2"
+set :rvm_ruby_string, "1.9.3"
+
+#############
+# Contents
+#
+
+# Here you can set all the contents folders, a content folder is a shared folder
+# public or private but the contents are shared between all releases.
+# The contents_folders is a hash of key/value where the key is the name of the folder
+# created under 'shared_path/contents' and symlinked to the value (absolute path)
+# you can use public_path/current_path/deploy_to etc...
+# set :contents_folder, {
+#                         'image' => "#{fetch :public_path}/images",
+#                         'video' => "#{fetch :public_path}/videos",
+#                       }
+
+#
+#
+#############
 
 #############
 # Mysql
@@ -61,7 +79,7 @@ set :rvm_ruby_string, "1.9.2"
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 
 # What is the database user ?
-# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: This is only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_db_user,                           -> { "#{fetch :application}" }
 
 # Where the database credentials are stored on the server ?
@@ -80,7 +98,7 @@ set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
 
 # Where can we find root credentials ?
-# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: These options are only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
 
 # Define the regex / match that will be ran against the contents of the file above to fetch the hostname
@@ -172,19 +190,6 @@ set :web_server_mode, :passenger
 # => What is the path to the socket file
 # set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
-#
-#
-#############
-
-#############
-# Contao
-#
-
-# Where do you store contao contents ?
-# The contents are stored in the shared path because they are uploaded from
-# contao's admin section
-# set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
-
 #
 #
 #############

data/examples/rails_passenger/deploy/production.rb

@@ -51,7 +51,25 @@ set :deploy_via,  :remote_cache
 set :keep_releases, 5
 
 # Using RVM? Set this to the ruby version/gemset to use
-set :rvm_ruby_string, "1.9.2"
+set :rvm_ruby_string, "1.9.3"
+
+#############
+# Contents
+#
+
+# Here you can set all the contents folders, a content folder is a shared folder
+# public or private but the contents are shared between all releases.
+# The contents_folders is a hash of key/value where the key is the name of the folder
+# created under 'shared_path/contents' and symlinked to the value (absolute path)
+# you can use public_path/current_path/deploy_to etc...
+# set :contents_folder, {
+#                         'image' => "#{fetch :public_path}/images",
+#                         'video' => "#{fetch :public_path}/videos",
+#                       }
+
+#
+#
+#############
 
 #############
 # Mysql
@@ -61,7 +79,7 @@ set :rvm_ruby_string, "1.9.2"
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 
 # What is the database user ?
-# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: This is only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_db_user,                           -> { "#{fetch :application}" }
 
 # Where the database credentials are stored on the server ?
@@ -80,7 +98,7 @@ set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
 
 # Where can we find root credentials ?
-# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: These options are only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
 
 # Define the regex / match that will be ran against the contents of the file above to fetch the hostname
@@ -172,19 +190,6 @@ set :web_server_mode, :passenger
 # => What is the path to the socket file
 # set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
-#
-#
-#############
-
-#############
-# Contao
-#
-
-# Where do you store contao contents ?
-# The contents are stored in the shared path because they are uploaded from
-# contao's admin section
-# set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
-
 #
 #
 #############

data/examples/rails_passenger/deploy/staging.rb

@@ -51,7 +51,25 @@ set :deploy_via,  :remote_cache
 set :keep_releases, 5
 
 # Using RVM? Set this to the ruby version/gemset to use
-set :rvm_ruby_string, "1.9.2"
+set :rvm_ruby_string, "1.9.3"
+
+#############
+# Contents
+#
+
+# Here you can set all the contents folders, a content folder is a shared folder
+# public or private but the contents are shared between all releases.
+# The contents_folders is a hash of key/value where the key is the name of the folder
+# created under 'shared_path/contents' and symlinked to the value (absolute path)
+# you can use public_path/current_path/deploy_to etc...
+# set :contents_folder, {
+#                         'image' => "#{fetch :public_path}/images",
+#                         'video' => "#{fetch :public_path}/videos",
+#                       }
+
+#
+#
+#############
 
 #############
 # Mysql
@@ -61,7 +79,7 @@ set :rvm_ruby_string, "1.9.2"
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 
 # What is the database user ?
-# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: This is only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_db_user,                           -> { "#{fetch :application}" }
 
 # Where the database credentials are stored on the server ?
@@ -80,7 +98,7 @@ set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
 
 # Where can we find root credentials ?
-# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: These options are only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
 
 # Define the regex / match that will be ran against the contents of the file above to fetch the hostname
@@ -172,19 +190,6 @@ set :web_server_mode, :passenger
 # => What is the path to the socket file
 # set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
-#
-#
-#############
-
-#############
-# Contao
-#
-
-# Where do you store contao contents ?
-# The contents are stored in the shared path because they are uploaded from
-# contao's admin section
-# set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
-
 #
 #
 #############

data/examples/rails_reverse_proxy/deploy/development.rb

@@ -51,7 +51,25 @@ set :deploy_via,  :remote_cache
 set :keep_releases, 5
 
 # Using RVM? Set this to the ruby version/gemset to use
-set :rvm_ruby_string, "1.9.2"
+set :rvm_ruby_string, "1.9.3"
+
+#############
+# Contents
+#
+
+# Here you can set all the contents folders, a content folder is a shared folder
+# public or private but the contents are shared between all releases.
+# The contents_folders is a hash of key/value where the key is the name of the folder
+# created under 'shared_path/contents' and symlinked to the value (absolute path)
+# you can use public_path/current_path/deploy_to etc...
+# set :contents_folder, {
+#                         'image' => "#{fetch :public_path}/images",
+#                         'video' => "#{fetch :public_path}/videos",
+#                       }
+
+#
+#
+#############
 
 #############
 # Mysql
@@ -61,7 +79,7 @@ set :rvm_ruby_string, "1.9.2"
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 
 # What is the database user ?
-# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: This is only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_db_user,                           -> { "#{fetch :application}" }
 
 # Where the database credentials are stored on the server ?
@@ -80,7 +98,7 @@ set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
 
 # Where can we find root credentials ?
-# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: These options are only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
 
 # Define the regex / match that will be ran against the contents of the file above to fetch the hostname
@@ -172,19 +190,6 @@ set :web_server_mode, :reverse_proxy
 # => What is the path to the socket file
 set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
-#
-#
-#############
-
-#############
-# Contao
-#
-
-# Where do you store contao contents ?
-# The contents are stored in the shared path because they are uploaded from
-# contao's admin section
-# set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
-
 #
 #
 #############

data/examples/rails_reverse_proxy/deploy/production.rb

@@ -51,7 +51,25 @@ set :deploy_via,  :remote_cache
 set :keep_releases, 5
 
 # Using RVM? Set this to the ruby version/gemset to use
-set :rvm_ruby_string, "1.9.2"
+set :rvm_ruby_string, "1.9.3"
+
+#############
+# Contents
+#
+
+# Here you can set all the contents folders, a content folder is a shared folder
+# public or private but the contents are shared between all releases.
+# The contents_folders is a hash of key/value where the key is the name of the folder
+# created under 'shared_path/contents' and symlinked to the value (absolute path)
+# you can use public_path/current_path/deploy_to etc...
+# set :contents_folder, {
+#                         'image' => "#{fetch :public_path}/images",
+#                         'video' => "#{fetch :public_path}/videos",
+#                       }
+
+#
+#
+#############
 
 #############
 # Mysql
@@ -61,7 +79,7 @@ set :rvm_ruby_string, "1.9.2"
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 
 # What is the database user ?
-# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: This is only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_db_user,                           -> { "#{fetch :application}" }
 
 # Where the database credentials are stored on the server ?
@@ -80,7 +98,7 @@ set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
 
 # Where can we find root credentials ?
-# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: These options are only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
 
 # Define the regex / match that will be ran against the contents of the file above to fetch the hostname

data/examples/rails_reverse_proxy/deploy/staging.rb

@@ -51,7 +51,25 @@ set :deploy_via,  :remote_cache
 set :keep_releases, 5
 
 # Using RVM? Set this to the ruby version/gemset to use
-set :rvm_ruby_string, "1.9.2"
+set :rvm_ruby_string, "1.9.3"
+
+#############
+# Contents
+#
+
+# Here you can set all the contents folders, a content folder is a shared folder
+# public or private but the contents are shared between all releases.
+# The contents_folders is a hash of key/value where the key is the name of the folder
+# created under 'shared_path/contents' and symlinked to the value (absolute path)
+# you can use public_path/current_path/deploy_to etc...
+# set :contents_folder, {
+#                         'image' => "#{fetch :public_path}/images",
+#                         'video' => "#{fetch :public_path}/videos",
+#                       }
+
+#
+#
+#############
 
 #############
 # Mysql
@@ -61,7 +79,7 @@ set :rvm_ruby_string, "1.9.2"
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 
 # What is the database user ?
-# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: This is only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_db_user,                           -> { "#{fetch :application}" }
 
 # Where the database credentials are stored on the server ?
@@ -80,7 +98,7 @@ set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
 
 # Where can we find root credentials ?
-# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: These options are only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
 
 # Define the regex / match that will be ran against the contents of the file above to fetch the hostname

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

@@ -1,5 +1,6 @@
 require 'capistrano'
 require 'capistrano/errors'
+require 'capistrano-exts/receipts/functions'
 require 'capistrano-exts/receipts/deploy'
 require 'capistrano-exts/receipts/mysql'
 
@@ -25,12 +26,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       shared_path = fetch :shared_path
       run <<-CMD
         #{try_sudo} mkdir -p #{shared_path}/logs &&
-        #{try_sudo} mkdir -p #{shared_path}/config &&
-        #{try_sudo} mkdir -p #{shared_path}/contents &&
-        #{try_sudo} mkdir -p #{shared_path}/contents/image &&
-        #{try_sudo} mkdir -p #{shared_path}/contents/video &&
-        #{try_sudo} mkdir -p #{shared_path}/contents/audio &&
-        #{try_sudo} mkdir -p #{shared_path}/contents/pdf
+        #{try_sudo} mkdir -p #{shared_path}/config
       CMD
 
       deny_htaccess = "order deny,allow\n"
@@ -79,31 +75,18 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "[internal] Fix contao's symlinks to the shared path"
     task :fix_links, :roles => :app, :except => { :no_release => true } do
-      contents_path = fetch :contents_path, "#{fetch :public_path}/tl_files/contents"
-      current_path = fetch :current_path
       latest_release = fetch :latest_release
       shared_path = fetch :shared_path
 
-      # At this point, the current_path does not exists and by running an mkdir
-      # later, we're actually breaking stuff.
-      # So replace current_path with latest_release in the contents_path string
-      contents_path.gsub! %r{#{current_path}}, latest_release
-
       # Remove files
       run <<-CMD
-        #{try_sudo} rm -f #{contents_path} &&
         #{try_sudo} rm -rf #{latest_release}/public/system/logs &&
         #{try_sudo} rm -f #{latest_release}/public/system/config/localconfig.php &&
         #{try_sudo} rm -f #{latest_release}/public/.htaccess
       CMD
 
-      run <<-CMD
-        mkdir -p #{File.dirname(contents_path)}
-      CMD
-
       # Create symlinks
       run <<-CMD
-        #{try_sudo} ln -nsf #{shared_path}/contents #{contents_path} &&
         #{try_sudo} ln -nsf #{shared_path}/config/htaccess.txt #{latest_release}/public/.htaccess &&
         #{try_sudo} ln -nsf #{shared_path}/config/localconfig.php #{latest_release}/public/system/config/localconfig.php &&
         #{try_sudo} ln -nsf #{shared_path}/logs #{latest_release}/public/system/logs
@@ -116,8 +99,6 @@ Capistrano::Configuration.instance(:must_exist).load do
   after "contao:setup", "contao:setup_localconfig"
   after "deploy:finalize_update", "contao:fix_links"
   before "contao:fix_links", "contao:setup_htaccess"
-  after "contao:fix_links", "deploy:cleanup"
-  after "deploy:restart", "deploy:fix_permissions"
 
   # Mysql Credentials
   before "contao:setup_localconfig", "mysql:credentials"

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

@@ -0,0 +1,80 @@
+require 'capistrano'
+require 'capistrano/errors'
+require 'capistrano-exts/receipts/functions'
+
+# Verify that Capistrano is version 2
+unless Capistrano::Configuration.respond_to?(:instance)
+  abort "This extension requires Capistrano 2"
+end
+
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :contents do
+    desc "Setup the contents folder"
+    task :setup, :roles => :app, :except => { :no_release => true } do
+      shared_path = fetch :shared_path
+      contents_folder = fetch :contents_folder
+
+      run <<-CMD
+        #{try_sudo} mkdir -p #{shared_path}/shared_contents
+      CMD
+
+      contents_folder.each do |folder, path|
+        run <<-CMD
+          #{try_sudo} mkdir -p #{shared_path}/shared_contents/#{folder}
+        CMD
+      end
+    end
+
+    desc "[internal] Fix contao's symlinks to the shared path"
+    task :fix_links, :roles => :app, :except => { :no_release => true } do
+      contents_folder = fetch :contents_folder
+      current_path = fetch :current_path
+      latest_release = fetch :latest_release
+      shared_path = fetch :shared_path
+
+      contents_folder.each do |folder, path|
+        # At this point, the current_path does not exists and by running an mkdir
+        # later, we're actually breaking stuff.
+        # So replace current_path with latest_release in the contents_path string
+        path.gsub! %r{#{current_path}}, latest_release
+
+        # Remove the path, making sure it does not exists
+        run <<-CMD
+          #{try_sudo} rm -f #{path}
+        CMD
+
+        # Make sure we have the folder that'll contain the shared path
+        run <<-CMD
+          #{try_sudo} mkdir -p #{File.dirname(path)}
+        CMD
+
+        # Create the symlink
+        run <<-CMD
+          #{try_sudo} ln -nsf #{shared_path}/shared_contents/#{folder} #{path}
+        CMD
+      end
+    end
+
+    desc "Export the contents folder"
+    task :export, :roles => :app, :except => { :no_release => true } do
+      shared_path = fetch :shared_path
+
+      # Create random file name
+      random_file = random_tmp_file + ".tar.gz"
+
+      # Create a tarball of the contents folder
+      run <<-CMD
+        cd #{shared_path} &&
+        tar czf #{random_file} --exclude='*~' --exclude='*.tmp' --exclude='*.bak' shared_contents
+      CMD
+
+      # Tranfer the contents to the local system
+      get random_file, random_file
+
+      puts "Contents has been downloaded to #{random_file}"
+    end
+  end
+
+  after "deploy:setup", "contents:setup"
+  after "deploy:finalize_update", "contents:fix_links"
+end

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

@@ -33,4 +33,5 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   # Dependencies
   before "deploy", "deploy:check_if_remote_ready"
+  after "deploy:restart", "deploy:fix_permissions"
 end

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

@@ -56,9 +56,9 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   def generate_random_file_name(data = nil)
     if data.present?
-      "#{fetch :application}_#{Time.now.strftime('%d-%m-%Y_%H-%M-%S')}_#{Digest::SHA1.hexdigest data}"
+      "#{fetch :application}_#{Time.now.strftime('%d-%m-%Y_%H-%M-%S-%L')}_#{Digest::SHA1.hexdigest data}"
     else
-      "#{fetch :application}_#{Time.now.strftime('%d-%m-%Y_%H-%M-%S')}"
+      "#{fetch :application}_#{Time.now.strftime('%d-%m-%Y_%H-%M-%S-%L')}"
     end
   end
 

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

@@ -27,7 +27,7 @@ Capistrano::Configuration.instance.load do
       begin
         load "#{location}/#{stage}" unless exists?(:multistages)
       rescue LoadError
-        abort "The file #{location}/#{stage} does not exist please run 'cap multistage:prepare'"
+        abort "The file #{location}/#{stage} does not exist please run 'cap multistage:setup'"
       end
       find_and_execute_task('multistage:parse_multistages') if exists?(:multistages)
     end
@@ -57,7 +57,7 @@ Capistrano::Configuration.instance.load do
     end
 
     desc "Stub out the staging config files."
-    task :prepare do
+    task :setup do
       FileUtils.mkdir_p(location)
       stages.each do |name|
         file = File.join(location, name.to_s + ".rb")
@@ -88,5 +88,5 @@ Capistrano::Configuration.instance.load do
     end
   end
 
-  on :start, "multistage:ensure", :except => stages + ['multistage:prepare', 'multistage:parse_multistages']
+  on :start, "multistage:ensure", :except => stages + ['multistage:setup', 'multistage:parse_multistages']
 end

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

@@ -15,7 +15,7 @@ end
 Capistrano::Configuration.instance(:must_exist).load do
   namespace :deploy do
     namespace :server do
-      namespace :prepare do
+      namespace :setup do
         desc "Prepare the server (database server, web server and folders)"
         task :default do
           # Empty task, server preparation goes into callbacks
@@ -43,9 +43,9 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
 
   # Callbacks
-  before "deploy:server:prepare", "deploy:server:prepare:folders"
-  after  "deploy:server:prepare", "deploy:server:prepare:finish"
+  before "deploy:server:setup", "deploy:server:setup:folders"
+  after  "deploy:server:setup", "deploy:server:setup:finish"
 
-  after "deploy:server:prepare:folders", "deploy:server:db_server:prepare"
-  after "deploy:server:prepare:folders", "deploy:server:web_server:prepare"
+  after "deploy:server:setup:folders", "deploy:server:db_server:setup"
+  after "deploy:server:setup:folders", "deploy:server:web_server:setup"
 end

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

@@ -12,7 +12,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :server do
       namespace :db_server do
         desc "[internal] Prepare the database server"
-        task :prepare, :roles => :db do
+        task :setup, :roles => :db do
           # Empty task, server preparation goes into callbacks
         end
 
@@ -24,6 +24,6 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   end
 
-  before "deploy:server:db_server:prepare", "mysql:create_db_user"
-  after  "deploy:server:db_server:prepare", "deploy:server:db_server:finish"
+  before "deploy:server:db_server:setup", "mysql:create_db_user"
+  after  "deploy:server:db_server:setup", "deploy:server:db_server:finish"
 end

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

@@ -16,7 +16,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :server do
       namespace :web_server do
         desc "Prepare the web server"
-        task :prepare, :roles => :web do
+        task :setup, :roles => :web do
           # Empty task, server preparation goes into callbacks
         end
 
@@ -128,8 +128,8 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   end
 
-  before "deploy:server:web_server:prepare", "deploy:server:web_server:generate_web_configuration"
-  after  "deploy:server:web_server:prepare", "deploy:server:web_server:finish"
+  before "deploy:server:web_server:setup", "deploy:server:web_server:generate_web_configuration"
+  after  "deploy:server:web_server:setup", "deploy:server:web_server:finish"
   after "deploy:server:web_server:generate_web_configuration", "deploy:server:web_server:generate_authentification"
   after "deploy:server:web_server:generate_web_configuration", "deploy:server:web_server:write_web_conf_file"
   after "deploy:server:web_server:generate_authentification", "deploy:server:web_server:write_web_server_auth_file"

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

@@ -48,7 +48,25 @@ set :deploy_via,  :remote_cache
 set :keep_releases, 5
 
 # Using RVM? Set this to the ruby version/gemset to use
-set :rvm_ruby_string, "1.9.2"
+set :rvm_ruby_string, "1.9.3"
+
+#############
+# Contents
+#
+
+# Here you can set all the contents folders, a content folder is a shared folder
+# public or private but the contents are shared between all releases.
+# The contents_folders is a hash of key/value where the key is the name of the folder
+# created under 'shared_path/contents' and symlinked to the value (absolute path)
+# you can use public_path/current_path/deploy_to etc...
+# set :contents_folder, {
+#                         'image' => "#{fetch :public_path}/images",
+#                         'video' => "#{fetch :public_path}/videos",
+#                       }
+
+#
+#
+#############
 
 #############
 # Mysql
@@ -58,7 +76,7 @@ set :rvm_ruby_string, "1.9.2"
 set :mysql_db_name,                           -> { "#{fetch :application}_#{fetch :stage}" }
 
 # What is the database user ?
-# NOTE: This is only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: This is only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_db_user,                           -> { "#{fetch :application}" }
 
 # Where the database credentials are stored on the server ?
@@ -77,7 +95,7 @@ set :mysql_credentials_pass_regex,            /password: (.*)$/o
 set :mysql_credentials_pass_regex_match,      1
 
 # Where can we find root credentials ?
-# NOTE: These options are only used if you run deploy:server:prepare which calls mysql:create_db_user
+# NOTE: These options are only used if you run deploy:server:setup which calls mysql:create_db_user
 set :mysql_root_credentials_file,             "/root/.mysql_password"
 
 # Define the regex / match that will be ran against the contents of the file above to fetch the hostname
@@ -170,20 +188,6 @@ set :web_server_mode, :reverse_proxy
 # => What is the path to the socket file
 # set :reverse_proxy_socket, -> { "#{shared_path}/sockets/unicorn.sock"}
 
-#
-#
-#############
-
-#############
-# Contao
-#
-
-# Where do you store contao contents ?
-# The contents are stored in the shared path because they are uploaded from
-# contao's admin section
-# Uncomment if necessary (default to public_path/tl_files/contents)
-# set :contents_path, -> { "#{fetch :public_path}/tl_files/contents"}
-
 #
 #
 #############

data/lib/capistrano-exts/version.rb

@@ -2,8 +2,8 @@ module Capistrano
   module Extensions
     module Version #:nodoc:
       MAJOR = 1
-      MINOR = 3
-      TINY = 6
+      MINOR = 4
+      TINY = 0
 
       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.3.6
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000 Z
+date: 2011-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2152053460 !ruby/object:Gem::Requirement
+  requirement: &2155898800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152053460
+  version_requirements: *2155898800
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152052440 !ruby/object:Gem::Requirement
+  requirement: &2152141240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152052440
+  version_requirements: *2152141240
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152051800 !ruby/object:Gem::Requirement
+  requirement: &2152140380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152051800
+  version_requirements: *2152140380
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2152050700 !ruby/object:Gem::Requirement
+  requirement: &2152139700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2152050700
+  version_requirements: *2152139700
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2152083640 !ruby/object:Gem::Requirement
+  requirement: &2152139040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2152083640
+  version_requirements: *2152139040
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2152081640 !ruby/object:Gem::Requirement
+  requirement: &2152138360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2152081640
+  version_requirements: *2152138360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152080060 !ruby/object:Gem::Requirement
+  requirement: &2152137740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2152080060
+  version_requirements: *2152137740
 description: Handy extensions for Capistrano
 email:
 - wael.nasreddine@gmail.com
@@ -120,6 +120,7 @@ files:
 - lib/capistrano-exts/core_ext/string/filters.rb
 - lib/capistrano-exts/receipts.rb
 - lib/capistrano-exts/receipts/contao.rb
+- lib/capistrano-exts/receipts/contents.rb
 - lib/capistrano-exts/receipts/deploy.rb
 - lib/capistrano-exts/receipts/functions.rb
 - lib/capistrano-exts/receipts/git.rb