capistrano3-puma 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28c9c75dc6f8d76315e7c45f93ae6bd942057082
-  data.tar.gz: 7853f2ad6ded69548d582ab4e1d7ec8b8d537955
+  metadata.gz: d4dc9950a23bafe870cddd6646561016a410f1d4
+  data.tar.gz: 42ce480b729df2bc98880303cc709cd137963f78
 SHA512:
-  metadata.gz: 3cf44c290adb44ccaa6a600426e25afb8a24e063cc3dd64c6f1fc154fea4c7aca19b700221e7d885fcc32305b3bf5f78419d15730639d98d9e7fe17e8a54d3ec
-  data.tar.gz: 17b823002d40963e1d67a6e968f59d96ab108627bda03d7af9275bcf31773de254620ca0daf86fe70eaf0da37712b30628d1ff9a0e022becc1068b409beac292
+  metadata.gz: daa0d11b90a4c1a9707d5c6d9b3435592bb383a8ea35cb8d4f4ca9a82b775c241533b0570a48599fe5d1fc39b053a1f6474b22ff494fc0f0abad78ee333eb193
+  data.tar.gz: 4f8f739a71eab448a9a778d2f9fdceeecf28f4b4cdd96efebfaaef64f95f266aa7c3a00ddd20da9988a89098d7afcff104749382d1b48768b1a07e862a0a8b10

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 ## Changelog
+- 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)
+
 - 2.0.0: 
  - Require puma 3.4+
  - Require Capistrano 3.5+

data/CONTRIBUTORS.md

@@ -3,12 +3,14 @@
 Abdelkader Boudih
 André Arko
 Ariel Zerahia
-ayaya
+Barack Obama
+Bart de Water
+Benjamin Kim
 Bin Huang
 Bryan Liles
 Claudio Poli
 Cyril Rohr
-dfang
+Eric
 Fritz Lee
 Hnat Kubov
 Ivan Schneider
@@ -25,21 +27,28 @@ Konstantin Papkovskiy
 Kyle Decot
 Lisa Hagemann
 Lonre Wang
-marshall-lee
+Lucas Alves
+Marcos Chicote
 Matias De Santi
 Michael C. Beck
 Molfar
-msbrigna
 Neil Bartley
 Peter
+Philippe Nénert
 Ponomarev Nikolay
 Rafael Goulart
 RavWar
-ruohan.chen
 Ruslan
+SHIMADA Koji
 Sergey Ponomarev
 Shane O'Grady
 Simon Males
 Steve Madere
 Suhail Patel
 Suraj Shirvankar
+ayaya
+dfang
+marshall-lee
+mizukmb
+msbrigna
+ruohan.chen

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2016 Abdelkader Boudih
+Copyright (c) 2013-2017 Abdelkader Boudih
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -20,10 +20,10 @@ And then execute:
     # Capfile
 
     require 'capistrano/puma'
-    require 'capistrano/puma/workers' # if you want to control the workers (in cluster mode)
-    require 'capistrano/puma/jungle'  # if you need the jungle tasks
-    require 'capistrano/puma/monit'   # if you need the monit tasks
-    require 'capistrano/puma/nginx'   # if you want to upload a nginx site template
+    install_plugin Capistrano::Puma::Workers  # if you want to control the workers (in cluster mode)
+    install_plugin Capistrano::Puma::Jungle # if you need the jungle tasks
+    install_plugin Capistrano::Puma::Monit  # if you need the monit tasks
+    install_plugin Capistrano::Puma::Nginx  # if you want to upload a nginx site template
 ```
 
 ### Config
@@ -113,6 +113,7 @@ Configurable options, shown here with defaults: Please note the configuration op
     set :puma_worker_timeout, nil
     set :puma_init_active_record, false
     set :puma_preload_app, false
+    set :puma_daemonize, true
     set :puma_plugins, []  #accept array of plugins
     set :nginx_use_ssl, false
 ```

data/capistrano3-puma.gemspec

@@ -5,7 +5,7 @@ require 'capistrano/puma/version'
 
 Gem::Specification.new do |spec|
   spec.name = 'capistrano3-puma'
-  spec.version = Capistrano::Puma::VERSION
+  spec.version = Capistrano::PumaVERSION
   spec.authors = ['Abdelkader Boudih']
   spec.email = ['Terminale@gmail.com']
   spec.description = %q{Puma integration for Capistrano 3}
@@ -18,7 +18,11 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files`.split($/)
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'capistrano', '~> 3.5'
+  spec.add_dependency 'capistrano', '~> 3.7'
   spec.add_dependency 'capistrano-bundler'
   spec.add_dependency 'puma' , '~> 3.4'
+  spec.post_install_message = %q{
+    [capistrano-puma] Plugins need to be explicitly installed with install_plugin.
+    Please see README.md
+  }
 end

data/lib/capistrano/puma.rb

@@ -1,2 +1,118 @@
 require 'capistrano/bundler'
-load File.expand_path('../tasks/puma.rake', __FILE__)
+require "capistrano/plugin"
+
+module Capistrano
+  module PumaCommon
+    def puma_switch_user(role, &block)
+      user = puma_user(role)
+      if user == role.user
+        block.call
+      else
+        as user do
+          block.call
+        end
+      end
+    end
+
+    def puma_user(role)
+      properties = role.properties
+      properties.fetch(:puma_user) || # local property for puma only
+          fetch(:puma_user) ||
+          properties.fetch(:run_as) || # global property across multiple capistrano gems
+          role.user
+    end
+
+    def puma_bind
+      Array(fetch(:puma_bind)).collect do |bind|
+        "bind '#{bind}'"
+      end.join("\n")
+    end
+
+
+    def template_puma(from, to, role)
+      file = [
+          "lib/capistrano/templates/#{from}-#{role.hostname}-#{fetch(:stage)}.rb",
+          "lib/capistrano/templates/#{from}-#{role.hostname}.rb",
+          "lib/capistrano/templates/#{from}-#{fetch(:stage)}.rb",
+          "lib/capistrano/templates/#{from}.rb.erb",
+          "lib/capistrano/templates/#{from}.rb",
+          "lib/capistrano/templates/#{from}.erb",
+          "config/deploy/templates/#{from}.rb.erb",
+          "config/deploy/templates/#{from}.rb",
+          "config/deploy/templates/#{from}.erb",
+          File.expand_path("../templates/#{from}.erb", __FILE__),
+      ].detect { |path| File.file?(path) }
+      erb = File.read(file)
+      backend.upload! StringIO.new(ERB.new(erb, nil, '-').result(binding)), to
+    end
+  end
+
+  class Puma < Capistrano::Plugin
+    include PumaCommon
+
+    def define_tasks
+      eval_rakefile File.expand_path('../tasks/puma.rake', __FILE__)
+    end
+
+    def set_defaults
+      set_if_empty :puma_role, :app
+      set_if_empty :puma_env, -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
+      # Configure "min" to be the minimum number of threads to use to answer
+      # requests and "max" the maximum.
+      set_if_empty :puma_threads, [0, 16]
+      set_if_empty :puma_workers, 0
+      set_if_empty :puma_rackup, -> { File.join(current_path, 'config.ru') }
+      set_if_empty :puma_state, -> { File.join(shared_path, 'tmp', 'pids', 'puma.state') }
+      set_if_empty :puma_pid, -> { File.join(shared_path, 'tmp', 'pids', 'puma.pid') }
+      set_if_empty :puma_bind, -> { File.join("unix://#{shared_path}", 'tmp', 'sockets', 'puma.sock') }
+      set_if_empty :puma_default_control_app, -> { File.join("unix://#{shared_path}", 'tmp', 'sockets', 'pumactl.sock') }
+      set_if_empty :puma_conf, -> { File.join(shared_path, 'puma.rb') }
+      set_if_empty :puma_access_log, -> { File.join(shared_path, 'log', 'puma_access.log') }
+      set_if_empty :puma_error_log, -> { File.join(shared_path, 'log', 'puma_error.log') }
+      set_if_empty :puma_init_active_record, false
+      set_if_empty :puma_preload_app, false
+      set_if_empty :puma_daemonize, false
+
+      # Chruby, Rbenv and RVM integration
+      append :chruby_map_bins, 'puma', 'pumactl'
+      append :rbenv_map_bins, 'puma', 'pumactl'
+      append :rvm_map_bins, 'puma', 'pumactl'
+
+      # Bundler integration
+      append :bundle_bins, 'puma', 'pumactl'
+    end
+
+    def register_hooks
+      after 'deploy:check', 'puma:check'
+      after 'deploy:finished', 'puma:smart_restart'
+    end
+
+    def puma_workers
+      fetch(:puma_workers, 0)
+    end
+
+    def puma_preload_app?
+      fetch(:puma_preload_app)
+    end
+
+    def puma_daemonize?
+      fetch(:puma_daemonize)
+    end
+
+    def puma_plugins
+      Array(fetch(:puma_plugins)).collect do |bind|
+        "plugin '#{bind}'"
+      end.join("\n")
+    end
+
+    def upload_puma_rb(role)
+      template_puma 'puma.rb', fetch(:puma_conf), role
+    end
+  end
+end
+install_plugin Capistrano::Puma
+
+require 'capistrano/puma/workers'
+require 'capistrano/puma/monit'
+require 'capistrano/puma/jungle'
+require 'capistrano/puma/nginx'

data/lib/capistrano/puma/jungle.rb

@@ -1,2 +1,30 @@
-# Load jungle tasks
-load File.expand_path('../../tasks/jungle.rake', __FILE__)
+module Capistrano
+  class Puma::Jungle < Capistrano::Plugin
+    include PumaCommon
+    
+    def set_defaults
+      set_if_empty :puma_jungle_conf, '/etc/puma.conf'
+      set_if_empty :puma_run_path, '/usr/local/bin/run-puma'
+    end
+
+    def define_tasks
+      eval_rakefile File.expand_path('../../tasks/jungle.rake', __FILE__)
+    end
+
+    private
+
+    def debian_install
+      template_puma 'puma-deb', "#{fetch(:tmp_dir)}/puma", @role
+      execute "chmod +x #{fetch(:tmp_dir)}/puma"
+      sudo "mv #{fetch(:tmp_dir)}/puma /etc/init.d/puma"
+      sudo 'update-rc.d -f puma defaults'
+    end
+
+    def rhel_install
+      template_puma 'puma-rpm', "#{fetch(:tmp_dir)}/puma", @role
+      execute "chmod +x #{fetch(:tmp_dir)}/puma"
+      sudo "mv #{fetch(:tmp_dir)}/puma /etc/init.d/puma"
+      sudo 'chkconfig --add puma'
+    end
+  end
+end

data/lib/capistrano/puma/monit.rb

@@ -1,2 +1,30 @@
-# Load monit tasks
-load File.expand_path('../../tasks/monit.rake', __FILE__)
+module Capistrano
+  class Puma::Monit < Capistrano::Plugin
+    def register_hooks
+      before 'deploy:updating', 'puma:monit:unmonitor'
+      after 'deploy:published', 'puma:monit:monitor'
+    end
+
+    def define_tasks
+      eval_rakefile File.expand_path('../../tasks/monit.rake', __FILE__)
+    end
+
+    def set_defaults
+      set_if_empty :puma_monit_conf_dir, -> { "/etc/monit/conf.d/#{puma_monit_service_name}.conf" }
+      set_if_empty :puma_monit_use_sudo, true
+      set_if_empty :puma_monit_bin, '/usr/bin/monit'
+    end
+
+    def puma_monit_service_name
+      fetch(:puma_monit_service_name, "puma_#{fetch(:application)}_#{fetch(:stage)}")
+    end
+
+    def sudo_if_needed(command)
+      if fetch(:puma_monit_use_sudo)
+        sudo command
+      else
+        execute command
+      end
+    end
+  end
+end

data/lib/capistrano/puma/nginx.rb

@@ -1 +1,20 @@
-load File.expand_path('../../tasks/nginx.rake', __FILE__)
+module Capistrano
+  class Puma::Nginx < Capistrano::Plugin
+    include PumaCommon
+    def set_defaults
+      # Nginx and puma configuration
+      set_if_empty :nginx_config_name, "#{fetch(:application)}_#{fetch(:stage)}"
+      set_if_empty :nginx_sites_available_path, '/etc/nginx/sites-available'
+      set_if_empty :nginx_sites_enabled_path, '/etc/nginx/sites-enabled'
+      set_if_empty :nginx_server_name,  "localhost #{fetch(:application)}.local"
+      set_if_empty :nginx_flags, 'fail_timeout=0'
+      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
+    end
+
+    def define_tasks
+      eval_rakefile File.expand_path('../../tasks/nginx.rake', __FILE__)
+    end
+  end
+end

data/lib/capistrano/puma/version.rb

@@ -1,5 +1,3 @@
 module Capistrano
-  module Puma
-    VERSION = '2.0.0'
-  end
+  PumaVERSION = '3.0.0'
 end

data/lib/capistrano/puma/workers.rb

@@ -1,2 +1,7 @@
-# Load monit tasks
-load File.expand_path('../../tasks/workers.rake', __FILE__)
+module Capistrano
+  class Puma::Workers < Capistrano::Plugin
+    def define_tasks
+      eval_rakefile File.expand_path('../../tasks/workers.rake', __FILE__)
+    end
+  end
+end

data/lib/capistrano/tasks/jungle.rake

@@ -1,27 +1,20 @@
-namespace :load do
-  task :defaults do
-    set :puma_jungle_conf, '/etc/puma.conf'
-    set :puma_run_path, '/usr/local/bin/run-puma'
-  end
-end
-
+git_plugin = self
 
 namespace :puma do
   namespace :jungle do
-
     desc 'Install Puma jungle'
     task :install do
       on roles(fetch(:puma_role)) do |role|
         @role = role
-        template_puma 'run-puma', "#{fetch(:tmp_dir)}/run-puma", role
+        git_plugin.template_puma 'run-puma', "#{fetch(:tmp_dir)}/run-puma", role
         execute "chmod +x #{fetch(:tmp_dir)}/run-puma"
         sudo "mv #{fetch(:tmp_dir)}/run-puma #{fetch(:puma_run_path)}"
         if test '[ -f /etc/redhat-release ]'
           #RHEL flavor OS
-          rhel_install
+          git_plugin.rhel_install
         elsif test '[ -f /etc/lsb-release ]'
           #Debian flavor OS
-          debian_install
+          git_plugin.debian_install
         else
           #Some other OS
           error 'This task is not supported for your OS'
@@ -30,23 +23,6 @@ namespace :puma do
       end
     end
 
-
-    def debian_install
-      template_puma 'puma-deb', "#{fetch(:tmp_dir)}/puma", @role
-      execute "chmod +x #{fetch(:tmp_dir)}/puma"
-      sudo "mv #{fetch(:tmp_dir)}/puma /etc/init.d/puma"
-      sudo 'update-rc.d -f puma defaults'
-
-    end
-
-    def rhel_install
-      template_puma 'puma-rpm', "#{fetch(:tmp_dir)}/puma" , @role
-      execute "chmod +x #{fetch(:tmp_dir)}/puma"
-      sudo "mv #{fetch(:tmp_dir)}/puma /etc/init.d/puma"
-      sudo 'chkconfig --add puma'
-    end
-
-
     desc 'Setup Puma config and install jungle script'
     task :setup do
       invoke 'puma:config'
@@ -76,6 +52,5 @@ namespace :puma do
         end
       end
     end
-
   end
 end

data/lib/capistrano/tasks/monit.rake

@@ -1,10 +1,4 @@
-namespace :load do
-  task :defaults do
-    set :puma_monit_conf_dir, -> { "/etc/monit/conf.d/#{puma_monit_service_name}.conf" }
-    set :puma_monit_use_sudo, true
-    set :puma_monit_bin, '/usr/bin/monit'
-  end
-end
+git_plugin = self
 
 namespace :puma do
   namespace :monit do
@@ -12,7 +6,7 @@ namespace :puma do
     task :config do
       on roles(fetch(:puma_role)) do |role|
         @role = role
-        template_puma 'puma_monit.conf', "#{fetch(:tmp_dir)}/monit.conf", @role
+        git_plugin.template_puma 'puma_monit.conf', "#{fetch(:tmp_dir)}/monit.conf", @role
         sudo_if_needed "mv #{fetch(:tmp_dir)}/monit.conf #{fetch(:puma_monit_conf_dir)}"
         sudo_if_needed "#{fetch(:puma_monit_bin)} reload"
       end
@@ -62,20 +56,5 @@ namespace :puma do
       end
     end
 
-    before 'deploy:updating', 'puma:monit:unmonitor'
-    after 'deploy:published', 'puma:monit:monitor'
-
-    def puma_monit_service_name
-      fetch(:puma_monit_service_name, "puma_#{fetch(:application)}_#{fetch(:stage)}")
-    end
-
-    def sudo_if_needed(command)
-      if fetch(:puma_monit_use_sudo)
-        sudo command
-      else
-        execute command
-      end
-    end
-
   end
 end

data/lib/capistrano/tasks/nginx.rake

@@ -1,22 +1,11 @@
-namespace :load do
-  task :defaults do
-    # Nginx and puma configuration
-    set :nginx_config_name, -> { "#{fetch(:application)}_#{fetch(:stage)}" }
-    set :nginx_sites_available_path, -> { '/etc/nginx/sites-available' }
-    set :nginx_sites_enabled_path, -> { '/etc/nginx/sites-enabled' }
-    set :nginx_server_name, -> { "localhost #{fetch(:application)}.local" }
-    set :nginx_flags, -> { 'fail_timeout=0' }
-    set :nginx_http_flags, -> { fetch(:nginx_flags) }
-    set :nginx_socket_flags, -> { fetch(:nginx_flags) }
-    set :nginx_use_ssl, false
-  end
-end
+git_plugin = self
+
 namespace :puma do
   desc 'Setup nginx configuration'
   task :nginx_config do
     on roles(fetch(:puma_nginx, :web)) do |role|
-      puma_switch_user(role) do
-        template_puma('nginx_conf', "/tmp/nginx_#{fetch(:nginx_config_name)}", role)
+      git_plugin.puma_switch_user(role) do
+        git_plugin.template_puma('nginx_conf', "/tmp/nginx_#{fetch(:nginx_config_name)}", role)
         sudo :mv, "/tmp/nginx_#{fetch(:nginx_config_name)} #{fetch(:nginx_sites_available_path)}/#{fetch(:nginx_config_name)}"
         sudo :ln, '-fs', "#{fetch(:nginx_sites_available_path)}/#{fetch(:nginx_config_name)} #{fetch(:nginx_sites_enabled_path)}/#{fetch(:nginx_config_name)}"
       end

data/lib/capistrano/tasks/puma.rake

@@ -1,52 +1,17 @@
-namespace :load do
-  task :defaults do
-    set :puma_default_hooks, -> { true }
-    set :puma_role, :app
-    set :puma_env, -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
-    # Configure "min" to be the minimum number of threads to use to answer
-    # requests and "max" the maximum.
-    set :puma_threads, [0, 16]
-    set :puma_workers, 0
-    set :puma_rackup, -> { File.join(current_path, 'config.ru') }
-    set :puma_state, -> { File.join(shared_path, 'tmp', 'pids', 'puma.state') }
-    set :puma_pid, -> { File.join(shared_path, 'tmp', 'pids', 'puma.pid') }
-    set :puma_bind, -> { File.join("unix://#{shared_path}", 'tmp', 'sockets', 'puma.sock') }
-    set :puma_default_control_app, -> { File.join("unix://#{shared_path}", 'tmp', 'sockets', 'pumactl.sock') }
-    set :puma_conf, -> { File.join(shared_path, 'puma.rb') }
-    set :puma_access_log, -> { File.join(shared_path, 'log', 'puma_access.log') }
-    set :puma_error_log, -> { File.join(shared_path, 'log', 'puma_error.log') }
-    set :puma_init_active_record, false
-    set :puma_preload_app, false
-
-    # Chruby, Rbenv and RVM integration
-    append :chruby_map_bins, 'puma', 'pumactl'
-    append :rbenv_map_bins, 'puma', 'pumactl'
-    append :rvm_map_bins, 'puma', 'pumactl'
-
-    # Bundler integration
-    append :bundle_bins, 'puma', 'pumactl'
-  end
-end
-
-namespace :deploy do
-  before :starting, :check_puma_hooks do
-    invoke 'puma:add_default_hooks' if fetch(:puma_default_hooks)
-  end
-end
+git_plugin = self
 
 namespace :puma do
-
   desc 'Setup Puma config file'
   task :config do
     on roles(fetch(:puma_role)) do |role|
-      template_puma 'puma', fetch(:puma_conf), role
+      git_plugin.upload_puma_rb(role)
     end
   end
 
   desc 'Start puma'
   task :start do
-    on roles (fetch(:puma_role)) do |role|
-      puma_switch_user(role) do
+    on roles(fetch(:puma_role)) do |role|
+      git_plugin.puma_switch_user(role) do
         if test "[ -f #{fetch(:puma_conf)} ]"
           info "using conf file #{fetch(:puma_conf)}"
         else
@@ -71,7 +36,7 @@ namespace :puma do
     task command do
       on roles (fetch(:puma_role)) do |role|
         within current_path do
-          puma_switch_user(role) do
+          git_plugin.puma_switch_user(role) do
             with rack_env: fetch(:puma_env) do
               if test "[ -f #{fetch(:puma_pid)} ]"
                 if test :kill, "-0 $( cat #{fetch(:puma_pid)} )"
@@ -96,7 +61,7 @@ namespace :puma do
     task command do
       on roles (fetch(:puma_role)) do |role|
         within current_path do
-          puma_switch_user(role) do
+          git_plugin.puma_switch_user(role) do
             with rack_env: fetch(:puma_env) do
               if test "[ -f #{fetch(:puma_pid)} ]" and test :kill, "-0 $( cat #{fetch(:puma_pid)} )"
                 # NOTE pid exist but state file is nonsense, so ignore that case
@@ -113,12 +78,11 @@ namespace :puma do
   end
 
   task :check do
-    on roles (fetch(:puma_role)) do |role|
+    on roles(fetch(:puma_role)) do |role|
       #Create puma.rb for new deployments
       unless  test "[ -f #{fetch(:puma_conf)} ]"
         warn 'puma.rb NOT FOUND!'
-        #TODO DRY
-        template_puma 'puma', fetch(:puma_conf), role
+        git_plugin.upload_puma_rb(role)
         info 'puma.rb generated'
       end
     end
@@ -126,77 +90,11 @@ namespace :puma do
 
 
   task :smart_restart do
-    if !puma_preload_app? && puma_workers.to_i > 1
+    if !git_plugin.puma_preload_app? && git_plugin.puma_workers.to_i > 1
       invoke 'puma:phased-restart'
     else
       invoke 'puma:restart'
     end
   end
 
-  def puma_switch_user(role, &block)
-    user = puma_user(role)
-    if user == role.user
-      block.call
-    else
-      as user do
-        block.call
-      end
-    end
-  end
-
-  def puma_user(role)
-    properties = role.properties
-    properties.fetch(:puma_user) ||               # local property for puma only
-    fetch(:puma_user) ||
-    properties.fetch(:run_as) || # global property across multiple capistrano gems
-    role.user
-  end
-
-  def puma_workers
-    fetch(:puma_workers, 0)
-  end
-
-  def puma_preload_app?
-    fetch(:puma_preload_app)
-  end
-
-  def puma_bind
-    Array(fetch(:puma_bind)).collect do |bind|
-      "bind '#{bind}'"
-    end.join("\n")
-  end
-
-  def puma_plugins
-    Array(fetch(:puma_plugins)).collect do |bind|
-      "plugin '#{bind}'"
-    end.join("\n")
-  end
-
-  def template_puma(from, to, role)
-    [
-        "lib/capistrano/templates/#{from}-#{role.hostname}-#{fetch(:stage)}.rb",
-        "lib/capistrano/templates/#{from}-#{role.hostname}.rb",
-        "lib/capistrano/templates/#{from}-#{fetch(:stage)}.rb",
-        "lib/capistrano/templates/#{from}.rb.erb",
-        "lib/capistrano/templates/#{from}.rb",
-        "lib/capistrano/templates/#{from}.erb",
-        "config/deploy/templates/#{from}.rb.erb",
-        "config/deploy/templates/#{from}.rb",
-        "config/deploy/templates/#{from}.erb",
-        File.expand_path("../../templates/#{from}.rb.erb", __FILE__),
-        File.expand_path("../../templates/#{from}.erb", __FILE__)
-    ].each do |path|
-      if File.file?(path)
-        erb = File.read(path)
-        upload! StringIO.new(ERB.new(erb, nil, '-').result(binding)), to
-        break
-      end
-    end
-  end
-
-  task :add_default_hooks do
-    after 'deploy:check', 'puma:check'
-    after 'deploy:finished', 'puma:smart_restart'
-  end
-
 end

data/lib/capistrano/tasks/workers.rake

@@ -1,14 +1,16 @@
+git_plugin = self
+
 namespace :puma do
   namespace :workers do
     desc 'Add a worker'
     task :count do
-      on roles (fetch(:puma_role)) do |role|
-        puma_switch_user(role) do
-        #TODO
-        # cleanup
-        # add host name/ip
-        workers_count = capture("ps ax | grep -c 'puma: cluster worker [0-9]: `cat  #{fetch(:puma_pid)}`'").to_i - 1
-        log  "Workers count : #{workers_count}"
+      on roles(fetch(:puma_role)) do |role|
+        git_plugin.puma_switch_user(role) do
+          #TODO
+          # cleanup
+          # add host name/ip
+          workers_count = capture("ps ax | grep -c 'puma: cluster worker [0-9]: `cat  #{fetch(:puma_pid)}`'").to_i - 1
+          log "Workers count : #{workers_count}"
         end
       end
     end
@@ -19,8 +21,8 @@ namespace :puma do
     # Refactor
     desc 'Worker++'
     task :more do
-      on roles (fetch(:puma_role)) do |role|
-        puma_switch_user(role) do
+      on roles(fetch(:puma_role)) do |role|
+        git_plugin.puma_switch_user(role) do
           execute(:kill, "-TTIN `cat  #{fetch(:puma_pid)}`")
         end
       end
@@ -28,8 +30,8 @@ namespace :puma do
 
     desc 'Worker--'
     task :less do
-      on roles (fetch(:puma_role)) do |role|
-        puma_switch_user(role) do
+      on roles(fetch(:puma_role)) do |role|
+        git_plugin.puma_switch_user(role) do
           execute(:kill, "-TTOU `cat  #{fetch(:puma_pid)}`")
         end
       end

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

@@ -24,6 +24,10 @@ workers <%= puma_workers %>
 worker_timeout <%= fetch(:puma_worker_timeout).to_i %>
 <% end %>
 
+<% if puma_daemonize? %>
+daemonize
+<% end %>
+
 <% if puma_preload_app? %>
 preload_app!
 <% else %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: capistrano-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -91,7 +91,8 @@ homepage: https://github.com/seuros/capistrano-puma
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: "\n    [capistrano-puma] Plugins need to be explicitly installed
+  with install_plugin.\n    Please see README.md\n  "
 rdoc_options: []
 require_paths:
 - lib