capistrano-psw 1.0.0.pre35 → 1.0.0.pre36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9f60cb544de44bea7b4729226b3e02d4bf4af28
-  data.tar.gz: 5ad8ff5e9c74abd4d4407edc62604bc2841e72eb
+  metadata.gz: adb04c574096e7f4584e52646f1534ef82a6c9f0
+  data.tar.gz: 163ed475c4a1b70c7b7239f170df7dfe8976419b
 SHA512:
-  metadata.gz: 59ce3e6ea10f45feda0d1084eb37ef101ffb8540a048d885f86bceb746679fab754a3437ecb2f3c27e07bddb5bba37c6e6eff3198f0272d7a4d1257a4709a2da
-  data.tar.gz: 7c3b3ed6c541aba84d311e299e192481a9528b6d723889f7f8fba3acdf2d0cce57a71cb932a90fa4f3f31f9e88df9e6e7a259384fb3389ca6a3528947ebd406c
+  metadata.gz: 0b2f0c33c767c8af621d41890c5ed32f2a60f59520c93fe9a01b511f80ed5b4f2fd785701c0af008926545498e3c826bfa674cadccde4919f84c5a0d281ccab6
+  data.tar.gz: 734bb3836063de1377595c49b17927902b5ea985190bacad23fcf9660f2967600afd24df40f7ab9644655f5bc577f20909eaf5af8db6274cf97372a0e05859fa

data/lib/capistrano/psw/version.rb

@@ -10,6 +10,6 @@
 
 module Capistrano
   module Psw
-    VERSION = "1.0.0.pre35"
+    VERSION = "1.0.0.pre36"
   end
 end

data/resources/lib/capistrano/tasks/psw-peppr-app-deploy.cap

@@ -46,6 +46,7 @@
 # Copyright:: 2013 Lexmark International Technology S.A.  All rights reserved.
 # License::   3-Clause BSD
 require 'capistrano/psw/peppr_app_deploy_file_utils'
+require 'capistrano/dsl'
 
 namespace :psw_peppr_app_deploy do
 
@@ -121,49 +122,6 @@ namespace :psw_peppr_app_deploy do
 
       info "Uploading #{local_shared_files_path} (local) to #{remote_shared_files_path} on remote server #{host}..."
       PepprAppDeployFileUtils::upload_compressed_local_dir(local_shared_files_path, remote_shared_files_path)
-
-      #this will only list the top-level folders and files, nested will show as a result of the link
-      if File.directory?(local_shared_files_path)
-        Dir.foreach(local_shared_files_path) do |file|
-          next if file == '.' || file == '..' || file == '.absolute_paths'
-          
-          if File.directory?(file)
-            new_file_path = File.join(shared_path, file)
-            debug "Deleting existing environment file:  #{new_file_path}"
-            sudo :rm, '-rf', new_file_path
-
-            debug "Creating a symlink for environment folder #{remote_shared_files_path}/#{file}..."
-            sudo :ln, '-sf', "#{remote_shared_files_path}/#{file}", "#{shared_path}"
-          else
-            new_file_path = File.join(shared_path, file)
-            debug "Deleting existing environment file:  #{new_file_path}"
-            sudo :rm, '-rf', new_file_path
-
-            debug "Creating a symlink for environment file #{remote_shared_files_path}/#{file}..."
-            sudo :ln, '-sf', "#{remote_shared_files_path}/#{file}", "#{shared_path}/#{file}"
-          end
-        end
-      end
-
-      #absolute directories and files need to explicitly link files (can't just link to remote file folder)
-      if File.directory?("#{local_shared_files_path}/.absolute_paths")
-        files = Find.find(local_shared_files_path)
-        absolute_path_files, shared_files = files.partition { |f| f.start_with? "#{local_shared_files_path}/.absolute_paths" }
-
-        absolute_path_files.each do |file|
-          relative_path = file.gsub("#{local_shared_files_path}/.absolute_paths", '')
-          filename = Pathname.new(relative_path).basename
-
-          if File.directory?(file) && relative_path.strip != ''
-            #we need to create the directories because symlinks don't created nested folders
-            execute :mkdir, '-p', relative_path 
-          elsif relative_path.gsub(/\s+/, '') != '' and relative_path != '.' and relative_path != '..'
-            original_location = File.join(remote_shared_files_path, ".absolute_paths", relative_path)
-            debug "Creating a symlink from environment file #{original_location} to #{relative_path}..."
-            sudo :ln, '-sf', original_location, relative_path
-          end       
-        end
-      end
     end
   end
 
@@ -215,4 +173,61 @@ namespace :psw_peppr_app_deploy do
   desc "Optional steps to execute a Peppr deployment after a Capistrano deploy has finished"
   task post_deploy_steps: [:'link_artifacts'] do
   end
+
+  desc "Create symlinks for the current deployment environment files"
+  task :symlink_env_files do
+    on roles(:app) do |host|
+      info "Creating symlinks for environment files..."
+      local_shared_files_path = PepprAppDeployFileUtils::Local::get_deployment_shared_files_dir
+      remote_shared_files_path = PepprAppDeployFileUtils::Remote::get_deployment_shared_files_dir
+
+      #this will only list the top-level folders and files, nested will show as a result of the link
+      if File.directory?(local_shared_files_path)
+        Dir.foreach(local_shared_files_path) do |file|
+          next if file == '.' || file == '..' || file == '.absolute_paths'
+          
+          if File.directory?(file)
+            new_file_path = File.join(shared_path, file)
+            debug "Deleting existing environment file:  #{new_file_path}"
+            sudo :rm, '-rf', new_file_path
+
+            debug "Creating a symlink for environment folder #{remote_shared_files_path}/#{file}..."
+            sudo :ln, '-sf', "#{remote_shared_files_path}/#{file}", "#{shared_path}"
+          else
+            new_file_path = File.join(shared_path, file)
+            debug "Deleting existing environment file:  #{new_file_path}"
+            sudo :rm, '-rf', new_file_path
+
+            debug "Creating a symlink for environment file #{remote_shared_files_path}/#{file}..."
+            sudo :ln, '-sf', "#{remote_shared_files_path}/#{file}", "#{shared_path}/#{file}"
+          end
+        end
+      end
+
+      #absolute directories and files need to explicitly link files (can't just link to remote file folder)
+      if File.directory?("#{local_shared_files_path}/.absolute_paths")
+        files = Find.find(local_shared_files_path)
+        absolute_path_files, shared_files = files.partition { |f| f.start_with? "#{local_shared_files_path}/.absolute_paths" }
+
+        absolute_path_files.each do |file|
+          relative_path = file.gsub("#{local_shared_files_path}/.absolute_paths", '')
+          filename = Pathname.new(relative_path).basename
+
+          if File.directory?(file) && relative_path.strip != ''
+            #we need to create the directories because symlinks don't created nested folders
+            execute :mkdir, '-p', relative_path 
+          elsif relative_path.gsub(/\s+/, '') != '' and relative_path != '.' and relative_path != '..'
+            original_location = File.join(remote_shared_files_path, ".absolute_paths", relative_path)
+            debug "Creating a symlink from environment file #{original_location} to #{relative_path}..."
+            sudo :ln, '-sf', original_location, relative_path
+          end       
+        end
+      end
+    end
+  end
+  #Need to create symlinks after the Capistrano directory structure exists, but before the Capistrano shared
+  #symlinks are created
+  #(https://github.com/capistrano/capistrano/blob/6353a02ed63dfe7f16921650e3b6e6d6317f0711/lib/capistrano/tasks/deploy.rake)
+  after 'deploy:check:directories', 'psw_peppr_app_deploy:symlink_env_files'
+
 end

data/spec/psw-peppr-app-deploy_spec.rb

@@ -2,6 +2,15 @@ require "rake"
 require File.expand_path('../spec_helper.rb', __FILE__)
 
 
+namespace :check do
+  desc 'Check shared and release directories exist'
+  task :directories do
+    on release_roles :all do
+      execute :mkdir, '-pv', shared_path, releases_path
+    end
+  end
+end
+
 describe "psw_peppr_app_deploy:" do
   describe "create_deployment_directories" do
     let(:rake)      { Rake::Application.new }
@@ -9,6 +18,8 @@ describe "psw_peppr_app_deploy:" do
     
     before do
       Rake.application = rake
+      Rake::Task.define_task('deploy:check:directories')
+
       Rake.application.add_import("./resources/lib/capistrano/tasks/psw-peppr-app-deploy.cap")
       Rake.application.load_imports()   
     end
@@ -24,6 +35,7 @@ describe "psw_peppr_app_deploy:" do
     
     before do
       Rake.application = rake
+      Rake::Task.define_task('deploy:check:directories')
       Rake.application.add_import("./resources/lib/capistrano/tasks/psw-peppr-app-deploy.cap")
       Rake.application.load_imports()   
     end
@@ -39,6 +51,7 @@ describe "psw_peppr_app_deploy:" do
     
     before do
       Rake.application = rake
+      Rake::Task.define_task('deploy:check:directories')
       Rake.application.add_import("./resources/lib/capistrano/tasks/psw-peppr-app-deploy.cap")
       Rake.application.load_imports()   
     end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+
+
 class Object
   def fetch(key, default=nil)
     @env_vars = Hash.new unless @env_vars != nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-psw
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre35
+  version: 1.0.0.pre36
 platform: ruby
 authors:
 - Lexmark International Technology S.A