capistrano-exts 1.10.2 → 1.11.0

data/README.md

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

data/examples/php_fpm/deploy/development.rb

@@ -77,6 +77,14 @@ set :shared_items, [
   'public/robots.txt',
 ]
 
+# Here you can define where are the configurations files located, these files
+# 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/config folder
+# set :configuration_files, [
+#   'public/system/config/localconfig.php',
+# ]
+
 #
 #
 #############

data/examples/php_fpm/deploy/production.rb

@@ -77,6 +77,14 @@ set :shared_items, [
   'public/robots.txt',
 ]
 
+# Here you can define where are the configurations files located, these files
+# 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/config folder
+# set :configuration_files, [
+#   'public/system/config/localconfig.php',
+# ]
+
 #
 #
 #############

data/examples/php_fpm/deploy/staging.rb

@@ -77,6 +77,14 @@ set :shared_items, [
   'public/robots.txt',
 ]
 
+# Here you can define where are the configurations files located, these files
+# 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/config folder
+# set :configuration_files, [
+#   'public/system/config/localconfig.php',
+# ]
+
 #
 #
 #############

data/examples/rails_passenger/deploy/development.rb

@@ -78,8 +78,13 @@ set :rvm_ruby_string, "1.9.3"
 #   'public/robots.txt',
 # ]
 
-# Link config files
-set :configuration_files, ['database.yml']
+# Here you can define where are the configurations files located, these files
+# 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/config folder
+set :configuration_files, [
+  'config/database.yml',
+]
 
 #
 #

data/examples/rails_passenger/deploy/production.rb

@@ -78,8 +78,13 @@ set :rvm_ruby_string, "1.9.3"
 #   'public/robots.txt',
 # ]
 
-# Link config files
-set :configuration_files, ['database.yml']
+# Here you can define where are the configurations files located, these files
+# 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/config folder
+set :configuration_files, [
+  'config/database.yml',
+]
 
 #
 #

data/examples/rails_passenger/deploy/staging.rb

@@ -78,8 +78,13 @@ set :rvm_ruby_string, "1.9.3"
 #   'public/robots.txt',
 # ]
 
-# Link config files
-set :configuration_files, ['database.yml']
+# Here you can define where are the configurations files located, these files
+# 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/config folder
+set :configuration_files, [
+  'config/database.yml',
+]
 
 #
 #

data/examples/rails_reverse_proxy/deploy/development.rb

@@ -78,8 +78,13 @@ set :rvm_ruby_string, "1.9.3"
 #   'public/robots.txt',
 # ]
 
-# Link config files
-set :configuration_files, ['database.yml']
+# Here you can define where are the configurations files located, these files
+# 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/config folder
+set :configuration_files, [
+  'config/database.yml',
+]
 
 #
 #

data/examples/rails_reverse_proxy/deploy/production.rb

@@ -78,8 +78,13 @@ set :rvm_ruby_string, "1.9.3"
 #   'public/robots.txt',
 # ]
 
-# Link config files
-set :configuration_files, ['database.yml']
+# Here you can define where are the configurations files located, these files
+# 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/config folder
+set :configuration_files, [
+  'config/database.yml',
+]
 
 #
 #

data/examples/rails_reverse_proxy/deploy/staging.rb

@@ -78,8 +78,13 @@ set :rvm_ruby_string, "1.9.3"
 #   'public/robots.txt',
 # ]
 
-# Link config files
-set :configuration_files, ['database.yml']
+# Here you can define where are the configurations files located, these files
+# 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/config folder
+set :configuration_files, [
+  'config/database.yml',
+]
 
 #
 #

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

@@ -38,8 +38,9 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "[internal] Setup contao's localconfig"
     task :setup_localconfig, :roles => :app, :except => { :no_release => true } do
-      unless remote_file_exists?("#{fetch :shared_path}/config/localconfig.php")
-        on_rollback { run "rm -f #{shared_path}/config/localconfig.php" }
+      localconfig_php_config_path = "#{fetch :shared_path}/config/system_config_localconfig.php"
+      unless remote_file_exists?(localconfig_php_config_path)
+        on_rollback { run "rm -f #{localconfig_php_config_path}" }
 
         localconfig = File.read("public/system/config/localconfig.php.sample")
         mysql_credentials = fetch :mysql_credentials
@@ -58,9 +59,9 @@ Capistrano::Configuration.instance(:must_exist).load do
           localconfig.gsub!(/#DB_NAME#/, mysql_db_name)
         end
 
-        put localconfig, "#{fetch :shared_path}/config/localconfig.php"
+        put localconfig, localconfig_php_config_path
       else
-        puts "WARNING: The file '#{fetch :shared_path}/config/localconfig.php' already exists, not overwriting."
+        puts "WARNING: The file '#{localconfig_php_config_path}' already exists, not overwriting."
       end
     end
 
@@ -71,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 -rf #{latest_release}/public/system/logs
       CMD
 
       # Create symlinks
       run <<-CMD
-        #{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
     end

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

@@ -41,7 +41,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       CMD
     end
 
-    desc "[internal] Fix contao's symlinks to the shared path"
+    desc "[internal] Fix symlinks of the contents folders to the shared path"
     task :fix_links, :roles => :app, :except => { :no_release => true } do
       contents_folder = fetch :contents_folder
       current_path = fetch :current_path

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

@@ -1,6 +1,7 @@
 require 'capistrano'
 require 'capistrano/errors'
 require 'capistrano-exts/receipts/functions'
+require 'capistrano-exts/receipts/files'
 
 # Verify that Capistrano is version 2
 unless Capistrano::Configuration.respond_to?(:instance)
@@ -73,39 +74,6 @@ 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
@@ -113,5 +81,4 @@ 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/receipts/files.rb

@@ -0,0 +1,30 @@
+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 :files do
+    desc "[internal] Shared items"
+    task :shared_items, :roles => :app, :except => { :no_release => true } do
+      if exists?(:shared_items)
+        link_files "#{fetch :shared_path}/items", fetch(:shared_items)
+      end
+    end
+
+    desc "[internal] Configuration files"
+    task :config_files, :roles => :app, :except => { :no_release => true } do
+      if exists?(:configuration_files)
+        link_files "#{fetch :shared_path}/config", fetch(:configuration_files)
+      end
+    end
+  end
+
+  # Dependencies
+  after "deploy:finalize_update", "files:shared_items"
+  after "deploy:finalize_update", "files:config_files"
+end

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

@@ -15,14 +15,35 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
 
   def link_file(source_file, destination_file)
+    p source_file
+    p destination_file
     if remote_file_exists?(source_file)
-      run "#{try_sudo} ln -nsf #{source_file} #{destination_file}"
+      begin
+        run "#{try_sudo} ln -nsf #{source_file} #{destination_file}"
+      rescue Capistrano::CommandError
+        abort "Unable to create a link for '#{source_file}' at '#{destination_file}'"
+      end
     end
   end
 
-  def link_config_file(config_file, config_path = nil)
-    config_path ||= "#{File.join release_path, 'config'}"
-    link_file("#{File.join shared_path, 'config', config_file}", "#{File.join config_path, config_file}")
+  def link_files(path, files = {})
+    files.each do |f|
+      file_name = f.dup.gsub(/\//, '_')
+      unless remote_file_exists?("#{path}/#{file_name}")
+        begin
+          run <<-CMD
+            #{try_sudo} cp -a #{latest_release}/#{f} #{path}/#{file_name}
+          CMD
+        rescue Capistrano::CommandError
+          run <<-CMD
+            #{try_sudo} touch #{path}/#{file_name}
+          CMD
+          puts "WARNING: You should edit '#{path}/#{file_name}' or re-create it as a folder if that's your intention."
+        end
+      end
+
+      link_file File.join(path, file_name), File.join(fetch(:latest_release), f)
+    end
   end
 
   def gen_pass( len = 8 )

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

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

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

@@ -75,8 +75,13 @@ set :rvm_ruby_string, "1.9.3"
 #   'public/robots.txt',
 # ]
 
-# Link config files
-# set :configuration_files, ['database.yml']
+# Here you can define where are the configurations files located, these files
+# 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/config folder
+# set :configuration_files, [
+#   'config/database.yml',
+# ]
 
 #
 #

data/lib/capistrano-exts/version.rb

@@ -2,8 +2,8 @@ module Capistrano
   module Extensions
     module Version #:nodoc:
       MAJOR = 1
-      MINOR = 10
-      TINY = 2
+      MINOR = 11
+      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.10.2
+  version: 1.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2153266900 !ruby/object:Gem::Requirement
+  requirement: &2161861100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153266900
+  version_requirements: *2161861100
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153265780 !ruby/object:Gem::Requirement
+  requirement: &2161860560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153265780
+  version_requirements: *2161860560
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153264640 !ruby/object:Gem::Requirement
+  requirement: &2161860100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153264640
+  version_requirements: *2161860100
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2153249860 !ruby/object:Gem::Requirement
+  requirement: &2161859640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2153249860
+  version_requirements: *2161859640
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2153247580 !ruby/object:Gem::Requirement
+  requirement: &2161859140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2153247580
+  version_requirements: *2161859140
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2153246300 !ruby/object:Gem::Requirement
+  requirement: &2161858660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2153246300
+  version_requirements: *2161858660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153245320 !ruby/object:Gem::Requirement
+  requirement: &2161857180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153245320
+  version_requirements: *2161857180
 description: ! 'Capistrano exts is a set of helper tasks to help with the initial
   server
 
@@ -138,6 +138,7 @@ files:
 - lib/capistrano-exts/receipts/contao.rb
 - lib/capistrano-exts/receipts/contents.rb
 - lib/capistrano-exts/receipts/deploy.rb
+- lib/capistrano-exts/receipts/files.rb
 - lib/capistrano-exts/receipts/functions.rb
 - lib/capistrano-exts/receipts/git.rb
 - lib/capistrano-exts/receipts/god.rb