capistrano3-puma 3.1.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 056f0e760a8050adbfa58de07ea92a2cd19155f6
-  data.tar.gz: 3606335e1e591fa8ec64799560f3305537232662
+SHA256:
+  metadata.gz: d3d97d6e6965faa5d7799a503e6730200c8f2c97c08a0eed22722bcde52927b4
+  data.tar.gz: 3b4616be230f21b14404d8c5581da21997458f6fff8e8eaf42d6c1532dea8ca7
 SHA512:
-  metadata.gz: 33112a1a74246ab3b71228d1b0a29cf82c8a04b18408dda5607505ffb9e65519e5cb7d07d5239e75a28b73d99e7f05462d83e3a1421187316d76aa92d41247e3
-  data.tar.gz: 45cf98d18423e1bf5da1a038051ceadfc2301b008120d1106ee749536f999bbd269f3bde6978c3c13723d4faa475d0c11c119971e52b60ca09c0dbc705049462
+  metadata.gz: 16b7475339b600ddddccf305fa5b02195e7be896771934d5577960425be2bc14737f544cfc76f63d7ffdc2e58acf3d00b585fc0f7a6730b4465dc63d877c1a18
+  data.tar.gz: 7432fbe4b4eac9c069c01da4774b0e12542ffb093112ea99ed8a177417ee994b94834b226d8d5e2072632eabcbabadd67361191d7981a449ce98b9e4cf17b52b

data/CHANGELOG.md

@@ -1,16 +1,18 @@
 ## Changelog
-- 3.1.0: 
+- 4.0.0:
+  - Support puma 4.x
+- 3.1.0:
   - Don't load puma hooks by default.
 - 3.0.0:
- - Require capistrano 3.7+
- - Implement the plugin system
- - don't fail if puma was already running
- - Added :puma_daemonize option (default is false)
+   - Require capistrano 3.7+
+   - Implement the plugin system
+   - don't fail if puma was already running
+   - Added :puma_daemonize option (default is false)
 
 - 2.0.0: 
- - Require puma 3.4+
- - Require Capistrano 3.5+
- - Require capistrano-bundler
+   - Require puma 3.4+
+   - Require Capistrano 3.5+
+   - Require capistrano-bundler
  
 - 1.2.0: add support for puma user for puma user @mcb & @seuros
 - 1.1.0: Set :puma_preload_app to false; Reload Monit after uploading any monit configuration; Always refresh Gemfile @rafaelgoulart @suhailpatel @sime

data/README.md

@@ -36,6 +36,15 @@ To prevent loading the hooks of the plugin, add false to the load_hooks param.
     install_plugin Capistrano::Puma::Monit, load_hooks: false  # Monit tasks without hooks
 ```
 
+To make it work with rvm, rbenv and chruby, install the plugin after corresponding library inclusion.
+```ruby
+    # Capfile
+    
+    require 'capistrano/rbenv'   
+    require 'capistrano/puma'
+    install_plugin Capistrano::Puma
+```
+
 ### Config
 
 To list available tasks use `cap -T`
@@ -44,7 +53,7 @@ To upload puma config use:
 ```ruby
 cap production puma:config
 ```
-By default the file located in  `shared/puma.config`
+By default the file located in  `shared/puma.rb`
 
 
 Ensure that `tmp/pids` and ` tmp/sockets log` are shared (via `linked_dirs`):
@@ -92,7 +101,7 @@ Multi-bind can be set with an array in the puma_bind variable
 ```ruby
   set :puma_bind, %w(tcp://0.0.0.0:9292 unix:///tmp/puma.sock)
 ```
-    * Listening on tcp://0.0.0.0:9220
+    * Listening on tcp://0.0.0.0:9292
     * Listening on unix:///tmp/puma.sock
 
 ### Active Record
@@ -127,6 +136,7 @@ Configurable options, shown here with defaults: Please note the configuration op
     set :puma_daemonize, false
     set :puma_plugins, []  #accept array of plugins
     set :puma_tag, fetch(:application)
+    set :puma_restart_command, 'bundle exec puma'
 
     set :nginx_config_name, "#{fetch(:application)}_#{fetch(:stage)}"
     set :nginx_flags, 'fail_timeout=0'
@@ -135,9 +145,10 @@ Configurable options, shown here with defaults: Please note the configuration op
     set :nginx_sites_available_path, '/etc/nginx/sites-available'
     set :nginx_sites_enabled_path, '/etc/nginx/sites-enabled'
     set :nginx_socket_flags, fetch(:nginx_flags)
-    set :nginx_ssl_certificate, "/etc/ssl/certs/{fetch(:nginx_config_name)}.crt"
-    set :nginx_ssl_certificate_key, "/etc/ssl/private/{fetch(:nginx_config_name)}.key"
+    set :nginx_ssl_certificate, "/etc/ssl/certs/#{fetch(:nginx_config_name)}.crt"
+    set :nginx_ssl_certificate_key, "/etc/ssl/private/#{fetch(:nginx_config_name)}.key"
     set :nginx_use_ssl, false
+    set :nginx_downstream_uses_ssl, false
 ```
 
 __Notes:__ If you are setting values for variables that might be used by other plugins, use `append` instead of `set`. For example:

data/capistrano3-puma.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'capistrano', '~> 3.7'
   spec.add_dependency 'capistrano-bundler'
-  spec.add_dependency 'puma' , '~> 3.4'
+  spec.add_dependency 'puma' , '~> 4.0'
   spec.post_install_message = %q{
     All plugins need to be explicitly installed with install_plugin.
     Please see README.md

data/lib/capistrano/puma.rb

@@ -76,6 +76,7 @@ module Capistrano
       set_if_empty :puma_preload_app, false
       set_if_empty :puma_daemonize, false
       set_if_empty :puma_tag, ''
+      set_if_empty :puma_restart_command, 'bundle exec puma'
 
       # Chruby, Rbenv and RVM integration
       append :chruby_map_bins, 'puma', 'pumactl'

data/lib/capistrano/puma/nginx.rb

@@ -11,6 +11,7 @@ module Capistrano
       set_if_empty :nginx_http_flags, fetch(:nginx_flags)
       set_if_empty :nginx_socket_flags, fetch(:nginx_flags)
       set_if_empty :nginx_use_ssl, false
+      set_if_empty :nginx_downstream_uses_ssl, false
     end
 
     def define_tasks

data/lib/capistrano/puma/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  PUMAVERSION = '3.1.1'
+  PUMAVERSION = '4.0.0'
 end

data/lib/capistrano/tasks/jungle.rake

@@ -39,7 +39,7 @@ namespace :puma do
     task :add do
       on roles(fetch(:puma_role)) do|role|
         begin
-          sudo "/etc/init.d/puma add '#{current_path}' #{fetch(:puma_user, role.user)}"
+          sudo "/etc/init.d/puma add '#{current_path}' #{fetch(:puma_user, role.user)} '#{fetch(:puma_conf)}'"
         rescue => error
           warn error
         end

data/lib/capistrano/templates/nginx_conf.erb

@@ -46,6 +46,7 @@ server {
   error_page 503 @503;
 
   location @puma_<%= fetch(:nginx_config_name) %> {
+    proxy_http_version 1.1;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $host;
     proxy_redirect off;
@@ -54,7 +55,11 @@ server {
 <% if fetch(:nginx_use_ssl) -%>
     proxy_set_header X-Forwarded-Proto https;
 <% else -%>
+  <% if fetch(:nginx_downstream_uses_ssl) -%>
+    proxy_set_header X-Forwarded-Proto https;
+  <% else -%>
     proxy_set_header X-Forwarded-Proto http;
+  <% end -%>
 <% end -%>
     proxy_pass http://puma_<%= fetch(:nginx_config_name) %>;
     # limit_req zone=one;

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

@@ -28,6 +28,8 @@ worker_timeout <%= fetch(:puma_worker_timeout).to_i %>
 daemonize
 <% end %>
 
+restart_command '<%= fetch(:puma_restart_command) %>'
+
 <% if puma_preload_app? %>
 preload_app!
 <% else %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.0'
 description: Puma integration for Capistrano 3
 email:
 - Terminale@gmail.com
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Puma integration for Capistrano