luban-rack 0.2.25 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba88795ad372137e882168115664d39c58016d00
-  data.tar.gz: b7c8daf27a7da974081d784cabef18e3e305263a
+  metadata.gz: 7dcdf2aa0a85983d8e4812d535c97f0ecd5fbb4a
+  data.tar.gz: 325a2d35ef82ea6e45311e994d61982a84d84c97
 SHA512:
-  metadata.gz: 223caf0343900b533477bdd2fd219eb9164b201a70069400adbca77b2d53882fad3af2c5ab35a9f80947d355738e03a5e497c4a23f98436de54bcd120f9b9447
-  data.tar.gz: b96e64c4985d18db760a7cbe8c826ae13ef058885647a4b0a8fecb9175cb12b4cb7e2de095bdde2f0332c528647696e5cc3a987a8e82c426de9e9ab6b994c553
+  metadata.gz: acf7051bdff689900968d367dbe9bb0af9f5e09c91b3eff3007d2fe5098f0fcb32381e8378d47dd460fea70fdf6b992c09fd9c29a3c2960e45434d1dd22c99e2
+  data.tar.gz: 38dfc837affd992f4db40a2b104639cc6438dea4c956de64efce7a961ef9fae718d536de0d48a7fd2c5cf217869a1849d5915c0eb155f2860db253e33156efb6

data/CHANGELOG.md

@@ -1,13 +1,19 @@
 # Change log
 
-## Version 0.2.25 (Feb 23, 2016)
+## Version 0.3.0 (Mar 28, 2017)
+  * Set up Puma/Thin web server configurations appropriately for dockerization
+
+Bug fixes:
+  * Compared excluded templates with their basename instead of full path
+
+## Version 0.2.25 (Feb 23, 2017)
 
 Minor enhancements:
   * Bump up gem dependency of Luban to version 0.12.8
     * To make use of an enhancement of cleaning up Bundler environment before executing any worker tasks
     * So that code can be cleaned up in a more concise way
 
-## Version 0.2.24 (Jan 03, 2016)
+## Version 0.2.24 (Jan 03, 2017)
 
 Minor enhancements:
   * Cleaned up Bundler environment for control actions and web server publishing

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

@@ -7,7 +7,7 @@ module Luban
           include WebServer
 
           def exclude_template?(template)
-            super or web_servers_unused.any? { |w| template =~ /^#{w}\./ }
+            super or web_servers_unused.any? { |w| File.basename(template) =~ /^#{w}\./ }
           end
 
           protected

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

@@ -1,7 +1,7 @@
 # Monit Monit configuration for Thin
 
 <% opts = web_server[:opts] -%>
-<% opts[:servers].times do |n| -%>
+<% (opts[:servers] || 1).times do |n| -%>
 check process <%= service_entry %>.<%= current_web_server %>.<%= n %>
   with pidfile <%= pid_file_path(n) %>
   group <%= service_entry %>

data/lib/luban/deployment/applications/rack/templates/thin/thin.nginx.http.proxy.conf.erb

@@ -1,17 +1,18 @@
 # Nginx reverse proxy configuration for Thin
 
 <% opts = web_server[:opts] -%>
+<% servers = opts[:servers] || 1 -%>
 upstream <%= service_entry %> {
     # fail_timeout=0 means we always retry an upstream even if it failed
     # to return a good HTTP response 
 
     <%- if tcp_socket? -%>
-    <%- opts[:servers].times do |n| -%>
+    <%- servers.times do |n| -%>
     server <%= opts[:address] %>:<%= opts[:port] + n %> fail_timeout=0;
     <%- end -%>
     <%- end -%>
     <%- if unix_socket? -%>
-    <%- opts[:servers].times do |n| -%>
+    <%- servers.times do |n| -%>
     server unix:<%= socket_file_path(n) %> fail_timeout=0;
     <%- end -%>
     <%- end -%>

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

@@ -1,7 +1,7 @@
 module Luban
   module Deployment
     module Applications
-      RACK_VERSION = '0.2.25'
+      RACK_VERSION = '0.3.0'
     end
   end
 end

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

@@ -24,8 +24,8 @@ module Luban
           protected
 
           def init
-            super
             load_web_server
+            super
           end
 
           def load_web_server

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

@@ -13,8 +13,9 @@ module Luban
                   socket: socket_file_path.to_s,
                   directory: release_path.to_s,
                   environment: stage,
+                  rackup: release_path.join('config.ru').to_s,
                   # Daemon options
-                  daemonize: true,
+                  daemonize: !dockerized?,
                   pidfile: pid_file_path.to_s,
                   state_path: state_file_path.to_s,
                   redirect_stdout: log_file_path.to_s,
@@ -78,6 +79,10 @@ module Luban
 
               protected
 
+              def init_docker_command
+                docker_command ["bundle", "exec", "puma", "-C", control_file_path.to_s]
+              end
+
               def set_web_server_options
                 super.tap do |opts|
                   [:uri, :stdout_redirect, :workers, :threads, :control, :tuning].each do |param|
@@ -107,7 +112,11 @@ module Luban
               end
 
               def set_workers_options(opts)
-                opts[:workers] = opts.delete(:servers)
+                if dockerized?
+                  opts.delete(:servers)
+                else
+                  opts[:workers] = opts.delete(:servers)
+                end
               end
 
               def set_threads_options(opts)

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

@@ -94,7 +94,7 @@ module Luban
                   chdir: release_path.to_s,
                   environment: stage,
                   # Daemon options
-                  daemonize: true,
+                  daemonize: !dockerized?,
                   log: log_file_path.to_s,
                   pid: pid_file_path.to_s,
                   tag: "#{env_name}:#{release_tag}",
@@ -131,6 +131,10 @@ module Luban
 
               protected
 
+              def init_docker_command
+                docker_command ["bundle", "exec", "thin", "start", "-C", control_file_path.to_s]
+              end
+
               def set_web_server_options
                 super.tap do |opts|
                   @unix_socket = !!opts.delete(:unix_socket)
@@ -141,6 +145,10 @@ module Luban
                   else
                     opts.delete(:socket)
                   end
+                  if dockerized?
+                    opts.delete(:servers)
+                    opts.delete(:wait)
+                  end
                 end
               end
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban-rack
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.3.0
 platform: ruby
 authors:
 - Rubyist Chi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban