capitomcat 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05fb97e5443b9a5ed772b29b91acc43e45ebafb7
-  data.tar.gz: 7ac4dbeaaf93dfd4499cb598e9a7150a94d26c2a
+  metadata.gz: 460283b08a3d25fe8c961e9916697ab59642bf16
+  data.tar.gz: 00f4e1a87866891dac1dae87a6598adc738d958f
 SHA512:
-  metadata.gz: 62dc7e70f831b737bf5539c381731d7b368fa32e110a69269d10142fd28353ee017156e6326ec2e10387650aa82695ddaf5f1b5ccd2fba5ec7f832a630e1805f
-  data.tar.gz: 259bc148df4060b929ca8606a902e6734aa4858cd542b03186499471f0d48743d16fe1d555bedcf5a645daf7281863a0393b8e1450c00519cb42a558304dde72
+  metadata.gz: cdafda575dcf154b73f551c165e631768d67207d3873fb8693aee9ceabe25d0aef2a77e0da1467a8f532236dbf1a28b8e488f291f58fcc2a4a92564c44798c01
+  data.tar.gz: f524e15d3483dcbf0e99745d9484e9819939873aa9e9acee4a0df97107596e9d5ad6e8abd0b368dba7e091dfded7496757b3bd8a042f67beb0b31b72b25686c1

data/README.md

@@ -1,6 +1,8 @@
 Capistrano Recipe for Tomcat
 ========================
 
+https://rubygems.org/gems/capitomcat
+
 ##Installation
 To use Capitomcat in your Capistrano script, you need install as RubyGem
 
@@ -14,6 +16,12 @@ $ gem install capistrano
 $ gem install capistrano-ext
 </pre>
 ###Install Capitomcat
+####Install from RubyGems
+<pre>
+$ gem install capitomcat
+</pre>
+
+####Install manually
 * Check-out the source code
 <pre>
 $ git clone git@github.com:sunggun-yu/capitomcat.git

data/capitomcat.gemspec

@@ -6,13 +6,13 @@ $:.push File.expand_path("lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "capitomcat"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
 
   s.authors     = ["Sunggun Yu"]
   s.email       = ["sunggun.dev@gmail.com"]
   s.licenses    = ['Apache 2.0']
   s.date        = %q{2013-12-27} 
-  s.homepage    = "https://github.com/sunggun-yu/capitomcat"
+  s.homepage    = "http://sunggun-yu.github.io/capitomcat/"
   s.summary     = %q{Capistrano Recipe for Tomcat}
   s.description = %q{You can deploy your war file to multiple remote tomcat servers through this Capistrano recipe.}
 

data/examples/multistage/Capfile

@@ -11,14 +11,15 @@ set   :user, "deploy"
 set   :password, "#{password}" #Set password from parameter.
 set   :tomcat_user, "tomcat"
 set   :tomcat_cmd_user, "root"
+set   :tomcat_port, "8080"
 
 # Local file section
-set   :local_war_file, "/tmp/app.war"
+set   :local_war_file, "/your-local-directory/app.war"
 set   :context_template_file, "./template/context.xml.erb"
 
 # Remote setting section
 set   :context_name, "app"
-set   :remote_docBase, "/tmp/test/earl/war/abc.war"
-set   :remote_context_file, "/tmp/test/tomcat/conf/Catalina/localhost/app.xml"
-set   :remote_tomcat_cmd, "/tmp/test/etc/init.d/tomcat7"
-set   :remote_tomcat_work_dir, "/opt/tomcat/work/Catalina/localhost/app"
+set(  :remote_docBase) {"/your-remote-directory-to-save-war-file/"+File.basename(local_war_file)} unless exists?(:remote_docBase)
+set   :remote_context_file, "/var/lib/tomcat7/conf/Catalina/localhost/app.xml"
+set   :remote_tomcat_cmd, "/etc/init.d/tomcat7"
+set   :remote_tomcat_work_dir, "/var/lib/tomcat7/work/Catalina/localhost/app"

data/examples/singlestage/Capfile

@@ -6,18 +6,19 @@ load 'config/deploy.rb'
 role  :app, "dev01"
 
 # User section
-set   :user, "deploy"
+set   :user, "user"
 set   :password, "#{password}" #Set password from parameter.
-set   :tomcat_user, "tomcat"
+set   :tomcat_user, "root"
 set   :tomcat_cmd_user, "root"
+set   :tomcat_port, "8080"
 
 # Local file section
-set   :local_war_file, "/tmp/app.war"
+set   :local_war_file, "/your-local-directory/app.war"
 set   :context_template_file, "./template/context.xml.erb"
 
 # Remote setting section
 set   :context_name, "app"
-set   :remote_docBase, "/tmp/test/earl/war/abc.war"
-set   :remote_context_file, "/tmp/test/tomcat/conf/Catalina/localhost/app.xml"
-set   :remote_tomcat_cmd, "/tmp/test/etc/init.d/tomcat7"
-set   :remote_tomcat_work_dir, "/opt/tomcat/work/Catalina/localhost/app"
+set(  :remote_docBase) {"/your-remote-directory-to-save-war-file/"+File.basename(local_war_file)} unless exists?(:remote_docBase)
+set   :remote_context_file, "/var/lib/tomcat7/conf/Catalina/localhost/app.xml"
+set   :remote_tomcat_cmd, "/etc/init.d/tomcat7"
+set   :remote_tomcat_work_dir, "/var/lib/tomcat7/work/Catalina/localhost/app"

data/lib/capitomcat.rb

@@ -21,7 +21,7 @@ configuration.load do
     desc "Start Tomcat"
     task :start, :roles => :app do
       run "echo `nohup #{sudo :as => tomcat_cmd_user} #{remote_tomcat_cmd} start&` && sleep 1", :pty => true
-      run("for i in {0..360}; do echo \"Waiting for Tomcat to start\"; if [[ \"\" != \"$\(netstat -an | grep #{tomcat_port}\)\" ]]; then break; fi; sleep 30; done")
+      run("for i in {0..180}; do echo \"Waiting for Tomcat to start\"; if [ \"\" != \"$\(netstat -an | grep #{tomcat_port}\)\" ]; then break; fi; sleep 30; done")
       run("netstat -an | grep #{tomcat_port}")
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capitomcat
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sunggun Yu
@@ -62,7 +62,7 @@ files:
 - examples/singlestage/config/deploy.rb
 - examples/singlestage/template/context.xml.erb
 - lib/capitomcat.rb
-homepage: https://github.com/sunggun-yu/capitomcat
+homepage: http://sunggun-yu.github.io/capitomcat/
 licenses:
 - Apache 2.0
 metadata: {}