luban-nginx 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b631ea23bca17cadca11aabf4e5d2b81640348fd
-  data.tar.gz: 201588804f4cd8b58a018838fb9c29a63cd8da52
+  metadata.gz: b424bf66e37e56f3b6a339389967eeaa9f908053
+  data.tar.gz: b2105b154e1ec6f1f8cafb69e5cc1dd6be7c191c
 SHA512:
-  metadata.gz: c07174b806ee5c0bc72669bf36d38341306598e9c77a07c5bfb20a657e854937cb1f5e533dfaaf3ff2cc526fe68235f3aab26055098a4fa70b68be157e617132
-  data.tar.gz: 10128279046c58ffd78731b2959f410f78873e2c20cab5932ad3c2289f959d5dbf18035022f11344e4948f96e405f20e26e4d4484ba42809989eb61e34e13737
+  metadata.gz: 5039251d11b9fd34e6acb10b209299ecb53be45e5fb1d3364be98b7e986f3fa944135003c3d7c6f326f72b208cf5c5a47831a66085fe863861983a2e8e2ba285
+  data.tar.gz: acda97cafd8b645759f0ee8a1bd7b8986825ff283ec1bb3436c6849e45cd887b364998f1de8afd966a9dad0b20e95bec24e44ac7c7e08682dd7f798938098115

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change log
 
+## Version 0.2.2 (Sept 19, 2016)
+
+Minor enhancements:
+  * Refactored the way of composing shell commands
+    * As a result, bumped up the gem dependency on Luban to version 0.8.0
+
 ## Version 0.2.1 (Sept 01, 2016)
 
 Bug fixes:

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

@@ -20,10 +20,12 @@ module Luban
               @process_pattern ||= "^nginx: master process #{nginx_command}"
             end
             
-            alias_method :start_command, :nginx_command
+            def start_command
+              @start_command ||= shell_command(nginx_command)
+            end
 
             def stop_command
-              @stop_command ||= "#{nginx_command} -s stop"
+              @stop_command ||= shell_command("#{nginx_command} -s stop")
             end
           end
 
@@ -55,19 +57,19 @@ module Luban
           protected
 
           def config_test!
-            capture(compose_command("#{nginx_command} -t"))
+            capture(shell_command("#{nginx_command} -t"))
           end
 
           def quit_process!
-            capture(compose_command("#{nginx_command} -s quit"))
+            capture(shell_command("#{nginx_command} -s quit"))
           end
 
           def reload_process!
-            capture(compose_command("#{nginx_command} -s reload"))
+            capture(shell_command("#{nginx_command} -s reload"))
           end
 
           def reopen_logs!
-            capture(compose_command("#{nginx_command} -s reopen"))
+            capture(shell_command("#{nginx_command} -s reopen"))
           end
         end
       end

data/lib/luban/deployment/packages/nginx/templates/nginx.monitrc.erb

@@ -3,8 +3,8 @@
 check process <%= service_entry %>
   with pidfile <%= pid_file_path %>
   onreboot laststate
-  start program = "/bin/bash -c 'sleep 1; <%= compose_command(start_command) %>'"
-  stop program = "/bin/bash -c '<%= compose_command(stop_command) %>'"
+  start program = "/bin/bash -c 'sleep 1; <%= start_command %>'"
+  stop program = "/bin/bash -c '<%= stop_command %>'"
   if totalmem is greater than 10.0 MB for 40 cycles then restart
   <%- if proxy? -%>
   if failed port <%= proxy_app.port %> for 4 times within 8 cycles then restart

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

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

data/luban-nginx.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.9"
+  spec.add_dependency 'luban', ">= 0.8.0"
 
   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-nginx
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Rubyist Chi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-19 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.9
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.9
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement