capistrano-psw 1.0.0.pre33 → 1.0.0.pre34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a6bb05a51b8f52e1d0794467c9f899642d06359
-  data.tar.gz: 3ef12e185ea7a4dca4a15e4a7d472c8e6c37154b
+  metadata.gz: c6b61dbaec2f8f0cac76941f3095074c3404a71e
+  data.tar.gz: 66e72333aea714660f5981c32d3067fd35d3c8a4
 SHA512:
-  metadata.gz: d0deda336d97eb31dc1020954c9b464a5a3d16bc69059a55089c5b419efff15d9fe55f4d894f9ed64404b62c33518b5c326586dbfbd32b190fb261800e6b0b37
-  data.tar.gz: 79a7d0e87ad864eaf211f70fa10ef6a5fc7682157346efb21d781d11f158b5479c30606f3014c5de52ee6b6bc8cbf0ffc7b2499e9c63f97fa755b99ac7bb2f9e
+  metadata.gz: ed260af184c0e90f492174ed77be814987b9e6f3100650bf01c192ee9ec6a7312c32b11cfeb97cc5ffd9266a351eede23ff6428be234a98610ef1533e70cf6e9
+  data.tar.gz: b7b6221258d8282f0e9a7187cdabb23f8acd8704098e812dee3557ce8079d38cfea0d3f1029c7eb6a51a138b61976b14f4187bc2b8da781129f632a91094a8df

data/lib/capistrano/psw/version.rb

@@ -10,6 +10,6 @@
 
 module Capistrano
   module Psw
-    VERSION = "1.0.0.pre33"
+    VERSION = "1.0.0.pre34"
   end
 end

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

@@ -76,55 +76,85 @@ namespace :psw_peppr_app_deploy do
     end
   end
 
+  desc 'Packer Gems locally so they can be pushed to the remote host'
+  task :pack_gems do
+    pack_gems = fetch(:psw_peppr_app_deploy_pack_gems)
+    puts "pack_gems:  #{pack_gems}"
+    if !pack_gems.nil? && pack_gems
+      on roles(:app) do |host|
+        info "Packing local Gems for deploy to host #{host}..."
+      end
+      
+      local_shared_files_path = PepprAppDeployFileUtils::Local::get_deployment_shared_files_dir
+      
+      Bundler.with_clean_env do
+        run_locally do     
+          cmd = "bundle install --gemfile Gemfile --path vendor/bundle --without development test --deployment --quiet"
+          info "Executing install command:  #{cmd}"
+          execute(cmd)
+          cmd = "bundle package --all"            
+          info "Executing bundle package command:  #{cmd}"
+          execute(cmd)
+
+          cmd = "mv vendor/ #{local_shared_files_path}"
+          info "Executing move command:  #{cmd}"
+          execute(cmd)
+
+          cmd = "mv Gemfile.lock #{local_shared_files_path}"
+          info "Executing move command:  #{cmd}"
+          execute(cmd)          
+        end
+      end
+    else
+      on roles(:app) do |host|
+        info "Peppr will not send local Gems to remote host #{host}"
+      end
+    end
+  end  
+
   desc 'Copy application enviroment files to remote machine'
   task :upload_environment_files do
-    on roles(:app) do |host|     
+    on roles(:app) do |host|
       info 'Preparing to upload environment files (if applicable)...'
       local_shared_files_path = PepprAppDeployFileUtils::Local::get_deployment_shared_files_dir
+      remote_shared_files_path = PepprAppDeployFileUtils::Remote::get_deployment_shared_files_dir
+
+      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)
+            debug "Creating a symlink for environment folder #{remote_shared_files_path}/#{file}..."
+            sudo :ln, '-sf', "#{remote_shared_files_path}/#{file}", "#{shared_path}"
+          else
+            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
 
-      if File.exist? local_shared_files_path
-        info "Uploading environment files from #{local_shared_files_path}..."
+      #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" }
 
-        if shared_files.nil?
-          info "Uploading #{shared_files.size} relative shared directory environment files..."
-        else
-          info "There are no relative shared directory environment files to upload."
-        end
-        shared_files.each do |file|
-          relative_path = file.gsub("#{local_shared_files_path}/", '')
-
-          debug "Inspecting: #{relative_path}"
-
-          if File.directory?(file) && relative_path.strip != ''
-            execute :mkdir, '-p', "#{shared_path}/#{relative_path}"
-          elsif relative_path.gsub(/\s+/, '') != '' and relative_path != '.' and relative_path != '..'
-            debug "Uploading environment file #{relative_path}..."
-            upload! file, "#{shared_path}/#{relative_path}"
-          end
-        end
-
-        if absolute_path_files.nil?
-          info "Uploading #{shared_files.size} absolute path environment files..."
-        else
-          info "There are no absolute path environment files to upload."
-        end
         absolute_path_files.each do |file|
           relative_path = file.gsub("#{local_shared_files_path}/.absolute_paths", '')
-
-          debug "Inspecting: #{relative_path}"
+          filename = Pathname.new(relative_path).basename
 
           if File.directory?(file) && relative_path.strip != ''
-            execute :mkdir, '-p', relative_path
+            #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 != '..'
-            debug "Uploading environment file #{relative_path}..."
-            upload! file, relative_path
-          end
+            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
-      else
-        info "The shared files path, #{local_shared_files_path} does not exist."
       end
     end
   end
@@ -161,7 +191,7 @@ namespace :psw_peppr_app_deploy do
   end
 
   desc "Deploy a Peppr application to the remote server(s)"
-  task default: [:'set_deploy_revision', :'create_deployment_directories', :'upload_app_source_repo', :'upload_environment_files', :'upload_artifacts', :'remove_existing_source_repo'] do 
+  task default: [:'set_deploy_revision', :'create_deployment_directories', :'upload_app_source_repo', :'pack_gems', :'upload_environment_files', :'upload_artifacts', :'remove_existing_source_repo'] do 
   end
 
   desc 'Task to create a symlink from the artifacts directory to the release directory'

metadata

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