luban 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f634550b34b8380b8a9bb38189ab450e3c50a34
-  data.tar.gz: d507cdf9924ca36905c4e8a8585a7835071e1168
+  metadata.gz: a5795337e52a2753d22609fc84702c7b7efc71e2
+  data.tar.gz: 09109191101bc31336b281f2909904d94a5cc78d
 SHA512:
-  metadata.gz: 75e17a9e3a96df84cea850e4313060c5cb2a4ca09c2e4274ff75d09704b6deb55a49f6f1e8656c471e7ed51aa883d3a77b179c3a7bdb39a7d1d42b315ceb948b
-  data.tar.gz: 246833cd50c99ef0d7d0d847a2a3aa44efec01ef0832df7868ff89ce06f94a7c829fd240a4252c2c22bc458384567d4f8e4967c1366c5f66630fb3542a161b9e
+  metadata.gz: ccce4793c55524d64f73ffea182d7c6336305876b15b7e1cbd5e3c43f4661a5457f36e9a69ddf554f93ded4380bc32c826637929dd60ff8c2280eb8df52e5327
+  data.tar.gz: f5b260f3f809787821928d385184dbb2febdb914785f48ed958e47a74a04df0987959c6a476727cc3ed24e523ff1bd4b14ab9a0e959f74a38a806bd35db00b4b

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change log
 
+## Version 0.4.3 (Jun 16, 2016)
+
+Minor enhancements:
+  * Changed #default_executable to #define_executable with a better general approach
+  * Refactored start/stop/monitor/unmonitor into corresponding commands for better reusability
+  * Added convenient methods, #default_pending_seconds and # default_pending_interval
+    * These two methods provided a better way to customize timging for process status check
+  * Refactored header information into a generic header template for all erb template files
+
+Bug fixes:
+  * Fixed monitor/unmonitor timing for start/stop operations
+  * Checked process status before killing process
+
 ## Version 0.4.2 (Jun 07, 2016)
 
 Minor enhancements:

data/lib/luban/deployment/cli/package/worker.rb

@@ -13,9 +13,15 @@ module Luban
             Luban::Deployment::Package::Base.worker_class(worker, **opts)
           end
 
-          def default_executable(name)
-            define_method("#{name}_executable") do
-              @default_executable ||= bin_path.join(name)
+          def define_executable(*names)
+            names.each do |name|
+              define_method("#{name}_executable") do
+                if instance_variable_defined?("@#{__method__}")
+                  instance_variable_get("@#{__method__}")
+                else
+                  instance_variable_set("@#{__method__}", bin_path.join(name))
+                end
+              end
             end
           end
         end

data/lib/luban/deployment/cli/service/controller.rb

@@ -26,8 +26,23 @@ module Luban
           file?(pid_file_path, "-s") # file is NOT zero size
         end
 
-        def process_pattern
-          raise NotImplementedError, "#{self.class.name}##{__method__} is an abstract method."
+        %i(process_pattern start_command stop_command).each do |m|
+          define_method(m) do
+            raise NotImplementedError, "#{self.class.name}##{__method__} is an abstract method."
+          end
+        end
+
+        def monitor_executable
+          @monitor_executable ||= env_path.join("#{stage}.#{process_monitor[:env]}").
+                                                join('bin').join(process_monitor[:name])
+        end
+
+        def monitor_command
+          @monitor_command ||= "#{monitor_executable} monitor #{service_entry}"
+        end
+
+        def unmonitor_command
+          @unmonitor_command ||= "#{monitor_executable} unmonitor #{service_entry}"
         end
 
         def start_process
@@ -38,8 +53,8 @@ module Luban
 
           output = start_process!
           if check_until { process_started? }
-            monitor_process
             update_result "Start #{package_full_name}: [OK] #{output}"
+            monitor_process
           else
             remove_orphaned_pid_file
             update_result "Start #{package_full_name}: [FAILED] #{output}", 
@@ -53,9 +68,9 @@ module Luban
             return
           end
 
+          unmonitor_process
           output = stop_process! || 'OK'
           if check_until { process_stopped? }
-            unmonitor_process
             update_result "Stop #{package_full_name}: [OK] #{output}"
           else
             remove_orphaned_pid_file
@@ -66,10 +81,10 @@ module Luban
 
         def restart_process
           if process_started?
+            unmonitor_process
             output = stop_process!
             if check_until { process_stopped? }
               info "Stop #{package_full_name}: [OK] #{output}"
-              unmonitor_process
             else
               remove_orphaned_pid_file
               update_result "Stop #{package_full_name}: [FAILED] #{output}",
@@ -94,9 +109,14 @@ module Luban
         end
 
         def kill_process
+          if process_stopped?
+            update_result "Skipped! Already stopped #{package_full_name}", status: :skipped
+            return
+          end
+
+          unmonitor_process
           output = kill_process!
           if check_until { process_stopped? }
-            unmonitor_process
             remove_orphaned_pid_file
             update_result "Kill #{package_full_name}: [OK] #{output}"
           else
@@ -128,23 +148,29 @@ module Luban
           end
         end
 
-        protected
+        def default_pending_seconds; 30; end
+        def default_pending_interval; 1; end
 
-        %i(start_process! stop_process!).each do |m|
-          define_method(m) do
-            raise NotImplementedError, "#{self.class.name}##{__method__} is an abstract method."
-          end
-        end
+        protected
 
-        def check_until(pending_seconds = 30)
+        def check_until(pending_seconds: default_pending_seconds, 
+                        pending_interval: default_pending_interval)
           succeeded = false
-          pending_seconds.times do
-            sleep 1
+          (pending_seconds/pending_interval).times do
+            sleep pending_interval
             break if (succeeded = yield)
           end
           succeeded
         end
 
+        def start_process!
+          capture("#{start_command} 2>&1")
+        end
+
+        def stop_process!
+          capture("#{stop_command} 2>&1")
+        end
+
         def check_process!
           if pid_file_missing?
             "#{package_full_name}: started but PID file does NOT exist - #{pid_file_path}"
@@ -174,24 +200,11 @@ module Luban
         end
 
         def monitor_process!
-          test(process_monitor_command)
+          test("#{monitor_command} 2>&1")
         end
 
         def unmonitor_process!
-          test(process_unmonitor_command)
-        end
-
-        def process_monitor_executable
-          @process_monitor_executable ||= env_path.join("#{stage}.#{process_monitor[:env]}").
-                                                   join('bin').join(process_monitor[:name])
-        end
-
-        def process_monitor_command
-          @process_monitor_command ||= "#{process_monitor_executable} monitor #{service_entry}"
-        end
-
-        def process_unmonitor_command
-          @process_unmonitor_command ||= "#{process_monitor_executable} unmonitor #{service_entry}"
+          test("#{unmonitor_command} 2>&1")
         end
       end
     end

data/lib/luban/deployment/helpers/utils.rb

@@ -118,14 +118,21 @@ module Luban
           # capture("curl -s -L -I -o /dev/null -w '%{http_code}' #{url}") == '200'
         end
 
-        def upload_by_template(file_to_upload:, template_file:, auto_revision: false, **opts)
+        def upload_by_template(file_to_upload:, template_file:, 
+                               header_file: find_template_file('header.erb'), 
+                               auto_revision: false, **opts)
+          content = render_template(template_file, context: binding)
+
+          revision = ''
           if auto_revision
             require 'digest/md5'
-            revision = Digest::MD5.file(template_file).hexdigest
+            revision = Digest::MD5.hexdigest(content)
             return if revision_match?(file_to_upload, revision)
           end
 
-          upload!(StringIO.new(render_template(template_file, context: binding)), file_to_upload)
+          header = render_template(header_file, context: binding)
+
+          upload!(StringIO.new(header + content), file_to_upload)
           yield file_to_upload if block_given?
         end
 

data/lib/luban/deployment/packages/bundler.rb

@@ -22,7 +22,7 @@ module Luban
             parent.install_path
           end
 
-          default_executable 'bundler'
+          define_executable 'bundler'
 
           def gem_executable
             parent.gem_executable

data/lib/luban/deployment/packages/git.rb

@@ -16,7 +16,7 @@ module Luban
         end
 
         class Installer < Luban::Deployment::Package::Installer
-          default_executable 'git'
+          define_executable 'git'
 
           def source_repo
             @source_repo ||= "https://www.kernel.org"

data/lib/luban/deployment/packages/openssl.rb

@@ -13,7 +13,7 @@ module Luban
             
           end
 
-          default_executable 'openssl'
+          define_executable 'openssl'
 
           def source_repo
             @source_repo ||= "ftp://ftp.openssl.org"

data/lib/luban/deployment/packages/ruby.rb

@@ -74,7 +74,7 @@ module Luban
             task.opts.install_doc
           end
 
-          default_executable 'ruby'
+          define_executable 'ruby'
 
           def gem_executable
             @gem_executable ||= bin_path.join('gem')
@@ -121,4 +121,4 @@ module Luban
       end
     end
   end
-end
+end

data/lib/luban/deployment/packages/rubygems.rb

@@ -22,7 +22,7 @@ module Luban
             parent.install_path
           end
           
-          default_executable 'gem'
+          define_executable 'gem'
           
           def ruby_executable
             parent.ruby_executable

data/lib/luban/deployment/templates/envrc.erb

@@ -1,7 +1,4 @@
 # Luban environment activation resource file
-# Environment: <%= env_name %>
-# Revision: <%= revision %>
-# Created at <%= now %>
 
 echo_line() {
   if [ "$PS1" ]; then

data/lib/luban/deployment/templates/header.erb

@@ -0,0 +1,4 @@
+# Environment: <%= env_name %>
+# Revision: <%= revision %>
+# Created at <%= now %>
+

data/lib/luban/deployment/templates/unset_envrc.erb

@@ -1,7 +1,4 @@
 # Environment de-activation resource file
-# Environment: <%= env_name %>
-# Revision: <%= revision %>
-# Created at <%= now %>
 
 echo_line() {
   if [ "$PS1" ]; then

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.4.2"
+    VERSION = "0.4.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli
@@ -144,6 +144,7 @@ files:
 - lib/luban/deployment/parameters.rb
 - lib/luban/deployment/runner.rb
 - lib/luban/deployment/templates/envrc.erb
+- lib/luban/deployment/templates/header.erb
 - lib/luban/deployment/templates/unset_envrc.erb
 - lib/luban/deployment/version.rb
 - lib/luban/deployment/worker.rb