capistrano3-puma 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2faa760ffae1290576f528f6108b2eee9043b4d
-  data.tar.gz: 71937a3ba57f88c3c0f235d57a17956ee9f94ec8
+  metadata.gz: 6d71dc0edb29b8856ac842c1fad416d01c7f6956
+  data.tar.gz: d31c166a6ab2e6bab255b6753a28e3b8b2b25fd5
 SHA512:
-  metadata.gz: 3dfeb25613924201beabe6e40918791fe8dcf4bda0683f4fdfe66f0918ec8edada386ec7d3aa09248175ee47c79f12cfbb9aba85d63c867bd88d84157d4e5946
-  data.tar.gz: 854ceb68a80b8ad7b860f83c36d8b909abb9df04492f47d764cbf936dbc5ee358ba301ae9d1130289d1ba7222a378d9daa4beb32eb58a513302e1c0a666fe01a
+  metadata.gz: 3da657d08ba95d780293a1bf19997a423dd895f251eec9d58f673d8bfb9af36a696b722f4648637cecc2303f5266d96cf4bc501c66783739a16b24917a751c7e
+  data.tar.gz: d24f24ffcc1b129c440ede8df04acd30223ff30b534358ac6b96f3e5f0db024b4be86576031ba8163273ab410aa8bf3b1beb2ce48cb8e69cda4fbbcbe0bf58b2

data/README.md

@@ -6,41 +6,57 @@ Add this line to your application's Gemfile:
 
     gem 'capistrano-puma', github: "seuros/capistrano-puma"
 
+or:
+
+    gem 'capistrano3-puma'
+
 And then execute:
 
     $ bundle
 
 ## Usage
-
+```ruby
     # Capfile
 
-        require 'capistrano/puma'
-        require 'capistrano/puma/jungle' #if you need the jungle tasks
-
+    require 'capistrano/puma'
+    require 'capistrano/puma/jungle' #if you need the jungle tasks
+```
 
 
 Configurable options, shown here with defaults:
-
+```ruby
     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"
-    set :puma_conf, "#{shared_path}/config/puma.rb"
+    set :puma_conf, "#{shared_path}/puma.rb"
     set :puma_access_log, "#{shared_path}/log/puma_error.log"
     set :puma_error_log, "#{shared_path}/log/puma_access.log"
     set :puma_role, :app
     set :puma_env, fetch(:rack_env, fetch(:rails_env, 'production'))
     set :puma_threads, [0, 16]
     set :puma_workers, 0
+```
+For Jungle tasks (beta), these options exist:
+```ruby
+    set :puma_jungle_conf, '/etc/puma.conf'
+    set :puma_run_path, '/usr/local/bin/run-puma'
+```
+Ensure that the following directories are shared (via ``linked_dirs``):
 
-    For RVM users, it is advisable to set in your deploy.rb for now :
-       set :puma_cmd, "#{fetch(:bundle_cmd, 'bundle')} exec puma"
-       set :pumactl_cmd, "#{fetch(:bundle_cmd, 'bundle')} exec pumactl"
+    tmp/pids tmp/sockets log
 
+## Changelog
 
+- 0.1.0: Phased restart will be used if puma is in cluster mode
+- 0.0.9: puma.rb location changed to shared_path root. puma:check moved to after deploy:check
+- 0.0.8: puma.rb is automatically generated if not present. Fixed RVM issue.
+- 0.0.7: Gem pushed to rubygems as capistrano3-puma. Support of Redhat based OS for Jungle init script.
 
 ## Contributors
 
 [molfar](https://github.com/molfar)
+[ayaya](https://github.com/ayamomiji)
+[Shane O'Grady](https://github.com/shaneog)
 
 
 ## Contributing

data/lib/capistrano/puma/monit.rb

@@ -0,0 +1,2 @@
+#load monit tasks
+load File.expand_path('../../tasks/monit.cap', __FILE__)

data/lib/capistrano/puma/nginx.rb

@@ -0,0 +1,2 @@
+#load nginx tasks
+load File.expand_path('../../tasks/nginx.cap', __FILE__)

data/lib/capistrano/puma/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Puma
-    VERSION = '0.0.7'
+    VERSION = '0.1.0'
   end
 end

data/lib/capistrano/tasks/jungle.cap

@@ -15,16 +15,15 @@ namespace :puma do
         template_puma 'run-puma.erb', "#{fetch(:tmp_dir)}/run-puma"
         execute "chmod +x #{fetch(:tmp_dir)}/run-puma"
         sudo "mv #{fetch(:tmp_dir)}/run-puma #{fetch(:puma_run_path)}"
-        if test "[ -f /etc/lsb-release ]"
+        if test '[ -f /etc/lsb-release ]'
           #Debian flavor OS
           debian_install
-        elsif test "[ -f /etc/redhat-release ]"
+        elsif test '[ -f /etc/redhat-release ]'
           #RHEL flavor OS
           rhel_install
         else
           #Some other OS
-          #TODO write in the error log
-          puts 'This task is not supported for your OS'
+          error 'This task is not supported for your OS'
         end
         sudo "touch #{fetch(:puma_jungle_conf)}"
       end
@@ -35,7 +34,7 @@ namespace :puma do
       template_puma 'puma-deb.erb', "#{fetch(:tmp_dir)}/puma"
       execute "chmod +x #{fetch(:tmp_dir)}/puma"
       sudo "mv #{fetch(:tmp_dir)}/puma /etc/init.d/puma"
-      sudo "update-rc.d -f puma defaults"
+      sudo 'update-rc.d -f puma defaults'
 
     end
 
@@ -43,7 +42,7 @@ namespace :puma do
       template_puma 'puma-rpm.erb', "#{fetch(:tmp_dir)}/puma"
       execute "chmod +x #{fetch(:tmp_dir)}/puma"
       sudo "mv #{fetch(:tmp_dir)}/puma /etc/init.d/puma"
-      sudo "chkconfig --add puma"
+      sudo 'chkconfig --add puma'
     end
 
 

data/lib/capistrano/tasks/monit.cap

@@ -0,0 +1,32 @@
+namespace :load do
+  task :defaults do
+    # set :puma_monit, -> { File.join(shared_path, 'tmp', 'pids', 'puma.state') }
+  end
+end
+
+
+namespace :puma do
+  namespace :monit do
+    desc 'Config Puma monit-service'
+    task :config do
+      on roles(fetch(:puma_role)) do
+        template_puma 'monit.conf.erb', "#{fetch(:tmp_dir)}/monit.test"
+      end
+    end
+
+    desc 'Enable Puma monit-service'
+    task :enable do
+      on roles(fetch(:puma_role)) do
+
+      end
+    end
+
+    desc 'Disable Puma monit-service'
+    task :disable do
+      on roles(fetch(:puma_role)) do
+
+      end
+    end
+
+  end
+end

data/lib/capistrano/tasks/nginx.cap

@@ -0,0 +1,17 @@
+namespace :load do
+  task :defaults do
+    set :nginx_access_log, -> { File.join(shared_path, 'log', 'nginx_error.log') }
+    set :nginx_error_log, -> { File.join(shared_path, 'log', 'nginx_access.log') }
+  end
+end
+
+namespace :puma do
+  namespace :nginx do
+    desc 'Config Puma nginx-server'
+    task :config do
+      on roles(fetch(:puma_role)) do
+        template_puma 'nginx.conf.erb', "#{fetch(:tmp_dir)}/nginx.test"
+      end
+    end
+  end
+end

data/lib/capistrano/tasks/puma.cap

@@ -1,5 +1,5 @@
 namespace :deploy do
-  after :finished, 'puma:restart'
+  after :finished, 'puma:smart_restart'
 end
 
 namespace :load do
@@ -13,7 +13,7 @@ namespace :load do
     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_conf, -> { File.join(shared_path, 'config', 'puma.rb') }
+    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') }
 
@@ -36,32 +36,68 @@ namespace :puma do
   task :start do
     on roles (fetch(:puma_role)) do
       within current_path do
-        # RVM has issues with bundler
-        if  fetch(:puma_cmd)
-          execute "#{fetch(:puma_cmd)} -C #{fetch(:puma_conf)}"
-        else
-          execute :puma, "-C #{fetch(:puma_conf)}"
-        end
+        execute :bundle, 'exec', :puma, "-C #{fetch(:puma_conf)}"
       end
     end
   end
 
-  %w[halt stop restart phased-restart status].each do |command|
+  %w[halt stop phased-restart status].each do |command|
     desc "#{command} puma"
     task command do
       on roles (fetch(:puma_role)) do
         within current_path do
-          # RVM has issues with bundler
-          if  fetch(:pumactl_cmd)
-            execute "#{fetch(:pumactl_cmd)} -S #{fetch(:puma_state)} #{command}"
-          else
-            execute :pumactl, "-S #{fetch(:puma_state)} #{command}"
-          end
+          execute :bundle, 'exec', :pumactl, "-S #{fetch(:puma_state)} #{command}"
+        end
+      end
+    end
+  end
+
+  desc 'Restart puma'
+  task :restart do
+    on roles (fetch(:puma_role)) do
+      within current_path do
+        if test "[ -f #{fetch(:puma_state)} ]"
+          execute :bundle, 'exec', :pumactl, "-S #{fetch(:puma_state)} restart"
+        else
+          # Puma is not running or state file is not present : Run it
+          # TODO check for pid
+          execute :bundle, 'exec', :puma, "-C #{fetch(:puma_conf)}"
         end
       end
     end
   end
 
+
+  task :check do
+    on roles (fetch(:puma_role)) do
+      #Create puma.rb for new deployments
+      unless  test "[ -f #{fetch(:puma_conf)} ]"
+        warn 'puma.rb NOT FOUND!'
+        #TODO DRY
+        template_puma 'puma.rb.erb', fetch(:puma_conf)
+        info 'puma.rb generated'
+      end
+    end
+  end
+  after 'deploy:check', 'puma:check'
+
+  task :smart_restart do
+    if  puma_workers.to_i > 1
+      invoke 'puma:phased-restart'
+    else
+      invoke 'puma:restart'
+    end
+  end
+
+  def processors_count
+    #TODO , will be used to warn if # of workers is > of available cores
+    capture 'grep -c processor /proc/cpuinfo'
+  end
+
+  def puma_workers
+    fetch(:puma_workers) || 0
+  end
+
   def template_puma(from, to)
     erb = File.read(File.expand_path("../../templates/#{from}", __FILE__))
     upload! StringIO.new(ERB.new(erb).result(binding)), to

data/lib/capistrano/templates/monit.conf.erb

@@ -0,0 +1,14 @@
+# Monit configuration for Puma
+# Service name: <%= fetch(:puma_monit_service_name) %>
+#
+check process <%= fetch(:puma_monit_service_name) %>
+    with pidfile <%= fetch(:puma_pid) %>
+    start program = "/bin/su - <%= fetch(:user) %> -c '/usr/bin/env PATH=/home/user/.rbenv/shims:/home/user/.rbenv/bin:$PATH /home/user/puma.sh start'"
+    stop program = "/bin/su - <%= fetch(:user) %> -c '/usr/bin/env PATH=/home/user/.rbenv/shims:/home/user/.rbenv/bin:$PATH /home/user/puma.sh stop'"
+    if mem is greater than <%= fetch(:puma_monit_memory_alert_threshold) %> then alert
+    if mem is greater than <%= fetch(:puma_monit_memory_restart_threshold) %> then restart
+    if cpu is greater than <%= fetch(:puma_monit_cpu_alert_threshold) %> then alert
+    if cpu is greater than <%= fetch(:puma_monit_cpu_restart_threshold) %> then restart
+
+
+

data/lib/capistrano/templates/nginx.conf.erb

@@ -0,0 +1,216 @@
+# Nginx configuration
+# <%= "#{fetch(:application)} running as #{fetch(:user)} in environment production" %>
+#
+#
+
+upstream <%= fetch(:application) %> {
+  server <%= fetch(:puma_bind) %> fail_timeout=0;
+}
+
+<% if fetch(:nginx_uses_http) %>
+#
+# HTTP server configuration
+#
+server {
+  listen <%= fetch(:nginx_port) %>;
+  client_max_body_size <%= fetch(:nginx_client_max_body_size) %>;
+  server_name <%= fetch(:server_names, '_') %>;
+
+  # ~2 seconds is often enough for most folks to parse HTML/CSS and
+  # retrieve needed images/icons/frames, connections are cheap in
+  # nginx so increasing this is generally safe...
+  # 8 seconds might be needed for some mobile devs
+  keepalive_timeout 8;
+
+  # path for static files
+  root <%= fetch(:deploy_to) %>/current/public;
+  access_log <%= fetch(:nginx_access_log) %>;
+  error_log <%= fetch(:nginx_error_log) %> info;
+
+  # this rewrites all the requests to the maintenance.html
+  # page if it exists in the doc root. This is for capistrano's
+  # disable web task
+  if (-f $document_root/system/maintenance.html) {
+    rewrite ^(.*)$ /system/maintenance.html last;
+    break;
+  }
+
+  location / {
+  <% if fetch(:nginx_use_simple_auth) %>
+    auth_basic "<%= fetch(:nginx_simple_auth_message) %>";
+    auth_basic_user_file <%= fetch(:nginx_remote_htpasswd) %>;
+  <% end %>
+
+    # needed to forward user's IP address to rails
+    proxy_set_header X-Real-IP $remote_addr;
+
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $http_host;
+
+    # if the request is for a static resource, nginx should serve it directly
+    # and add a far future expires header to it, making the browser
+    # cache the resource and navigate faster over the website.
+    location ~ ^/(assets)/.+-([0-9a-zA-Z])+\. {
+      gzip_static on;
+      expires max;
+      add_header Cache-Control public;
+    }
+
+    # Serve images outside the asset path
+    # Now this supposedly should work as it gets the filenames with querystrings that Rails provides.
+    # BUT there's a chance it could break the ajax calls.
+    location ~* \.(ico|css|gif|jpe?g|png)(\?[0-9]+)?$ {
+       expires max;
+    }
+
+    # Serve javascript outside the asset path
+    location ~ ^/javascripts/.*\.js(\?[0-9]+)?$ {
+       expires max;
+    }
+
+    # If the file exists as a static file serve it directly without
+    # running all the other rewrite tests on it
+    if (-f $request_filename) {
+      break;
+    }
+
+    # check for index.html for directory index
+    # if its there on the filesystem then rewite
+    # the url to add /index.html to the end of it
+    # and then break to send it to the next config rules.
+    if (-f $request_filename/index.html) {
+      rewrite (.*) $1/index.html break;
+    }
+
+    # this is the meat of the rails page caching config
+    # it adds .html to the end of the url and then checks
+    # the filesystem for that file. If it exists, then we
+    # rewite the url to have explicit .html on the end
+    # and then send it on its way to the next config rule.
+    # if there is no file on the fs then it sets all the
+    # necessary headers and proxies to our upstream mongrels
+    if (-f $request_filename.html) {
+      rewrite (.*) $1.html break;
+    }
+
+    if (!-f $request_filename) {
+      proxy_pass http://<%= upstream_name %>;
+      break;
+    }
+  }
+
+  # Rails error pages
+  error_page 500 502 503 504 /500.html;
+  location = /500.html {
+    root <%= fetch(:deploy_to) %>/current/public;
+  }
+}
+<% end %>
+
+<% if fetch(:nginx_uses_ssl) %>
+#
+# HTTPs server configuration
+#
+upstream <%= upstream_name_ssl %> {
+  server unix:<%= File.join("#{fetch(:shared_path)}","sockets", "puma.sock") %> fail_timeout=0;
+}
+
+# This server is setup for ssl. Uncomment if
+# you are using ssl as well as port 80.
+server {
+  listen <%= fetch(:nginx_ssl_port) %>;
+  client_max_body_size 500M;
+  server_name <%= fetch(:server_names) %>;
+  ssl on;
+  ssl_certificate <%= fetch(:nginx_ssl_public_crt) %>;
+  ssl_certificate_key <%= fetch(:nginx_ssl_private_key) %>;
+  ssl_session_timeout 5m;
+  client_max_body_size <%= fetch(:nginx_ssl_client_max_body_size) %>;
+
+  root <%= fetch(:deploy_to) %>/current/public;
+  access_log <%= fetch(:nginx_log_path) %>;
+  error_log <%= fetch(:nginx_log_path) %> info;
+
+  # this rewrites all the requests to the maintenance.html
+  # page if it exists in the doc root. This is for capistrano's
+  # disable web task
+  if (-f $document_root/system/maintenance.html) {
+      rewrite ^(.*)$ /system/maintenance.html last;
+      break;
+  }
+
+  location / {
+  <% if fetch(:nginx_ssl_use_simple_auth) %>
+    auth_basic "<%= fetch(:nginx_simple_auth_message) %>";
+    auth_basic_user_file <%= fetch(:nginx_remote_htpasswd) %>;
+  <% end %>
+
+    # needed to forward user's IP address to rails
+    proxy_set_header X-Real-IP $remote_addr;
+
+    # needed for HTTPS
+    proxy_set_header X_FORWARDED_PROTO https;
+
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $http_host;
+    proxy_redirect off;
+    proxy_max_temp_file_size 0;
+
+    # if the request is for a static resource, nginx should serve it directly
+    # and add a far future expires header to it, making the browser
+    # cache the resource and navigate faster over the website.
+    location ~ ^/(assets)/.+-([0-9a-zA-Z])+\. {
+      gzip_static on;
+      expires max;
+      add_header Cache-Control public;
+    }
+
+    # Serve images outside the asset path
+    # Now this supposedly should work as it gets the filenames with querystrings that Rails provides.
+    # BUT there's a chance it could break the ajax calls.
+    location ~* \.(ico|css|gif|jpe?g|png)(\?[0-9]+)?$ {
+       expires max;
+    }
+
+    # Serve javascript outside the asset path
+    location ~ ^/javascripts/.*\.js(\?[0-9]+)?$ {
+       expires max;
+    }
+
+    # If the file exists as a static file serve it directly without
+    # running all the other rewite tests on it
+    if (-f $request_filename) {
+      break;
+    }
+
+    # check for index.html for directory index
+    # if its there on the filesystem then rewite
+    # the url to add /index.html to the end of it
+    # and then break to send it to the next config rules.
+    if (-f $request_filename/index.html) {
+      rewrite (.*) $1/index.html break;
+    }
+
+    # this is the meat of the rails page caching config
+    # it adds .html to the end of the url and then checks
+    # the filesystem for that file. If it exists, then we
+    # rewite the url to have explicit .html on the end
+    # and then send it on its way to the next config rule.
+    # if there is no file on the fs then it sets all the
+    # necessary headers and proxies to our upstream mongrels
+    if (-f $request_filename.html) {
+      rewrite (.*) $1.html break;
+    }
+
+    if (!-f $request_filename) {
+      proxy_pass http://<%= upstream_name_ssl %>;
+      break;
+    }
+  }
+
+  error_page 500 502 503 504 /500.html;
+  location = /500.html {
+    root <%= fetch(:deploy_to) %>/current/public;
+  }
+}
+<% end %>

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

@@ -10,7 +10,8 @@
 # placed in /etc/init.d.
 ### END INIT INFO
 
-# Author: Darío Javier Cravero <dario@exordo.com>
+# Author: Darío Javier Cravero <'dario@exordo.com'>
+# Modified by: Abdelkader Boudih <'terminale@gmail.com'>
 #
 # Do NOT "set -e"
 
@@ -59,7 +60,7 @@ do_start_one() {
     if [ "`ps -A -o pid= | grep -c $PID`" -eq 0 ]; then
       do_start_one_do $1 $2
     else
-      do_restart_one $1
+      do_restart_one $1 $2
     fi
   else
     do_start_one_do $1 $2
@@ -70,7 +71,7 @@ do_start_one_do() {
   log_daemon_msg "--> Woke up puma $1"
   log_daemon_msg "user $2"
   log_daemon_msg "log to $4"
-  log_daemon_msg "start-stop-daemon --verbose --start --chdir $1 --chuid $2 --background --exec $RUNPUMA -- $1 "
+  log_daemon_msg "start-stop-daemon --verbose --start --chdir $1 --chuid $2 --background --exec $RUNPUMA $1 "
   start-stop-daemon --verbose --start --chdir $1 --chuid $2 --background --exec $RUNPUMA -- $1
 }
 
@@ -81,7 +82,8 @@ do_stop() {
   log_daemon_msg "=> Putting all the beasts to bed..."
   for i in $JUNGLE; do
     dir=`echo $i | cut -d , -f 1`
-    do_stop_one $dir
+    user=`echo $i | cut -d , -f 2`
+    do_stop_one $dir $user
   done
 }
 #
@@ -97,7 +99,7 @@ do_stop_one() {
       log_daemon_msg "---> Puma $1 isn't running."
     else
       log_daemon_msg "---> About to kill PID `cat $PIDFILE`"
-      pumactl --state $STATEFILE stop
+      su - $2 -c "pumactl --state $STATEFILE stop"
       # Many daemons don't delete their pidfiles when they exit.
       rm -f $PIDFILE $STATEFILE
     fi
@@ -113,7 +115,8 @@ do_stop_one() {
 do_restart() {
   for i in $JUNGLE; do
     dir=`echo $i | cut -d , -f 1`
-    do_restart_one $dir
+    user=`echo $i | cut -d , -f 2`
+    do_restart_one $dir $user
   done
 }
 
@@ -127,7 +130,7 @@ do_restart_one() {
   
   if [ -e $PIDFILE ]; then
     log_daemon_msg "--> About to restart puma $1"
-    pumactl --state $dir/tmp/pids/puma.state restart
+    su - $2 -c "pumactl --state $dir/tmp/pids/puma.state restart"
     # kill -s USR2 `cat $PIDFILE`
     # TODO Check if process exist
   else
@@ -135,8 +138,9 @@ do_restart_one() {
     user=`echo $i | cut -d , -f 2`
     config_file=`echo $i | cut -d , -f 3`
     if [ "$config_file" = "" ]; then
-      config_file="$dir/config/puma.rb"
-    fi
+    config_file="$dir/config/puma.rb"
+    do_start_one $dir $user $config_file
+  fi
     log_file=`echo $i | cut -d , -f 4`
     if [ "$log_file" = "" ]; then
       log_file="$dir/log/puma.log"
@@ -152,7 +156,8 @@ do_restart_one() {
 do_status() {
   for i in $JUNGLE; do
     dir=`echo $i | cut -d , -f 1`
-    do_status_one $dir
+    user=`echo $i | cut -d , -f 2`
+    do_status_one $dir $user
   done
 }
 
@@ -166,9 +171,9 @@ do_status_one() {
   
   if [ -e $PIDFILE ]; then
     log_daemon_msg "--> About to status puma $1"
-    pumactl --state $dir/tmp/pids/puma.state stats
-    # kill -s USR2 `cat $PIDFILE`
-    # TODO Check if process exist
+
+    su - $2 -c "pumactl --state $dir/tmp/pids/puma.state stats "
+
   else
     log_daemon_msg "--> $1 isn't there :(..."
   fi
@@ -238,13 +243,9 @@ else
   user=`echo $i | cut -d , -f 2`
   config_file=`echo $i | cut -d , -f 3`
   if [ "$config_file" = "" ]; then
-    config_file="$dir/config/puma.rb"
-  fi
-  log_file=`echo $i | cut -d , -f 4`
-  if [ "$log_file" = "" ]; then
-    log_file="$dir/log/puma.log"
-  fi
-  do_start_one $dir $user $config_file $log_file
+  config_file="$dir/config/puma.rb"
+
+  do_start_one $dir $user $config_file
 fi
 case "$?" in
   0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;

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

@@ -9,5 +9,5 @@ stdout_redirect '<%=fetch(:puma_access_log)%>', '<%=fetch(:puma_error_log)%>', t
 threads <%=fetch(:puma_threads).join(',')%>
 bind "<%=fetch(:puma_bind)%>"
 
-workers <%=fetch(:puma_workers)%>
+workers <%= puma_workers %>
 preload_app!

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

@@ -1,2 +1,9 @@
 #!/bin/bash
-cd $1 && exec bundle exec puma -C config/puma.rb
+app=$1;
+cd $app || exit 1
+
+if [ -e Gemfile ]; then
+    exec sh -c "exec bundle exec puma -C ../../shared/config/puma.rb"
+else
+    exec sh -c "exec puma -C ../../shared/config/puma.rb"
+fi

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: Puma integration for Capistrano 3
@@ -31,7 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -41,9 +41,15 @@ files:
 - lib/capistrano-puma.rb
 - lib/capistrano/puma.rb
 - lib/capistrano/puma/jungle.rb
+- lib/capistrano/puma/monit.rb
+- lib/capistrano/puma/nginx.rb
 - lib/capistrano/puma/version.rb
 - lib/capistrano/tasks/jungle.cap
+- lib/capistrano/tasks/monit.cap
+- lib/capistrano/tasks/nginx.cap
 - lib/capistrano/tasks/puma.cap
+- lib/capistrano/templates/monit.conf.erb
+- lib/capistrano/templates/nginx.conf.erb
 - lib/capistrano/templates/puma-deb.erb
 - lib/capistrano/templates/puma-rpm.erb
 - lib/capistrano/templates/puma.rb.erb
@@ -58,17 +64,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Puma integration for Capistrano