capistrano-psw 1.0.0.pre37 → 1.0.0.pre38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faeed6aa6953cfd8e283a5c2a446b5329f992274
-  data.tar.gz: 1e302fd93ba0a9a7596d33f9f3677c57bf68a16f
+  metadata.gz: 97ed93489efaaaa150e01f7f4cf0e6640fe98c48
+  data.tar.gz: bb22c0367f1ed2b9c654f6decfca88d6f66f5044
 SHA512:
-  metadata.gz: 894eb4b01112fbaaef6c185801f8ce684306af7e58b51e82db54146b6ab27d41b54392db16c44162c48fe3c91baffc2d27fb14dc8b19a73b950466dc4e7129d3
-  data.tar.gz: 386448357886b992ad160169bb46cd4947107aab7b1e52f735f99bb961d53f0227c67caf530d83f9961e2efc9677ed8edce3214ccad05601da349dd436ffb561
+  metadata.gz: d74fff8e564f71a1ecfaa1b7eedbb3c8d77bc92af5e1cc4e67caf6b1d6bb23d7983e804b634d4aff79c0d2f86ec8280d507818b0ebd254a5e71c2ada60c42523
+  data.tar.gz: e6ce5d9bda42f8857bca156d494352d3aae80398180c882db7c6c71b1156333987197b8255a2b2e8688aef1f40478313122c2371cf48be5fab6357b177aa6015

data/lib/capistrano/psw/peppr_app_deploy_file_utils.rb

@@ -17,6 +17,14 @@ module PepprAppDeployFileUtils
   PEPPR_RELATIVE_ENVIRONMENTS_DIR = "/environments"
   PEPPR_RELATIVE_SHARED_FILE_DIR = "/shared_files"
   PEPPR_RELATIVE_ARTIFACTS_DIR = "/artifacts"
+
+  def self.peppr_deployment?
+    application_id = ENV['peppr_application_id'].to_i
+    application_deployment = ENV['peppr_application_deployment_id'].to_i
+    return true if application_id > 0 && application_deployment > 0
+    
+    false
+  end
     
   module Local
     # Method for verifying that Peppr's application deployment file structure exists on the

data/lib/capistrano/psw/version.rb

@@ -10,6 +10,6 @@
 
 module Capistrano
   module Psw
-    VERSION = "1.0.0.pre37"
+    VERSION = "1.0.0.pre38"
   end
 end

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

@@ -177,51 +177,55 @@ namespace :psw_peppr_app_deploy do
 
   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}"
+    #only try to symlink files if we are executing Capistrano from a peppr deployment
+    if PepprAppDeployFileUtils::peppr_deployment?
+      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
-      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       
+        #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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-psw
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre37
+  version: 1.0.0.pre38
 platform: ruby
 authors:
 - Lexmark International Technology S.A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler