lib/capistrano/puma.rb in capistrano3-puma-5.2.0 vs lib/capistrano/puma.rb in capistrano3-puma-6.0.0.alpha.1

- old
+ new

@@ -42,11 +42,11 @@ "config/deploy/templates/#{from}.erb", File.expand_path("../templates/#{from}.erb", __FILE__), 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) backend.upload! compiled_template_puma(from, role), to end @@ -92,74 +92,23 @@ 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_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' 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' - 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'