luban-rack 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea13e5a37f9b56a8b1dfe2f174aafda0f1203c09
-  data.tar.gz: 6422249762e63456d09496618b969614dc4262bd
+  metadata.gz: 5db2c3cf756af8c21ed8770721c1b72e286ad866
+  data.tar.gz: 1a8cc08f561ed98bff57bc805f935b3237de2dd2
 SHA512:
-  metadata.gz: 0c4b899af232c7e531938cc500146b72510fd19095acda952bd03b90594ab6492206ccab86905008349eafcafe3326d422e4538617268fd204864a18c69b1192
-  data.tar.gz: 4acc29ff54764af13544a825a760ae9dd047ec3e364a17807666627d0c8b6de005b7080c3f798622ecaaf320fca4c2f9a93095b8fc82e72c3a13e5a82f494c6f
+  metadata.gz: ed6cbca820f68ec611d7c653cb181aa1b5fbb8317966711bf95fa8e576ed4269252e50f2b727a72f5f2df6ee8f9bbdb6b884c38107776896334cd64678d85e63
+  data.tar.gz: 9d5e8a1b8f621f1c0a7a428d3ffa6398dab9d3123efd60b5a27f8c63e9b97f2f80fd6237bf5077ba3295e6721f2cb5471574b68d6c6ac062a12b1e64e4e391ec

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change log
 
+## Version 0.2.2 (Aug 18, 2016)
+
+Minor enhancments:
+  * Changed default web server from thin to puma
+  * Used #compose_command to support shell setup commands
+
 ## Version 0.2.1 (Aug 05, 2016)
 
 Bug fixes:

data/lib/luban/deployment/applications/rack/base.rb

@@ -9,7 +9,7 @@ module Luban
 
           DefaultPort = 3000
           DefaultVirtualHost = 'localhost'
-          DefaultWebServer = :thin
+          DefaultWebServer = :puma
 
           parameter :port
           parameter :virtual_host

data/lib/luban/deployment/applications/rack/controller.rb

@@ -38,11 +38,11 @@ module Luban
           end
 
           def restart_process!
-            capture("#{restart_command} 2>&1")
+            capture(compose_command(restart_command))
           end
 
           def phased_restart_process!
-            capture("#{phased_restart_command} 2>&1")
+            capture(compose_command(phased_restart_command))
           end
         end
       end

data/lib/luban/deployment/applications/rack/templates/puma/puma.monitrc.erb

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

data/lib/luban/deployment/applications/rack/templates/thin/thin.monitrc.erb

@@ -6,8 +6,8 @@ check process <%= service_entry %>.<%= current_web_server %>.<%= n %>
   with pidfile <%= pid_file_path(n) %>
   group <%= service_entry %>
   onreboot laststate
-  start program = "/bin/bash -c 'sleep 1; <%= start_command %> -o <%=n %>'"
-  stop program = "/bin/bash -c '<%= stop_command %> -o <%=n %>'"
+  start program = "/bin/bash -c 'sleep 1; <%= compose_command(start_command) %> -o <%=n %>'"
+  stop program = "/bin/bash -c '<%= compose_command(stop_command) %> -o <%=n %>'"
   if totalmem is greater than 150.0 MB for 40 cycles then alert
   <%- if tcp_socket? -%>
   if failed port <%= opts[:port] + n %> for 4 times within 8 cycles then restart

data/lib/luban/deployment/applications/rack/version.rb

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

data/lib/luban/deployment/applications/rack/web_servers/puma.rb

@@ -61,11 +61,11 @@ module Luban
               end
 
               def start_command
-                @start_command ||= "cd #{release_path}; #{puma_command} start"
+                @start_command ||= "#{puma_command} start"
               end
 
               def stop_command
-                @stop_command ||= "cd #{release_path}; #{puma_command} stop"
+                @stop_command ||= "#{puma_command} stop"
               end
 
               def process_pattern
@@ -143,11 +143,11 @@ module Luban
             include Common
 
             def restart_command
-              @restart_command ||= "cd #{release_path}; #{puma_command} restart"
+              @restart_command ||= "#{puma_command} restart"
             end
 
             def phased_restart_command
-              @phased_restart_command ||= "cd #{release_path}; #{puma_command} phased-restart"
+              @phased_restart_command ||= "#{puma_command} phased-restart"
             end
           end
         end

data/lib/luban/deployment/applications/rack/web_servers/thin.rb

@@ -118,11 +118,11 @@ module Luban
               end
 
               def start_command
-                @start_command ||= "cd #{release_path}; #{thin_command} start"
+                @start_command ||= "#{thin_command} start"
               end
 
               def stop_command
-                @stop_command ||= "cd #{release_path}; #{thin_command} stop"
+                @stop_command ||= "#{thin_command} stop"
               end
 
               def process_pattern
@@ -148,11 +148,11 @@ module Luban
             include Common
 
             def restart_command
-              @restart_command ||= "cd #{release_path}; #{thin_command} restart"
+              @restart_command ||= "#{thin_command} restart"
             end
 
             def phased_restart_command
-              @phased_restart_command ||= "cd #{release_path}; #{thin_command} restart --onebyone"
+              @phased_restart_command ||= "#{thin_command} restart --onebyone"
             end
           end
         end

data/luban-rack.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.6.8"
+  spec.add_dependency 'luban', ">= 0.7.0"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban-rack
 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-08-05 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement