capitomcat 1.1.0 → 1.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 SHA1:
   metadata.gz: !binary |-
-    YTQ2ZTRhNGVmMTMxMGRhZjNiNjcyOWU3MGU3YWJlOGFjYjAyYWQzMQ==
+    MzJkY2Q4NjZjYmQ4OTJhMzQ5OGZjNTg3OWQwZWVjNTFlMTJhOTBhOA==
   data.tar.gz: !binary |-
-    ZThmODg3M2E4YzBhNTIzMjQ3OWNjNWVmNTBiOTIyNGEyOGY5YzA0Mg==
+    MDgzODQ5ZjA1YzIxM2M3MmE4NWY3ZmNkZTEyOGYyNjc4OGE0YjliNg==
 SHA512:
   metadata.gz: !binary |-
-    ZDFkM2Q5NGMxYTRlOTk0NTlkZDc5ZTNmMmNiNDhlNjk4MTEyZGQ0NjU4ZDYy
-    YjM2ZGNjMzBkMjBlZjQxNzU4YWUzZTJhNzliNTgyOGIyODA0MjVkOGYxYWFh
-    YzVhZmJiYmUwYjhlNWFkMjI2YjMyNzA1ZGZiOWU5NGYwZmE5NzY=
+    OTAzYzRiOTg4M2E5OTU0MjdlOWFiODk3NDI4M2MwM2FhOTkxNzAxYmFjN2Qx
+    MzQxMGFhNmYwOWRiYzQwYTY5N2RkYzBhYWJiYWQwMjdjN2ZmM2Y3MzE5YTRj
+    NzljNjg4NmQxMzE2ODdjNWI5MjZjODI1MWIzZWFlZmFkYjM2YTE=
   data.tar.gz: !binary |-
-    NWY5Y2U4NTA4MGY4YjhiMGNiYzVkMWU3NDE0OGRkNWUxMzU5MDcwMjRmYTA3
-    NjlmYzM1OTQwYTRkOWExNzU0NjI5YTU4ZmQ3MzMxNTFkMjgxOTg4NWI1Mzlh
-    ZjhiMDUzNDljNDFjYThmMDkwMzI4ZjA5YzkxOTYxMzlhZGNiYzE=
+    NTY3MWY1ZjFkZGQ2YTM3ODVlNDhmMWEwMDY1MDE3MzE2Mjg3MGY5MjhjMGQ4
+    NzhmZDljZWM2M2VjYzg2OTY2ZGQzYTYxZjk5MjkwOTVkZmIwYjA2YjFmOWFk
+    YzFkZjUxN2FlMTFkYWE0MDM2ZTg2ZGZhOTljNjZkOTYxNDU4Mjg=

data/CHANGES.md

@@ -0,0 +1,25 @@
+# Changes
+[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.1][1.1.1]
+ * File uploading strategy changing.
+ * Modifying tomcat starting check script.
+ * Adding tomcat stopping check script.
+
+## [v1.1.0][1.1.0]
+ * Update Capistrano dependency to v3.1.0
+ * Raise an exception instead of using exit command when local war file or context.xml template file does not exist.
+ * The example for 'native' has changed because Capistrano do not allow load_imports in Capistrano class since they update to v3.1.0
+
+## [v1.0.1][1.0.1]
+ * Remove Unnecessary dependency
+
+## [v1.0.0][1.0.0]
+ * Support Capistrano 3
+
+## [v0.0.3][0.0.3]
+ * Support Capistrano 2

data/README.md

@@ -4,29 +4,10 @@
 Capitomcat is library for creating Capistrano Tomcat recipe.
 Capitomcat includes basic tasks for Tomcat deployment. You can create easily your own Capistrano 3 recipe for Tomcat with Capitomcat.
 
-## Changes
-[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.0][1.1.0]
- * Update Capistrano dependency to v3.1.0
- * Raise an exception instead of using exit command when local war file or context.xml template file does not exist.
- * The example for 'native' has changed because Capistrano do not allow load_imports in Capistrano class since they update to v3.1.0
-
-### [v1.0.1][1.0.1]
- * Remove Unnecessary dependency
-
-### [v1.0.0][1.0.0]
- * Support Capistrano 3
-
-### [v0.0.3][0.0.3]
- * Support Capistrano 2
-
 ##See Also
 ### Capitomcat Jenkins Plugin
 * Home page : https://wiki.jenkins-ci.org/display/JENKINS/Capitomcat+Plugin
-* Source : https://github.com/jenkinsci/capitomcat-plugin
+* Source Repo: https://github.com/jenkinsci/capitomcat-plugin
 
 ##Requirement
 ###Gem Dependency

data/lib/capitomcat/tasks/deploy.cap

@@ -1,4 +1,5 @@
 require 'capistrano'
+require 'sshkit/backends/netssh'
 
 # Author:: Sunggun Yu
 
@@ -37,6 +38,7 @@ namespace :capitomcat do
 
         info 'Stop Tomcat'
         stop_tomcat
+        check_tomcat_stopped
 
         info 'Update Context'
         upload_context_file
@@ -50,6 +52,7 @@ namespace :capitomcat do
       else
         info 'Stop Tomcat'
         stop_tomcat
+        check_tomcat_stopped
 
         info 'Upload WAR file'
         upload_war_file
@@ -68,25 +71,47 @@ namespace :capitomcat do
   def start_tomcat
     # local variables
     tomcat_cmd = fetch(:tomcat_cmd)
-
-    puts capture(:sudo, get_sudo_user_tomcat_cmd, "#{tomcat_cmd} start")
+    execute(:sudo, get_sudo_user_tomcat_cmd, "#{tomcat_cmd} start")
   end
 
-  # Check status whether started
+  # Check status whether Tomcat started
   def check_tomcat_started
     # local variables
     tomcat_port = fetch(:tomcat_port)
+    _times = 0
+    begin
+      _times = _times + 1
+      info("Check and wait until Tomcat starting up ... #{_times}")
+      _netstat = capture("netstat -an | grep \"#{tomcat_port}\" | grep \"LISTEN\" ; echo \"\"")
+      info (_netstat)
+      sleep(1)
+    end until _times > 180 || (_netstat != nil && _netstat.to_s.length > 1)
+    if _times > 180
+      raise 'Starting Tomcat has failed - timed out'
+    end
+  end
 
-    execute "for i in {0..180}; do echo \"Waiting for Tomcat to start\"; if [ \"\" != \"$(netstat -an | grep #{tomcat_port})\" ]; then break; fi; sleep 30; done"
-    puts capture("netstat -an | grep #{tomcat_port}")
+  # Check status whether Tomcat stopped
+  def check_tomcat_stopped
+    # local variables
+    tomcat_port = fetch(:tomcat_port)
+    _times = 0
+    begin
+      _times = _times + 1
+      info("Check and wait until Tomcat stopping ... #{_times}")
+      _netstat = capture("netstat -an | grep \"#{tomcat_port}\" | grep \"LISTEN\" ; echo \"\"")
+      sleep(1)
+    end until _times > 180 || _netstat == nil || _netstat.to_s.length == 0
+    if _times > 180
+      raise 'Stopping Tomcat has failed - timed out'
+    end
   end
 
   # Stop Tomcat server
   def stop_tomcat
     # local variables
     tomcat_cmd = fetch(:tomcat_cmd)
-
-    puts capture(:sudo, get_sudo_user_tomcat_cmd, "#{tomcat_cmd} stop")
+    execute(:sudo, get_sudo_user_tomcat_cmd, "#{tomcat_cmd} stop")
   end
 
   # Upload the WAR file
@@ -96,20 +121,19 @@ namespace :capitomcat do
     local_war_file = fetch(:local_war_file)
     tomcat_war_file = fetch(:tomcat_war_file)
     tomcat_user = fetch(:tomcat_user)
-    tomcat_user_group = fetch(:tomcat_user_group)
 
     if File.exists?(local_war_file)
       # Setup file name
       temp_dir = Pathname.new('/tmp')
       temp_file = File.basename(tomcat_war_file)
       tmp_war_file = temp_dir.join(temp_file)
-
+      tmp_war_file = timestamp_filename(tmp_war_file)
       # Clean remote file before uploading
       remove_file_if_exist(upload_user, tmp_war_file)
       # Upload WAR file into temp dir
       upload! local_war_file, tmp_war_file
       # Move tmp WAR file to actual path
-      change_owner_and_move(tmp_war_file, tomcat_war_file, tomcat_user, tomcat_user_group)
+      clean_after_copy(tmp_war_file, tomcat_war_file, tomcat_user)
     else
       raise("Local WAR file does not existing. : #{local_war_file}")
     end
@@ -140,14 +164,14 @@ namespace :capitomcat do
     upload_user = fetch(:user)
     tomcat_context_file = fetch(:tomcat_context_file)
     tomcat_user = fetch(:tomcat_user)
-    tomcat_user_group = fetch(:tomcat_user_group)
     context_template = get_context_template
 
     temp_upload_file = '/tmp/' + File.basename(tomcat_context_file)
+    temp_upload_file = timestamp_filename(temp_upload_file)
     remove_file_if_exist upload_user, temp_upload_file
     contents = StringIO.new(context_template)
     upload! contents, temp_upload_file
-    change_owner_and_move(temp_upload_file, tomcat_context_file, tomcat_user, tomcat_user_group)
+    clean_after_copy(temp_upload_file, tomcat_context_file, tomcat_user)
   end
 
   # Clean-up work directory
@@ -185,29 +209,29 @@ namespace :capitomcat do
     end
   end
 
-  # Change owner and move file
-  # @param [String] file
-  # @param [String] destination file name with its path
-  # @param [String] user
-  # @param [String] group
-  def change_owner_and_move (file, destination, user, group)
-    # Change file's owner
-    puts user
-    execute :sudo, :chown, "#{user}:#{group}", file
+  # Copy the file and remove after copy
+  def clean_after_copy (file, destination, sudo_user)
+    # Change permission
+    execute :chmod, '666', file
 
-    # Move file to destination
+    # Copy file to destination
     target_dir = File.dirname(destination)
     if test "[ -d #{target_dir} ]"
       within target_dir do
-        execute :sudo, '-u', user, :mv, '-f', file, destination
+        execute :sudo, '-u', sudo_user, :cp, file, destination
       end
     else
       warn("Target directory is not existing. Capitomcat will try mkdir for target directory. : #{target_dir}")
-      execute :sudo, '-u', user, :mkdir, '-p', target_dir
+      execute :sudo, '-u', sudo_user, :mkdir, '-p', target_dir
       within(target_dir) do
-        execute :sudo, '-u', user, :mv, '-f', file, destination
+        execute :sudo, '-u', sudo_user, :cp, file, destination
       end
     end
+    if test "[ -e #{file} ]"
+      execute :rm, '-f', file
+    else
+      warn('File to remove is not existing.')
+    end
   end
 
   # Remove file if exist
@@ -221,4 +245,13 @@ namespace :capitomcat do
       warn('Target file to remove is not existing.')
     end
   end
+
+  # Add timestamp to filename
+  def timestamp_filename(file)
+    dir = File.dirname(file)
+    base = File.basename(file, '.*')
+    time = Time.now.to_i
+    ext = File.extname(file)
+    File.join(dir, "#{base}-#{time}#{ext}")
+  end
 end

data/lib/capitomcat/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capitomcat
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sunggun Yu
@@ -32,6 +32,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGES.md
 - Gemfile
 - LICENSE.md
 - README.md