luban-rack 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4dbb78382653dc3a7bd7810fd9a229f56c1ee88
-  data.tar.gz: 8c13742326db0c9346587c867a1914f2d9ccafc7
+  metadata.gz: 932f2f5f02ca6ef79258c826163e2f3046b5e317
+  data.tar.gz: f2977360ca06c07a6aebeaea3dbb57ec9f5f15f8
 SHA512:
-  metadata.gz: 6130e86d0ec042a4345e8f0d96f17e1430c1287dd6345e0b28538a4c58e73c8c8e9d38450ad67b4a3c8e9a3d1e34e935224c1e33279c0fa7bc97e143e471381b
-  data.tar.gz: 26f6b502fa09122af638e19c47389e36b15168311a389474d7ca2104fd9dd280208785a3628a6d5c0a6a5c851c860eee215e3f896088d54788f5c7de94a7ab74
+  metadata.gz: e89dce255a7e42e197bd0e9ed40d199e3ba8a77288e8881500d9700ade058cfe779b01ef9265118675b8129afcff936783992a5dce380d96ef208a229d96d990
+  data.tar.gz: 8c95e6aa2392e690088e5fab41cbbf7446a51c2057d429db3d6d2b20b0ea0b233c5d839262b8ffefe16239dd450a30216e9243733e620e35b21acdf15b29d058

data/CHANGELOG.md

@@ -1,10 +1,16 @@
 # Change log
 
+## Version 0.2.7 (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.6 (Sept 04, 2016)
 
 Bug fixes:
   * Overloaded #shell_command_prefix method in all worker classes
-  * 
+  * Minor bug fixes
 
 ## Version 0.2.5 (Sept 01, 2016)
 

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

@@ -4,13 +4,6 @@ module Luban
       class Rack < Luban::Deployment::Application
         using Luban::CLI::CoreRefinements
 
-        module Common
-          def shell_command_prefix
-            @shell_command_prefix ||= 
-              has_gemfile? ? (super << "#{bundle_executable} exec") : super
-          end
-        end
-
         module Parameters
           extend Luban::Deployment::Parameters::Base  
 

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

@@ -3,7 +3,6 @@ module Luban
     module Applications
       class Rack
         class Configurator < Luban::Deployment::Application::Configurator
-          include Common
           include Paths
           include Parameters
           include WebServer

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

@@ -3,7 +3,6 @@ module Luban
     module Applications
       class Rack
         class Controller < Luban::Deployment::Application::Controller
-          include Common
           include Paths
           include Parameters
           include WebServer
@@ -38,13 +37,8 @@ module Luban
             set_web_server_options
           end
 
-          def restart_process!
-            capture(compose_command(restart_command))
-          end
-
-          def phased_restart_process!
-            capture(compose_command(phased_restart_command))
-          end
+          def restart_process!; capture(restart_command); end
+          def phased_restart_process!; capture(phased_restart_command); end
         end
       end
     end

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

@@ -3,8 +3,6 @@ module Luban
     module Applications
       class Rack
         class Publisher < Luban::Deployment::Application::Publisher
-          include Common
-          
           protected
 
           def init

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; <%= 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 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; <%= compose_command(start_command) %> -o <%=n %>'"
-  stop program = "/bin/bash -c '<%= compose_command(stop_command) %> -o <%=n %>'"
+  start program = "/bin/bash -c 'sleep 1; <%= start_command %> -o <%=n %>'"
+  stop program = "/bin/bash -c '<%= 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.6'
+        VERSION = '0.2.7'
       end
     end
   end

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

@@ -5,7 +5,7 @@ module Luban
         module WebServers
           module Puma
             module Common
-              def default_web_server_options
+             def default_web_server_options
                 @default_web_server_options ||= {
                   # Server options
                   address: "0.0.0.0",
@@ -61,11 +61,11 @@ module Luban
               end
 
               def start_command
-                @start_command ||= "#{puma_command} start"
+                @start_command ||= bundle_command("#{puma_command} start")
               end
 
               def stop_command
-                @stop_command ||= "#{puma_command} stop"
+                @stop_command ||= bundle_command("#{puma_command} stop")
               end
 
               def process_pattern
@@ -143,11 +143,11 @@ module Luban
             include Common
 
             def restart_command
-              @restart_command ||= "#{puma_command} restart"
+              @restart_command ||= bundle_command("#{puma_command} restart")
             end
 
             def phased_restart_command
-              @phased_restart_command ||= "#{puma_command} phased-restart"
+              @phased_restart_command ||= bundle_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 ||= "#{thin_command} start"
+                @start_command ||= bundle_command("#{thin_command} start")
               end
 
               def stop_command
-                @stop_command ||= "#{thin_command} stop"
+                @stop_command ||= bundle_command("#{thin_command} stop")
               end
 
               def process_pattern
@@ -148,11 +148,11 @@ module Luban
             include Common
 
             def restart_command
-              @restart_command ||= "#{thin_command} restart"
+              @restart_command ||= bundle_command("#{thin_command} restart")
             end
 
             def phased_restart_command
-              @phased_restart_command ||= "#{thin_command} restart --onebyone"
+              @phased_restart_command ||= bundle_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.7.11"
+  spec.add_dependency 'luban', ">= 0.8.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.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Rubyist Chi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-04 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.11
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.11
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement