capistrano3-puma 3.0.2 → 5.0.0.beta1

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/daemon.rake

@@ -0,0 +1,66 @@
+git_plugin = self
+
+namespace :puma do
+  desc 'Start puma'
+  task :start do
+    on roles(fetch(:puma_role)) do |role|
+      git_plugin.puma_switch_user(role) do
+        if test "[ -f #{fetch(:puma_pid)} ]" and test :kill, "-0 $( cat #{fetch(:puma_pid)} )"
+          info 'Puma is already running'
+        else
+          within current_path do
+            with rack_env: fetch(:puma_env) do
+              execute :puma, "-C #{fetch(:puma_conf)} --daemon"
+            end
+          end
+        end
+      end
+    end
+  end
+
+  %w[halt stop status].map do |command|
+    desc "#{command} puma"
+    task command do
+      on roles (fetch(:puma_role)) do |role|
+        within current_path do
+          git_plugin.puma_switch_user(role) do
+            with rack_env: fetch(:puma_env) do
+              if test "[ -f #{fetch(:puma_pid)} ]"
+                if test :kill, "-0 $( cat #{fetch(:puma_pid)} )"
+                  execute :pumactl, "-S #{fetch(:puma_state)} -F #{fetch(:puma_conf)} #{command}"
+                else
+                  # delete invalid pid file , process is not running.
+                  execute :rm, fetch(:puma_pid)
+                end
+              else
+                #pid file not found, so puma is probably not running or it using another pidfile
+                warn 'Puma not running'
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  %w[phased-restart restart].map do |command|
+    desc "#{command} puma"
+    task command do
+      on roles (fetch(:puma_role)) do |role|
+        within current_path do
+          git_plugin.puma_switch_user(role) do
+            with rack_env: fetch(:puma_env) do
+              if test "[ -f #{fetch(:puma_pid)} ]" and test :kill, "-0 $( cat #{fetch(:puma_pid)} )"
+                # NOTE pid exist but state file is nonsense, so ignore that case
+                execute :pumactl, "-S #{fetch(:puma_state)} -F #{fetch(:puma_conf)} #{command}"
+              else
+                # Puma is not running or state file is not present : Run it
+                invoke 'puma:start'
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/capistrano/tasks/jungle.rake

@@ -5,16 +5,21 @@ namespace :puma do
     desc 'Install Puma jungle'
     task :install do
       on roles(fetch(:puma_role)) do |role|
-        @role = role
         git_plugin.template_puma 'run-puma', "#{fetch(:tmp_dir)}/run-puma", role
         execute "chmod +x #{fetch(:tmp_dir)}/run-puma"
         sudo "mv #{fetch(:tmp_dir)}/run-puma #{fetch(:puma_run_path)}"
         if test '[ -f /etc/redhat-release ]'
           #RHEL flavor OS
-          git_plugin.rhel_install
+          git_plugin.rhel_install(role)
+          execute "chmod +x #{fetch(:tmp_dir)}/puma"
+          sudo "mv #{fetch(:tmp_dir)}/puma /etc/init.d/puma"
+          sudo 'chkconfig --add puma'
         elsif test '[ -f /etc/lsb-release ]'
           #Debian flavor OS
-          git_plugin.debian_install
+          git_plugin.debian_install(role)
+          execute "chmod +x #{fetch(:tmp_dir)}/puma"
+          sudo "mv #{fetch(:tmp_dir)}/puma /etc/init.d/puma"
+          sudo 'update-rc.d -f puma defaults'
         else
           #Some other OS
           error 'This task is not supported for your OS'
@@ -33,7 +38,11 @@ namespace :puma do
     desc 'Add current project to the jungle'
     task :add do
       on roles(fetch(:puma_role)) do|role|
-        sudo "/etc/init.d/puma add '#{current_path}' #{fetch(:puma_user, role.user)}"
+        begin
+          sudo "/etc/init.d/puma add '#{current_path}' #{fetch(:puma_user, role.user)} '#{fetch(:puma_conf)}'"
+        rescue => error
+          warn error
+        end
       end
     end
 

data/lib/capistrano/tasks/monit.rake

@@ -8,6 +8,8 @@ namespace :puma do
         git_plugin.template_puma 'puma_monit.conf', "#{fetch(:tmp_dir)}/monit.conf", role
         git_plugin.sudo_if_needed "mv #{fetch(:tmp_dir)}/monit.conf #{fetch(:puma_monit_conf_dir)}"
         git_plugin.sudo_if_needed "#{fetch(:puma_monit_bin)} reload"
+        # Wait for Monit to be reloaded
+        sleep 1
       end
     end
 
@@ -15,10 +17,10 @@ namespace :puma do
     task :monitor do
       on roles(fetch(:puma_role)) do
         begin
-          git_plugin.sudo_if_needed "#{fetch(:puma_monit_bin)} monitor #{puma_monit_service_name}"
+          git_plugin.sudo_if_needed "#{fetch(:puma_monit_bin)} monitor #{git_plugin.puma_monit_service_name}"
         rescue
           invoke 'puma:monit:config'
-          git_plugin.sudo_if_needed "#{fetch(:puma_monit_bin)} monitor #{puma_monit_service_name}"
+          git_plugin.sudo_if_needed "#{fetch(:puma_monit_bin)} monitor #{git_plugin.puma_monit_service_name}"
         end
       end
     end
@@ -27,7 +29,7 @@ namespace :puma do
     task :unmonitor do
       on roles(fetch(:puma_role)) do
         begin
-          git_plugin.sudo_if_needed "#{fetch(:puma_monit_bin)} unmonitor #{puma_monit_service_name}"
+          git_plugin.sudo_if_needed "#{fetch(:puma_monit_bin)} unmonitor #{git_plugin.puma_monit_service_name}"
         rescue
           # no worries here (still no monitoring)
         end
@@ -37,23 +39,23 @@ namespace :puma do
     desc 'Start Puma monit-service'
     task :start do
       on roles(fetch(:puma_role)) do
-        git_plugin.sudo_if_needed "#{fetch(:puma_monit_bin)} start #{puma_monit_service_name}"
+        git_plugin.sudo_if_needed "#{fetch(:puma_monit_bin)} start #{git_plugin.puma_monit_service_name}"
       end
     end
 
     desc 'Stop Puma monit-service'
     task :stop do
       on roles(fetch(:puma_role)) do
-        git_plugin.sudo_if_needed "#{fetch(:puma_monit_bin)}  stop #{puma_monit_service_name}"
+        git_plugin.sudo_if_needed "#{fetch(:puma_monit_bin)}  stop #{git_plugin.puma_monit_service_name}"
       end
     end
 
     desc 'Restart Puma monit-service'
     task :restart do
       on roles(fetch(:puma_role)) do
-        git_plugin.sudo_if_needed "#{fetch(:puma_monit_bin)} restart #{puma_monit_service_name}"
+        git_plugin.sudo_if_needed "#{fetch(:puma_monit_bin)} restart #{git_plugin.puma_monit_service_name}"
       end
     end
 
   end
-end
+end

data/lib/capistrano/tasks/puma.rake

@@ -8,75 +8,6 @@ namespace :puma do
     end
   end
 
-  desc 'Start puma'
-  task :start do
-    on roles(fetch(:puma_role)) do |role|
-      git_plugin.puma_switch_user(role) do
-        if test "[ -f #{fetch(:puma_conf)} ]"
-          info "using conf file #{fetch(:puma_conf)}"
-        else
-          invoke 'puma:config'
-        end
-
-        if test "[ -f #{fetch(:puma_pid)} ]" and test :kill, "-0 $( cat #{fetch(:puma_pid)} )"
-          info 'Already Puma is running'
-        else
-          within current_path do
-            with rack_env: fetch(:puma_env) do
-              execute :puma, "-C #{fetch(:puma_conf)} --daemon"
-            end
-          end
-        end
-      end
-    end
-  end
-
-  %w[halt stop status].map do |command|
-    desc "#{command} puma"
-    task command do
-      on roles (fetch(:puma_role)) do |role|
-        within current_path do
-          git_plugin.puma_switch_user(role) do
-            with rack_env: fetch(:puma_env) do
-              if test "[ -f #{fetch(:puma_pid)} ]"
-                if test :kill, "-0 $( cat #{fetch(:puma_pid)} )"
-                  execute :pumactl, "-S #{fetch(:puma_state)} -F #{fetch(:puma_conf)} #{command}"
-                else
-                  # delete invalid pid file , process is not running.
-                  execute :rm, fetch(:puma_pid)
-                end
-              else
-                #pid file not found, so puma is probably not running or it using another pidfile
-                warn 'Puma not running'
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-
-  %w[phased-restart restart].map do |command|
-    desc "#{command} puma"
-    task command do
-      on roles (fetch(:puma_role)) do |role|
-        within current_path do
-          git_plugin.puma_switch_user(role) do
-            with rack_env: fetch(:puma_env) do
-              if test "[ -f #{fetch(:puma_pid)} ]" and test :kill, "-0 $( cat #{fetch(:puma_pid)} )"
-                # NOTE pid exist but state file is nonsense, so ignore that case
-                execute :pumactl, "-S #{fetch(:puma_state)} -F #{fetch(:puma_conf)} #{command}"
-              else
-                # Puma is not running or state file is not present : Run it
-                invoke 'puma:start'
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-
   task :check do
     on roles(fetch(:puma_role)) do |role|
       #Create puma.rb for new deployments
@@ -87,14 +18,4 @@ namespace :puma do
       end
     end
   end
-
-
-  task :smart_restart do
-    if !git_plugin.puma_preload_app? && git_plugin.puma_workers.to_i > 1
-      invoke 'puma:phased-restart'
-    else
-      invoke 'puma:restart'
-    end
-  end
-
 end

data/lib/capistrano/tasks/systemd.rake

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+git_plugin = self
+
+namespace :puma do
+  namespace :systemd do
+    desc 'Config Puma systemd service'
+    task :config do
+      on roles(fetch(:puma_role)) do |role|
+        unit_filename = "#{fetch(:puma_service_unit_name)}.service"
+        git_plugin.template_puma unit_filename, "#{fetch(:tmp_dir)}/#{unit_filename}", role
+        sudo "mv #{fetch(:tmp_dir)}/#{unit_filename} #{fetch(:puma_systemd_conf_dir)}"
+        sudo "#{fetch(:puma_systemctl_bin)} daemon-reload"
+      end
+    end
+
+    desc 'Enable Puma systemd service'
+    task :enable do
+      on roles(fetch(:puma_role)) do
+        sudo "#{fetch(:puma_systemctl_bin)} enable #{fetch(:puma_service_unit_name)}"
+      end
+    end
+
+    desc 'Disable Puma systemd service'
+    task :disable do
+      on roles(fetch(:puma_role)) do
+        sudo "#{fetch(:puma_systemctl_bin)} disable #{fetch(:puma_service_unit_name)}"
+      end
+    end
+  end
+
+  desc 'Start Puma service via systemd'
+  task :start do
+    on roles(fetch(:puma_role)) do
+      sudo "#{fetch(:puma_systemctl_bin)} start #{fetch(:puma_service_unit_name)}"
+    end
+  end
+
+  desc 'Stop Puma service via systemd'
+  task :stop do
+    on roles(fetch(:puma_role)) do
+      sudo "#{fetch(:puma_systemctl_bin)} stop #{fetch(:puma_service_unit_name)}"
+    end
+  end
+
+  desc 'Restart Puma service via systemd'
+  task :restart do
+    on roles(fetch(:puma_role)) do
+      sudo "#{fetch(:puma_systemctl_bin)} restart #{fetch(:puma_service_unit_name)}"
+    end
+  end
+
+  desc 'Get Puma service status via systemd'
+  task :status do
+    on roles(fetch(:puma_role)) do
+      sudo "#{fetch(:puma_systemctl_bin)} status #{fetch(:puma_service_unit_name)}"
+    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/nginx_conf.erb

@@ -14,16 +14,27 @@ end
 server {
   listen 80;
   server_name <%= fetch(:nginx_server_name) %>;
-  rewrite ^(.*) https://$host$1 permanent;
+  return 301 https://$host$1$request_uri;
 }
 <% end -%>
 
 server {
 <% if fetch(:nginx_use_ssl) -%>
-  listen 443;
-  ssl on;
+  <% if fetch(:nginx_use_http2) -%>
+  listen 443 ssl http2;
+  <% else -%>
+  listen 443 ssl;
+  <% end -%>
+<% if fetch(:nginx_ssl_certificate) -%>
+  ssl_certificate <%= fetch(:nginx_ssl_certificate) %>;
+<% else -%>
   ssl_certificate /etc/ssl/certs/<%= fetch(:nginx_config_name) %>.crt;
+<% end -%>
+<% if fetch(:nginx_ssl_certificate_key) -%>
+  ssl_certificate_key <%= fetch(:nginx_ssl_certificate_key) %>;
+<% else -%>
   ssl_certificate_key /etc/ssl/private/<%= fetch(:nginx_config_name) %>.key;
+<% end -%>
 <% else -%>
   listen 80;
 <% end -%>
@@ -38,11 +49,20 @@ server {
   error_page 503 @503;
 
   location @puma_<%= fetch(:nginx_config_name) %> {
+    proxy_http_version 1.1;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header Host $http_host;
+    proxy_set_header Host $host;
     proxy_redirect off;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "Upgrade";
 <% if fetch(:nginx_use_ssl) -%>
     proxy_set_header X-Forwarded-Proto https;
+<% else -%>
+  <% if fetch(:nginx_downstream_uses_ssl) -%>
+    proxy_set_header X-Forwarded-Proto https;
+  <% else -%>
+    proxy_set_header X-Forwarded-Proto http;
+  <% end -%>
 <% end -%>
     proxy_pass http://puma_<%= fetch(:nginx_config_name) %>;
     # limit_req zone=one;

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

@@ -1,17 +1,16 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides: puma
-# Required-Start: $remote_fs $syslog
-# Required-Stop: $remote_fs $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Example initscript
-# Description: This file should be used to construct scripts to be
-# placed in /etc/init.d.
+# Provides:          puma 
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Puma web server
+# Description:       A ruby web server built for concurrency http://puma.io
+#                    initscript to be placed in /etc/init.d.
 ### END INIT INFO
 
-# Author: Darío Javier Cravero <'dario@exordo.com'>
-# Modified by: Abdelkader Boudih <'terminale@gmail.com'>
+# Author: Darío Javier Cravero <dario@exordo.com>
 #
 # Do NOT "set -e"
 
@@ -24,6 +23,7 @@ SCRIPTNAME=/etc/init.d/$NAME
 CONFIG=<%=fetch(:puma_jungle_conf)%>
 JUNGLE=`cat $CONFIG`
 RUNPUMA=<%=fetch(:puma_run_path)%>
+USE_LOCAL_BUNDLE=0
 
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
@@ -33,22 +33,13 @@ RUNPUMA=<%=fetch(:puma_run_path)%>
 . /lib/lsb/init-functions
 
 #
-# Function that starts the jungle
+# Function that starts the jungle 
 #
 do_start() {
   log_daemon_msg "=> Running the jungle..."
   for i in $JUNGLE; do
     dir=`echo $i | cut -d , -f 1`
-    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
+    do_start_one $dir
   done
 }
 
@@ -58,21 +49,41 @@ do_start_one() {
     PID=`cat $PIDFILE`
     # If the puma isn't running, run it, otherwise restart it.
     if [ "`ps -A -o pid= | grep -c $PID`" -eq 0 ]; then
-      do_start_one_do $1 $2
+      do_start_one_do $1
     else
-      do_restart_one $1 $2
+      do_restart_one $1
     fi
   else
-    do_start_one_do $1 $2
+    do_start_one_do $1
   fi
 }
 
 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 "
-  start-stop-daemon --verbose --start --chdir $1 --chuid $2 --background --exec $RUNPUMA -- $1
+  i=`grep $1 $CONFIG`
+  dir=`echo $i | cut -d , -f 1`
+  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
+  environment=`echo $i | cut -d , -f 5`
+
+  log_daemon_msg "--> Woke up puma $dir"
+  log_daemon_msg "user $user"
+  log_daemon_msg "log to $log_file"
+
+  if [ ! -z "$environment" ]; then
+    for e in $(echo "$environment" | tr ';' '\n'); do
+        log_daemon_msg "environment $e"
+        v=${e%%\=*} ;  eval "$e" ; export $v
+    done
+  fi
+
+  start-stop-daemon --verbose --start --chdir $dir --chuid $user --background --exec $RUNPUMA -- $dir $config_file $log_file
 }
 
 #
@@ -82,8 +93,7 @@ do_stop() {
   log_daemon_msg "=> Putting all the beasts to bed..."
   for i in $JUNGLE; do
     dir=`echo $i | cut -d , -f 1`
-    user=`echo $i | cut -d , -f 2`
-    do_stop_one $dir $user
+    do_stop_one $dir
   done
 }
 #
@@ -99,7 +109,11 @@ do_stop_one() {
       log_daemon_msg "---> Puma $1 isn't running."
     else
       log_daemon_msg "---> About to kill PID `cat $PIDFILE`"
-      su - $2 -c "pumactl --state $STATEFILE stop"
+      if [ "$USE_LOCAL_BUNDLE" -eq 1 ]; then
+        cd $1 && bundle exec pumactl --state $STATEFILE stop
+      else
+        pumactl --state $STATEFILE stop
+      fi
       # Many daemons don't delete their pidfiles when they exit.
       rm -f $PIDFILE $STATEFILE
     fi
@@ -110,13 +124,12 @@ do_stop_one() {
 }
 
 #
-# Function that restarts the jungle
+# Function that restarts the jungle 
 #
 do_restart() {
   for i in $JUNGLE; do
     dir=`echo $i | cut -d , -f 1`
-    user=`echo $i | cut -d , -f 2`
-    do_restart_one $dir $user
+    do_restart_one $dir
   done
 }
 
@@ -125,39 +138,52 @@ do_restart() {
 #
 do_restart_one() {
   PIDFILE=$1/tmp/pids/puma.pid
-  i=`grep $1 $CONFIG`
-  dir=`echo $i | cut -d , -f 1`
 
   if [ -e $PIDFILE ]; then
     log_daemon_msg "--> About to restart puma $1"
-    su - $2 -c "pumactl --state $dir/tmp/pids/puma.state restart"
-    # kill -s USR2 `cat $PIDFILE`
+    kill -s USR2 `cat $PIDFILE`
     # TODO Check if process exist
   else
     log_daemon_msg "--> Your puma was never playing... Let's get it out there first"
-    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"
-      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"
-    fi
-    do_start_one $dir $user $config_file $log_file
+    do_start_one $1
   fi
-  return 0
+	return 0
+}
+
+#
+# Function that phased restarts the jungle
+#
+do_phased_restart() {
+  for i in $JUNGLE; do
+    dir=`echo $i | cut -d , -f 1`
+    do_phased_restart_one $dir
+  done
+}
+
+#
+# Function that sends a SIGUSR1 to the daemon/service
+#
+do_phased_restart_one() {
+  PIDFILE=$1/tmp/pids/puma.pid
+
+  if [ -e $PIDFILE ]; then
+    log_daemon_msg "--> About to restart puma $1"
+    kill -s USR1 `cat $PIDFILE`
+    # TODO Check if process exist
+  else
+    log_daemon_msg "--> Your puma was never playing... Let's get it out there first"
+    do_start_one $1
+  fi
+	return 0
 }
 
 #
-# Function that statuss the jungle
+# Function that statuss the jungle 
 #
 do_status() {
   for i in $JUNGLE; do
     dir=`echo $i | cut -d , -f 1`
-    user=`echo $i | cut -d , -f 2`
-    do_status_one $dir $user
+    do_status_one $dir
   done
 }
 
@@ -168,16 +194,20 @@ do_status_one() {
   PIDFILE=$1/tmp/pids/puma.pid
   i=`grep $1 $CONFIG`
   dir=`echo $i | cut -d , -f 1`
-
+  
   if [ -e $PIDFILE ]; then
     log_daemon_msg "--> About to status puma $1"
-
-    su - $2 -c "pumactl --state $dir/tmp/pids/puma.state stats "
-
+    if [ "$USE_LOCAL_BUNDLE" -eq 1 ]; then
+      cd $1 && bundle exec pumactl --state $dir/tmp/pids/puma.state stats
+    else
+      pumactl --state $dir/tmp/pids/puma.state stats
+    fi
+    # kill -s USR2 `cat $PIDFILE`
+    # TODO Check if process exist
   else
-    log_daemon_msg "--> $1 isn't there :(..."
+    log_daemon_msg "--> $1 isn't there :(..." 
   fi
-  return 0
+	return 0
 }
 
 do_add() {
@@ -188,7 +218,7 @@ do_add() {
       str=$1
     else
       echo "The app is already being managed. Remove it if you want to update its config."
-      exit 0
+      exit 1 
     fi
   else
     echo "The directory $1 doesn't exist."
@@ -215,7 +245,12 @@ do_add() {
     str="$str,$4"
   fi
 
-  # Add it to the jungle
+  # Environment variables
+  if [ "$5" != "" ]; then
+    str="$str,$5"
+  fi
+
+  # Add it to the jungle 
   echo $str >> $CONFIG
   log_daemon_msg "Added a Puma to the jungle: $str. You still have to start it though."
 }
@@ -232,6 +267,49 @@ do_remove() {
   fi
 }
 
+config_bundler() {
+  HOME="$(eval echo ~$(id -un))"
+
+  if [ -d "$1/.rbenv/bin" ]; then
+    PATH="$1/.rbenv/bin:$1/.rbenv/shims:$1"
+    eval "$(rbenv init -)"
+    USE_LOCAL_BUNDLE=1
+    return 0
+
+  elif [ -d "/usr/local/rbenv/bin" ]; then
+    PATH="/usr/local/rbenv/bin:/usr/local/rbenv/shims:$PATH"
+    eval "$(rbenv init -)"
+    USE_LOCAL_BUNDLE=1
+    return 0
+
+  elif [ -d "$HOME/.rbenv/bin" ]; then
+    PATH="$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH"
+    eval "$(rbenv init -)"
+    USE_LOCAL_BUNDLE=1
+    return 0
+
+  # TODO: test rvm
+  # elif [ -f  /etc/profile.d/rvm.sh ]; then
+  #   source /etc/profile.d/rvm.sh
+  # elif [ -f /usr/local/rvm/scripts/rvm ]; then
+  #   source /etc/profile.d/rvm.sh
+  # elif [ -f "$HOME/.rvm/scripts/rvm" ]; then
+  #   source "$HOME/.rvm/scripts/rvm"
+  # TODO: don't know what to do with chruby
+  # elif [ -f /usr/local/share/chruby/chruby.sh ]; then
+  #   source /usr/local/share/chruby/chruby.sh
+  #   if [ -f /usr/local/share/chruby/auto.sh ]; then
+  #     source /usr/local/share/chruby/auto.sh
+  #   fi
+  # if you aren't using auto, set your version here
+  # chruby 2.0.0
+  fi
+
+  return 1
+}
+
+config_bundler
+
 case "$1" in
   start)
     [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
@@ -240,18 +318,12 @@ case "$1" in
     else
       i=`grep $2 $CONFIG`
       dir=`echo $i | cut -d , -f 1`
-      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"
-
-        do_start_one $dir $user $config_file
-      fi
-      case "$?" in
-        0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-        2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-      esac
+      do_start_one $dir
     fi
+    case "$?" in
+      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+    esac
   ;;
   stop)
     [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
@@ -296,11 +368,25 @@ case "$1" in
       2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
     esac
   ;;
+  phased-restart)
+    log_daemon_msg "Restarting (phased) $DESC" "$NAME"
+    if [ "$#" -eq 1 ]; then
+      do_phased_restart
+    else
+      i=`grep $2 $CONFIG`
+      dir=`echo $i | cut -d , -f 1`
+      do_phased_restart_one $dir
+    fi
+    case "$?" in
+      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+    esac
+  ;;
   add)
     if [ "$#" -lt 3 ]; then
-      echo "Please, specifiy the app's directory and the user that will run it at least."
-      echo " Usage: $SCRIPTNAME add /path/to/app user /path/to/app/config/puma.rb /path/to/app/config/log/puma.log"
-      echo " config and log are optionals."
+      echo "Please, specify the app's directory and the user that will run it at least."
+      echo "  Usage: $SCRIPTNAME add /path/to/app user /path/to/app/config/puma.rb /path/to/app/config/log/puma.log"
+      echo "    config and log are optionals."
       exit 1
     else
       do_add $2 $3 $4 $5
@@ -324,13 +410,12 @@ case "$1" in
   ;;
   *)
     echo "Usage:" >&2
-    echo " Run the jungle: $SCRIPTNAME {start|stop|status|restart}" >&2
-    echo " Add a Puma: $SCRIPTNAME add /path/to/app user /path/to/app/config/puma.rb /path/to/app/config/log/puma.log"
-    echo " config and log are optionals."
-    echo " Remove a Puma: $SCRIPTNAME remove /path/to/app"
-    echo " On a Puma: $SCRIPTNAME {start|stop|status|restart} PUMA-NAME" >&2
+    echo "  Run the jungle: $SCRIPTNAME {start|stop|status|restart|phased-restart}" >&2
+    echo "  Add a Puma: $SCRIPTNAME add /path/to/app user /path/to/app/config/puma.rb /path/to/app/config/log/puma.log"
+    echo "    config and log are optionals."
+    echo "  Remove a Puma: $SCRIPTNAME remove /path/to/app"
+    echo "  On a Puma: $SCRIPTNAME {start|stop|status|restart|phased-restart} PUMA-NAME" >&2
     exit 3
   ;;
 esac
 :
-