luban-monit 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b17b119e8484f1468a96063ce56f153a386c24f
-  data.tar.gz: b6e232d7921bd61b32c76347091dd4928d79fb58
+  metadata.gz: f4ff6bf96ef011c09c671981ce035af92ea35956
+  data.tar.gz: 19f86daa270dbcb17215d7de1ee22f4a2eb8056f
 SHA512:
-  metadata.gz: 7de3e3b8a1d235c70b8b5a4cf5e00fb6e4366e0755c1e38fdd7dc248f670009e7c404a352591984e2807d1bbf0b381ac10144ef0e30980c36ff204a467184c0e
-  data.tar.gz: f3228233cfe029845375b550e652104b796c88af667289d247f680b8bfd6c42a542c0bbd171c3c3b1a56e99dd306e7cf0c76cb08757d4b703ee2d62a8b3844f7
+  metadata.gz: 7cd947baf88fa2336f2774c156e1e6a82b43419bf4e15a8cb3bb8e6b4d954e05a21c81ffe88c1127adb3520380fdc27b4d5cefdb73f852637f79a680c676b4a9
+  data.tar.gz: 2bbf8bbf23902668c865b8c11eb530ee98411900f2b36bc84a7edada5ceeab8c5ba7e43a30d59b348128ece4353fc252f93ddffd16220ba70c882dc40788ef25

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change log
 
+## Version 0.2.3 (Sept 19, 2016)
+
+New features:
+  * Added commands to monitor/unmonitor named service
+  * Provided the above commands to other Luban services/apps thru module Monit::Controller::Commands::Public
+    * As a result, bumped up the gem dependency on Luban to version 0.8.1
+
+Minor enhancements:
+  * Refactored the way of composing shell commands
+  * Fixed regular expression to check process start to support Monit 5.19.0
+  * Minor code cleanup
+
 ## Version 0.2.2 (Sept 06, 2016)
 
 Minor enhancements:

data/lib/luban/deployment/packages/monit/base.rb

@@ -8,7 +8,8 @@ module Luban
           end
         end
 
-        %i(config_test reload_process match_process).each do |action|
+        %i(config_test match_process monitor_process
+            unmonitor_process reload_process).each do |action|
           service_action action, dispatch_to: :controller
         end
 
@@ -42,6 +43,18 @@ module Luban
             argument :pattern, "Regex for process match"
             action! :match_process
           end
+
+          task :monitor do
+            desc "Enable monitoring"
+            argument :service_entry, "Servie entry name"
+            action! :monitor_process
+          end
+
+          task :unmonitor do
+            desc "Disable monitoring"
+            argument :service_entry, "Servie entry name"
+            action! :unmonitor_process
+          end
         end
       end
     end

data/lib/luban/deployment/packages/monit/controller.rb

@@ -4,6 +4,22 @@ module Luban
       class Monit
         class Controller < Luban::Deployment::Service::Controller
           module Commands
+            module Public
+              def monitor_command(service_entry)
+                @monitor_command ||= shell_command("#{monitor_executable} monitor #{service_entry}")
+              end
+
+              def unmonitor_command(service_entry)
+                @unmonitor_command ||= shell_command("#{monitor_executable} unmonitor #{service_entry}")
+              end
+
+              def reload_monitor_command
+                @reload_monitor_command ||= shell_command("#{monitor_executable} reload")
+              end
+            end
+
+            include Public
+
             def self.included(base)
               base.define_executable 'monit'
             end
@@ -11,15 +27,18 @@ module Luban
             def monit_command
               @monit_command ||= "#{monit_executable}"
             end
+            alias_method :monitor_executable, :monit_command
 
             def process_pattern
               @process_pattern ||= "^#{monit_command}"
             end
 
-            alias_method :start_command, :monit_command
+            def start_command
+              @start_command ||= shell_command(monit_command)
+            end
 
             def stop_command
-              @stop_command ||= "#{monit_command} quit"
+              @stop_command ||= shell_command("#{monit_command} quit")
             end
           end
 
@@ -30,37 +49,37 @@ module Luban
           end
 
           def process_started?
-            super and check_process! =~ /^The Monit daemon #{package_major_version} uptime:|^Monit uptime:/
-          end
-
-          def config_test
-            update_result config_test!
-          end
-
-          def reload_process
-            update_result reload_process!
+            super and check_process! =~ /^Monit #{package_major_version} uptime:|^Monit uptime:|^The Monit daemon #{package_major_version} uptime:/
           end
 
-          def match_process
-            update_result match_process!
+          %i(config_test match_process monitor_process unmonitor_process reload_process).each do |m|
+            define_method(m) { update_result send("#{__method__}!") }
           end
 
           protected
 
           def config_test!
-            capture(compose_command("#{monit_command} -t"))
+            capture(shell_command("#{monit_command} -t"))
           end
 
           def check_process!
-            capture(compose_command("#{monit_command} status"))
+            capture(shell_command("#{monit_command} status"))
           end
 
-          def reload_process!
-            capture(compose_command("#{monit_command} reload"))
+          def match_process!
+            capture(shell_command("#{monit_command} procmatch #{task.args.pattern}"))
           end
 
-          def match_process!
-            capture(compose_command("#{monit_command} procmatch #{task.args.pattern}"))
+          def monitor_process!
+            capture(monitor_command(task.args.service_entry))
+          end
+
+          def unmonitor_process!
+            capture(unmonitor_command(task.args.service_entry))
+          end
+
+          def reload_process!
+            capture(reload_monitor_command)
           end
         end
       end

data/lib/luban/deployment/packages/monit/version.rb

@@ -2,7 +2,7 @@ module Luban
   module Deployment
     module Packages
       class Monit
-        VERSION = '0.2.2'
+        VERSION = '0.2.3'
       end
     end
   end

data/luban-monit.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.1.0"
-  spec.add_dependency 'luban', ">= 0.7.0"
+  spec.add_dependency 'luban', ">= 0.8.1"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban-monit
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Rubyist Chi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement