capistrano3-puma 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bbc53ee929dc4a1cced45086a8f3b2e9517e1cc
-  data.tar.gz: 52bcee92dbb183aa41cefb36ed3379e1408804f6
+  metadata.gz: f37043e11c00bbf05127487cb0db68bb106120f5
+  data.tar.gz: 8a413a81ad477bab83a07a5498c8260dfb84b6ff
 SHA512:
-  metadata.gz: 90d35597bd28a50eba1c6bec77bfb6a594cf7963f69dd7fb7361c44f526fc8493d29c93a1fbaf2a5d467785ed6c26bc2fa63c9af9bdfb1b029ac3171cefdba91
-  data.tar.gz: cb20fdedfe75cba45224f63d42e65c97be3012234837214cdc45070216efc09a38f7d9d77b634f9e9fff7af1c13c0b2eae2b41197ef2fe48d9fe1a02107068d1
+  metadata.gz: a036762c011be4afaf8b613baa13b2f96612a838f560335473354c9e0e9618169573a4a4d943a4b7f0f4956d4b9135ed0fbfb77d7d3a2afa327ca8711042b4b1
+  data.tar.gz: 464224d5cc6113970787efe15b123ddb98717d7e3cb302c7c4dc8d56c7488637faf3660f829fb6f64da4cccfe8043daac62f9495c6263555deaacc4ec1ab64a8

data/README.md

@@ -59,8 +59,8 @@ Configurable options, shown here with defaults: Please note the configuration op
     set :puma_pid, "#{shared_path}/tmp/pids/puma.pid"
     set :puma_bind, "unix://#{shared_path}/tmp/sockets/puma.sock"    #accept array for multi-bind
     set :puma_conf, "#{shared_path}/puma.rb"
-    set :puma_access_log, "#{shared_path}/log/puma_error.log"
-    set :puma_error_log, "#{shared_path}/log/puma_access.log"
+    set :puma_access_log, "#{shared_path}/log/puma_access.log"
+    set :puma_error_log, "#{shared_path}/log/puma_error.log"
     set :puma_role, :app
     set :puma_env, fetch(:rack_env, fetch(:rails_env, 'production'))
     set :puma_threads, [0, 16]
@@ -94,6 +94,7 @@ Ensure that the following directories are shared (via ``linked_dirs``):
     tmp/pids tmp/sockets log
 
 ## Changelog
+- 0.8.4: Allow patch method (Nginx template) @lonre
 - 0.8.2: Start task creates a conf file if none exists @stevemadere
 - 0.8.1: Fixed nginx task @hnatt, support for prune_bundler @behe
 - 0.8.0: Some changes

data/lib/capistrano/puma/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Puma
-    VERSION = '0.8.3'
+    VERSION = '0.8.4'
   end
 end

data/lib/capistrano/tasks/monit.cap

@@ -31,21 +31,21 @@ namespace :puma do
       end
     end
 
-    desc 'Disable Puma monit-service'
+    desc 'Start Puma monit-service'
     task :start do
       on roles(fetch(:puma_role)) do
         sudo "#{fetch(:puma_monit_bin)}  start #{puma_monit_service_name}"
       end
     end
 
-    desc 'Disable Puma monit-service'
+    desc 'Stop Puma monit-service'
     task :stop do
       on roles(fetch(:puma_role)) do
         sudo "#{fetch(:puma_monit_bin)}  stop #{puma_monit_service_name}"
       end
     end
 
-    desc 'Disable Puma monit-service'
+    desc 'Restart Puma monit-service'
     task :restart do
       on roles(fetch(:puma_role)) do
         sudo "#{fetch(:puma_monit_bin)}  restart #{puma_monit_service_name}"
@@ -53,7 +53,7 @@ namespace :puma do
     end
 
     def puma_monit_service_name
-      fetch(:puma_monit_service_name, "puma_#{fetch(:application)}")
+      fetch(:puma_monit_service_name, "puma_#{fetch(:application)}_#{fetch(:stage)}")
     end
 
   end

data/lib/capistrano/tasks/puma.cap

@@ -29,8 +29,8 @@ namespace :load do
     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) }
+    set :nginx_http_flags, -> { fetch(:nginx_flags) }
+    set :nginx_socket_flags, -> { fetch(:nginx_flags) }
   end
 end
 

data/lib/capistrano/templates/nginx_conf.erb

@@ -1,7 +1,7 @@
 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
+  etype, address  = /(tcp|unix|ssl):\/{1,2}(.+)/.match(m).captures
   if etype =='unix'
     "server #{etype}:#{address} #{fetch(:nginx_socket_flags)};"
   else
@@ -57,7 +57,7 @@ server {
     rewrite ^(.*)$ /503.html break;
   }
 
-  if ($request_method !~ ^(GET|HEAD|PUT|POST|DELETE|OPTIONS)$ ){
+  if ($request_method !~ ^(GET|HEAD|PUT|PATCH|POST|DELETE|OPTIONS)$ ){
     return 405;
   }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -96,3 +96,4 @@ signing_key:
 specification_version: 4
 summary: Puma integration for Capistrano
 test_files: []
+has_rdoc: