capistrano-psw 1.0.0.pre34 → 1.0.0.pre35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6b61dbaec2f8f0cac76941f3095074c3404a71e
-  data.tar.gz: 66e72333aea714660f5981c32d3067fd35d3c8a4
+  metadata.gz: b9f60cb544de44bea7b4729226b3e02d4bf4af28
+  data.tar.gz: 5ad8ff5e9c74abd4d4407edc62604bc2841e72eb
 SHA512:
-  metadata.gz: ed260af184c0e90f492174ed77be814987b9e6f3100650bf01c192ee9ec6a7312c32b11cfeb97cc5ffd9266a351eede23ff6428be234a98610ef1533e70cf6e9
-  data.tar.gz: b7b6221258d8282f0e9a7187cdabb23f8acd8704098e812dee3557ce8079d38cfea0d3f1029c7eb6a51a138b61976b14f4187bc2b8da781129f632a91094a8df
+  metadata.gz: 59ce3e6ea10f45feda0d1084eb37ef101ffb8540a048d885f86bceb746679fab754a3437ecb2f3c27e07bddb5bba37c6e6eff3198f0272d7a4d1257a4709a2da
+  data.tar.gz: 7c3b3ed6c541aba84d311e299e192481a9528b6d723889f7f8fba3acdf2d0cce57a71cb932a90fa4f3f31f9e88df9e6e7a259384fb3389ca6a3528947ebd406c

data/README.md

@@ -296,17 +296,17 @@ before :'psw_apache2:deploy_ssl_certs', :set_apache2_options do
   set :psw_apache2_shared_cert_dir, ""
 end
 ```
-## Java EE-related Tasks
+## Java-related Tasks
 These tasks are needed to facilitate Java EE deployments.
 
 
-### psw_javaee:explode_war_file
+### psw_java:explode_war_file
 This task will explode a WAR file into a specified directory.  
 Parameters:
 *explode_directory [String] - The directory to which the exploded contents will be written
 *war_file_location [String] - The absolute path of the WAR file.
 
-### psw_javaee:deploy_ssl_certs
+### psw_java:deploy_ssl_certs
 This task will copy SSL certificates defined in the application's shared directory
 to /etc/ssl/certs and /etc/ssl/private.  a Java Keystore will be created for Tomcat's reference.
 The task takes the following parameters:
@@ -318,7 +318,7 @@ The task takes the following parameters:
 *[String] keystore_file - the file path of the keystore.
    The default value '/<Capistrano Shared Path>/tomcat/keystore.jks'
 
-### psw_javaee:configure_tomcat
+### psw_java:configure_tomcat
 This task task will override the Tomcat server definition.  This method allows consumers to 
 define an ERB template as well as pass in a ruby binding to populate it.
 The task takes the following parameters:

data/lib/capistrano/psw/version.rb

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

data/resources/lib/capistrano/tasks/{psw-javaee.cap → psw-java.cap}

@@ -1,4 +1,4 @@
-# == psw-javaee.cap
+# == psw-java.cap
 #
 # Contains the capistrano tasks needed to facilitate Java EE deployments.
 #
@@ -6,13 +6,13 @@
 #
 # == Tasks
 #
-# === psw_javaee:explode_war_file
+# === psw_java:explode_war_file
 # This task will explode a WAR file into a specified directory.  
 # Parameters:
 # *explode_directory [String] - The directory to which the exploded contents will be written
 # *war_file_location [String] - The absolute path of the WAR file.
 #
-# === psw_javaee:deploy_ssl_certs
+# === psw_java:deploy_ssl_certs
 # This task will copy SSL certificates defined in the application's shared directory
 # to /etc/ssl/certs and /etc/ssl/private.  a Java Keystore will be created for Tomcat's reference.
 # The task takes the following parameters:
@@ -25,7 +25,7 @@
 # @param [String] keystore_file - the file path of the keystore.
 #   The default value '/<Capistrano Shared Path>/tomcat/keystore.jks'
 #
-# === psw_javaee:configure_tomcat
+# === psw_java:configure_tomcat
 # This task task will override the Tomcat server definition.  This method allows consumers to 
 # define an ERB template as well as pass in a ruby binding to populate it.
 # The task takes the following parameters:
@@ -44,7 +44,7 @@
 #
 require 'capistrano/psw/peppr_app_deploy_file_utils'
   
-namespace :psw_javaee do
+namespace :psw_java do
 
 	desc 'Explodes a WAR file into a specified directory'
   task :explode_war_file, :explode_directory, :war_file_location do |t, args|

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

@@ -128,9 +128,17 @@ namespace :psw_peppr_app_deploy do
           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

data/spec/{psw-javaee_spec.rb → psw-java_spec.rb}

@@ -2,14 +2,14 @@ require "rake"
 require File.expand_path('../spec_helper.rb', __FILE__)
 
 
-describe "psw_javaee:" do
+describe "psw_java:" do
   describe "explode_war_file" do
     let(:rake)      { Rake::Application.new }
-    subject         { rake["psw_javaee:explode_war_file"] }
+    subject         { rake["psw_java:explode_war_file"] }
     
     before do
       Rake.application = rake
-      Rake.application.add_import("./resources/lib/capistrano/tasks/psw-javaee.cap")
+      Rake.application.add_import("./resources/lib/capistrano/tasks/psw-java.cap")
       Rake.application.load_imports()   
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-psw
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre34
+  version: 1.0.0.pre35
 platform: ruby
 authors:
 - Lexmark International Technology S.A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,7 @@ files:
 - lib/capistrano/psw/version.rb
 - resources/lib/capistrano/tasks/psw-apache2.cap
 - resources/lib/capistrano/tasks/psw-clockwork.cap
-- resources/lib/capistrano/tasks/psw-javaee.cap
+- resources/lib/capistrano/tasks/psw-java.cap
 - resources/lib/capistrano/tasks/psw-nginx.cap
 - resources/lib/capistrano/tasks/psw-peppr-app-deploy.cap
 - resources/lib/capistrano/tasks/psw-peppr.cap
@@ -97,7 +97,7 @@ files:
 - resources/lib/capistrano/tasks/psw-sidekiq.cap
 - spec/psw-apache2_spec.rb
 - spec/psw-clockwork_spec.rb
-- spec/psw-javaee_spec.rb
+- spec/psw-java_spec.rb
 - spec/psw-nginx_spec.rb
 - spec/psw-peppr-app-deploy_spec.rb
 - spec/psw-peppr_spec.rb
@@ -134,7 +134,7 @@ summary: Contains Capistrano v3 Deployment Tasks
 test_files:
 - spec/psw-apache2_spec.rb
 - spec/psw-clockwork_spec.rb
-- spec/psw-javaee_spec.rb
+- spec/psw-java_spec.rb
 - spec/psw-nginx_spec.rb
 - spec/psw-peppr-app-deploy_spec.rb
 - spec/psw-peppr_spec.rb