capistrano3-puma 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 906e7e263c2cf0567f367308907420814fedf12d
-  data.tar.gz: cf6269ede1b1f672c1d38d5ff63ac008ffd30efe
+  metadata.gz: a2255db8f6e5e8f22eb484c40fe6c5848e436a35
+  data.tar.gz: 37a20cc815d7df734b26cdefe9a0dfbd500e6912
 SHA512:
-  metadata.gz: 1a2bc17d7c278226a39664ee3da1e16c7f1e103c9c170b4074662f0263739f27ad66c67d751ec55d0321a23ebae677ddf062086ebb76ce44cbff5de7abf2b7c4
-  data.tar.gz: cf8c248c466623a27f5f41c614ead058998f5d87a511ee94416b9d223bbb5ee21b2532ea4a88ce9072f322278055a7853d4931ef8aab8c4d8137ea88026bcadb
+  metadata.gz: 4dcf652c3a5db23dfe7236a175220bc51174bd79a713bc04130fb273999aaea7a90ad2a50c0320be3b00b239758b700a9520f10448f7ca95cdd315c56c5b3467
+  data.tar.gz: ecd46e7275d169a1be620cbcebeb3327288f57bd8ff9d080ba994909ed1f71306446874dfc65565aab2f6b7c3a33482c8d1f4971d3ec61407ed71452b971721f

data/lib/capistrano/puma/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Puma
-    VERSION = '0.7.0'
+    VERSION = '0.8.0'
   end
 end

data/lib/capistrano/tasks/nginx.cap

@@ -1,8 +1,8 @@
-namespace :nginx do
+namespace :puma do
   desc "Setup nginx configuration"
-  task :config do
-    on roles(:puma_nginx) do
-      template_puma("nginx_conf", "/tmp/nginx_#{fetch(:nginx_config_name)}")
+  task :nginx_config do
+    on roles(:puma_nginx) do |role|
+      template_puma("nginx_conf", "/tmp/nginx_#{fetch(:nginx_config_name)}", role)
       sudo :mv, "/tmp/nginx_#{fetch(:nginx_config_name)} #{fetch(:nginx_sites_available_path)}/#{fetch(:nginx_config_name)}"
       sudo :ln, '-fs', "#{fetch(:nginx_sites_available_path)}/#{fetch(:nginx_config_name)} #{fetch(:nginx_sites_enabled_path)}/#{fetch(:nginx_config_name)}"
     end

data/lib/capistrano/tasks/puma.cap

@@ -27,7 +27,9 @@ namespace :load do
     set :nginx_sites_available_path, -> { '/etc/nginx/sites-available' }
     set :nginx_sites_enabled_path, -> { '/etc/nginx/sites-enabled' }
     set :nginx_server_name, -> { "localhost #{fetch(:application)}.local" }
-
+    set :nginx_flags, -> { 'fail_timeout=0' }
+		set :nginx_http_flags, -> { fetch(:nginx_flags) }
+		set :nginx_socket_flags, -> { fetch(:nginx_flags) }
   end
 end
 

data/lib/capistrano/templates/nginx_conf.erb

@@ -1,5 +1,15 @@
-upstream puma_<%= fetch(:nginx_config_name) %> {
-  server <%= fetch(:puma_bind) %> fail_timeout=0;
+upstream puma_<%= fetch(:nginx_config_name) %> { <%
+  flags = 'fail_timeout=0'
+  @backends = [fetch(:puma_bind)].flatten.map do |m|
+  etype, address  = /(tcp|unix|ssl):\/\/(.+)/.match(m).captures
+  if etype =='unix'
+    "server #{etype}:#{address} #{fetch(:nginx_socket_flags)};"
+  else
+    "server #{address.gsub(/0\.0\.0\.0(.+)/, "127.0.0.1\\1")} #{fetch(:nginx_http_flags)};"
+  end
+end
+%><% @backends.each do |server|  %>
+  <%= server %><% end %>
 }
 
 server {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -93,9 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Puma integration for Capistrano
 test_files: []
-has_rdoc: