capistrano3-puma 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72adcf17b7df644935888f2db4d54f8768fa37e3
-  data.tar.gz: 6339c8ae779638584d8bd2cf5cb58f53979504bd
+  metadata.gz: c5e6d7a282e15a64ea0a11d8e75715b8d1e7b5f9
+  data.tar.gz: 96ddd46d8d8818de1e6741996cb49345bbdb9804
 SHA512:
-  metadata.gz: 5a72c7686a9d3b45c02b7a20a88f444cddf9f9eabb0efca4367e5b31d5130cd686004a9a681157d90a79afd132c4fff8600ffb230e897500169c35a8efc0c443
-  data.tar.gz: 10d90221ff1886edab8ce24e3f5347d5cb3899eded6ef36a87b14c018a20fb7418ad94f86195bf04dc8c64cfd5984e430cc17e4ce2131086a29fc759088ea4e6
+  metadata.gz: f759e225e50b35f2590a474dd0e260f9e822600e0843ce1b55cfc3eaf0f890bfee8a7db402ea063fa768ced9371ee2429a17d6731103446b54106f1c8cb28bbd
+  data.tar.gz: a81853cc9b5b7bc62323ef0c868058481f271b8b7f5892ad77e729c633bb60e7a15543a2139e93d6a1819d172db48d72745be6186353088c848e0f2c30190428

data/README.md

@@ -39,6 +39,7 @@ Configurable options, shown here with defaults: Please note the configuration op
     set :puma_env, fetch(:rack_env, fetch(:rails_env, 'production'))
     set :puma_threads, [0, 16]
     set :puma_workers, 0
+    set :puma_worker_timeout, nil
     set :puma_init_active_record, false
     set :puma_preload_app, true
 ```
@@ -66,6 +67,7 @@ Ensure that the following directories are shared (via ``linked_dirs``):
     tmp/pids tmp/sockets log
 
 ## Changelog
+- 0.5.1: Added worker_timeout option
 - 0.5.0: Bugs fixes
 - 0.4.2: Fix monit template to support chruby
 - 0.4.1: Fix puma jungle (debian)

data/lib/capistrano/puma/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Puma
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

data/lib/capistrano/tasks/puma.cap

@@ -112,17 +112,7 @@ namespace :puma do
     fetch(:puma_workers) || 0
   end
 
-  def puma_tag
-    if  fetch(:puma_tag)
-      # Versions(puma) prior to 2.8.2 don't support tag option
-      if Gem.loaded_specs['puma'].version >= Gem::Version.new('2.8.2')
-        return "tag '#{fetch(:puma_tag)}'"
-      else
-        warn 'Version puma 2.8.2+ required for tag option: Tag not set'
-      end
-      return
-    end
-  end
+
 
   def puma_bind
     case fetch(:puma_bind)

data/lib/capistrano/templates/puma.rb.erb

@@ -3,7 +3,9 @@
 directory '<%= current_path %>'
 rackup "<%=fetch(:puma_rackup)%>"
 environment '<%= fetch(:puma_env) %>'
-<%= puma_tag %>
+<% if fetch(:puma_tag) %>
+  tag '<%= fetch(:puma_tag)%>'
+<% end %>
 daemonize true
 pidfile "<%=fetch(:puma_pid)%>"
 state_path "<%=fetch(:puma_state)%>"
@@ -13,9 +15,11 @@ stdout_redirect '<%=fetch(:puma_access_log)%>', '<%=fetch(:puma_error_log)%>', t
 threads <%=fetch(:puma_threads).join(',')%>
 
 <%= puma_bind %>
-
-
 workers <%= puma_workers %>
+<% if fetch(:puma_worker_timeout) %>
+worker_timeout <%= fetch(:puma_worker_timeout).to_i %>
+<% end %>
+
 <% if fetch(:puma_preload_app) %>
 preload_app!
 <% end %>

data/lib/capistrano/templates/run-puma.erb

@@ -3,7 +3,7 @@ app=$1;
 cd $app || exit 1
 
 if [ -e Gemfile ]; then
-    exec sh -c "exec bundle exec puma -C ../../shared/config/puma.rb"
+    exec sh -c "exec bundle exec puma -C ../../shared/puma.rb"
 else
-    exec sh -c "exec puma -C ../../shared/config/puma.rb"
-fi
+    exec sh -c "exec puma -C ../../shared/puma.rb"
+fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Puma integration for Capistrano