edploy 2.0.0 → 2.0.1

data/edploy.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "edploy"
-  s.version     = "2.0.0"
+  s.version     = "2.0.1"
   s.authors     = ["Ewout Vonk"]
   s.email       = ["dev@ewout.to"]
   s.homepage    = "https://github.com/ewoutvonk/edploy"

data/templates/config/edploy/scripts/after_deploy_update_code/make_symlinks.erb

@@ -10,19 +10,20 @@ sudo_mkdir_p = []
 mkdir_p = []
 sudo_chown = []
 rm_rf = []
+sudo_cp_a = {}
 cp_a = {}
 sudo_ln_nfs = {}
 ln_nfs = {}
 commands = []
 
-SYMLINK_DURING_DEPLOY.each do |source_template, target_template|
-  is_dir_symlink = source_template.end_with?('/')
+(COPY_DURING_DEPLOY || {}).each do |source_template, target_template|
+  source_is_dir = source_template.end_with?('/')
   source = source_template.gsub(/:[^\/]+/) { |s| Kernel.const_get(s[1..-1].upcase.to_sym) }.gsub(/\/$/, '')
   target = target_template.gsub(/:[^\/]+/) { |s| Kernel.const_get(s[1..-1].upcase.to_sym) }
   
   target_is_inside_project = target.start_with?(DEPLOY_TO)
   source_is_inside_project = source.start_with?(DEPLOY_TO)
-  if is_dir_symlink
+  if source_is_dir
 		unless File.exists?(source)
 			if source_is_inside_project
 				mkdir_p << source
@@ -31,15 +32,40 @@ SYMLINK_DURING_DEPLOY.each do |source_template, target_template|
 			end
 			sudo_chown << source
 		end
-		rm_rf << target if File.exists?(target) && !File.symlink?(target) && is_inside_project
+		rm_rf << target if File.exists?(target) && target_is_inside_project
   end
 	if target_is_inside_project
-		ln_nfs[source] = target
+		cp_a[source] = target
 	else
-		sudo_ln_nfs[source] = target
+		sudo_cp_a[source] = target
 	end
 end
 
+(SYMLINK_DURING_DEPLOY || {}).each do |source_template, target_template|
+  is_dir_symlink = source_template.end_with?('/')
+  source = source_template.gsub(/:[^\/]+/) { |s| Kernel.const_get(s[1..-1].upcase.to_sym) }.gsub(/\/$/, '')
+  target = target_template.gsub(/:[^\/]+/) { |s| Kernel.const_get(s[1..-1].upcase.to_sym) }
+  
+  target_is_inside_project = target.start_with?(DEPLOY_TO)
+  source_is_inside_project = source.start_with?(DEPLOY_TO)
+  if is_dir_symlink
+    unless File.exists?(source)
+      if source_is_inside_project
+        mkdir_p << source
+      else
+        sudo_mkdir_p << source
+      end
+      sudo_chown << source
+    end
+    rm_rf << target if File.exists?(target) && !File.symlink?(target) && target_is_inside_project
+  end
+  if target_is_inside_project
+    ln_nfs[source] = target
+  else
+    sudo_ln_nfs[source] = target
+  end
+end
+
 stage_host_files_dir = File.join(PROJECT_PATH, 'config', 'edploy', 'copy', 'project_files', STAGE, MY_HOSTNAME)
 stage_role_files_dir = File.join(PROJECT_PATH, 'config', 'edploy', 'copy', 'project_files', STAGE, MY_HOSTNAME_WITHOUT_INDEX)
 stage_files_dir = File.join(PROJECT_PATH, 'config', 'edploy', 'copy', 'project_files', STAGE)
@@ -63,6 +89,7 @@ commands << "sudo mkdir -p #{sudo_mkdir_p.uniq.join(' ')}" unless sudo_mkdir_p.e
 commands << "mkdir -p #{mkdir_p.uniq.join(' ')}" unless mkdir_p.empty?
 commands << "sudo chown #{DEPLOY_USER}:#{DEPLOY_GROUP} #{sudo_chown.uniq.join(' ')}" unless sudo_chown.empty?
 commands << "rm -rf #{rm_rf.uniq.join(' ')}" unless rm_rf.empty?
+commands += sudo_cp_a.map { |source, target| "sudo cp -a #{source} #{target}" }
 commands += cp_a.map { |source, target| "cp -a #{source} #{target}" }
 commands += sudo_ln_nfs.map { |source, target| "sudo ln -nfs #{source} #{target}" }
 commands += ln_nfs.map { |source, target| "ln -nfs #{source} #{target}" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edploy
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000Z
+date: 2012-02-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70279503919100 !ruby/object:Gem::Requirement
+  requirement: &70243797042740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70279503919100
+  version_requirements: *70243797042740
 description: A gem which allows for fast, easy and efficient deploys with capistrano
 email:
 - dev@ewout.to