capistrano3-puma 5.2.0 → 6.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98e0fb64cfd73c2183c8ac641ec0e426f1721657254eeae1b6cebea4d9b34e78
-  data.tar.gz: 658219686493acef08d13c050c6d3c8536c980a6820d3d1165dcb5c3e3c80f89
+  metadata.gz: 01bd202af4ad17172fc916bf260dbf62087ea870d2a52804d064d0af0887ca2a
+  data.tar.gz: 59a9663b2823120f9efc4a02912bce9fd3311d82cca7e519773fd10c0bcc5560
 SHA512:
-  metadata.gz: 2423e9acfe501fe4404592ae5099e619aa168e055372ea7e56762a001e59cbefbdf6d32373e7c003a6abe2fefcde429887bddb5d02d7806b8969fa92297d70ad
-  data.tar.gz: f629c899266cbc6a97b40243c1edfdfa7ba23e6f519f837e6c05209de2845261ca25a823a84ecbf1045fe8566845deff8fb71c7fee967e1c9b46d67896f9652b
+  metadata.gz: 2bd42b02660819d794a727b823cf2971aa07aa99bf1b7ffc8b2e7437c8994beec8526eab86395e76c9ce99778c214b281488fc656f870affce42f09ea35a3216
+  data.tar.gz: 56f3da4144e37e077f992053782a3bedfff7927b3dff4ff5a10e4ac550c0cbeb5684a7472273108218f4a3b48e8d91d9b0c97f20ecb875915922675233284db9

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2020 Abdelkader Boudih
+Copyright (c) 2013-2022 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

@@ -21,19 +21,10 @@ And then execute:
 
     require 'capistrano/puma'
     install_plugin Capistrano::Puma  # Default puma tasks
-    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::Systemd
     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
 ```
-You will need to select your service manager
-```ruby
-install_plugin Capistrano::Puma::Daemon  # If you using puma daemonized (not supported in Puma 5+)
-```
-or
-```ruby
-install_plugin Capistrano::Puma::Systemd  # if you use SystemD
-```
 
 To prevent loading the hooks of the plugin, add false to the load_hooks param.
 ```ruby
@@ -95,27 +86,6 @@ or define a standalone one:
 role :puma_nginx, %w{root@example.com}
 ```
 
-### Jungle
-
-For Jungle tasks (beta), these options exist:
-```ruby
-    set :puma_jungle_conf, '/etc/puma.conf'
-    set :puma_run_path, '/usr/local/bin/run-puma'
-```
-
-### Systemd
-
-Install Systemd plugin in `Capfile`:
-```ruby
-install_plugin Capistrano::Puma
-install_plugin Capistrano::Puma::Systemd
-```
-
-To generate unit file use:
-```
-cap production puma:systemd:config puma:systemd:enable
-```
-
 To use customize environment variables
 
 ```ruby
@@ -172,33 +142,13 @@ Configurable options, shown here with defaults: Please note the configuration op
 
 ```ruby
     set :puma_user, fetch(:user)
-    set :puma_rackup, -> { File.join(current_path, 'config.ru') }
-    set :puma_state, "#{shared_path}/tmp/pids/puma.state"
-    set :puma_pid, "#{shared_path}/tmp/pids/puma.pid"
-    set :puma_bind, "unix://#{shared_path}/tmp/sockets/puma.sock"    #accept array for multi-bind
-    set :puma_control_app, false
-    set :puma_default_control_app, "unix://#{shared_path}/tmp/sockets/pumactl.sock"
-    set :puma_conf, "#{shared_path}/puma.rb"
-    set :puma_access_log, "#{shared_path}/log/puma_access.log"
-    set :puma_error_log, "#{shared_path}/log/puma_error.log"
     set :puma_role, :app
-    set :puma_env, fetch(:rack_env, fetch(:rails_env, 'production'))
-    set :puma_threads, [0, 16]
-    set :puma_workers, 0
-    set :puma_worker_timeout, nil
-    set :puma_init_active_record, false
-    set :puma_preload_app, false
-    set :puma_daemonize, false
-    set :puma_plugins, []  #accept array of plugins
-    set :puma_tag, fetch(:application)
-    set :puma_restart_command, 'bundle exec puma'
     set :puma_service_unit_name, "puma_#{fetch(:application)}_#{fetch(:stage)}"
     set :puma_systemctl_user, :system # accepts :user
     set :puma_enable_lingering, fetch(:puma_systemctl_user) != :system # https://wiki.archlinux.org/index.php/systemd/User#Automatic_start-up_of_systemd_user_instances
     set :puma_lingering_user, fetch(:user)
     set :puma_service_unit_env_file, nil
     set :puma_service_unit_env_vars, []
-    set :puma_phased_restart, false
 
     set :nginx_config_name, "#{fetch(:application)}_#{fetch(:stage)}"
     set :nginx_flags, 'fail_timeout=0'

data/lib/capistrano/puma/systemd.rb

@@ -11,13 +11,18 @@ module Capistrano
     end
 
     def set_defaults
-      set_if_empty :puma_systemctl_bin, '/bin/systemctl'
+      set_if_empty :puma_systemctl_bin, -> { fetch(:systemctl_bin, '/bin/systemctl') }
       set_if_empty :puma_service_unit_name, -> { "puma_#{fetch(:application)}_#{fetch(:stage)}" }
       set_if_empty :puma_enable_socket_service, -> { false }
-      set_if_empty :puma_systemctl_user, :system
-      set_if_empty :puma_enable_lingering, -> { fetch(:puma_systemctl_user) != :system }
-      set_if_empty :puma_lingering_user, -> { fetch(:user) }
       set_if_empty :puma_phased_restart, -> { false }
+
+      set_if_empty :puma_systemctl_user, -> { fetch(:systemctl_user, :user) }
+      set_if_empty :puma_enable_lingering, -> { fetch(:puma_systemctl_user) != :system }
+      set_if_empty :puma_lingering_user, -> { fetch(:lingering_user, fetch(:user)) }
+      set_if_empty :puma_access_log, -> { File.join(shared_path, 'log', "#{fetch(:puma_env)}.log") }
+      set_if_empty :puma_error_log, -> { File.join(shared_path, 'log', "#{fetch(:puma_env)}.log") }
+
+      set_if_empty :puma_service_templates_path, fetch(:service_templates_path, 'config/deploy/templates')
     end
 
     def expanded_bundle_command

data/lib/capistrano/puma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capistrano
-  PUMAVERSION = '5.2.0'
+  PUMAVERSION = '6.0.0.alpha.1'
 end

data/lib/capistrano/puma.rb

@@ -44,7 +44,7 @@ module Capistrano
           File.expand_path("../templates/#{from}.rb.erb", __FILE__)
       ].detect { |path| File.file?(path) }
       erb = File.read(file)
-      StringIO.new(ERB.new(erb, nil, '-').result(binding))
+      StringIO.new(ERB.new(erb, trim_mode: '-').result(binding))
     end
 
     def template_puma(from, to, role)
@@ -94,31 +94,9 @@ module Capistrano
   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_control_app, false
-      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
-      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'
@@ -128,38 +106,9 @@ module Capistrano
       # Bundler integration
       append :bundle_bins, 'puma', 'pumactl'
     end
-
-    def register_hooks
-      after 'deploy:check', 'puma:check'
-    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', fetch(:puma_conf), role
-    end
   end
 end
 
-require 'capistrano/puma/workers'
-require 'capistrano/puma/daemon'
 require 'capistrano/puma/systemd'
 require 'capistrano/puma/monit'
-require 'capistrano/puma/jungle'
 require 'capistrano/puma/nginx'

data/lib/capistrano/tasks/systemd.rake

@@ -3,76 +3,64 @@
 git_plugin = self
 
 namespace :puma do
-  namespace :systemd do
-    desc 'Config Puma systemd service'
-    task :config do
-      on roles(fetch(:puma_role)) do |role|
-
-        upload_compiled_template = lambda do |template_name, unit_filename|
-          git_plugin.template_puma template_name, "#{fetch(:tmp_dir)}/#{unit_filename}", role
-          systemd_path = fetch(:puma_systemd_conf_dir, git_plugin.fetch_systemd_unit_path)
-          if fetch(:puma_systemctl_user) == :system
-            sudo "mv #{fetch(:tmp_dir)}/#{unit_filename} #{systemd_path}"
-          else
-            execute :mkdir, "-p", systemd_path
-            execute :mv, "#{fetch(:tmp_dir)}/#{unit_filename}", "#{systemd_path}"
-          end
+  desc 'Install Puma systemd service'
+  task :install do
+    on roles(fetch(:puma_role)) do |role|
+
+      upload_compiled_template = lambda do |template_name, unit_filename|
+        git_plugin.template_puma template_name, "#{fetch(:tmp_dir)}/#{unit_filename}", role
+        systemd_path = fetch(:puma_systemd_conf_dir, git_plugin.fetch_systemd_unit_path)
+        if fetch(:puma_systemctl_user) == :system
+          sudo "mv #{fetch(:tmp_dir)}/#{unit_filename} #{systemd_path}"
+        else
+          execute :mkdir, "-p", systemd_path
+          execute :mv, "#{fetch(:tmp_dir)}/#{unit_filename}", "#{systemd_path}"
         end
+      end
 
-        upload_compiled_template.call("puma.service", "#{fetch(:puma_service_unit_name)}.service")
-
-        if fetch(:puma_enable_socket_service)
-          upload_compiled_template.call("puma.socket", "#{fetch(:puma_service_unit_name)}.socket")
-        end
+      upload_compiled_template.call("puma.service", "#{fetch(:puma_service_unit_name)}.service")
 
-        # Reload systemd
-        git_plugin.execute_systemd("daemon-reload")
+      if fetch(:puma_enable_socket_service)
+        upload_compiled_template.call("puma.socket", "#{fetch(:puma_service_unit_name)}.socket")
       end
-    end
 
-    desc 'Generate service configuration locally'
-    task :generate_config_locally do
-      fake_role = Struct.new(:hostname)
-      run_locally do
-        File.write('puma.service', git_plugin.compiled_template_puma("puma.service", fake_role.new("example.com")).string)
-        if fetch(:puma_enable_socket_service)
-          File.write('puma.socket', git_plugin.compiled_template_puma("puma.socket", fake_role.new("example.com")).string)
-        end
-      end
+      # Reload systemd
+      git_plugin.execute_systemd("daemon-reload")
     end
+  end
 
-    desc 'Enable Puma systemd service'
-    task :enable do
-      on roles(fetch(:puma_role)) do
-        git_plugin.execute_systemd("enable", fetch(:puma_service_unit_name))
-        git_plugin.execute_systemd("enable", fetch(:puma_service_unit_name) + ".socket") if fetch(:puma_enable_socket_service)
-
-        if fetch(:puma_systemctl_user) != :system && fetch(:puma_enable_lingering)
-          execute :loginctl, "enable-linger", fetch(:puma_lingering_user)
-        end
+  desc 'Uninstall Puma systemd service'
+  task :uninstall do
+    invoke 'puma:disable'
+    on roles(fetch(:puma_role)) do |role|
+      systemd_path = fetch(:puma_systemd_conf_dir, git_plugin.fetch_systemd_unit_path)
+      if fetch(:puma_systemctl_user) == :system
+        sudo "rm -f #{systemd_path}/#{fetch(:puma_service_unit_name)}*"
+      else
+        execute :rm, "-f", "#{systemd_path}/#{fetch(:puma_service_unit_name)}*"
       end
+      git_plugin.execute_systemd("daemon-reload")
     end
 
-    desc 'Disable Puma systemd service'
-    task :disable do
-      on roles(fetch(:puma_role)) do
-        git_plugin.execute_systemd("disable", fetch(:puma_service_unit_name))
-        git_plugin.execute_systemd("disable", fetch(:puma_service_unit_name) + ".socket") if fetch(:puma_enable_socket_service)
-      end
-    end
+  end
 
-    desc 'Stop Puma socket via systemd'
-    task :stop_socket do
-      on roles(fetch(:puma_role)) do
-        git_plugin.execute_systemd("stop", fetch(:puma_service_unit_name) + ".socket")
+  desc 'Enable Puma systemd service'
+  task :enable do
+    on roles(fetch(:puma_role)) do
+      git_plugin.execute_systemd("enable", fetch(:puma_service_unit_name))
+      git_plugin.execute_systemd("enable", fetch(:puma_service_unit_name) + ".socket") if fetch(:puma_enable_socket_service)
+
+      if fetch(:puma_systemctl_user) != :system && fetch(:puma_enable_lingering)
+        execute :loginctl, "enable-linger", fetch(:puma_lingering_user)
       end
     end
+  end
 
-    desc 'Restart Puma socket via systemd'
-    task :restart_socket do
-      on roles(fetch(:puma_role)) do
-        git_plugin.execute_systemd("restart", fetch(:puma_service_unit_name) + ".socket")
-      end
+  desc 'Disable Puma systemd service'
+  task :disable do
+    on roles(fetch(:puma_role)) do
+      git_plugin.execute_systemd("disable", fetch(:puma_service_unit_name))
+      git_plugin.execute_systemd("disable", fetch(:puma_service_unit_name) + ".socket") if fetch(:puma_enable_socket_service)
     end
   end
 
@@ -90,6 +78,13 @@ namespace :puma do
     end
   end
 
+  desc 'Stop Puma socket via systemd'
+  task :stop_socket do
+    on roles(fetch(:puma_role)) do
+      git_plugin.execute_systemd("stop", fetch(:puma_service_unit_name) + ".socket")
+    end
+  end
+
   desc 'Restarts or reloads Puma service via systemd'
   task :smart_restart do
     if fetch(:puma_phased_restart)
@@ -106,16 +101,23 @@ namespace :puma do
     end
   end
 
+  desc 'Restart Puma socket via systemd'
+  task :restart_socket do
+    on roles(fetch(:puma_role)) do
+      git_plugin.execute_systemd("restart", fetch(:puma_service_unit_name) + ".socket")
+    end
+  end
+
   desc 'Reload Puma service via systemd'
   task :reload do
     on roles(fetch(:puma_role)) do
       service_ok = if fetch(:puma_systemctl_user) == :system
-        execute("#{fetch(:puma_systemctl_bin)} status #{fetch(:puma_service_unit_name)} > /dev/null", raise_on_non_zero_exit: false)
-      else
-        execute("#{fetch(:puma_systemctl_bin)} --user status #{fetch(:puma_service_unit_name)} > /dev/null", raise_on_non_zero_exit: false)
-      end
+                     execute("#{fetch(:puma_systemctl_bin)} status #{fetch(:puma_service_unit_name)} > /dev/null", raise_on_non_zero_exit: false)
+                   else
+                     execute("#{fetch(:puma_systemctl_bin)} --user status #{fetch(:puma_service_unit_name)} > /dev/null", raise_on_non_zero_exit: false)
+                   end
       cmd = 'reload'
-      if !service_ok
+      unless service_ok
         cmd = 'restart'
       end
       if fetch(:puma_systemctl_user) == :system

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

@@ -1,28 +1,40 @@
+# This file tells systemd how to run Puma as a 24/7 long-running daemon.
+#
+# Customize this file based on your bundler location, app directory, etc.
+# Customize and copy this into /usr/lib/systemd/system (CentOS) or /lib/systemd/system (Ubuntu).
+# Then run:
+#   - systemctl enable <%= fetch(:puma_service_unit_name) %>
+#   - systemctl {start,stop,restart} <%= fetch(:puma_service_unit_name) %>
+#
+#
+# Use `journalctl -u <%= fetch(:puma_service_unit_name) %> -rn 100` to view the last 100 lines of log output.
+#
 [Unit]
 Description=Puma HTTP Server for <%= "#{fetch(:application)} (#{fetch(:stage)})" %>
 After=network.target
 <%= "Requires=#{fetch(:puma_service_unit_name)}.socket" if fetch(:puma_enable_socket_service) %>
+After=syslog.target network.target
 
 [Service]
 Type=simple
-<%="User=#{puma_user(@role)}" if fetch(:puma_systemctl_user) == :system %>
+<%="User=#{puma_user(@role)}" if fetch(:puma_systemctl_user) == :system -%>
 WorkingDirectory=<%= current_path %>
 # Support older bundler versions where file descriptors weren't kept
 # See https://github.com/rubygems/rubygems/issues/3254
-ExecStart=<%= expanded_bundle_command %> exec --keep-file-descriptors puma -C <%= fetch(:puma_conf) %>
+ExecStart=<%= expanded_bundle_command %> exec --keep-file-descriptors puma
 ExecReload=/bin/kill -USR1 $MAINPID
-StandardOutput=append:<%= fetch(:puma_access_log) %>
-StandardError=append:<%= fetch(:puma_error_log) %>
-<%="EnvironmentFile=#{fetch(:puma_service_unit_env_file)}" if fetch(:puma_service_unit_env_file) %>
 
+<%="EnvironmentFile=#{fetch(:puma_service_unit_env_file)}" if fetch(:puma_service_unit_env_file) %>
 <% fetch(:puma_service_unit_env_vars, []).each do |environment_variable| %>
 <%="Environment=#{environment_variable}" %>
 <% end %>
-
-Restart=always
+# if we crash, restart
 RestartSec=1
+Restart=on-failure
 
-SyslogIdentifier=puma
+<%="StandardOutput=append:#{fetch(:puma_access_log)}" if fetch(:puma_access_log) %>
+<%="StandardError=append:#{fetch(:puma_error_log)}" if fetch(:puma_error_log) %>
 
+SyslogIdentifier=<%= fetch(:puma_service_unit_name) %>
 [Install]
 WantedBy=<%=(fetch(:puma_systemctl_user) == :system) ? "multi-user.target" : "default.target"%>

data/lib/capistrano/templates/puma_monit.conf.erb

@@ -3,5 +3,5 @@
 #
 check process <%= puma_monit_service_name %>
   with pidfile "<%= fetch(:puma_pid) %>"
-  start program = "/usr/bin/sudo -iu <%= puma_user(@role) %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:puma] %> -C <%= fetch(:puma_conf) %> --daemon'"
+  start program = "/usr/bin/sudo -iu <%= puma_user(@role) %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:puma] %>  %> --daemon'"
   stop program = "/usr/bin/sudo -iu <%= puma_user(@role) %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:pumactl] %> -S <%= fetch(:puma_state) %> stop'"

data/lib/generators/capistrano/nginx_puma/config_generator.rb

@@ -9,7 +9,6 @@ module Capistrano
           :banner => "path to templates"
 
         def copy_template
-          copy_file "../../../../capistrano/templates/puma.rb.erb", "#{templates_path}/puma.rb.erb"
           copy_file "../../../../capistrano/templates/nginx_conf.erb", "#{templates_path}/nginx_conf.erb"
           # copy_file "puma.rb.erb", "#{templates_path}/puma.rb.erb"
           # copy_file "puma_init.erb", "#{templates_path}/puma_init.erb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 6.0.0.alpha.1
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-11 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -65,38 +65,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/stale.yml"
-- ".gitignore"
 - CHANGELOG.md
-- CONTRIBUTORS.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- capistrano3-puma.gemspec
 - lib/capistrano/puma.rb
-- lib/capistrano/puma/daemon.rb
-- lib/capistrano/puma/jungle.rb
 - lib/capistrano/puma/monit.rb
 - lib/capistrano/puma/nginx.rb
 - lib/capistrano/puma/systemd.rb
 - lib/capistrano/puma/version.rb
-- lib/capistrano/puma/workers.rb
-- lib/capistrano/tasks/daemon.rake
-- lib/capistrano/tasks/jungle.rake
 - lib/capistrano/tasks/monit.rake
 - lib/capistrano/tasks/nginx.rake
-- lib/capistrano/tasks/puma.rake
 - lib/capistrano/tasks/systemd.rake
-- lib/capistrano/tasks/workers.rake
 - lib/capistrano/templates/nginx_conf.erb
 - lib/capistrano/templates/puma-deb.erb
 - lib/capistrano/templates/puma-rpm.erb
-- lib/capistrano/templates/puma.rb.erb
 - lib/capistrano/templates/puma.service.erb
 - lib/capistrano/templates/puma.socket.erb
 - lib/capistrano/templates/puma_monit.conf.erb
-- lib/capistrano/templates/run-puma.erb
 - lib/capistrano3-puma.rb
 - lib/generators/capistrano/nginx_puma/USAGE
 - lib/generators/capistrano/nginx_puma/config_generator.rb
@@ -104,8 +89,8 @@ homepage: https://github.com/seuros/capistrano-puma
 licenses:
 - MIT
 metadata: {}
-post_install_message: "\n    All plugins need to be explicitly installed with install_plugin.\n
-  \   Please see README.md\n  "
+post_install_message: "\n    Version 6.0.0 is a major release. Please see README.md,
+  breaking changes are listed in CHANGELOG.md\n  "
 rdoc_options: []
 require_paths:
 - lib
@@ -113,14 +98,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Puma integration for Capistrano

data/.github/workflows/stale.yml

@@ -1,19 +0,0 @@
-name: Mark stale issues and pull requests
-
-on:
-  schedule:
-  - cron: "30 1 * * *"
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/stale@v3
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'Stale issue message'
-        stale-pr-message: 'Stale pull request message'
-        stale-issue-label: 'no-issue-activity'
-        stale-pr-label: 'no-pr-activity'

data/.gitignore

@@ -1,18 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.idea
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/CONTRIBUTORS.md

@@ -1,48 +0,0 @@
-## Contributors
-
-- Abdelkader Boudih
-- André Arko
-- Ariel Zerahia
-- Barack Obama
-- Bart de Water
-- Benjamin Kim
-- Bin Huang
-- Bryan Liles
-- Claudio Poli
-- Cyril Rohr
-- Fritz Lee
-- Feña Agar
-- Hnat Kubov
-- Ivan Schneider
-- James-Hendrickson
-- Jens Hausherr
-- Jeremy Rottman
-- Jesse Cooke
-- Johan Lind
-- Jordan Hollinger
-- Jun Lin
-- Kamil Giszczak
-- Kevin Collignon
-- Konstantin Papkovskiy
-- Kyle Decot
-- Lisa Hagemann
-- Lonre Wang
-- Lucas Alves
-- Marcos Chicote
-- Mario Celit log
-- Matias De Santi
-- Michael C. Beck
-- Neil Bartley
-- Philippe Nénert
-- Ponomarev Nikolay
-- Rafael Goulart
-- SHIMADA Koji
-- Sergey Ponomarev
-- Shane O'Grady
-- Simon Males
-- Steve Madere
-- Suhail Patel
-- Suraj Shirvankar
-- marshall-lee
-- ruohan chen
-- ayaya zhao

data/Gemfile

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in capistrano-puma.gemspec
-gemspec
-
-gem "bump", "~> 0.10.0"
-
-gem "github_changelog_generator", "~> 1.16"

data/Rakefile

@@ -1,9 +0,0 @@
-require "bundler/gem_tasks"
-require 'github_changelog_generator/task'
-
-GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  config.user = 'seuros'
-  config.project = 'capistrano-puma'
-  config.issues = false
-  config.future_release = '5.2.0'
-end

data/capistrano3-puma.gemspec

@@ -1,28 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'capistrano/puma/version'
-
-Gem::Specification.new do |spec|
-  spec.name = 'capistrano3-puma'
-  spec.version = Capistrano::PUMAVERSION
-  spec.authors = ['Abdelkader Boudih']
-  spec.email = ['Terminale@gmail.com']
-  spec.description = %q{Puma integration for Capistrano 3}
-  spec.summary = %q{Puma integration for Capistrano}
-  spec.homepage = 'https://github.com/seuros/capistrano-puma'
-  spec.license = 'MIT'
-
-  spec.required_ruby_version     = '>= 1.9.3'
-
-  spec.files = `git ls-files`.split($/)
-  spec.require_paths = ['lib']
-
-  spec.add_dependency 'capistrano', '~> 3.7'
-  spec.add_dependency 'capistrano-bundler'
-  spec.add_dependency 'puma' , '>= 4.0', '< 6.0'
-  spec.post_install_message = %q{
-    All plugins need to be explicitly installed with install_plugin.
-    Please see README.md
-  }
-end

data/lib/capistrano/puma/daemon.rb

@@ -1,13 +0,0 @@
-module Capistrano
-  class Puma::Daemon < Capistrano::Plugin
-    include PumaCommon
-
-    def register_hooks
-      after 'deploy:finished', 'puma:smart_restart'
-    end
-
-    def define_tasks
-      eval_rakefile File.expand_path('../../tasks/daemon.rake', __FILE__)
-    end
-  end
-end

data/lib/capistrano/puma/jungle.rb

@@ -1,22 +0,0 @@
-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
-
-    def debian_install(role)
-      template_puma 'puma-deb', "#{fetch(:tmp_dir)}/puma", role
-    end
-
-    def rhel_install(role)
-      template_puma 'puma-rpm', "#{fetch(:tmp_dir)}/puma", role
-    end
-  end
-end

data/lib/capistrano/puma/workers.rb

@@ -1,9 +0,0 @@
-module Capistrano
-  class Puma::Workers < Capistrano::Plugin
-    include PumaCommon
-
-    def define_tasks
-      eval_rakefile File.expand_path('../../tasks/workers.rake', __FILE__)
-    end
-  end
-end

data/lib/capistrano/tasks/daemon.rake

@@ -1,74 +0,0 @@
-git_plugin = self
-
-namespace :puma do
-  desc 'Start puma'
-  task :start do
-    on roles(fetch(:puma_role)) do |role|
-      git_plugin.puma_switch_user(role) do
-        if test "[ -f #{fetch(:puma_pid)} ]" and test :kill, "-0 $( cat #{fetch(:puma_pid)} )"
-          info 'Puma is already running'
-        else
-          within current_path do
-            with rack_env: fetch(:puma_env) do
-              execute :puma, "-C #{fetch(:puma_conf)} --daemon"
-            end
-          end
-        end
-      end
-    end
-  end
-
-  %w[halt stop status].map do |command|
-    desc "#{command} puma"
-    task command do
-      on roles (fetch(:puma_role)) do |role|
-        within current_path 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)} )"
-                  execute :pumactl, "-S #{fetch(:puma_state)} -F #{fetch(:puma_conf)} #{command}"
-                else
-                  # delete invalid pid file , process is not running.
-                  execute :rm, fetch(:puma_pid)
-                end
-              else
-                #pid file not found, so puma is probably not running or it using another pidfile
-                warn 'Puma not running'
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-
-  %w[phased-restart restart].map do |command|
-    desc "#{command} puma"
-    task command do
-      on roles (fetch(:puma_role)) do |role|
-        within current_path 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
-                execute :pumactl, "-S #{fetch(:puma_state)} -F #{fetch(:puma_conf)} #{command}"
-              else
-                # Puma is not running or state file is not present : Run it
-                invoke 'puma:start'
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-
-  task :smart_restart do
-    if !fetch(:puma_preload_app) && fetch(:puma_workers, 0).to_i > 1
-      invoke 'puma:phased-restart'
-    else
-      invoke 'puma:restart'
-    end
-  end
-end

data/lib/capistrano/tasks/jungle.rake

@@ -1,65 +0,0 @@
-git_plugin = self
-
-namespace :puma do
-  namespace :jungle do
-    desc 'Install Puma jungle'
-    task :install do
-      on roles(fetch(:puma_role)) do |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
-          git_plugin.rhel_install(role)
-          execute "chmod +x #{fetch(:tmp_dir)}/puma"
-          sudo "mv #{fetch(:tmp_dir)}/puma /etc/init.d/puma"
-          sudo 'chkconfig --add puma'
-        elsif test '[ -f /etc/lsb-release ]'
-          #Debian flavor OS
-          git_plugin.debian_install(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'
-        else
-          #Some other OS
-          error 'This task is not supported for your OS'
-        end
-        sudo "touch #{fetch(:puma_jungle_conf)}"
-      end
-    end
-
-    desc 'Setup Puma config and install jungle script'
-    task :setup do
-      invoke 'puma:config'
-      invoke 'puma:jungle:install'
-      invoke 'puma:jungle:add'
-    end
-
-    desc 'Add current project to the jungle'
-    task :add do
-      on roles(fetch(:puma_role)) do|role|
-        begin
-          sudo "/etc/init.d/puma add '#{current_path}' #{fetch(:puma_user, role.user)} '#{fetch(:puma_conf)}'"
-        rescue => error
-          warn error
-        end
-      end
-    end
-
-    desc 'Remove current project from the jungle'
-    task :remove do
-      on roles(fetch(:puma_role)) do
-        sudo "/etc/init.d/puma remove '#{current_path}'"
-      end
-    end
-
-    %w[start stop restart status].each do |command|
-      desc "#{command} puma"
-      task command do
-        on roles(fetch(:puma_role)) do
-          sudo "service puma #{command} #{current_path}"
-        end
-      end
-    end
-  end
-end

data/lib/capistrano/tasks/puma.rake

@@ -1,21 +0,0 @@
-git_plugin = self
-
-namespace :puma do
-  desc 'Setup Puma config file'
-  task :config do
-    on roles(fetch(:puma_role)) do |role|
-      git_plugin.upload_puma_rb(role)
-    end
-  end
-
-  task :check do
-    on roles(fetch(:puma_role)) do |role|
-      #Create puma.rb for new deployments
-      unless  test "[ -f #{fetch(:puma_conf)} ]"
-        warn 'puma.rb NOT FOUND!'
-        git_plugin.upload_puma_rb(role)
-        info 'puma.rb generated'
-      end
-    end
-  end
-end

data/lib/capistrano/tasks/workers.rake

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

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

@@ -1,54 +0,0 @@
-#!/usr/bin/env puma
-
-directory '<%= current_path %>'
-rackup "<%=fetch(:puma_rackup)%>"
-environment '<%= fetch(:puma_env) %>'
-<% if fetch(:puma_tag) %>
-tag '<%= fetch(:puma_tag)%>'
-<% end %>
-pidfile "<%=fetch(:puma_pid)%>"
-state_path "<%=fetch(:puma_state)%>"
-stdout_redirect '<%=fetch(:puma_access_log)%>', '<%=fetch(:puma_error_log)%>', true
-
-
-threads <%=fetch(:puma_threads).join(',')%>
-
-<%= puma_plugins %>
-
-<%= puma_bind %>
-<% if fetch(:puma_control_app) %>
-activate_control_app "<%= fetch(:puma_default_control_app) %>"
-<% end %>
-workers <%= puma_workers %>
-<% if fetch(:puma_worker_timeout) %>
-worker_timeout <%= fetch(:puma_worker_timeout).to_i %>
-<% end %>
-
-<% if puma_daemonize? %>
-daemonize
-<% end %>
-
-restart_command '<%= fetch(:puma_restart_command) %>'
-
-<% if puma_preload_app? %>
-preload_app!
-<% else %>
-prune_bundler
-<% end %>
-
-on_restart do
-  puts 'Refreshing Gemfile'
-  ENV["BUNDLE_GEMFILE"] = "<%= fetch(:bundle_gemfile, "#{current_path}/Gemfile") %>"
-end
-
-<% if puma_preload_app? and fetch(:puma_init_active_record) %>
-before_fork do
-  ActiveRecord::Base.connection_pool.disconnect!
-end
-
-on_worker_boot do
-  ActiveSupport.on_load(:active_record) do
-    ActiveRecord::Base.establish_connection
-  end
-end
-<% end %>

data/lib/capistrano/templates/run-puma.erb

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# source ENV variables manually
-. /etc/environment
-# on system boot, and root have no rbenv installed,
-#   after start-stop-daemon switched to current user, we have to init rbenv
-if [ -d "$HOME/.rbenv/bin" ]; then
-  PATH="$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH"
-  eval "$(rbenv init -)"
-elif [ -d "/usr/local/rbenv/bin" ]; then
-  PATH="/usr/local/rbenv/bin:/usr/local/rbenv/shims:$PATH"
-  eval "$(rbenv init -)"
-elif [ -f /usr/local/rvm/scripts/rvm ]; then
-  source /etc/profile.d/rvm.sh
-elif [ -f "$HOME/.rvm/scripts/rvm" ]; then
-  source "$HOME/.rvm/scripts/rvm"
-fi
-
-app=$1; config=$2; log=$3;
-cd $app && exec bundle exec puma -C $config 2>&1 >> $log