teleporter 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bc1577f3f9290f6a4275836e730defc5fc78a88
-  data.tar.gz: 73e66a6b98e16a75d6bbefd0c1442c9814f88da5
+  metadata.gz: 3dfe68013173039db4725ce3acac288a192e6f4e
+  data.tar.gz: 9e9a9957356c1403abf9700b0fb57482db2b6f9b
 SHA512:
-  metadata.gz: 8800bf16f79c5e513c5ca04fe89a4860f8da7dd045da91d2967ec78e65e70b57e8315a72565ca0b0105987364b0b3f18abe3ef830b9bb3bc7a0e2191d37c5d16
-  data.tar.gz: 87fbd5b697d7b637ad03a5c798e5f6317ef3cd2c9247640c50b321ad6cd65731013cb66c14fe4f1d90958333d7ba31996d55d9cd3c2760adb6214e21df6cbd82
+  metadata.gz: b9aefe47ec8ef2b5a66a115c3c33a7979e6165ba131ec65a15c5be6c9b14ee89dd08d504258e1b256b1aa947575bbaaa0c68da4143bf0225441d602daa75d20b
+  data.tar.gz: 8cde798b53c862ac12c1b2deba8ed0d593a07da6071eb20776478a99ce8e059272219af5b81b6f67b45fba40eadfb747b45b4395a53398597ad294a8e453b820

data/lib/generators/initial/capistrano.rb

@@ -9,6 +9,7 @@ module Initial
         gem 'capistrano-bundler'
         gem 'capistrano-rails'
         gem 'capistrano-sidekiq' , github: 'seuros/capistrano-sidekiq'
+        gem 'capistrano3-puma'
       end
 
       Bundler.with_clean_env do
@@ -18,9 +19,6 @@ module Initial
       directory 'capistrano/tasks', 'lib/capistrano/tasks'
       directory 'capistrano/shared', 'config/deploy/shared'
 
-      template "capistrano/lib/substitute_strings.rb", "lib/capistrano/substitute_strings.rb"
-      template "capistrano/lib/template.rb", "lib/capistrano/template.rb"
-
       run 'cap install'
 
       uncomment_lines 'Capfile', /require 'capistrano\/rbenv'/
@@ -29,127 +27,14 @@ module Initial
       uncomment_lines 'Capfile', /require 'capistrano\/rails\/migrations'/
       insert_into_file "Capfile", "require 'capistrano/sidekiq'\n",
                        after: "require 'capistrano/rails/migrations'\n"
+      insert_into_file "Capfile", "require 'capistrano/sidekiq'\n",
+                       after: "require 'capistrano/puma'\n"
+      insert_into_file "Capfile", "require 'capistrano/sidekiq'\n",
+                       after: "require 'capistrano/puma/monit'\n"
 
+      copy_file 'capistrano/deploy/deploy.rb', 'config/deploy.rb'
+      copy_file 'capistrano/deploy/production.rb', 'config/deploy/production.rb'
 
-      append_to_file 'config/deploy.rb' do
-        <<-EOT
-set :rbenv_type, :system
-set :rbenv_ruby, '2.1.2'
-set :rbenv_prefix, "RBENV_ROOT=\#{fetch(:rbenv_path)} RBENV_VERSION=\#{fetch(:rbenv_ruby)} \#{fetch(:rbenv_path)}/bin/rbenv exec"
-set :rbenv_map_bins, %w{rake gem bundle ruby rails}
-set :linked_files, %w{config/database.yml config/application.yml}
-set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system public/uploads}
-set(:config_files, %w(
-  nginx.conf
-  application.yml
-  database.example.yml
-  log_rotation
-  monit
-  monit_sidekiq
-  unicorn.rb
-  unicorn_init.sh
-  sidekiq_init.sh
-))
-set(:executable_config_files, %w(
-  unicorn_init.sh
-  sidekiq_init.sh
-))
-set(:symlinks, [
-  {
-    source: "nginx.conf",
-    link: "/etc/nginx/sites-enabled/{{full_app_name}}"
-  },
-  {
-    source: "unicorn_init.sh",
-    link: "/etc/init.d/unicorn_{{full_app_name}}"
-  },
-  {
-    source: "log_rotation",
-    link: "/etc/logrotate.d/{{full_app_name}}"
-  },
-  {
-    source: "monit",
-    link: "/etc/monit/conf.d/{{full_app_name}}.conf"
-  },
-  {
-    source: "monit_sidekiq",
-    link: "/etc/monit/conf.d/sidekiq_{{full_app_name}}.conf"
-  },
-  {
-    source: "sidekiq_init.sh",
-    link: "/etc/init.d/sidekiq_{{full_app_name}}"
-  }
-])
-namespace :deploy do
-  desc 'Normalize asset timestamps'
-  task migr: fetch(:stage)  do
-    on roles(:app) do
-      within release_path do
-        execute :rake, "migrate:users", "RAILS_ENV=\#{fetch(:stage)}"
-      end
-    end
-  end
-end
-
-namespace :deploy do
-  task clear_cache: fetch(:stage) do
-    on roles(:app) do
-      within release_path do
-        execute :rake, 'tmp:cache:clear'
-      end
-    end
-  end
-end
-
-namespace :deploy do
-  # make sure we're deploying what we think we're deploying
-  before :deploy, "deploy:check_revision"
-  # only allow a deploy with passing tests to deployed
-  # compile assets locally then rsync
-  #after 'deploy:symlink:shared', 'deploy:compile_assets_locally'
-  after :finishing, 'deploy:cleanup'
-  after :finishing, 'deploy:restart'
-  after :finishing, 'deploy:clear_cache'
-  #after :finishing, 'sidekiq:restart'
-  #after :finishing, 'deploy:migr'
-end
-
-        EOT
-      end
-
-      append_to_file 'config/deploy/production.rb' do
-      <<-EOT
-set :stage, :production
-set :branch, "master"
-
-# used in case we're deploying multiple versions of the same
-# app side by side. Also provides quick sanity checks when looking
-# at filepaths
-set :full_app_name, "\#{fetch(:application)}_\#{fetch(:stage)}"
-
-server '95.85.33.125', user: 'deploy', roles: %w{web app db}, primary: true
-
-set :deploy_to, "/home/\#{fetch(:deploy_user)}/apps/\#{fetch(:full_app_name)}"
-
-# dont try and infer something as important as environment from
-# stage name.
-set :rails_env, :production
-
-# number of unicorn workers, this will be reflected in
-# the unicorn.rb and the monit configs
-set :unicorn_worker_count, 2
-
-# whether we're using ssl or not, used for building nginx
-# config file
-set :enable_ssl, false
-      EOT
-      end
-
-      p '*****'
-      p 'config application name in config/deploy.rb'
-      p 'config git repo path in config/deploy.rb'
-      p 'remove default deploy:start task in config/deploy.rb'
-      p 'remove default examples in config/production/deploy.rb'
     end
   end
 end

data/lib/generators/initial/templates/capistrano/deploy/deploy.rb

@@ -0,0 +1,100 @@
+lock '3.2.1'
+
+set :application, 'my_app_name'
+set :repo_url, 'git@github.com:itsNikolay/puma-testing.git'
+set :deploy_user, 'deploy'
+
+set :puma_init_active_record, true
+
+set :rbenv_type, :system
+set :rbenv_ruby, '2.1.2'
+set :rbenv_prefix, "RBENV_ROOT=#{fetch(:rbenv_path)} RBENV_VERSION=#{fetch(:rbenv_ruby)} #{fetch(:rbenv_path)}/bin/rbenv exec"
+set :rbenv_map_bins, %w{rake gem bundle ruby rails}
+set :linked_files, %w{config/database.yml config/application.yml config/secrets.yml}
+set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system public/uploads}
+set(:config_files, %w(
+  nginx.conf
+  application.yml
+  database.example.yml
+  log_rotation
+  monit
+  monit_sidekiq
+  puma.conf
+  puma
+  run-puma
+  sidekiq_init.sh
+  secrets.yml
+))
+set(:executable_config_files, %w(
+  puma
+  run-puma
+  sidekiq_init.sh
+))
+set(:symlinks, [
+  {
+    source: "nginx.conf",
+    link: "/etc/nginx/sites-enabled/{{full_app_name}}"
+  },
+  {
+    source: "puma",
+    link: "/etc/init.d/puma"
+  },
+  {
+    source: "run-puma",
+    link: "/usr/local/bin/run-puma"
+  },
+  {
+    source: "puma.conf",
+    link: "/etc/puma.conf"
+  },
+  {
+    source: "log_rotation",
+    link: "/etc/logrotate.d/{{full_app_name}}"
+  },
+  {
+    source: "monit",
+    link: "/etc/monit/conf.d/{{full_app_name}}.conf"
+  },
+  {
+    source: "monit_sidekiq",
+    link: "/etc/monit/conf.d/sidekiq_{{full_app_name}}.conf"
+  },
+  {
+    source: "sidekiq_init.sh",
+    link: "/etc/init.d/sidekiq_{{full_app_name}}"
+  },
+])
+namespace :deploy do
+  desc 'Normalize asset timestamps'
+  task migr: fetch(:stage)  do
+    on roles(:app) do
+      within release_path do
+        execute :rake, "migrate:users", "RAILS_ENV=#{fetch(:stage)}"
+      end
+    end
+  end
+end
+
+namespace :deploy do
+  task clear_cache: fetch(:stage) do
+    on roles(:app) do
+      within release_path do
+        execute :rake, 'tmp:cache:clear'
+      end
+    end
+  end
+end
+
+namespace :deploy do
+  # make sure we're deploying what we think we're deploying
+  before :deploy, "deploy:check_revision"
+  # only allow a deploy with passing tests to deployed
+  # compile assets locally then rsync
+  #after 'deploy:symlink:shared', 'deploy:compile_assets_locally'
+  after :finishing, 'deploy:cleanup'
+  after :finishing, 'deploy:restart'
+  after :finishing, 'deploy:clear_cache'
+  #after :finishing, 'sidekiq:restart'
+  #after :finishing, 'deploy:migr'
+end
+

data/lib/generators/initial/templates/capistrano/deploy/production.rb

@@ -0,0 +1,19 @@
+set :stage, :production
+set :branch, "master"
+
+# used in case we're deploying multiple versions of the same
+# app side by side. Also provides quick sanity checks when looking
+# at filepaths
+set :full_app_name, "#{fetch(:application)}_#{fetch(:stage)}"
+
+server '192.168.33.10', user: 'deploy', roles: %w{web app db}, primary: true
+
+set :deploy_to, "/home/#{fetch(:deploy_user)}/apps/#{fetch(:full_app_name)}"
+
+# dont try and infer something as important as environment from
+# stage name.
+set :rails_env, :production
+
+# whether we're using ssl or not, used for building nginx
+# config file
+set :enable_ssl, false

data/lib/generators/initial/templates/capistrano/shared/monit.erb

@@ -1,22 +1,7 @@
-<% application = fetch(:application) %>
-set mail-format { subject: <%= "#{fetch(:full_app_name)} - #{fetch(:rails_env)}" %> $SERVICE $EVENT at $DATE }
-
-check process unicorn
-  with pidfile <%= current_path %>/tmp/pids/unicorn.pid
-  start program = "/etc/init.d/unicorn_<%= application %>_<%= fetch(:rails_env)%> start"
-  stop program = "/etc/init.d/unicorn_<%= application %>_<%= fetch(:rails_env)%> stop"
-  if mem is greater than 300.0 MB for 1 cycles then restart       # eating up memory?
-  if cpu is greater than 50% for 2 cycles then alert                  # send an email to admin
-  if cpu is greater than 80% for 30 cycles then restart                # hung process?
-  group unicorn
-
-<% (0..(fetch(:unicorn_worker_count) -1)).each do |worker| %>
-  check process unicorn_worker_<%= (5000 + worker).to_s %>
-    with pidfile <%= current_path %>/tmp/pids/unicorn.<%= (5000 + worker).to_s %>.pid
-    start program = "/bin/true"
-    stop program = "/etc/init.d/unicorn_<%= application %>_<%= fetch(:rails_env)%> kill_worker <%= (5000 + worker).to_s %>"
-    if mem is greater than 350.0 MB for 1 cycles then restart
-    if cpu is greater than 80% for 30 cycles then restart
-
-    group unicorn_workers
-<% end %>
+# Monit configuration for Puma
+# Service name: <%= puma_monit_service_name %>
+#
+check process <%= puma_monit_service_name %>
+  with pidfile "<%= fetch(:puma_pid) %>"
+  start program = "/usr/bin/sudo -u <%= fetch(:deploy_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 <%= fetch(:deploy_user) %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec pumactl -S <%= fetch(:puma_state) %> stop'"

data/lib/generators/initial/templates/capistrano/shared/nginx.conf.erb

@@ -1,5 +1,5 @@
-upstream unicorn {
-  server unix:/tmp/unicorn.<%= fetch(:full_app_name) %>.sock fail_timeout=0;
+upstream puma {
+  server unix:/<%= fetch(:deploy_to) %>/shared/tmp/sockets/puma.sock fail_timeout=0;
 }
 
 server {
@@ -12,12 +12,12 @@ server {
     add_header Cache-Control public;
   }
 
-  try_files $uri/index.html $uri @unicorn;
-  location @unicorn {
+  try_files $uri/index.html $uri @puma;
+  location @puma {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
     proxy_redirect off;
-    proxy_pass http://unicorn;
+    proxy_pass http://puma;
   }
 
   error_page 500 502 503 504 /500.html;
@@ -36,13 +36,13 @@ server {
     add_header Cache-Control public;
   }
 
-  try_files $uri/index.html $uri @unicorn;
-  location @unicorn {
+  try_files $uri/index.html $uri @puma;
+  location @puma {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header   X-Forwarded-Proto https;
     proxy_set_header Host $http_host;
     proxy_redirect off;
-    proxy_pass http://unicorn;
+    proxy_pass http://puma;
   }
 
   error_page 500 502 503 504 /500.html;

data/lib/generators/initial/templates/capistrano/shared/puma.conf.erb

@@ -0,0 +1 @@
+<%= current_path %>,<%= fetch(:deploy_user) %>

data/lib/generators/initial/templates/capistrano/shared/puma.erb

@@ -0,0 +1,332 @@
+#! /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.
+### END INIT INFO
+
+# Author: Darío Javier Cravero <dario@exordo.com>
+#
+# Do NOT "set -e"
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/usr/local/bin:/usr/local/sbin/:/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Puma rack web server"
+NAME=puma
+DAEMON=$NAME
+SCRIPTNAME=/etc/init.d/$NAME
+CONFIG=/etc/puma.conf
+JUNGLE=`cat $CONFIG`
+RUNPUMA=/usr/local/bin/run-puma
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# 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
+  done
+}
+
+do_start_one() {
+  PIDFILE=$1/tmp/puma/pid
+  if [ -e $PIDFILE ]; then
+    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 $3 $4
+    else
+      do_restart_one $1
+    fi
+  else
+    do_start_one_do $1 $2 $3 $4
+  fi
+}
+
+do_start_one_do() {
+  log_daemon_msg "--> Woke up puma $1"
+  log_daemon_msg "user $2"
+  log_daemon_msg "log to $4"
+  start-stop-daemon --verbose --start --chdir $1 --chuid $2 --background --exec $RUNPUMA -- $1 $3 $4
+}
+
+#
+# Function that stops the jungle
+#
+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
+  done
+}
+#
+# Function that stops the daemon/service
+#
+do_stop_one() {
+  log_daemon_msg "--> Stopping $1"
+  PIDFILE=$1/tmp/puma/pid
+  STATEFILE=$1/tmp/puma/state
+  if [ -e $PIDFILE ]; then
+    PID=`cat $PIDFILE`
+    if [ "`ps -A -o pid= | grep -c $PID`" -eq 0 ]; then
+      log_daemon_msg "---> Puma $1 isn't running."
+    else
+      log_daemon_msg "---> About to kill PID `cat $PIDFILE`"
+      pumactl --state $STATEFILE stop
+      # Many daemons don't delete their pidfiles when they exit.
+      rm -f $PIDFILE $STATEFILE
+    fi
+  else
+    log_daemon_msg "---> No puma here..."
+  fi
+  return 0
+}
+
+#
+# Function that restarts the jungle 
+#
+do_restart() {
+  for i in $JUNGLE; do
+    dir=`echo $i | cut -d , -f 1`
+    do_restart_one $dir
+  done
+}
+
+#
+# Function that sends a SIGUSR2 to the daemon/service
+#
+do_restart_one() {
+  PIDFILE=$1/tmp/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"
+    pumactl --state $dir/tmp/puma/state restart
+    # 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"
+    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
+  fi
+	return 0
+}
+
+#
+# Function that statuss the jungle 
+#
+do_status() {
+  for i in $JUNGLE; do
+    dir=`echo $i | cut -d , -f 1`
+    do_status_one $dir
+  done
+}
+
+#
+# Function that sends a SIGUSR2 to the daemon/service
+#
+do_status_one() {
+  PIDFILE=$1/tmp/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"
+    pumactl --state $dir/tmp/puma/state stats
+    # kill -s USR2 `cat $PIDFILE`
+    # TODO Check if process exist
+  else
+    log_daemon_msg "--> $1 isn't there :(..." 
+  fi
+	return 0
+}
+
+do_add() {
+  str=""
+  # App's directory
+  if [ -d "$1" ]; then
+    if [ "`grep -c "^$1" $CONFIG`" -eq 0 ]; then
+      str=$1
+    else
+      echo "The app is already being managed. Remove it if you want to update its config."
+      exit 1 
+    fi
+  else
+    echo "The directory $1 doesn't exist."
+    exit 1
+  fi
+  # User to run it as
+  if [ "`grep -c "^$2:" /etc/passwd`" -eq 0 ]; then
+    echo "The user $2 doesn't exist."
+    exit 1
+  else
+    str="$str,$2"
+  fi
+  # Config file
+  if [ "$3" != "" ]; then
+    if [ -e $3 ]; then
+      str="$str,$3"
+    else
+      echo "The config file $3 doesn't exist."
+      exit 1
+    fi
+  fi
+  # Log file
+  if [ "$4" != "" ]; then
+    str="$str,$4"
+  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."
+}
+
+do_remove() {
+  if [ "`grep -c "^$1" $CONFIG`" -eq 0 ]; then
+    echo "There's no app $1 to remove."
+  else
+    # Stop it first.
+    do_stop_one $1
+    # Remove it from the config.
+    sed -i "\\:^$1:d" $CONFIG
+    log_daemon_msg "Removed a Puma from the jungle: $1."
+  fi
+}
+
+case "$1" in
+  start)
+    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+    if [ "$#" -eq 1 ]; then
+      do_start
+    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"
+      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
+    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"
+    if [ "$#" -eq 1 ]; then
+      do_stop
+    else
+      i=`grep $2 $CONFIG`
+      dir=`echo $i | cut -d , -f 1`
+      do_stop_one $dir
+    fi
+    case "$?" in
+      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+    esac
+  ;;
+  status)
+    # TODO Implement.
+    log_daemon_msg "Status $DESC" "$NAME"
+    if [ "$#" -eq 1 ]; then
+      do_status
+    else
+      i=`grep $2 $CONFIG`
+      dir=`echo $i | cut -d , -f 1`
+      do_status_one $dir
+    fi
+    case "$?" in
+      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+    esac
+  ;;
+  restart)
+    log_daemon_msg "Restarting $DESC" "$NAME"
+    if [ "$#" -eq 1 ]; then
+      do_restart
+    else
+      i=`grep $2 $CONFIG`
+      dir=`echo $i | cut -d , -f 1`
+      do_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."
+      exit 1
+    else
+      do_add $2 $3 $4 $5
+    fi
+    case "$?" in
+      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+    esac
+  ;;
+  remove)
+    if [ "$#" -lt 2 ]; then
+      echo "Please, specifiy the app's directory to remove."
+      exit 1
+    else
+      do_remove $2
+    fi
+    case "$?" in
+      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+    esac
+  ;;
+  *)
+    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
+    exit 3
+  ;;
+esac
+:

data/lib/generators/initial/templates/capistrano/shared/run-puma.erb

@@ -0,0 +1,3 @@
+#!/bin/bash
+app=$1; config=$2; log=$3;
+cd $app && exec bundle exec puma -C $config 2>&1 >> $log

data/lib/generators/initial/templates/capistrano/shared/secrets.yml.erb

@@ -0,0 +1,2 @@
+production:
+  secret_key_base: <%= SecureRandom.hex %>

data/lib/generators/initial/templates/capistrano/tasks/setup_config.rake

@@ -31,3 +31,33 @@ namespace :deploy do
     end
   end
 end
+
+
+def smart_template(from, to=nil)
+  to ||= from
+  full_to_path = "#{shared_path}/config/#{to}"
+  if from_erb_path = template_file(from)
+    from_erb = StringIO.new(ERB.new(File.read(from_erb_path)).result(binding))
+    upload! from_erb, full_to_path
+    info "copying: #{from_erb} to: #{full_to_path}"
+  else
+    error "error #{from} not found"
+  end
+end
+
+def template_file(name)
+  if File.exist?((file = "config/deploy/#{fetch(:full_app_name)}/#{name}.erb"))
+    return file
+  elsif File.exist?((file = "config/deploy/shared/#{name}.erb"))
+    return file
+  end
+  return nil
+end
+
+def sub_strings(input_string)
+  output_string = input_string
+  input_string.scan(/{{(\w*)}}/).each do |var|
+    output_string.gsub!("{{#{var[0]}}}", fetch(var[0].to_sym))
+  end
+  output_string
+end

data/lib/teleporter/version.rb

@@ -1,3 +1,3 @@
 module Teleporter
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teleporter
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Ponomarev Nikolay
@@ -70,14 +70,18 @@ files:
 - lib/generators/initial/gemfile.rb
 - lib/generators/initial/rspec_base.rb
 - lib/generators/initial/start.rb
-- lib/generators/initial/templates/capistrano/lib/substitute_strings.rb
-- lib/generators/initial/templates/capistrano/lib/template.rb
+- lib/generators/initial/templates/capistrano/deploy/deploy.rb
+- lib/generators/initial/templates/capistrano/deploy/production.rb
 - lib/generators/initial/templates/capistrano/shared/application.yml.erb
 - lib/generators/initial/templates/capistrano/shared/database.example.yml.erb
 - lib/generators/initial/templates/capistrano/shared/log_rotation.erb
 - lib/generators/initial/templates/capistrano/shared/monit.erb
 - lib/generators/initial/templates/capistrano/shared/monit_sidekiq.erb
 - lib/generators/initial/templates/capistrano/shared/nginx.conf.erb
+- lib/generators/initial/templates/capistrano/shared/puma.conf.erb
+- lib/generators/initial/templates/capistrano/shared/puma.erb
+- lib/generators/initial/templates/capistrano/shared/run-puma.erb
+- lib/generators/initial/templates/capistrano/shared/secrets.yml.erb
 - lib/generators/initial/templates/capistrano/shared/sidekiq.yml.erb
 - lib/generators/initial/templates/capistrano/shared/sidekiq_init.sh.erb
 - lib/generators/initial/templates/capistrano/shared/unicorn.rb.erb
@@ -85,7 +89,6 @@ files:
 - lib/generators/initial/templates/capistrano/tasks/check_revision.rake
 - lib/generators/initial/templates/capistrano/tasks/compile_assets_locally.rake
 - lib/generators/initial/templates/capistrano/tasks/logs.rake
-- lib/generators/initial/templates/capistrano/tasks/restart.rake
 - lib/generators/initial/templates/capistrano/tasks/setup_config.rake
 - lib/generators/initial/templates/rspec_base/configs/capybara.rb
 - lib/generators/initial/templates/rspec_base/configs/database_cleaner.rb

data/lib/generators/initial/templates/capistrano/lib/substitute_strings.rb

@@ -1,12 +0,0 @@
-# we often want to refer to variables which
-# are defined in subsequent stage files. This
-# let's us use the {{var}} to represent fetch(:var)
-# in strings which are only evaluated at runtime.
-
-def sub_strings(input_string)
-  output_string = input_string
-  input_string.scan(/{{(\w*)}}/).each do |var|
-    output_string.gsub!("{{#{var[0]}}}", fetch(var[0].to_sym))
-  end
-  output_string
-end

data/lib/generators/initial/templates/capistrano/lib/template.rb

@@ -1,32 +0,0 @@
-# will first try and copy the file:
-# config/deploy/#{full_app_name}/#{from}.erb
-# to:
-# shared/config/to
-# if the original source path doesn exist then it will
-# search in:
-# config/deploy/shared/#{from}.erb
-# this allows files which are common to all enviros to
-# come from a single source while allowing specific
-# ones to be over-ridden
-# if the target file name is the same as the source then
-# the second parameter can be left out
-def smart_template(from, to=nil)
-  to ||= from
-  full_to_path = "#{shared_path}/config/#{to}"
-  if from_erb_path = template_file(from)
-    from_erb = StringIO.new(ERB.new(File.read(from_erb_path)).result(binding))
-    upload! from_erb, full_to_path
-    info "copying: #{from_erb} to: #{full_to_path}"
-  else
-    error "error #{from} not found"
-  end
-end
-
-def template_file(name)
-  if File.exist?((file = "config/deploy/#{fetch(:full_app_name)}/#{name}.erb"))
-    return file
-  elsif File.exist?((file = "config/deploy/shared/#{name}.erb"))
-    return file
-  end
-  return nil
-end

data/lib/generators/initial/templates/capistrano/tasks/restart.rake

@@ -1,10 +0,0 @@
-namespace :deploy do
-  desc 'Restart unicorn application'
-  %w(start stop force-stop kill_worker restart upgrage reopen-logs).each do |command|
-    task command.to_sym do
-      on roles(:app), in: :sequence, wait: 5 do
-        sudo "/etc/init.d/unicorn_#{fetch(:full_app_name)} #{command}"
-      end
-    end
-  end
-end