capistrano3-puma 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d2f07d6e635bd2c3dd87706742d9f417140165102818a2f05f7be0b9d4e031d
-  data.tar.gz: ce613f7509c20d4520a599a0f93a9a6d5a0d485037c11aa94914fdca4c0fffcd
+  metadata.gz: a0e3b56cceac3a829240f070437a0e232c5c79f38370989572024ab08af9038a
+  data.tar.gz: 67e21b9c665facae205f009b694d6a2652c0a9546c95a3db3739fac5c5a0159f
 SHA512:
-  metadata.gz: c303ca5c2c0d1f28e288bffcb84ffe5ee69a708ad2c08bf000cc3f0004cdef369da1822b00b564d8c6c9e2ded34e54de7aa43a256e95384d6d7c29195a9538a1
-  data.tar.gz: 6750f2ae9a2c356cf1e099b5ea2e1144a6fc843bd5b9828e2843a50b15977df4e5cdc43b98216dff0bc02e40661d6934bb5a519e85734edb3a334e0a7e76a437
+  metadata.gz: 3c216aed4f83378c3ecf0a2bb0cab5c7046eb1a2ad9bf280691ea4325e6d583dbf98640c14e7c8e793eb8ee9c3645d2c0da17b9205e20db3c48b330fa4ed80ed
+  data.tar.gz: 4b19a5a3c2513402c5987ec0e501e5dcb19d7fb47e80b3ad4eec037d1a4171c1ba9645c0bad51f8cc28f5c8f16f215084015f1e32861784fd13ccbe364a995a1

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [6.2.0](https://github.com/seuros/capistrano-puma/tree/6.2.0) (2025-06-22)
+
+[Full Changelog](https://github.com/seuros/capistrano-puma/compare/v6.1.0...6.2.0)
+- Harmonized interface with capistrano-sidekiq for better ecosystem consistency
+- Aligned configuration variable naming patterns
+- Unified systemd command execution methods
+- Standardized template search order across both gems
+- Added documentation reference to example application
+
 ## [6.1.0](https://github.com/seuros/capistrano-puma/tree/6.1.0) (2025-01-21)
 
 [Full Changelog](https://github.com/seuros/capistrano-puma/compare/v6.0.0...6.1.0)

data/README.md

@@ -1,6 +1,17 @@
 [![Gem Version](https://badge.fury.io/rb/capistrano3-puma.svg)](http://badge.fury.io/rb/capistrano3-puma)
 # Capistrano::Puma
 
+Puma integration for Capistrano - providing systemd service management and zero-downtime deployments for Puma 5.1+.
+
+## Example Application
+
+For a complete working example of this gem in action, see the [capistrano-example-app](https://github.com/seuros/capistrano-example-app) which demonstrates:
+- Rails 8.0 deployment with Capistrano
+- Puma 6.0 with systemd socket activation
+- Zero-downtime deployments
+- rbenv integration
+- Nginx configuration examples
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/capistrano/puma/systemd.rb

@@ -26,10 +26,6 @@ module Capistrano
       set_if_empty :puma_service_templates_path, fetch(:service_templates_path, 'config/deploy/templates')
     end
 
-    def expanded_bundle_command
-      backend.capture(:echo, SSHKit.config.command_map[:bundle]).strip
-    end
-
     def fetch_systemd_unit_path
       if fetch(:puma_systemctl_user) == :system
         "/etc/systemd/system/"

data/lib/capistrano/puma.rb

@@ -6,18 +6,18 @@ module Capistrano
     def puma_switch_user(role, &block)
       user = puma_user(role)
       if user == role.user
-        block.call
+        yield
       else
-        backend.as user do
-          block.call
-        end
+        backend.as(user, &block)
       end
     end
 
     def puma_user(role)
       properties = role.properties
+      return role.user unless properties
+      
       properties.fetch(:puma_user) || # local property for puma only
-          fetch(:puma_user) ||
+          fetch(:puma_user, nil) ||
           properties.fetch(:run_as) || # global property across multiple capistrano gems
           role.user
     end
@@ -53,11 +53,7 @@ module Capistrano
           File.expand_path("../templates/#{from}.rb.erb", __FILE__)
       ].detect { |path| File.file?(path) }
       erb = File.read(file)
-      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.6')
-        StringIO.new(ERB.new(erb, nil, '-').result(binding))
-      else
-        StringIO.new(ERB.new(erb, trim_mode: '-').result(binding))
-      end
+      StringIO.new(ERB.new(erb, trim_mode: '-').result(binding))
     end
 
     def template_puma(from, to, role)
@@ -102,6 +98,10 @@ module Capistrano
         PumaBind.new(m, etype.to_sym, address)
       end
     end
+
+    def expanded_bundle_command
+      backend.capture(:echo, SSHKit.config.command_map[:bundle]).strip
+    end
   end
 
   class Puma < Capistrano::Plugin
@@ -109,10 +109,10 @@ module Capistrano
 
     def set_defaults
       set_if_empty :puma_role, :web
-      set_if_empty :puma_env, -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
+      set_if_empty :puma_env, -> { fetch(:rack_env, fetch(:rails_env, fetch(:rake_env, fetch(:stage)))) }
       set_if_empty :puma_bind, -> { "unix://#{File.join(shared_path, 'tmp', 'sockets', 'puma.sock')}" }
       set_if_empty :puma_access_log, -> { File.join(shared_path, 'log', "puma.log") }
-      set_if_empty :puma_error_log, -> { File.join(shared_path, 'log', "puma.log") }
+      set_if_empty :puma_error_log, -> { File.join(shared_path, 'log', "puma_error.log") }
 
       # Chruby, Rbenv and RVM integration
       append :chruby_map_bins, 'puma', 'pumactl' if fetch(:chruby_map_bins)

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

@@ -21,7 +21,11 @@ WatchdogSec=<%= fetch(:puma_systemd_watchdog_sec) %>
 <% end %>
 <%="User=#{puma_user(@role)}" if fetch(:puma_systemctl_user) == :system %>
 WorkingDirectory=<%= current_path %>
+<% if fetch(:puma_use_login_shell) %>
+ExecStart=/bin/bash -lc '<%= expanded_bundle_command %> exec puma -e <%= fetch(:puma_env) %>'
+<% else %>
 ExecStart=<%= expanded_bundle_command %> exec puma -e <%= fetch(:puma_env) %>
+<% end %>
 ExecReload=/bin/kill -USR1 $MAINPID
 <%- Array(fetch(:puma_service_unit_env_files)).each do |file| %>
 <%="EnvironmentFile=#{file}" -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Abdelkader Boudih