capistrano3-puma 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5e6d7a282e15a64ea0a11d8e75715b8d1e7b5f9
-  data.tar.gz: 96ddd46d8d8818de1e6741996cb49345bbdb9804
+  metadata.gz: 6eb1f47c6b33ef2ce0b2eb525a419d404592bf71
+  data.tar.gz: f83553ccc0af1fd138d47bd0d5842e2ca513e74e
 SHA512:
-  metadata.gz: f759e225e50b35f2590a474dd0e260f9e822600e0843ce1b55cfc3eaf0f890bfee8a7db402ea063fa768ced9371ee2429a17d6731103446b54106f1c8cb28bbd
-  data.tar.gz: a81853cc9b5b7bc62323ef0c868058481f271b8b7f5892ad77e729c633bb60e7a15543a2139e93d6a1819d172db48d72745be6186353088c848e0f2c30190428
+  metadata.gz: b8bf1eb3e4dfe05f5397ec3ed4a383c0bfbd043417b957180bab10874052d10d900379bf8c6d85d340fc4f9b4e859c3a40efc7ed80bc2d9bd50a42d62759edf3
+  data.tar.gz: 602506a6bb39b3de0870c81bcd708376e730db78774b3a30a78e7e9cf0f27ab8294096ff06214f615f8a151c897f66609f5a9e7df52579bbad81b97fc2008f99

data/README.md

@@ -67,6 +67,7 @@ Ensure that the following directories are shared (via ``linked_dirs``):
     tmp/pids tmp/sockets log
 
 ## Changelog
+- 0.6.0: Remove `daemonize true` from default puma.rb file. Explicitly pass `--daemon` flag when needed.
 - 0.5.1: Added worker_timeout option
 - 0.5.0: Bugs fixes
 - 0.4.2: Fix monit template to support chruby

data/capistrano3-puma.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'capistrano', '~> 3.0'
   spec.add_dependency 'puma' , '>= 2.6'
 
+  spec.post_install_message = "capistrano-puma: The puma.rb configuration file no longer explicitly sets daemonize to true. Add the --daemon flag if you reuse that file elsewhere (e.g. 'puma -C path/to/puma.rb --daemon')."
 end

data/lib/capistrano/puma/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Puma
-    VERSION = '0.5.1'
+    VERSION = '0.6.0'
   end
 end

data/lib/capistrano/tasks/puma.cap

@@ -11,8 +11,8 @@ namespace :load do
     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_conf, -> { File.join(shared_path, 'puma.rb') }
-    set :puma_access_log, -> { File.join(shared_path, 'log', 'puma_error.log') }
-    set :puma_error_log, -> { File.join(shared_path, 'log', 'puma_access.log') }
+    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, true
 
@@ -37,7 +37,7 @@ namespace :puma do
       within current_path do
         with rack_env: fetch(:puma_env) do
 
-          execute :bundle, 'exec', :puma, "-C #{fetch(:puma_conf)}"
+          execute :bundle, 'exec', :puma, "-C #{fetch(:puma_conf)} --daemon"
         end
       end
     end
@@ -77,7 +77,7 @@ namespace :puma do
               execute :bundle, 'exec', :pumactl, "-S #{fetch(:puma_state)} #{command}"
             else
               # Puma is not running or state file is not present : Run it
-              execute :bundle, 'exec', :puma, "-C #{fetch(:puma_conf)}"
+              execute :bundle, 'exec', :puma, "-C #{fetch(:puma_conf)} --daemon"
             end
           end
         end
@@ -109,20 +109,14 @@ namespace :puma do
 
 
   def puma_workers
-    fetch(:puma_workers) || 0
+    fetch(:puma_workers, 0)
   end
 
 
-
   def puma_bind
-    case fetch(:puma_bind)
-      when Array
-        fetch(:puma_bind).collect do |bind|
-          "bind '#{bind}'"
-        end.join("\n")
-      else
-        "bind '#{fetch(:puma_bind)}'"
-    end
+    Array(fetch(:puma_bind)).collect do |bind|
+      "bind '#{bind}'"
+    end.join("\n")
   end
 
   def template_puma(from, to, role)

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

@@ -6,7 +6,6 @@ environment '<%= fetch(:puma_env) %>'
 <% if fetch(:puma_tag) %>
   tag '<%= fetch(:puma_tag)%>'
 <% end %>
-daemonize true
 pidfile "<%=fetch(:puma_pid)%>"
 state_path "<%=fetch(:puma_state)%>"
 stdout_redirect '<%=fetch(:puma_access_log)%>', '<%=fetch(:puma_error_log)%>', true

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 -u <%= @role.user %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec puma -C <%= fetch(:puma_conf) %>'"
+  start program = "/usr/bin/sudo -u <%= @role.user %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec puma -C <%= fetch(:puma_conf) %> --daemon'"
   stop program = "/usr/bin/sudo -u <%= @role.user %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec pumactl -S <%= fetch(:puma_state) %> stop'"

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

@@ -3,7 +3,7 @@ app=$1;
 cd $app || exit 1
 
 if [ -e Gemfile ]; then
-    exec sh -c "exec bundle exec puma -C ../../shared/puma.rb"
+    exec sh -c "exec bundle exec puma -C ../../shared/puma.rb --daemon"
 else
-    exec sh -c "exec puma -C ../../shared/puma.rb"
+    exec sh -c "exec puma -C ../../shared/puma.rb --daemon"
 fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -70,7 +70,9 @@ homepage: https://github.com/seuros/capistrano-puma
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: 'capistrano-puma: The puma.rb configuration file no longer explicitly
+  sets daemonize to true. Add the --daemon flag if you reuse that file elsewhere (e.g.
+  ''puma -C path/to/puma.rb --daemon'').'
 rdoc_options: []
 require_paths:
 - lib