capistrano3-puma 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55d549d7cb3e0dbaeec810b62a92d8849b2dc8b4
-  data.tar.gz: 53ee26a9429adca7d5d333393ba93c9439398f55
+  metadata.gz: aea05894d90b7b2c3d9e0c8b6da97a0c9bd095a0
+  data.tar.gz: fc5089649511e22e2965d95e687e87c10aa1f1dd
 SHA512:
-  metadata.gz: 9cc4f3473a175e4c74af3244c8b5e758626db8b556bdd0c72501b7053a2995ddecd18c3f0b42eb5764b6e948d73f8b62274e012e4171ca701ce03508b618b30d
-  data.tar.gz: e9669146b2f239bd934ac1b014e4e24af981b78325accdba11dc2f1c2c8191c1aec2a331cda7c24d1323bbd2fb61ff6cd01c4bc5751b39080950169b0ea579aa
+  metadata.gz: b35bfb74e3004346403dd141d7fc9f9892ac897a26f7b1cc5f3dcf52962c917b96566e466c287cc74fcd305389b430a2c39bd6dc94abd30eeda0d3ab4308f3d6
+  data.tar.gz: 7176bdadcda38433454f8da5f5528c22ffea4374e1aea66d4c030a2d483b06fb9715f59a3d3ee74ebbb4f5b2eaac53bb9fe8441c98de910218b53d73d8b6f7af

data/CHANGELOG.md

@@ -1,4 +1,6 @@
 ## Changelog
+- 3.1.0: 
+  - Don't load puma hooks by default.
 - 3.0.0:
  - Require capistrano 3.7+
  - Implement the plugin system

data/CONTRIBUTORS.md

@@ -1,54 +1,47 @@
 ## Contributors
 
-Abdelkader Boudih
-André Arko
-Ariel Zerahia
-Barack Obama
-Bart de Water
-Benjamin Kim
-Bin Huang
-Bryan Liles
-Claudio Poli
-Cyril Rohr
-Eric
-Fritz Lee
-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
-Matias De Santi
-Michael C. Beck
-Molfar
-Neil Bartley
-Peter
-Philippe Nénert
-Ponomarev Nikolay
-Rafael Goulart
-RavWar
-Ruslan
-SHIMADA Koji
-Sergey Ponomarev
-Shane O'Grady
-Simon Males
-Steve Madere
-Suhail Patel
-Suraj Shirvankar
-ayaya
-dfang
-marshall-lee
-mizukmb
-msbrigna
-ruohan.chen
+- 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

data/README.md

@@ -20,19 +20,29 @@ And then execute:
     # Capfile
 
     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::Monit  # if you need the monit tasks
     install_plugin Capistrano::Puma::Nginx  # if you want to upload a nginx site template
 ```
 
+To prevent loading the hooks of the plugin, add false to the load_hooks param.
+```ruby
+    # Capfile
+
+    require 'capistrano/puma'
+    install_plugin Capistrano::Puma, load_hooks: false  # Default puma tasks without hooks
+    install_plugin Capistrano::Puma::Monit, load_hooks: false  # Monit tasks without hooks
+```
+
 ### Config
 
 To list available tasks use `cap -T`
 
 To upload puma config use:
 ```ruby
-cap puma:config 
+cap puma:config
 ```
 By default the file located in  `shared/puma.config`
 
@@ -102,6 +112,7 @@ Configurable options, shown here with defaults: Please note the configuration op
     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"
@@ -115,9 +126,15 @@ Configurable options, shown here with defaults: Please note the configuration op
     set :puma_preload_app, false
     set :puma_daemonize, true
     set :puma_plugins, []  #accept array of plugins
+    set :puma_tag, fetch(:application)
     set :nginx_use_ssl, false
 ```
 
+__Notes:__ If you are setting values for variables that might be used by other plugins, use `append` instead of `set`. For example:
+```ruby
+append :rbenv_map_bins, 'puma', 'pumactl'
+```
+
 ## Contributing
 
 1. Fork it

data/capistrano3-puma.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'capistrano-bundler'
   spec.add_dependency 'puma' , '~> 3.4'
   spec.post_install_message = %q{
-    [capistrano-puma] Plugins need to be explicitly installed with install_plugin.
+    All plugins need to be explicitly installed with install_plugin.
     Please see README.md
   }
 end

data/lib/capistrano/puma.rb

@@ -42,6 +42,7 @@ module Capistrano
           "config/deploy/templates/#{from}.rb",
           "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)
       backend.upload! StringIO.new(ERB.new(erb, nil, '-').result(binding)), to
@@ -66,6 +67,7 @@ module Capistrano
       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') }
@@ -73,6 +75,7 @@ module Capistrano
       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, ''
 
       # Chruby, Rbenv and RVM integration
       append :chruby_map_bins, 'puma', 'pumactl'
@@ -107,11 +110,10 @@ module Capistrano
     end
 
     def upload_puma_rb(role)
-      template_puma 'puma.rb', fetch(:puma_conf), role
+      template_puma 'puma', fetch(:puma_conf), role
     end
   end
 end
-install_plugin Capistrano::Puma
 
 require 'capistrano/puma/workers'
 require 'capistrano/puma/monit'

data/lib/capistrano/puma/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  PumaVERSION = '3.0.3'
+  PumaVERSION = '3.1.0'
 end

data/lib/capistrano/puma/workers.rb

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

data/lib/capistrano/tasks/workers.rake

@@ -9,7 +9,8 @@ namespace :puma do
           #TODO
           # cleanup
           # add host name/ip
-          workers_count = capture("ps ax | grep -c 'puma: cluster worker [0-9]: `cat  #{fetch(:puma_pid)}`'").to_i - 1
+          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
@@ -23,7 +24,8 @@ namespace :puma do
     task :more do
       on roles(fetch(:puma_role)) do |role|
         git_plugin.puma_switch_user(role) do
-          execute(:kill, "-TTIN `cat  #{fetch(:puma_pid)}`")
+          puma_pid = capture("cat  #{fetch(:puma_pid)}")
+          execute(:kill, "-TTIN #{puma_pid}")
         end
       end
     end
@@ -32,7 +34,8 @@ namespace :puma do
     task :less do
       on roles(fetch(:puma_role)) do |role|
         git_plugin.puma_switch_user(role) do
-          execute(:kill, "-TTOU `cat  #{fetch(:puma_pid)}`")
+          puma_pid = capture("cat  #{fetch(:puma_pid)}")
+          execute(:kill, "-TTOU #{puma_pid}")
         end
       end
     end

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

@@ -4,7 +4,7 @@ directory '<%= current_path %>'
 rackup "<%=fetch(:puma_rackup)%>"
 environment '<%= fetch(:puma_env) %>'
 <% if fetch(:puma_tag) %>
-  tag '<%= fetch(:puma_tag)%>'
+tag '<%= fetch(:puma_tag)%>'
 <% end %>
 pidfile "<%=fetch(:puma_pid)%>"
 state_path "<%=fetch(:puma_state)%>"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -91,8 +91,8 @@ homepage: https://github.com/seuros/capistrano-puma
 licenses:
 - MIT
 metadata: {}
-post_install_message: "\n    [capistrano-puma] Plugins need to be explicitly installed
-  with install_plugin.\n    Please see README.md\n  "
+post_install_message: "\n    All plugins need to be explicitly installed with install_plugin.\n
+  \   Please see README.md\n  "
 rdoc_options: []
 require_paths:
 - lib