capitomcat 1.1.1 → 1.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 SHA1:
   metadata.gz: !binary |-
-    MzJkY2Q4NjZjYmQ4OTJhMzQ5OGZjNTg3OWQwZWVjNTFlMTJhOTBhOA==
+    NTliMWU5ZmEzOTFlN2M4YmRmMzc1OTJiYTlkNWY2MDkzZTg5MGY5Ng==
   data.tar.gz: !binary |-
-    MDgzODQ5ZjA1YzIxM2M3MmE4NWY3ZmNkZTEyOGYyNjc4OGE0YjliNg==
+    Nzg4MjlmYTQwNWZjM2Y4YzExNjlkODMyM2JjODhkMDA2NzEyNWU5Mg==
 SHA512:
   metadata.gz: !binary |-
-    OTAzYzRiOTg4M2E5OTU0MjdlOWFiODk3NDI4M2MwM2FhOTkxNzAxYmFjN2Qx
-    MzQxMGFhNmYwOWRiYzQwYTY5N2RkYzBhYWJiYWQwMjdjN2ZmM2Y3MzE5YTRj
-    NzljNjg4NmQxMzE2ODdjNWI5MjZjODI1MWIzZWFlZmFkYjM2YTE=
+    N2Q1MmQwNjlkOGY3MzI0MzQxMmJiNmJiNTVmNGNkZWM4ZmJkNjUyNzYwMzhk
+    MTVmNWFlYjY0NjgzZjkxNmYyMGNiYjgxODczNTA2MmYxYTBhZGU0NDRhNjE1
+    MDhjNDAzNDNiNjQ0OWZkOThlMTQxYmI5NjA4OWMxN2RjNmVhOGI=
   data.tar.gz: !binary |-
-    NTY3MWY1ZjFkZGQ2YTM3ODVlNDhmMWEwMDY1MDE3MzE2Mjg3MGY5MjhjMGQ4
-    NzhmZDljZWM2M2VjYzg2OTY2ZGQzYTYxZjk5MjkwOTVkZmIwYjA2YjFmOWFk
-    YzFkZjUxN2FlMTFkYWE0MDM2ZTg2ZGZhOTljNjZkOTYxNDU4Mjg=
+    NWQwN2M4Y2I5OWMyNjBhNTE0MTA2ZDNlNGI0NTcwN2IwN2QwNjJiZmQ1NzJk
+    OWFjZTU2OGVlZjYxNWRkMDI4M2M1N2Y3Y2EyMzUxOWE1ZWE1ZDI1YjQ0Nzc0
+    NzA3MTEyZTRhNTNhZTE2MGQ5MmFlNzA3NDg3ZDUxYWI3ZmE5MDk=

data/CHANGES.md

@@ -1,10 +1,19 @@
 # Changes
+[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
 [1.0.1]: https://github.com/sunggun-yu/capitomcat/releases/tag/v1.0.1
 [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.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.
+    * Adding sleep time after command is executed.
+ * Bug Fix : SSHKIT test and within not properly working at CentOS5.x #7 (https://github.com/sunggun-yu/capitomcat/issues/7)
+    * Removing within method
+    * Adding checking method for remote directory and file existing.
+
 ## [v1.1.1][1.1.1]
  * File uploading strategy changing.
  * Modifying tomcat starting check script.

data/capitomcat.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.authors     = ['Sunggun Yu']
   s.email       = ['sunggun.dev@gmail.com']
   s.licenses    = ['Apache 2.0']
-  s.date        = %q{2014-01-24}
+  s.date        = %q{2014-01-30}
   s.homepage    = 'http://sunggun-yu.github.io/capitomcat/'
   s.summary     = %q{Capistrano 3 recipe for Tomcat web application deployment}
   s.description = %q{Capitomcat is the Capistrano 3 recipe for Tomcat web application deployment.}

data/lib/capitomcat/tasks/deploy.cap

@@ -70,8 +70,7 @@ namespace :capitomcat do
   # Start Tomcat server
   def start_tomcat
     # local variables
-    tomcat_cmd = fetch(:tomcat_cmd)
-    execute(:sudo, get_sudo_user_tomcat_cmd, "#{tomcat_cmd} start")
+    execute_tomcat_cmd('start', 1)
   end
 
   # Check status whether Tomcat started
@@ -109,9 +108,7 @@ namespace :capitomcat do
 
   # Stop Tomcat server
   def stop_tomcat
-    # local variables
-    tomcat_cmd = fetch(:tomcat_cmd)
-    execute(:sudo, get_sudo_user_tomcat_cmd, "#{tomcat_cmd} stop")
+    execute_tomcat_cmd('stop', 1)
   end
 
   # Upload the WAR file
@@ -180,12 +177,10 @@ namespace :capitomcat do
     tomcat_work_dir = fetch(:tomcat_work_dir)
     tomcat_user = fetch(:tomcat_user)
 
-    if test "[ -d #{tomcat_work_dir} ]"
-      within(tomcat_work_dir) do
-        execute :sudo, '- u', tomcat_user, 'rm -rf', tomcat_work_dir
-      end
+    if dir_exist?(tomcat_work_dir)
+      execute :sudo, '- u', tomcat_user, 'rm -rf', tomcat_work_dir
     else
-      warn('Tomcat work directory does not existing.')
+      warn('Tomcat work directory does not exist.')
     end
   end
 
@@ -216,21 +211,17 @@ namespace :capitomcat do
 
     # Copy file to destination
     target_dir = File.dirname(destination)
-    if test "[ -d #{target_dir} ]"
-      within target_dir do
-        execute :sudo, '-u', sudo_user, :cp, file, destination
-      end
+    if dir_exist?(target_dir)
+      execute :sudo, '-u', sudo_user, :cp, file, destination
     else
-      warn("Target directory is not existing. Capitomcat will try mkdir for target directory. : #{target_dir}")
+      warn("Target directory does not exist. Capitomcat will try to mkdir for target directory. : #{target_dir}")
       execute :sudo, '-u', sudo_user, :mkdir, '-p', target_dir
-      within(target_dir) do
-        execute :sudo, '-u', sudo_user, :cp, file, destination
-      end
+      execute :sudo, '-u', sudo_user, :cp, file, destination
     end
-    if test "[ -e #{file} ]"
+    if file_exist?(file)
       execute :rm, '-f', file
     else
-      warn('File to remove is not existing.')
+      warn("The target file to remove does not exist : #{file}")
     end
   end
 
@@ -238,11 +229,11 @@ namespace :capitomcat do
   # @param [String] user
   # @param [String] file
   def remove_file_if_exist (user, file)
-    if test "[ -e #{file} ]"
+    if file_exist?(file)
       execute :sudo, :chown, user, file
       execute :rm, '-f', file
     else
-      warn('Target file to remove is not existing.')
+      warn("The target file to remove does not exist : #{file}")
     end
   end
 
@@ -254,4 +245,32 @@ namespace :capitomcat do
     ext = File.extname(file)
     File.join(dir, "#{base}-#{time}#{ext}")
   end
+
+  # Execute the Tomcat command
+  # it executes the Tomcat command in background. and sleeps for several sec after executing.
+  def execute_tomcat_cmd(arg, sleep)
+    # local variables
+    tomcat_cmd = fetch(:tomcat_cmd)
+    execute("echo `nohup sudo #{get_sudo_user_tomcat_cmd} #{tomcat_cmd} #{arg}& > /dev/null 2>&1` && sleep #{sleep}")
+  end
+
+  # Test if dir is existing
+  def dir_exist?(dir)
+    _test = capture("echo `if [ -d '#{dir}' ] ; then echo 'true' ; else echo 'false' ; fi`").to_s
+    if _test.eql?('true')
+      return true
+    else
+      return false
+    end
+  end
+
+  # Test if file is existing
+  def file_exist?(file)
+    _test = capture("echo `if [ -e '#{file}' ] ; then echo 'true' ; else echo 'false' ; fi`").to_s
+    if _test.eql?('true')
+      return true
+    else
+      return false
+    end
+  end
 end

data/lib/capitomcat/version.rb

@@ -1,3 +1,3 @@
 module Capitomcat
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capitomcat
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Sunggun Yu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano