capistrano-cable 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6b994fb2900c73d5d4afe2a12e7a7432e2a53611fd37ad2ac4534031a3bbd65
-  data.tar.gz: bc7ee8750a36a2d613eaf7c9e8379da3d4d21cf5d69dffb40c5347eb0e8a8b07
+  metadata.gz: 7e1a47bf59656cff6458c37414595512d8fee87ad11ce021fa959f55d8ff8d96
+  data.tar.gz: 8760656360a1e0e92413131b47e125f0ae0d00c7421896955644ca210767f502
 SHA512:
-  metadata.gz: 78ddf453aeeadee09e1bfe8418f7435fbc8565fdfbb9131f47b4e8d8a1d06f6f57f4245ee0cf0d8b77450aab013a8ab9f9b46e82095572843e961bfe701dc7d8
-  data.tar.gz: c094d0a7acda838ad3c219a29deee9226765213099a41a03d0176a98a75a0782ce6e57ae0f902904f4d71998abea30afea634a16d7e94a9a7645180790435f5b
+  metadata.gz: 2603c3875d4e470ef7c27d3360f7904584add2ca644f209d74d04eab98411c3f802ba91f8df1949965ebf809cea3c21a921562a4fc271304ad79aeee19abde7a
+  data.tar.gz: f4f5d9d77e6800ee48a958519d7554e906fefbbcb5b9291dfb293ff8adfddb0cc07f71d744bae5173fbe4591b6e42fa776496cee9f3a00c59dab6408ed169a22

data/README.md

@@ -1,6 +1,7 @@
 # Capistrano::Cable
 
 **Capistrano::Cable** helps to deploy standalone ActionCable server with Puma over `systemd`.
+It doesn't use a specific `puma.rb` for Puma configuration, it relies on given options.
 
 ## Installation
 
@@ -38,28 +39,29 @@ install_plugin Capistrano::Cable
 ```
 
 ### Config
+Many options are available to customize the cable server configuration. Here are the main ones:
 
 ```ruby
 # config/deploy.rb or config/deploy/<stage>.rb
 set :cable_role, :web
+set :cable_port, 29292
+# set :cable_ssl_certificate
+# set :cable_ssl_certificate_key
+set :cable_rackup_file, 'cable/config.ru'
+set :cable_dir, -> { File.join(release_path, "cable") }
+set :cable_pidfile, -> { File.join(shared_path, "tmp", "pids", "cable.pid") }
 set :cable_env, -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
-set :cable_access_log, -> { File.join(shared_path, 'log', 'cable.log') }
-set :cable_error_log, -> { File.join(shared_path, 'log', 'cable.log') }
-
-set :cable_systemctl_bin, -> { fetch(:systemctl_bin, '/bin/systemctl') }
-set :cable_service_unit_name, -> { "#{fetch(:application)}_cable_#{fetch(:stage)}" }
-set :cable_enable_socket_service, false
-# set :cable_bind, ... # Example: ->{ "unix:/path/to/cable.sock" }
-
+set :cable_access_log, -> { File.join(shared_path, "log", "cable.access.log") }
+set :cable_error_log, -> { File.join(shared_path, "log", "cable.error.log") }
+set :cable_phased_restart, -> { true }
 set :cable_service_unit_env_files, -> { fetch(:service_unit_env_files, []) }
 set :cable_service_unit_env_vars, -> { fetch(:service_unit_env_vars, []) }
-
-set :cable_systemctl_user, -> { fetch(:systemctl_user, :user) }
-set :cable_enable_lingering, -> { fetch(:cable_systemctl_user) != :system }
-set :cable_lingering_user, -> { fetch(:lingering_user, fetch(:user)) }
-
-set :cable_service_templates_path, fetch(:service_templates_path, 'config/deploy/templates')
+set :cable_service_templates_path, fetch(:service_templates_path, "config/deploy/templates")
 ```
+See Capistrao::Cable::Systemd#set_defaults for more details.
+
+To enable SSL, set the `cable_ssl_certificate` and `cable_ssl_certificate_key` options.
+The both are required to enable SSL.
 
 ## Development
 

data/lib/capistrano/cable/systemd.rb

@@ -15,19 +15,13 @@ module Capistrano
       def set_defaults
         set_if_empty :cable_role, :web
         set_if_empty :cable_port, 29292
+        set_if_empty :cable_rackup_file, 'cable/config.ru'
         set_if_empty :cable_dir, -> { File.join(release_path, "cable") }
         set_if_empty :cable_pidfile, -> { File.join(shared_path, "tmp", "pids", "cable.pid") }
         set_if_empty :cable_env, -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
         set_if_empty :cable_access_log, -> { File.join(shared_path, "log", "cable.access.log") }
         set_if_empty :cable_error_log, -> { File.join(shared_path, "log", "cable.error.log") }
-
-        # Chruby, Rbenv and RVM integration
-        append :chruby_map_bins, "puma", "pumactl" if fetch(:chruby_map_bins)
-        append :rbenv_map_bins, "puma", "pumactl" if fetch(:rbenv_map_bins)
-        append :rvm_map_bins, "puma", "pumactl" if fetch(:rvm_map_bins)
-
-        # Bundler integration
-        append :bundle_bins, "puma", "pumactl"
+        set_if_empty :cable_phased_restart, -> { true }
 
         set_if_empty :cable_systemctl_bin, -> { fetch(:systemctl_bin, "/bin/systemctl") }
         set_if_empty :cable_service_unit_name, -> { "#{fetch(:application)}_cable_#{fetch(:stage)}" }
@@ -43,6 +37,14 @@ module Capistrano
         set_if_empty :cable_lingering_user, -> { fetch(:lingering_user, fetch(:user)) }
 
         set_if_empty :cable_service_templates_path, fetch(:service_templates_path, "config/deploy/templates")
+
+        # Chruby, Rbenv and RVM integration
+        append :chruby_map_bins, "puma", "pumactl" if fetch(:chruby_map_bins)
+        append :rbenv_map_bins, "puma", "pumactl" if fetch(:rbenv_map_bins)
+        append :rvm_map_bins, "puma", "pumactl" if fetch(:rvm_map_bins)
+
+        # Bundler integration
+        append :bundle_bins, "puma", "pumactl"
       end
 
       def expanded_bundle_command
@@ -118,13 +120,12 @@ module Capistrano
       def puma_options
         options = []
         options << "--no-config"
-        # options << "--dir #{fetch(:cable_dir)}" if fetch(:cable_dir) # or change WorkingDirectory in cable.service?
         if fetch(:cable_ssl_certificate) && fetch(:cable_ssl_certificate_key)
           options << "--bind 'ssl://0.0.0.0:#{fetch(:cable_port)}?key=#{fetch(:cable_ssl_certificate_key)}&cert=#{fetch(:cable_ssl_certificate)}'"
-          # Can use: &verify_mode=none&ca=...
+        else
+          options << "--port #{fetch(:cable_port)}"
         end
         options << "--environment #{fetch(:cable_env)}"
-        # options << "--port #{fetch(:cable_port)}"
         options << "--pidfile #{fetch(:cable_pidfile)}" if fetch(:cable_pidfile)
         options << "--threads #{fetch(:cable_threads)}" if fetch(:cable_threads)
         options << "--workers #{fetch(:cable_workers)}" if fetch(:cable_workers)

data/lib/capistrano/cable/version.rb

@@ -2,6 +2,6 @@
 
 module Capistrano
   module Cable
-    VERSION = "0.1.0"
+    VERSION = "0.1.2"
   end
 end

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

@@ -20,7 +20,7 @@ WatchdogSec=30
 <%="User=#{cable_user(@role)}" if fetch(:cable_systemctl_user) == :system %>
 <%="PIDFile=#{fetch(:cable_pidfile)}" if fetch(:cable_pidfile) %>
 WorkingDirectory=<%= current_path %>
-ExecStart=<%= expanded_bundle_command %> exec puma <%= puma_options %> cable/config.ru
+ExecStart=<%= expanded_bundle_command %> exec puma <%= puma_options %> <%= fetch(:cable_rackup_file) %>
 ExecReload=/bin/kill -USR1 $MAINPID
 Environment='RAILS_ENV=<%= fetch(:stage) %>'
 <% fetch(:default_env).reject{ |k, _| k.to_s == 'path' }.each do |variable, value| -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-cable
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Brice TEXIER