capitomcat 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0220d095d62be811014fc54b4e5bf3f45fac497
-  data.tar.gz: cd764ebcb60a77d2a917f54beea77ab7a15afa85
+  metadata.gz: e4edd194bc87052c00dddde2d94c38edd404762a
+  data.tar.gz: 326b2322dd4c85b0f5e750961e8862cf744fedce
 SHA512:
-  metadata.gz: aba56c9c433c72ee18c7020285a6279718738a948f3b30fb06b92828f90c7a225943448bda49eec17fd7806d93f84e5c1e24b483daf3155c3885e0971a3dd551
-  data.tar.gz: 65a10a6918355ffe0d443acd061a18f89c4f386d135907b4e5b6b32ee373a988fee8b794fd1f9f0e4ead7549eea58cf89780c1a97a8a93a7057f78fa79ba92c8
+  metadata.gz: 222bbf775ebecf1d70999bee2c7d20d3e6158c6310d537622437105ea62b2faea76f83ce8d624225f33c34b07c7f0d1841fe71a0cf89eca8059011556df7791b
+  data.tar.gz: 6f0a996fe78075dc9ea0571c43400ff9a13baf2abb22a92f0ef5d0bfe2c62286cbe699fd2662b67048f548d010f26f04cf2dc0eee21afe0e0e86d0407e29fab2

data/CHANGES.md

@@ -1,4 +1,5 @@
 # Changes
+[1.2.1]: https://github.com/sunggun-yu/capitomcat/releases/tag/v1.2.1
 [1.2.0]: https://github.com/sunggun-yu/capitomcat/releases/tag/v1.2.0
 [1.1.4]: https://github.com/sunggun-yu/capitomcat/releases/tag/v1.1.4
 [1.1.3]: https://github.com/sunggun-yu/capitomcat/releases/tag/v1.1.3
@@ -9,6 +10,11 @@
 [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.2.1][1.2.1]
+ * Revert back the executing tomcat command in background. gives choice option whether use background or not
+   * It really hard to know which OS is work with pty true/false for tomcat start script. it depends.... please refer to http://capistranorb.com/documentation/faq/why-does-something-work-in-my-ssh-session-but-not-in-capistrano/
+   * Some of the OS only works with background script. ex) CentOS 5.6
+
 ## [v1.2.0][1.2.0]
  * Updating Capistrano dependency version.
  * Removing background executing of tomcat command. also, sleep time has removed accordingly.

data/README.md

@@ -76,6 +76,9 @@ set :tomcat_war_file, '/var/app/war/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'
+set :tomcat_cmd_wait_start, 10 # Second
+set :tomcat_cmd_wait_stop, 5 # Second
+set :use_background_tomcat_cmd, false # Use normal execute command as default
 
 # Deploy setting section
 set :local_war_file, '/tmp/test-web.war'

data/lib/capitomcat/tasks/deploy.cap

@@ -25,6 +25,7 @@ namespace :capitomcat do
     set   :tomcat_work_dir, '/var/lib/tomcat7/work/Catalina/localhost/test-web'
     set   :tomcat_cmd_wait_start, 10 # Second
     set   :tomcat_cmd_wait_stop, 5 # Second
+    set   :use_background_tomcat_cmd, false # Use normal execute command as default
 
     # Deploy setting section
     set   :local_war_file, '/tmp/test-web.war'
@@ -287,8 +288,18 @@ namespace :capitomcat do
   # it executes the Tomcat command in background. and sleeps for several sec after executing.
   def execute_tomcat_cmd(arg)
     # local variables
+    puts "use_background_tomcat_cmd --> #{fetch(:use_background_tomcat_cmd)}"
+    use_background = if fetch(:use_background_tomcat_cmd).to_s.length > 0
+                       fetch(:use_background_tomcat_cmd).to_bool
+                     else
+                       true # Default is use background command which force not attaching tty(tty=UNKNOWN)
+                     end
     tomcat_cmd = fetch(:tomcat_cmd)
-    execute :sudo, get_sudo_user_tomcat_cmd, tomcat_cmd, arg
+    if use_background
+      execute("echo `nohup sudo #{get_sudo_user_tomcat_cmd} #{tomcat_cmd} #{arg}& > /dev/null 2>&1` && sleep 1")
+    else
+      execute :sudo, get_sudo_user_tomcat_cmd, tomcat_cmd, arg
+    end
   end
 
   # Test if dir is existing

data/lib/capitomcat/version.rb

@@ -1,3 +1,3 @@
 module Capitomcat
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capitomcat
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Sunggun Yu