capitomcat 1.1.3 → 1.1.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
 SHA1:
-  metadata.gz: !binary |-
-    N2U1YTY0MGZlNGZmYjNkZjM1Y2JlYzFmZTI5MDhlYmRiMGY4YzI4OA==
-  data.tar.gz: !binary |-
-    NWViNDkxM2E1M2Q2MTYzN2FjYzA5NzIxZGFjNmY4MWMwMTcyNmU0NQ==
+  metadata.gz: 48868d432a96f6956fc798aecdf5becabcb713a9
+  data.tar.gz: 0d29561ce9b5d05dd6306041b1fc679d73fd64f3
 SHA512:
-  metadata.gz: !binary |-
-    ZGJlZWMwYzYxNzRjZDQ2ODk4NDFmOTNlOTRiNDY5YzkzNzNkZmFkNzM5YzNl
-    NjI1NDdiN2ExZjA2MTJmZWFjMThmODRkNTVkOGU0YTAwZGNmMGVkZGJjZThm
-    Y2Q0ZjM2MDJmMmRmMzIxNjZlOGRmODQ5ZDU5ZDFjMmQzYWUzN2Q=
-  data.tar.gz: !binary |-
-    MWE4OWJkZDg0Nzg5ZWVhZTgxZjI1NjFiYjMwZmRhZmU0NTU5NDMxMTIzODhl
-    MDRmY2M4ODVhZjM0ZGVkM2FhODY4NGEzN2M3OTBiMmU1NDBiODg5ZGMxMTQx
-    YmJlNzZkNjVmM2M2ZjkxZjIyYWI2YzI5YmNlMDRlMzNmMzA4NWY=
+  metadata.gz: 73550bdad1d01ffb5ab5dfcc609c2c48501d0dfab7c4262fdc6d7d9cd0e6d389d08e66d62111b526cb2327ce6aa6c944056e845ad2b68b405311a6cea0cf0bda
+  data.tar.gz: b73cfa67cecca1c23b115ef32246c484785cc47906c41cfe3f493ceca2f3e2ae29e40bbfb0d12b9a03ce029902900a2c5a9bdfe32437979df6ed655a770990fb

data/CHANGES.md

@@ -1,4 +1,5 @@
 # Changes
+[1.1.3]: https://github.com/sunggun-yu/capitomcat/releases/tag/v1.1.3
 [1.1.2]: https://github.com/sunggun-yu/capitomcat/releases/tag/v1.1.2
 [1.1.1]: https://github.com/sunggun-yu/capitomcat/releases/tag/v1.1.1
 [1.1.0]: https://github.com/sunggun-yu/capitomcat/releases/tag/v1.1.0
@@ -6,6 +7,9 @@
 [1.0.0]: https://github.com/sunggun-yu/capitomcat/releases/tag/v1.0.0
 [0.0.3]: https://github.com/sunggun-yu/capitomcat/releases/tag/v0.0.3
 
+## [v1.1.3][1.1.3]
+ * Bug Fix : There was space between "-" and "u" at Tomcat work directory cleaning task.
+
 ## [v1.1.2][1.1.2]
  * Bug Fix : Some Tomcat startup script need to be executed in background #6 (https://github.com/sunggun-yu/capitomcat/issues/6)
     * Start/stop command has modified to be executed in the background.
@@ -31,4 +35,4 @@
  * Support Capistrano 3
 
 ## [v0.0.3][0.0.3]
- * Support Capistrano 2
+ * Support Capistrano 2

data/examples/recipe/singlestage/lib/capistrano/tasks/tomcat_webapp.cap

@@ -17,7 +17,7 @@ set :tomcat_user_group, 'tomcat7'
 set :tomcat_port, '8080'
 set :tomcat_cmd, '/etc/init.d/tomcat7'
 set :use_tomcat_user_cmd, false
-set :tomcat_war_file, '/var/app/war/test-web.war'
+set :tomcat_war_file, '/var/lib/tomcat7/webapps/test-web.war'
 set :tomcat_context_path, '/test-web'
 set :tomcat_context_file, '/var/lib/tomcat7/conf/Catalina/localhost/test-web.xml'
 set :tomcat_work_dir, '/var/lib/tomcat7/work/Catalina/localhost/test-web'

data/lib/capitomcat/tasks/deploy.cap

@@ -46,6 +46,9 @@ namespace :capitomcat do
         info 'Clean Work directory'
         cleanup_work_dir
 
+        info 'Clean Unpacked WAR directory'
+        cleanup_unpacked_dir
+
         info 'Start Tomcat'
         start_tomcat
         check_tomcat_started
@@ -54,6 +57,9 @@ namespace :capitomcat do
         stop_tomcat
         check_tomcat_stopped
 
+        info 'Clean Unpacked WAR directory'
+        cleanup_unpacked_dir
+
         info 'Upload WAR file'
         upload_war_file
 
@@ -183,6 +189,20 @@ namespace :capitomcat do
       warn('Tomcat work directory does not exist.')
     end
   end
+  
+  # Clean-up work directory
+  def cleanup_unpacked_dir
+    # local variables
+    tomcat_user = fetch(:tomcat_user)
+    tomcat_war_file = fetch(:tomcat_war_file)
+    tomcat_unpacked_dir = tomcat_war_file.sub('.war', '')
+
+    if dir_exist?(tomcat_unpacked_dir)
+      execute :sudo, '-u', tomcat_user, 'rm -rf', tomcat_unpacked_dir
+    else
+      warn('Tomcat unpacked directory does not exist.')
+    end
+  end
 
   # Get Parallelism
   # @return :parallel or :sequence

data/lib/capitomcat/version.rb

@@ -1,3 +1,3 @@
 module Capitomcat
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: capitomcat
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Sunggun Yu
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-  prerelease: false
-  type: :runtime
 description: Capitomcat is the Capistrano 3 recipe for Tomcat web application deployment.
 email:
 - sunggun.dev@gmail.com
@@ -72,7 +72,7 @@ homepage: http://sunggun-yu.github.io/capitomcat/
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -87,9 +87,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.2.1
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.3.0
+signing_key: 
 specification_version: 4
 summary: Capistrano 3 recipe for Tomcat web application deployment
 test_files: []