luban 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b563d81bdac67bae927aae3873d245713af281db
-  data.tar.gz: 342b20e4251bc4edbfea4ef0bbfc928ad85dd0f1
+  metadata.gz: 8efefadae50e7e28a9576ead9092d2d5d951349d
+  data.tar.gz: e0a8a86b1f33019e2953ca640cb1c5d4121aeb18
 SHA512:
-  metadata.gz: 542d60b312f8b980320b2db1cf3613d57ff5943b9af92397038b75ea36669866002eb490b75f442c359ecc7e1dfbcf5dd1f6c0ab7758016c8830f7094c9fb697
-  data.tar.gz: 59ef6d0cfcf330b5d194a266ff65bd64715c6571e99854abaf060fb85e8b242574a5a125e4a1f63daa71a289e4674841892fe18112d1aa0d628f965db05f7072
+  metadata.gz: 0b79a40a13f3301ff09c114d6ecc8e9e3624f43d2206bc3f1afe96efef323631d66e2972c8686d80479866f847a3d067ad01429b5db382e3d64e2719d3d5f4c0
+  data.tar.gz: bde512704035dfdc76240f7cf05dede43a969c87d7be891db9162d2a2cc79fffa61a4aef7de00009f511f2ee419021314a08a0397b4cf1071668e58fb5fce36c

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change log
 
+## Version 0.8.7 (Sept 27, 2016)
+
+Minor enhancements:
+  * Added option #format to specify archive file format explicitly
+  * Added subcommands to manage process monitor: #monitor_on, #monitor_off and #monitor_reload
+  * Refactored convenient methods to handle process monitor
+
+Bug fixes:
+  * Fixed local variables in global context in .envrc/.unset_envrc files to void bash warnings
+  * Skipped md5 checksum calculation for gem packages if md5 has been generated previously
+  * Handled result update more appropriately
+
 ## Version 0.8.6 (Sept 23, 2016)
 
 Bug fixes:

data/lib/luban/deployment/cli/application/base.rb

@@ -7,6 +7,7 @@ module Luban
       include Luban::Deployment::Command::Tasks::Install
       include Luban::Deployment::Command::Tasks::Deploy
       include Luban::Deployment::Command::Tasks::Control
+      include Luban::Deployment::Command::Tasks::Monitor
       include Luban::Deployment::Command::Tasks::Crontab
 
       attr_reader :packages
@@ -201,7 +202,8 @@ module Luban
         deploy_cronjobs(args: args, opts: opts)
       end
 
-      Luban::Deployment::Command::Tasks::Control::Actions.each do |action|
+      (Luban::Deployment::Command::Tasks::Control::Actions |
+       Luban::Deployment::Command::Tasks::Monitor::Actions).each do |action|
         define_method(action) do |args:, opts:|
           show_app_environment
           send("service_#{action}!", args: args, opts: opts)

data/lib/luban/deployment/cli/application/repository.rb

@@ -196,7 +196,7 @@ module Luban
                 gem_name = File.basename(gem_file)
                 md5_file = "#{gem_file}.md5"
                 gems[gem_name] =
-                  if file?(md5_file)
+                  if file?(workspace_path.join(md5_file))
                     gems[gem_name] = capture(:cat, md5_file)
                   else
                     md5_for_file(gem_file).tap { |md5|

data/lib/luban/deployment/cli/application/scm/git.rb

@@ -32,7 +32,7 @@ module Luban
             end
 
             def release
-              within(clone_path) { test(git_cmd, :archive, version, "--prefix=#{release_tag}/ -o #{release_package_path}") }
+              within(clone_path) { test(git_cmd, :archive, version, "--format=#{release_package_extname} --prefix=#{release_tag}/ -o #{release_package_path}") }
             end
 
             def branch?

data/lib/luban/deployment/cli/command.rb

@@ -101,12 +101,6 @@ module Luban
 
           def controllable?; true; end
 
-          def process_monitor_via(monitor, env: "uber/lubmon")
-            monitor = monitor.to_s.downcase
-            env = "#{stage}.#{env.to_s.downcase}"
-            process_monitor name: monitor, env: env
-          end
-
           protected
 
           def setup_control_tasks
@@ -142,6 +136,38 @@ module Luban
           end
         end
 
+        module Monitor
+          Actions = %i(monitor_on monitor_off monitor_reload)
+          Actions.each do |action|
+            define_method(action) do |args:, opts:|
+              raise NotImplementedError, "#{self.class.name}##{__method__} is an abstract method."
+            end
+          end
+
+          def monitorable?
+            controllable? and monitor_defined? and !monitor_itself?
+          end
+
+          protected
+
+          def setup_monitor_tasks
+            task :monitor_on do
+              desc "Turn on process monitor"
+              action! :monitor_on
+            end
+
+            task :monitor_off do
+              desc "Turn off process monitor"
+              action! :monitor_off
+            end
+
+            task :monitor_reload do
+              desc "Reload monitor configuration"
+              action! :monitor_reload
+            end
+          end
+        end
+
         module Crontab
           Actions = %i(update_cronjobs list_cronjobs)
           Actions.each do |action|
@@ -201,6 +227,7 @@ module Luban
       def installable?;  false; end
       def deployable?;   false; end
       def controllable?; false; end
+      def monitorable?;  false; end
 
       def task(cmd, **opts, &blk)
         command(cmd, **opts, &blk).tap do |c|
@@ -344,6 +371,7 @@ module Luban
         setup_install_tasks if installable?
         setup_deploy_tasks if deployable?
         setup_control_tasks if controllable?
+        setup_monitor_tasks if monitorable?
       end
 
       %i(install deploy control).each do |action|

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

@@ -71,6 +71,8 @@ module Luban
         include Luban::Deployment::Parameters::Application
         include Luban::Deployment::Command::Tasks::Install
 
+        def monitorable?; false; end
+
         def find_project; parent.parent; end
         def find_application(name = nil)
           name.nil? ? parent : find_project.apps[name.to_sym]

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

@@ -3,6 +3,7 @@ module Luban
     module Service
       class Base < Luban::Deployment::Package::Base
         include Luban::Deployment::Command::Tasks::Control
+        include Luban::Deployment::Command::Tasks::Monitor
 
         def self.service_action(action, dispatch_to: nil, as: action, locally: false, &blk)
           define_method(action) do |args:, opts:|
@@ -18,7 +19,8 @@ module Luban
           end
         end
 
-        Luban::Deployment::Command::Tasks::Control::Actions.each do |action|
+        (Luban::Deployment::Command::Tasks::Control::Actions |
+         Luban::Deployment::Command::Tasks::Monitor::Actions).each do |action|
           service_action action, dispatch_to: :controller
         end
         %i(init_profile update_profile).each do |action| 

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

@@ -33,18 +33,6 @@ module Luban
             end
           end
 
-          def process_monitorable?
-            process_monitor_defined? and !process_monitor?
-          end
-
-          def process_monitor_defined?
-            !process_monitor[:name].nil?
-          end
-
-          def process_monitor?
-            env_name == process_monitor[:env]
-          end
-
           def monitor_executable
             @monitor_executable ||= env_path.join(process_monitor[:env], 'bin', 
                                                   process_monitor[:name])
@@ -64,10 +52,7 @@ module Luban
             output = start_process!
             if check_until { process_started? }
               update_result "Start #{service_full_name}: [OK] #{output}"
-              if process_monitorable?
-                reload_monitor_process
-                monitor_process 
-              end
+              monitor_process if monitorable?
             else
               remove_orphaned_pid_file
               update_result "Start #{service_full_name}: [FAILED] #{output}", 
@@ -81,7 +66,7 @@ module Luban
               return
             end
 
-            unmonitor_process if process_monitorable?
+            unmonitor_process if monitorable?
             output = stop_process! || 'OK'
             if check_until { process_stopped? }
               update_result "Stop #{service_full_name}: [OK] #{output}"
@@ -94,7 +79,7 @@ module Luban
 
           def restart_process
             if process_started?
-              unmonitor_process if process_monitorable?
+              unmonitor_process if monitorable?
               output = stop_process!
               if check_until { process_stopped? }
                 remove_orphaned_pid_file
@@ -110,7 +95,7 @@ module Luban
             output = start_process!
             if check_until { process_started? }
               update_result "Restart #{service_full_name}: [OK] #{output}"
-              monitor_process if process_monitorable?
+              monitor_process if monitorable?
             else
               remove_orphaned_pid_file
               update_result "Restart #{service_full_name}: [FAILED] #{output}", 
@@ -132,7 +117,7 @@ module Luban
               return
             end
 
-            unmonitor_process if process_monitorable?
+            unmonitor_process if monitorable?
             output = kill_process!
             if check_until { process_stopped? }
               update_result "Kill #{service_full_name}: [OK] #{output}"
@@ -142,27 +127,39 @@ module Luban
             remove_orphaned_pid_file
           end
 
-          def monitor_process
+          def monitor_on
+            monitor_process(output: :update_result)
+          end
+
+          def monitor_off
+            unmonitor_process(output: :update_result)
+          end
+
+          def monitor_reload
+            reload_monitor_process(output: :update_result)
+          end
+
+          def monitor_process(output: :info)
             if monitor_process!
-              info "Turned on process monitor for #{service_entry}"
+              send(output, "Turned on process monitor for #{service_entry}")
             else
-              info "Failed to turn on process monitor for #{service_entry}"
+              send(output, "Failed to turn on process monitor for #{service_entry}")
             end
           end
 
-          def unmonitor_process
+          def unmonitor_process(output: :info)
             if unmonitor_process!
-              info "Turned off process monitor for #{service_entry}"
+              send(output, "Turned off process monitor for #{service_entry}")
             else
-              info "Failed to turn off process monitor for #{service_entry}"
+              send(output, "Failed to turn off process monitor for #{service_entry}")
             end
           end
 
-          def reload_monitor_process
+          def reload_monitor_process(output: :info)
             if reload_monitor_process!
-              info "Reloaded process monitor for #{service_entry}"
+              send(output, "Reloaded process monitor for #{service_entry}")
             else
-              info "Failed to reload process monitor for #{service_entry}"
+              send(output, "Failed to reload process monitor for #{service_entry}")
             end
           end
 
@@ -172,7 +169,7 @@ module Luban
           protected
 
           def init
-            load_process_monitor_commands if process_monitorable?
+            load_process_monitor_commands if monitorable?
           end
 
           def load_process_monitor_commands

data/lib/luban/deployment/parameters.rb

@@ -74,6 +74,14 @@ module Luban
         parameter :ssh_options
         parameter :use_sudo
 
+        def process_monitor_via(monitor, env: "uber/lubmon")
+          monitor = monitor.to_s.downcase
+          env = "#{stage}.#{env.to_s.downcase}"
+          process_monitor name: monitor, env: env
+        end
+
+        def monitor_defined?; !process_monitor.empty?; end
+
         protected
 
         def set_default_project_parameters
@@ -95,7 +103,7 @@ module Luban
         end
 
         def validate_project_parameters
-          unless process_monitor.empty?
+          if monitor_defined?
             if process_monitor[:name].nil?
               abort "Aborted! Please specify the process monitor."
             end
@@ -113,6 +121,18 @@ module Luban
         parameter :scm_role
         parameter :logrotate_files
 
+        def env_name
+          @env_name ||= "#{stage}.#{project}/#{application}"
+        end
+
+        def monitor_itself?
+          env_name == process_monitor[:env]
+        end
+
+        def monitorable?
+          monitor_defined? and !monitor_itself?
+        end
+
         protected
 
         def set_default_application_parameters

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

@@ -10,7 +10,7 @@ if [ -n "${LUBAN_ROOT:+x}" ]; then
   if [[ "$LUBAN_ROOT" == "<%= app_path %>" ]]; then
     echo_line "Environment <%= env_name %> has ALREADY been activated!"
   else
-    local current_env=${LUBAN_ROOT##*env/}
+    current_env=${LUBAN_ROOT##*env/}
     echo_line "Environment $current_env is STILL active!"
     echo_line "Please de-activate it first:"
     echo_line "\tunset_lubenv $current_env"

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

@@ -16,7 +16,7 @@ if [ -n "${LUBAN_ROOT:+x}" ]; then
     <%- end -%>
     echo_line "Environment <%= env_name %> is de-activated!"
   else
-    local current_env=${LUBAN_ROOT##*env/}
+    current_env=${LUBAN_ROOT##*env/}
     echo_line "ACTUALLY, environment $curent_env is active!"
     echo_line "Please run the following command instead to de-activate it:"
     echo_line "\tunset_lubenv $current_env"

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.8.6"
+    VERSION = "0.8.7"
   end
 end

data/lib/luban/deployment/worker/base.rb

@@ -25,10 +25,6 @@ module Luban
         def osx?; os_name == 'Darwin'; end
         def linux?; os_name == 'Linux'; end
 
-        def env_name
-          @env_name ||= "#{stage}.#{project}/#{application}"
-        end
-
         def target_name; task.opts.name; end
         def target_full_name; "#{target_name}-#{target_version}"; end
 
@@ -71,8 +67,8 @@ module Luban
 
         def update_result(message = nil, status: :succeeded, level: :info, **attrs)
           task.result.tap do |r|
-            r.status = status
-            r.level = level
+            r.status = status unless status.nil? or !r.status.nil?
+            r.level = level unless level.nil? or !r.level.nil?
             r.message = message unless message.nil? or !r.message.nil?
             attrs.each_pair { |k, v| r.send("#{k}=", v) }
             unless message.nil? or message.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli