capistrano3-puma 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2255db8f6e5e8f22eb484c40fe6c5848e436a35
-  data.tar.gz: 37a20cc815d7df734b26cdefe9a0dfbd500e6912
+  metadata.gz: 8ea350fc3a6710ad4d8c993d22ba678de9f257b4
+  data.tar.gz: 11a6d44358efac4a923d7d085f9ab2d902a0356e
 SHA512:
-  metadata.gz: 4dcf652c3a5db23dfe7236a175220bc51174bd79a713bc04130fb273999aaea7a90ad2a50c0320be3b00b239758b700a9520f10448f7ca95cdd315c56c5b3467
-  data.tar.gz: ecd46e7275d169a1be620cbcebeb3327288f57bd8ff9d080ba994909ed1f71306446874dfc65565aab2f6b7c3a33482c8d1f4971d3ec61407ed71452b971721f
+  metadata.gz: da870baec198029a8918416162ffc2ad8a4eadd73a16a50075f6c9f05d81d70b95241ffbb22862d5a62a6c408a21b2e7ae6244a5b7b6a076e8b2c9ce13fba76a
+  data.tar.gz: 8c7b71aaa0ef4a25b369880172c9f018d9991f8fb9bebfb0d87711b3e5f01780e88ac93775dfebd00a3d7beab6139797d0498a47f593b118b89c29813fc8f759

data/README.md

@@ -27,10 +27,10 @@ And then execute:
 
 then you can use ```cap -vT``` to list tasks
 ```
-cap nginx:config # upload a nginx site config(eg. /etc/nginx/site-enabled/)
+cap puma:nginx_config # upload a nginx site config(eg. /etc/nginx/site-enabled/)
 cap puma:config  # upload puma config(eg. shared/puma.config)
 ```
-you may want to customize these two templates localy before uploading
+you may want to customize these two templates locally before uploading
 ```
 rails g capistrano:nginx_puma:config
 ```
@@ -41,6 +41,15 @@ set :nginx_sites_available_path, "/etc/nginx/sites-available"
 set :nginx_sites_enabled_path, "/etc/nginx/sites-enabled"
 ```
 
+By default, ```nginx_config``` will be executed with ```:web``` role. But you can assign it to a different role:
+```
+set :puma_nginx, :foo
+```
+or define a standalone one:
+```
+role :puma_nginx, %w{root@example.com}
+```
+
 Configurable options, shown here with defaults: Please note the configuration options below are not required unless you are trying to override a default setting, for instance if you are deploying on a host on which you do not have sudo or root privileges and you need to restrict the path. These settings go in the deploy.rb file.
 
 ```ruby
@@ -58,6 +67,7 @@ Configurable options, shown here with defaults: Please note the configuration op
     set :puma_worker_timeout, nil
     set :puma_init_active_record, false
     set :puma_preload_app, true
+    set :puma_prune_bundler, false
 ```
 For Jungle tasks (beta), these options exist:
 ```ruby
@@ -83,6 +93,8 @@ Ensure that the following directories are shared (via ``linked_dirs``):
     tmp/pids tmp/sockets log
 
 ## Changelog
+- 0.8.1: Fixed nginx task @hnatt, support for prune_bundler @behe
+- 0.8.0: Some changes
 - 0.7.0: added Nginx template generator  @dfang
 - 0.6.1: added :puma_default_hooks, you can turn off the automatic hooks by setting it false
 - 0.6.0: Remove `daemonize true` from default puma.rb file. Explicitly pass `--daemon` flag when needed.

data/lib/capistrano/puma/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Puma
-    VERSION = '0.8.0'
+    VERSION = '0.8.1'
   end
 end

data/lib/capistrano/tasks/nginx.cap

@@ -1,6 +1,13 @@
+namespace :load do
+  task :defaults do
+    set :puma_nginx, :web
+  end
+end
+
 namespace :puma do
   desc "Setup nginx configuration"
   task :nginx_config do
+    fail ":puma_nginx role not set!" if roles(:puma_nginx).empty?
     on roles(:puma_nginx) do |role|
       template_puma("nginx_conf", "/tmp/nginx_#{fetch(:nginx_config_name)}", role)
       sudo :mv, "/tmp/nginx_#{fetch(:nginx_config_name)} #{fetch(:nginx_sites_available_path)}/#{fetch(:nginx_config_name)}"

data/lib/capistrano/tasks/puma.cap

@@ -2,7 +2,6 @@ namespace :load do
   task :defaults do
     set :puma_default_hooks, -> { true }
     set :puma_role, :app
-    set :puma_nginx_role, :web
     set :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.
@@ -11,12 +10,13 @@ namespace :load do
     set :puma_rackup, -> { File.join(current_path, 'config.ru') }
     set :puma_state, -> { File.join(shared_path, 'tmp', 'pids', 'puma.state') }
     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_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_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
+    set :puma_prune_bundler, false
 
     # Rbenv and RVM integration
     set :rbenv_map_bins, fetch(:rbenv_map_bins).to_a.concat(%w{ puma pumactl })

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

@@ -23,10 +23,9 @@ worker_timeout <%= fetch(:puma_worker_timeout).to_i %>
 preload_app!
 <% end %>
 
-on_restart do
-  puts 'Refreshing Gemfile'
-  ENV["BUNDLE_GEMFILE"] = "<%= fetch(:bundle_gemfile, "#{current_path}/Gemfile") %>"
-end
+<% if fetch(:puma_prune_bundler) %>
+prune_bundler
+<% end %>
 
 <% if fetch(:puma_init_active_record) %>
 on_worker_boot do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -93,8 +93,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Puma integration for Capistrano
 test_files: []
+has_rdoc: