capistrano3-puma 7.1.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c35dc9ccbaff14a1fff1a8562fabc12f5e1b7a5ad1f5154598ff3e047b74c348
-  data.tar.gz: 7b7fd37c69d3a85e3a61d417a0bc3fbfe6125a9d26dbb716c595c9c23ede27ad
+  metadata.gz: d588875160dbea91b36102b048470c0445b3360afc3621ca988d7c379f935fa3
+  data.tar.gz: d129c1ed1b7a16578b38716219956d6a1e9dcff4d2c8cbf758ff5edcea8a4355
 SHA512:
-  metadata.gz: 4f07c452c5443b21342b0d2f7c979204d6e38fe319f7e7082c10e13908bd313a05de35032d8b78abd004bcfcb3e15acfd8f5f21cc56e90e5e4103f2cd649b5b2
-  data.tar.gz: a1ef0c8dc878b6be0a21d9e5d0df5aa44ee30148f53115a14b032ec97924500b1630b5380134281b623eefd463dee5232107bc4495c509504cf152c12297512d
+  metadata.gz: 971eb199834a65c274c6abce1cc729bb008b64c4753b511722d70c08507aec600b77299f2ae8c47a430365afbeb48ae4fcb627ba417f118350a33fea9ede673d
+  data.tar.gz: ac83b265f25dfac84e039ff38aef5e568d696ee47a669b8653019f3ab9b214f7ae94f39e0eb6ae391fbb8114a70e762100a7f9c887e6744977853c519633426e

data/README.md

@@ -179,8 +179,20 @@ Configurable options, shown here with defaults: Please note the configuration op
     set :puma_systemd_watchdog_sec, 10  # Set to 0 or false to disable watchdog
     set :puma_service_unit_env_files, []
     set :puma_service_unit_env_vars, []
+    set :puma_service_unit_props, [] # Set extral puma service properties, such as ["MemoryMax=2G","TimeoutAbortSec=30"]
+    set :puma_systemctl_reload_options, [] # Extra flags passed to `systemctl reload`, e.g. ["--no-block"]
 ```
 
+`puma_systemctl_reload_options` is an array of extra flags appended to the `systemctl reload`
+command (empty by default). The flags are applied to `reload` only; the `restart` fallback,
+used when the service is not running, is left untouched.
+
+For example, with the default `Type=notify` service, `systemctl reload` waits for the phased
+restart to finish and every worker to re-signal readiness before it returns. Passing
+`%w[--no-block]` makes systemd enqueue the reload and return immediately instead. This is a
+trade-off — the deploy no longer waits on the reload, so it will not surface a failed restart;
+use it only when your rollout is verified by other means.
+
 __Notes:__ If you are setting values for variables that might be used by other plugins, use `append` instead of `set`. For example:
 ```ruby
 append :rbenv_map_bins, 'puma', 'pumactl'

data/lib/capistrano/puma/systemd.rb

@@ -15,9 +15,11 @@ module Capistrano
       set_if_empty :puma_service_unit_name, -> { "#{fetch(:application)}_puma_#{fetch(:stage)}" }
       set_if_empty :puma_enable_socket_service, false
       set_if_empty :puma_systemd_watchdog_sec, 10
+      set_if_empty :puma_systemctl_reload_options, -> { fetch(:systemctl_reload_options, []) }
 
       set_if_empty :puma_service_unit_env_files, -> { fetch(:service_unit_env_files, []) }
       set_if_empty :puma_service_unit_env_vars, -> { fetch(:service_unit_env_vars, []) }
+      set_if_empty :puma_service_unit_props, -> { fetch(:service_unit_props, []) }
 
       set_if_empty :puma_systemctl_user, -> { fetch(:systemctl_user, :user) }
       set_if_empty :puma_enable_lingering, -> { fetch(:puma_systemctl_user) != :system }

data/lib/capistrano/tasks/systemd.rake

@@ -118,14 +118,12 @@ namespace :puma do
                      execute("#{fetch(:puma_systemctl_bin)} --user status #{fetch(:puma_service_unit_name)} > /dev/null", raise_on_non_zero_exit: false)
                    end
       cmd = 'reload'
+      opts = Array(fetch(:puma_systemctl_reload_options))
       unless service_ok
         cmd = 'restart'
+        opts = []
       end
-      if fetch(:puma_systemctl_user) == :system
-        sudo "#{fetch(:puma_systemctl_bin)} #{cmd} #{fetch(:puma_service_unit_name)}"
-      else
-        execute "#{fetch(:puma_systemctl_bin)}", "--user", cmd, fetch(:puma_service_unit_name)
-      end
+      git_plugin.execute_systemd(*opts, cmd, fetch(:puma_service_unit_name))
     end
   end
 

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

@@ -52,5 +52,9 @@ StandardError=journal
 <%- end -%>
 
 SyslogIdentifier=<%= fetch(:puma_service_unit_name) %>
+<% Array(fetch(:puma_service_unit_props)).each do |unit_property| %>
+<%="#{unit_property}" -%>
+<% end -%>
+
 [Install]
 WantedBy=<%=(fetch(:puma_systemctl_user) == :system) ? "multi-user.target" : "default.target"%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -46,7 +46,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,10 +56,10 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 description: Puma integration for Capistrano 3
 email:
-- Terminale@gmail.com
+- terminale@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Puma integration for Capistrano
 test_files: []