capistrano3-puma 6.1.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d2f07d6e635bd2c3dd87706742d9f417140165102818a2f05f7be0b9d4e031d
-  data.tar.gz: ce613f7509c20d4520a599a0f93a9a6d5a0d485037c11aa94914fdca4c0fffcd
+  metadata.gz: e49b3136d5a3c5279003a9139c46ce543b0e313cba29cfe17a91f86e4d44b67b
+  data.tar.gz: 9659ae66cf2f6d0347411f6dedb79a2f8d616d0a5648e2fe0c306601d874cb0c
 SHA512:
-  metadata.gz: c303ca5c2c0d1f28e288bffcb84ffe5ee69a708ad2c08bf000cc3f0004cdef369da1822b00b564d8c6c9e2ded34e54de7aa43a256e95384d6d7c29195a9538a1
-  data.tar.gz: 6750f2ae9a2c356cf1e099b5ea2e1144a6fc843bd5b9828e2843a50b15977df4e5cdc43b98216dff0bc02e40661d6934bb5a519e85734edb3a334e0a7e76a437
+  metadata.gz: b8534f612b8bc2afb41266a1a7bf3a91671768a776b7dc0669057dec847f3bc1d1767cb17dd9da2c6624de7f0d98045012fce8c77f29634272938444a7cb0840
+  data.tar.gz: 1ae3fd5a9a4a3c5884388055e61c271fe97766dfce7e7372aa85567f50f899b6b00d905b7b1e867156786dc75cd4b4626e8ef58201b29c697bccc2fb33c2d8a5

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

@@ -3,7 +3,7 @@ module Capistrano
     include PumaCommon
 
     def register_hooks
-      after 'deploy:finished', 'puma:smart_restart'
+      after 'deploy:published', 'puma:smart_restart'
     end
 
     def define_tasks
@@ -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
@@ -31,10 +31,8 @@ module Capistrano
     def service_unit_type
       ## Jruby don't support notify
       return "simple" if RUBY_ENGINE == "jruby"
-      fetch(:puma_service_unit_type,
-      ## Check if sd_notify is available in the bundle
-        Gem::Specification.find_all_by_name("sd_notify").any? ? "notify" : "simple")
-
+      ## Puma 6.1+ has built-in sd_notify support
+      fetch(:puma_service_unit_type, "notify")
     end
 
     def compiled_template_puma(from, role)
@@ -53,11 +51,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 +96,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 +107,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,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Abdelkader Boudih
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -43,20 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 description: Puma integration for Capistrano 3
 email:
 - Terminale@gmail.com
@@ -82,8 +83,7 @@ homepage: https://github.com/seuros/capistrano-puma
 licenses:
 - MIT
 metadata: {}
-post_install_message: "\n    Version 6.0.0 is a major release. Please see README.md,
-  breaking changes are listed in CHANGELOG.md\n  "
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -91,14 +91,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Puma integration for Capistrano
 test_files: []