capistrano-exts 1.9.0 → 1.10.0

data/README.md

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

data/examples/php_fpm/deploy/development.rb

@@ -64,8 +64,18 @@ set :rvm_ruby_string, "1.9.3"
 # 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",
-                      }
+  'contenu' => "#{fetch :public_path}/tl_files/durable/contenu",
+}
+
+# Here you can define which files/folder you would like to keep, these files
+# and folders are not considered contents so they will not be synced from one
+# server to another with the tasks mulltistage:sync:* instead they will be kept
+# between versions in the shared/items folder
+set :shared_items, [
+  'public/.htaccess',
+  'public/sitemap.xml',
+  'public/robots.txt',
+]
 
 #
 #

data/examples/php_fpm/deploy/production.rb

@@ -64,8 +64,18 @@ set :rvm_ruby_string, "1.9.3"
 # 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",
-                      }
+  'contenu' => "#{fetch :public_path}/tl_files/durable/contenu",
+}
+
+# Here you can define which files/folder you would like to keep, these files
+# and folders are not considered contents so they will not be synced from one
+# server to another with the tasks mulltistage:sync:* instead they will be kept
+# between versions in the shared/items folder
+set :shared_items, [
+  'public/.htaccess',
+  'public/sitemap.xml',
+  'public/robots.txt',
+]
 
 #
 #

data/examples/php_fpm/deploy/staging.rb

@@ -64,8 +64,18 @@ set :rvm_ruby_string, "1.9.3"
 # 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",
-                      }
+  'contenu' => "#{fetch :public_path}/tl_files/durable/contenu",
+}
+
+# Here you can define which files/folder you would like to keep, these files
+# and folders are not considered contents so they will not be synced from one
+# server to another with the tasks mulltistage:sync:* instead they will be kept
+# between versions in the shared/items folder
+set :shared_items, [
+  'public/.htaccess',
+  'public/sitemap.xml',
+  'public/robots.txt',
+]
 
 #
 #

data/examples/rails_passenger/deploy/development.rb

@@ -64,10 +64,19 @@ set :rvm_ruby_string, "1.9.3"
 # 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",
-#                       }
-
+#   'image' => "#{fetch :public_path}/images",
+#   'video' => "#{fetch :public_path}/videos",
+# }
+
+# Here you can define which files/folder you would like to keep, these files
+# and folders are not considered contents so they will not be synced from one
+# server to another with the tasks mulltistage:sync:* instead they will be kept
+# between versions in the shared/items folder
+# set :shared_items, [
+#   'public/.htaccess',
+#   'public/sitemap.xml',
+#   'public/robots.txt',
+# ]
 #
 #
 #############

data/examples/rails_passenger/deploy/production.rb

@@ -64,9 +64,19 @@ set :rvm_ruby_string, "1.9.3"
 # 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",
-#                       }
+#   'image' => "#{fetch :public_path}/images",
+#   'video' => "#{fetch :public_path}/videos",
+# }
+
+# Here you can define which files/folder you would like to keep, these files
+# and folders are not considered contents so they will not be synced from one
+# server to another with the tasks mulltistage:sync:* instead they will be kept
+# between versions in the shared/items folder
+# set :shared_items, [
+#   'public/.htaccess',
+#   'public/sitemap.xml',
+#   'public/robots.txt',
+# ]
 
 #
 #

data/examples/rails_passenger/deploy/staging.rb

@@ -64,9 +64,19 @@ set :rvm_ruby_string, "1.9.3"
 # 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",
-#                       }
+#   'image' => "#{fetch :public_path}/images",
+#   'video' => "#{fetch :public_path}/videos",
+# }
+
+# Here you can define which files/folder you would like to keep, these files
+# and folders are not considered contents so they will not be synced from one
+# server to another with the tasks mulltistage:sync:* instead they will be kept
+# between versions in the shared/items folder
+# set :shared_items, [
+#   'public/.htaccess',
+#   'public/sitemap.xml',
+#   'public/robots.txt',
+# ]
 
 #
 #

data/examples/rails_reverse_proxy/deploy/development.rb

@@ -64,9 +64,19 @@ set :rvm_ruby_string, "1.9.3"
 # 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",
-#                       }
+#   'image' => "#{fetch :public_path}/images",
+#   'video' => "#{fetch :public_path}/videos",
+# }
+
+# Here you can define which files/folder you would like to keep, these files
+# and folders are not considered contents so they will not be synced from one
+# server to another with the tasks mulltistage:sync:* instead they will be kept
+# between versions in the shared/items folder
+# set :shared_items, [
+#   'public/.htaccess',
+#   'public/sitemap.xml',
+#   'public/robots.txt',
+# ]
 
 #
 #

data/examples/rails_reverse_proxy/deploy/production.rb

@@ -64,9 +64,19 @@ set :rvm_ruby_string, "1.9.3"
 # 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",
-#                       }
+#   'image' => "#{fetch :public_path}/images",
+#   'video' => "#{fetch :public_path}/videos",
+# }
+
+# Here you can define which files/folder you would like to keep, these files
+# and folders are not considered contents so they will not be synced from one
+# server to another with the tasks mulltistage:sync:* instead they will be kept
+# between versions in the shared/items folder
+# set :shared_items, [
+#   'public/.htaccess',
+#   'public/sitemap.xml',
+#   'public/robots.txt',
+# ]
 
 #
 #

data/examples/rails_reverse_proxy/deploy/staging.rb

@@ -64,9 +64,19 @@ set :rvm_ruby_string, "1.9.3"
 # 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",
-#                       }
+#   'image' => "#{fetch :public_path}/images",
+#   'video' => "#{fetch :public_path}/videos",
+# }
+
+# Here you can define which files/folder you would like to keep, these files
+# and folders are not considered contents so they will not be synced from one
+# server to another with the tasks mulltistage:sync:* instead they will be kept
+# between versions in the shared/items folder
+# set :shared_items, [
+#   'public/.htaccess',
+#   'public/sitemap.xml',
+#   'public/robots.txt',
+# ]
 
 #
 #

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

@@ -64,21 +64,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
 
-    desc "[internal] Setup .htaccess"
-    task :setup_htaccess do
-      unless remote_file_exists?("#{fetch :shared_path}/config/htaccess.txt")
-        begin
-          run <<-CMD
-            #{try_sudo} cp #{fetch :latest_release}/public/.htaccess.default #{fetch :shared_path}/config/htaccess.txt
-          CMD
-        rescue Capistrano::CommandError
-          run <<-CMD
-            #{try_sudo} touch #{fetch :shared_path}/config/htaccess.txt
-          CMD
-        end
-      end
-    end
-
     desc "[internal] Fix contao's symlinks to the shared path"
     task :fix_links, :roles => :app, :except => { :no_release => true } do
       latest_release = fetch :latest_release
@@ -87,13 +72,11 @@ Capistrano::Configuration.instance(:must_exist).load do
       # Remove files
       run <<-CMD
         #{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
+        #{try_sudo} rm -f #{latest_release}/public/system/config/localconfig.php
       CMD
 
       # Create symlinks
       run <<-CMD
-        #{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
       CMD
@@ -104,7 +87,6 @@ Capistrano::Configuration.instance(:must_exist).load do
   after "deploy:setup", "contao:setup"
   after "contao:setup", "contao:setup_localconfig"
   after "deploy:finalize_update", "contao:fix_links"
-  before "contao:fix_links", "contao:setup_htaccess"
 
   # Mysql Credentials
   before "contao:setup_localconfig", "mysql:credentials"

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

@@ -38,7 +38,8 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       run <<-CMD
         mkdir -p #{fetch :deploy_to} &&
-        mkdir -p #{backup_path}
+        mkdir -p #{backup_path} &&
+        mkdir -p #{fetch :shared_path}/items
       CMD
 
       if exists? :logs_path
@@ -72,6 +73,39 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       puts "The public folders has been moved to the old folder"
     end
+
+    desc "Shared items"
+    task :shared_items, :roles => :app, :except => { :no_release => true } do
+      if exists?(:shared_items)
+        shared_items = fetch :shared_items
+        shared_path = fetch :shared_path
+        latest_release = fetch :latest_release
+
+        shared_items.each do |f|
+          file_name = f.gsub(/\//, '_')
+          unless remote_file_exists?("#{shared_path}/items/#{file_name}")
+            begin
+              run <<-CMD
+                #{try_sudo} cp #{latest_release}/#{f} #{shared_path}/items/#{file_name}
+              CMD
+            rescue Capistrano::CommandError
+              run <<-CMD
+                #{try_sudo} touch #{shared_path}/items/#{file_name}
+              CMD
+              puts "WARNING: You should edit #{shared_path}/items/#{file_name}"
+            end
+          end
+
+          begin
+            run <<-CMD
+              #{try_sudo} ln -nsf #{shared_path}/items/#{file_name} #{latest_release}/#{f}
+            CMD
+          rescue Capistrano::CommandError
+            abort "Unable to create a link for '#{shared_path}/items/#{file_name}' at '#{latest_release}/#{f}'"
+          end
+        end
+      end
+    end
   end
 
   # Dependencies
@@ -79,4 +113,5 @@ Capistrano::Configuration.instance(:must_exist).load do
   after "deploy:restart", "deploy:fix_permissions"
   after "deploy:setup", "deploy:folders"
   after "deploy:setup", "deploy:symlink_public_folders"
+  after "deploy:finalize_update", "deploy:shared_items"
 end

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

@@ -61,9 +61,19 @@ set :rvm_ruby_string, "1.9.3"
 # 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",
-#                       }
+#   'image' => "#{fetch :public_path}/images",
+#   'video' => "#{fetch :public_path}/videos",
+# }
+
+# Here you can define which files/folder you would like to keep, these files
+# and folders are not considered contents so they will not be synced from one
+# server to another with the tasks mulltistage:sync:* instead they will be kept
+# between versions in the shared/items folder
+# set :shared_items, [
+#   'public/.htaccess',
+#   'public/sitemap.xml',
+#   'public/robots.txt',
+# ]
 
 #
 #

data/lib/capistrano-exts/version.rb

@@ -2,7 +2,7 @@ module Capistrano
   module Extensions
     module Version #:nodoc:
       MAJOR = 1
-      MINOR = 9
+      MINOR = 10
       TINY = 0
 
       ARRAY  = [MAJOR, MINOR, TINY]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exts
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000 Z
+date: 2011-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2151803400 !ruby/object:Gem::Requirement
+  requirement: &2153165220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151803400
+  version_requirements: *2153165220
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2151801460 !ruby/object:Gem::Requirement
+  requirement: &2153164720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151801460
+  version_requirements: *2153164720
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2151799900 !ruby/object:Gem::Requirement
+  requirement: &2153164260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151799900
+  version_requirements: *2153164260
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2151798720 !ruby/object:Gem::Requirement
+  requirement: &2153163800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2151798720
+  version_requirements: *2153163800
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2153407400 !ruby/object:Gem::Requirement
+  requirement: &2153163340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2153407400
+  version_requirements: *2153163340
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2153406580 !ruby/object:Gem::Requirement
+  requirement: &2153162880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2153406580
+  version_requirements: *2153162880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153405280 !ruby/object:Gem::Requirement
+  requirement: &2153162420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153405280
+  version_requirements: *2153162420
 description: ! 'Capistrano exts is a set of helper tasks to help with the initial
   server