capistrano-runit-puma 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41d1ad3edcb0ea6b5f08c8c0b86a000010358141
-  data.tar.gz: 5cd2de426525c85aeac0da6bad8b54c59ae14782
+  metadata.gz: a59229ab3e25b6c7ffaa1d6e5e822a845b70aef1
+  data.tar.gz: 47293eaac0eca5bd6d54f6b4b5d3967538670c36
 SHA512:
-  metadata.gz: 468cec02588887fba78d19a0a048f5238b97a8fa54c2340883a8397ef9bc4bf454cf17a0a7acd9fd1c57b8b8ba2482723acc5c1b8df0c6f5b0bd350c6d13260d
-  data.tar.gz: 5e71bcb197935816cacdede308805e38da7fd63e93ad92212e143a38c3a69fa68b3ab6dad2161c89b438bf8eded7f539b0bee8edcb0187b1926a51aca0cb9f2c
+  metadata.gz: 955cade143980d9bc9c19e8de9e0bc17a02d9b94ac1f553f5aef2d111d51df4d5ead397d9bbfeb33358c27b9a44010f7924e7ddc0c68370da88e04799b609495
+  data.tar.gz: 331e0c7c266ffb4f2a0d94c14cf9953660760fd7253c7587dc6219dec006eec1bd2295179bae0ed6741f94cab34d88feb2ea004f6621f35d5d93df88145a18a0

data/README.md

@@ -39,19 +39,19 @@ require 'capistrano/runit/puma'
 * `runit_puma_role` -- what host roles uses runit to run puma. Default value: `:app`
 * `runit_puma_default_hooks` -- run default hooks for runit puma or not. Default value: `true`.
 * `runit_puma_run_template` -- path to ERB template of `run` file. Default value: `nil`.
-* `runit_puma_workers` -- number of puma workers. Default value: 1.
+* `runit_puma_workers` -- number of puma workers. Default value: 0.
 * `runit_puma_threads_min` -- minimal threads to use. Default value: 0.
 * `runit_puma_threads_max` -- maximal threads to use. Default value: 16.
-* `runit_puma_bind` -- bind URI. Examples: tcp://127.0.0.1:8080, unix:///tmp/puma.sock. Default value: nil.
+* `runit_puma_bind` -- bind URI. Examples: tcp://127.0.0.1:8080, unix:///tmp/puma.sock. It can be set per server. Default value: nil.
 * `runit_puma_rackup` -- Path to application's rackup file. Default value: `File.join(current_path, 'config.ru')`
 * `runit_puma_state`  -- Path to puma's state file. Default value: `File.join(shared_path, 'tmp', 'pids', 'puma.state')`
 * `runit_puma_pid` -- Path to pid file. Default value: `File.join(shared_path, 'tmp', 'pids', 'puma.pid')`
-* `runit_puma_bind` -- Puma's bind string. Default value: `File.join('unix://', shared_path, 'tmp', 'sockets', 'puma.sock')`
 * `runit_puma_conf` -- Path to puma's config file. Default value: `File.join(shared_path, 'puma.rb')`
-* `runit_puma_access_log` -- Path to puma's access log. Default value: `File.join(shared_path, 'log', 'puma_access.log')`
-* `runit_puma_error_log` -- Path to puma's error log. Default value: `File.join(shared_path, 'log', 'puma_access.log')`
+* `runit_puma_log` -- path to puma's log (stdout/stderr combined). Default value: `File.join(shared_path, 'log', 'puma.log')`
 * `runit_puma_init_active_record` -- Enable or not establish ActiveRecord connection. Default value: `false`
-* `runit_puma_preload_app` -- Preload application. Default value: `true`
+* `runit_puma_preload_app` -- Preload application. Default value: `false`
+* `runit_puma_restart_method` -- One of following methods: `:restart` (default), `:force_restart`, `:phased_restart`.
+* `runit_puma_on_worker_boot` -- Custom `on_worker_boot`code as string. Default value: nil.
 
 ## Contributing
 

data/capistrano-runit-puma.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name        = "capistrano-runit-puma"
-  spec.version     = '0.1.0'
+  spec.version     = '0.2.0'
   spec.author      = ['Oleksandr Simonov', 'Anton Ageev']
   spec.email       = ['alex@simonov.me', 'antage@gmail.com']
   spec.summary     = %q{Capistrano3 tasks for manage puma via runit supervisor.}
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'capistrano-runit-core', '~> 0.1.0'
+  spec.add_runtime_dependency 'capistrano-runit-core', '~> 0.2.0'
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 end

data/lib/capistrano/tasks/puma.rake

@@ -5,8 +5,7 @@ namespace :load do
   task :defaults do
     set :runit_puma_role, -> { :app }
     set :runit_puma_default_hooks, -> { true }
-    set :runit_puma_run_template, nil
-    set :runit_puma_workers, 1
+    set :runit_puma_workers, 0
     set :runit_puma_threads_min, 0
     set :runit_puma_threads_max, 16
     set :runit_puma_rackup, -> { File.join(current_path, 'config.ru') }
@@ -15,13 +14,14 @@ namespace :load do
     set :runit_puma_bind, -> { File.join('unix://', shared_path, 'tmp', 'sockets', 'puma.sock') }
     set :runit_puma_conf, -> { File.join(shared_path, 'puma.rb') }
     set :runit_puma_conf_in_repo, -> { false }
-    set :runit_puma_access_log, -> { File.join(shared_path, 'log', 'puma_access.log') }
-    set :runit_puma_error_log, -> { File.join(shared_path, 'log', 'puma_error.log') }
+    set :runit_puma_log, -> { File.join(shared_path, 'log', 'puma.log') }
     set :runit_puma_init_active_record, false
-    set :runit_puma_preload_app, true
+    set :runit_puma_preload_app, false
+    set :runit_puma_restart_method, :restart
+    set :runit_puma_on_worker_boot, nil
     # Rbenv and RVM integration
-    set :rbenv_map_bins, fetch(:rbenv_map_bins).to_a.concat(%w(puma pumactl))
-    set :rvm_map_bins, fetch(:rvm_map_bins).to_a.concat(%w(puma pumactl))
+    set :rbenv_map_bins, fetch(:rbenv_map_bins).to_a.concat(%w(puma))
+    set :rvm_map_bins, fetch(:rvm_map_bins).to_a.concat(%w(puma))
   end
 end
 
@@ -55,8 +55,13 @@ namespace :runit do
       array.compact.join(' ')
     end
 
-    def create_puma_default_conf
-      warn 'puma.rb NOT FOUND!'
+    def create_puma_default_conf(host)
+      info 'Create or overwrite puma.rb'
+      # requirements
+      if host.fetch(:runit_puma_bind).nil? && fetch(:runit_puma_bind).nil?
+        $stderr.puts "You should set 'runit_puma_bind' variable globally or for host #{host.hostname}."
+        exit 1
+      end
       path = File.expand_path('../../templates/puma.rb.erb', __FILE__)
       if File.file?(path)
         template = ERB.new(File.read(path))
@@ -68,16 +73,26 @@ namespace :runit do
 
     task :add_default_hooks do
       after 'deploy:check', 'runit:puma:check'
-      after 'deploy:finished', 'runit:puma:restart'
+      case fetch(:runit_puma_restart_method)
+      when :restart
+        after 'deploy:published', 'runit:puma:restart'
+      when :force_restart
+        after 'deploy:published', 'runit:puma:force_restart'
+      when :phased_restart
+        after 'deploy:published', 'runit:puma:phased_restart'
+      else
+        $stderr.puts 'Unknown restart method in runit_puma_restart_method variable. Allowed methods: :restart, :force_restart, :phased_restart.'
+        exit 1
+      end
     end
 
     task :check do
       check_service('puma')
-      on roles fetch(:runit_puma_role) do
+      on roles fetch(:runit_puma_role) do |host|
         if test "[ -d #{puma_enabled_service_dir} ]"
           # Create puma.rb for new deployments if not in repo
-          if !fetch(:runit_puma_conf_in_repo) && !test("[ -f #{fetch(:runit_puma_conf)} ]")
-            create_puma_default_conf
+          if !fetch(:runit_puma_conf_in_repo)
+            create_puma_default_conf(host)
           end
         else
           error "Puma runit service isn't enabled."
@@ -87,12 +102,7 @@ namespace :runit do
 
     desc 'Setup puma runit service'
     task :setup do
-      # requirements
-      if fetch(:runit_puma_bind).nil?
-        $stderr.puts "You should set 'runit_puma_bind' variable."
-        exit 1
-      end
-      setup_service('puma', collect_sidekiq_run_command)
+      setup_service('puma', collect_puma_run_command)
     end
 
     desc 'Enable puma runit service'
@@ -120,16 +130,14 @@ namespace :runit do
       on roles fetch(:runit_puma_role) do
         if test "[ -d #{puma_enabled_service_dir} ]"
           if test("[ -f #{fetch(:runit_puma_pid)} ]") && test("kill -0 $( cat #{fetch(:runit_puma_pid)} )")
-            within current_path do
-              execute :bundle, :exec, :pumactl, "-S #{fetch(:runit_puma_state)} restart"
-            end
+            runit_execute_command('puma', '2')
           else
             info 'Puma is not running'
             if test("[ -f #{fetch(:runit_puma_pid)} ]")
               info 'Removing broken pid file'
               execute :rm, '-f', fetch(:runit_puma_pid)
             end
-            execute "#{fetch(:runit_sv_path)} start #{puma_enabled_service_dir}"
+            runit_execute_command('puma', 'start')
           end
         else
           error "Puma runit service isn't enabled."

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

@@ -4,11 +4,11 @@ daemonize false
 quiet
 pidfile '<%= fetch(:runit_puma_pid)%>'
 state_path '<%= fetch(:runit_puma_state)%>'
-stdout_redirect '<%= fetch(:runit_puma_access_log)%>', '<%= fetch(:runit_puma_error_log)%>', true
+stdout_redirect '<%= fetch(:runit_puma_log)%>', '<%= fetch(:runit_puma_log)%>', true
 
 workers <%= fetch(:runit_puma_workers, 1) %>
 threads <%= fetch(:runit_puma_threads_min, 0) %>, <%= fetch(:runit_puma_threads_max, 16) %>
-bind "<%= fetch(:runit_puma_bind) %>"
+bind "<%= host.fetch(:runit_puma_bind) or fetch(:runit_puma_bind) %>"
 
 <% if fetch(:runit_puma_preload_app) %>
 preload_app!
@@ -19,10 +19,15 @@ on_restart do
   ENV["BUNDLE_GEMFILE"] = "<%= fetch(:bundle_gemfile, "#{current_path}/Gemfile") %>"
 end
 
+<% if fetch(:runit_puma_init_active_record) %>
 on_worker_boot do
-  <% if fetch(:runit_puma_init_active_record) %>
-  ActiveSupport.on_load(:active_record) do
-    ActiveRecord::Base.establish_connection
+  ::ActiveSupport.on_load(:active_record) do
+    ::ActiveRecord::Base.establish_connection
   end
-  <% end %>
 end
+<% end %>
+<% unless fetch(:runit_puma_on_worker_boot, nil).nil? %>
+on_worker_boot do
+<%= fetch(:runit_puma_on_worker_boot) %>
+end
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-runit-puma
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Oleksandr Simonov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano-runit-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -91,8 +91,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Capistrano3 tasks for manage puma via runit supervisor.
 test_files: []
+has_rdoc: