deploy_mate 0.17.4 → 0.17.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d916b27c3a82a7a0eb5b88799922b9a1002a10d0
-  data.tar.gz: c9fe794d0f88c61cadad26af9df0537de27c61b4
+  metadata.gz: b32dbcc8129a7dec28bed595b73896b7d2640b3c
+  data.tar.gz: 6c01d173525aea2c48d9b688825c26a8628e4f4b
 SHA512:
-  metadata.gz: d1e8a111283fec26db5098d33b62edf03c742b7548fd9fc0548aa5e2d1a0649504e296196fa5438a10373b31d42e9e6c4d65a3f2180e12c43d631ef75444ad57
-  data.tar.gz: 66059fceb476788b5dd43267e09159a120c239264fab1e2b6b207710e970e0665e84db709f3ddc3c6b6395724727bced930c71bb0f6631d5f812478b47a477a6
+  metadata.gz: d2df75c00a46a75298cb3c03fb30433387ab7ffaea1c53c855f5eead2390ee0029f64b33ca3cfc67674dcb0dbd877319da6a719ed73e3e6515d86aea17f7a8da
+  data.tar.gz: 4b408d949d237aa3697d29c4c88aaec7d922795cf653a4da7a4c1dd588aef79807d5a3b10cba41ad6956ce444b474cc4b2b802ecc9096de74a41f111e0efe6e3

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2.0
+ruby-2.2.3

data/README.md

@@ -4,7 +4,7 @@
 
 This little gem can be added to your ruby-projects in order to **set up a working ruby-server** and **deploy** to it.
 
-The resulting server will work with this setup: 
+The resulting server will work with this setup:
 - NGINX Webserver (http://nginx.org/)
 - Unicorn Rack App Server (http://unicorn.bogomips.org/)
 - Bluepill Process Monitoring (https://github.com/bluepill-rb/bluepill)
@@ -29,6 +29,7 @@ It uses the following Capistrano-roles to divide the installed components:
 - **cronjobs**: [OPTIONAL] For environments where `whenever` should manage/run cronjobs
 
 ## Changelog
+* **2015-10-17**: Added support for puma as application server
 * **2015-10-12**: Support additional linked-directories
 * **2015-08-27**: Small fix for `nginx`-config regarding gzipping of svgs
 * **2015-08-14**: Important small fix for `nginx`-config regarding ssl

data/deploy-mate.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name                      = "deploy_mate"
-  s.version                   = "0.17.4"
+  s.version                   = "0.17.5"
 
-  s.authors                   = ["Tim Adler"]
-  s.date                      = %q{2015-06-23}
+  s.authors                   = ["Tim Adler", "Marcus Geißler"]
+  s.date                      = %q{2016-02-17}
   s.description               = %q{This is how we deploy around here.}
   s.summary                   = s.description
-  s.email                     = %q{tim.adler (at) hanseventures (dot) com}
+  s.email                     = %q{development (at) hanseventures (dot) com}
   s.license                   = "MIT"
 
   s.files                     = `git ls-files`.split("\n")

data/lib/capistrano/configs/application.pill.erb

@@ -7,6 +7,25 @@ Bluepill.application("<%= fetch(:application) %>", :log_file => "#{shared_path}/
   app.uid = 'ubuntu'
   app.gid = 'www-data'
 
+  <% if fetch(:app_server) == "puma" %>
+  app.process("puma") do |process|
+    process.pid_file = "#{shared_path}/system/pids/puma.pid"
+    process.environment = { 'BUNDLE_GEMFILE' => "#{current_path}/Gemfile" }
+
+    process.start_command = "/home/ubuntu/.rvm/wrappers/default/bundle exec puma -C #{shared_path}/config/puma.rb #{current_path}/config.ru"
+    process.stop_command = "kill -QUIT {{PID}}"
+    process.restart_command = "kill -USR2 {{PID}}"
+
+    process.start_grace_time = 10.seconds
+    process.stop_grace_time = 10.seconds
+    process.restart_grace_time = 10.seconds
+
+    process.monitor_children do |child_process|
+      child_process.stop_command = "kill -9 {{PID}}"
+      child_process.checks :mem_usage, :every => 30.seconds, :below => 500.megabytes, :times => [3,4], :fires => :stop
+    end
+  end
+  <% else %>
   app.process("unicorn") do |process|
     process.pid_file = "#{shared_path}/system/pids/unicorn.pid"
     process.environment = { 'BUNDLE_GEMFILE' => "#{current_path}/Gemfile" }
@@ -24,6 +43,7 @@ Bluepill.application("<%= fetch(:application) %>", :log_file => "#{shared_path}/
       child_process.checks :mem_usage, :every => 30.seconds, :below => 500.megabytes, :times => [3,4], :fires => :stop
     end
   end
+  <% end %>
 
   <% if fetch(:sidekiq) %>
   app.process("sidekiq") do |process|
@@ -36,4 +56,4 @@ Bluepill.application("<%= fetch(:application) %>", :log_file => "#{shared_path}/
   end
   <% end %>
 
-end
+end

data/lib/capistrano/configs/logrotate.erb

@@ -17,6 +17,6 @@
                 [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid`
         endscript
         lastaction
-                [ ! -f <%= shared_path %>/system/pids/unicorn.pid ] || kill -USR1 `cat <%= shared_path %>/system/pids/unicorn.pid`
+                [ ! -f <%= shared_path %>/system/pids/<%= fetch(:app_server) %>.pid ] || kill -USR1 `cat <%= shared_path %>/system/pids/<%= fetch(:app_server) %>.pid`
         endscript
-}
+}

data/lib/capistrano/configs/nginx_app.conf.erb

@@ -1,5 +1,5 @@
-upstream unicorn_upstream {
-  server unix:<%= shared_path %>/system/sockets/unicorn.sock;
+upstream appserver_upstream {
+  server unix:<%= shared_path %>/system/sockets/<%= fetch(:app_server) %>.sock;
 }
 
 server {
@@ -21,7 +21,7 @@ server {
     proxy_set_header Host $http_host;
     proxy_redirect off;
 
-    proxy_pass http://unicorn_upstream;
+    proxy_pass http://appserver_upstream;
     break;
   }
 

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

@@ -0,0 +1,55 @@
+# puma configuration
+
+shared_path = "<%= shared_path %>"
+
+# Puma can serve each request in a thread from an internal thread pool.
+# The `threads` method setting takes two numbers a minimum and maximum.
+# Any libraries that use thread pools should be configured to match
+# the maximum value specified for Puma. Default is set to 5 threads for minimum
+# and maximum, this matches the default thread size of Active Record.
+#
+threads_count = <%= fetch(:puma_threads) %>
+threads threads_count, threads_count
+
+# Specifies the `environment` that Puma will run in.
+#
+environment "<%= fetch(:environment) %>"
+
+# Specifies the number of `workers` to boot in clustered mode.
+# Workers are forked webserver processes. If using threads and workers together
+# the concurrency of the application would be max `threads` * `workers`.
+# Workers do not work on JRuby or Windows (both of which do not support
+# processes).
+#
+workers <%= fetch(:puma_workers) %>
+
+# Use the `preload_app!` method when specifying a `workers` number.
+# This directive tells Puma to first boot the application and load code
+# before forking the application. This takes advantage of Copy On Write
+# process behavior so workers use less memory. If you use this option
+# you need to make sure to reconnect any threads in the `on_worker_boot`
+# block.
+#
+preload_app!
+
+# The code in the `on_worker_boot` will be called if you are using
+# clustered mode by specifying a number of `workers`. After each worker
+# process is booted this block will be run, if you are using `preload_app!`
+# option you will want to use this block to reconnect to any threads
+# or connections that may have been created at application boot, Ruby
+# cannot share connections between processes.
+#
+on_worker_boot do
+ ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+end
+
+# Set up socket location
+bind "unix://#{shared_path}/system/sockets/puma.sock"
+
+# Logging
+stdout_redirect "#{shared_path}/log/puma.stdout.log", "#{shared_path}/log/puma.stderr.log", true
+
+# Set master PID and state locations
+pidfile "#{shared_path}/system/pids/puma.pid"
+state_path "#{shared_path}/system/pids/puma.state"
+activate_control_app

data/lib/capistrano/deploy_mate_capfile.rb

@@ -28,6 +28,6 @@ require "capistrano/helpers.rb"
 end
 
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
-%w(bluepill logrotate machine elasticsearch nginx rvm unicorn upstart).each do |t|
+%w(bluepill logrotate machine elasticsearch nginx rvm unicorn puma upstart).each do |t|
   import File.expand_path("../tasks/#{t}.rake", __FILE__)
 end

data/lib/capistrano/deploy_mate_defaults.rb

@@ -19,6 +19,9 @@ set :bundle_flags, "--deployment"
 set :bundle_without, %w{development test}.join(' ')
 set :bundle_exec, "bundle exec"
 
+# app server
+set :app_server, "unicorn" # default to unicorn if nothing set
+
 namespace :deploy do
   desc 'Restart application'
   task :restart do

data/lib/capistrano/tasks/bluepill.rake

@@ -15,7 +15,7 @@ namespace :bluepill do
     end
   end
 
-  desc "Stops unicorn"
+  desc "Stops app server"
   task :stop do
     on roles(:app) do
       sudo "stop bluepill"
@@ -26,7 +26,7 @@ namespace :bluepill do
   task :restart do
     on roles(:app) do
       if bluepill_running?
-        if pill_running?(:unicorn)
+        if pill_running?(fetch(:app_server))
           execute :rvmsudo, :bluepill, fetch(:application), :restart
         else
           execute :rvmsudo, :bluepill, fetch(:application), :start
@@ -39,4 +39,3 @@ namespace :bluepill do
   end
   before :restart, 'rvm:hook'
 end
-

data/lib/capistrano/tasks/machine.rake

@@ -49,7 +49,8 @@ namespace :machine do
   desc "Install configs"
   task :setup do
     invoke "nginx:setup"
-    invoke "unicorn:setup"
+    invoke "unicorn:setup" if fetch(:app_server) == "unicorn"
+    invoke "puma:setup" if fetch(:app_server) == "puma"
     invoke "upstart:setup"
     invoke "logrotate:setup"
     invoke "bluepill:setup"

data/lib/capistrano/tasks/puma.rake

@@ -0,0 +1,17 @@
+set_default(:puma_workers, "5")
+set_default(:puma_threads, "10")
+set_default(:puma_timeout, "30")
+set_default(:puma_worker_grace_time, "60")
+
+namespace :puma do
+  include Bluepill
+
+  desc "Installs the puma config"
+  task :setup do
+    on roles(:app) do
+      execute "mkdir -p #{shared_path}/config"
+      template "puma.rb.erb", "#{shared_path}/config/puma.rb"
+    end
+  end
+
+end

data/lib/deploy_mate/tasks.rake

@@ -7,19 +7,20 @@ namespace :deploy_mate do
     puts "I'm your DEPLOY_MATE."
     puts "We will setting up your deployment now."
 
-    @app_name = ask("[01/13] App-Name (for nginx, servers, etc.)", guess_app_name)
-    @stage_name = ask("[02/13] Give the first stage a name", "prestage")
-    @ssh_name = ask("[03/13] SSH-Hostname for the server", "#{@app_name}-#{@stage_name}")
-    @ruby_version = ask("[04/13] Ruby-Version (the RVM-way, e.g. ruby-2.2.0)", guess_ruby_version)
-    @db_engine = ask_until("[05/13] What db are you using?", %w( postgresql mysql ), "mysql")
-    @repo_url = ask("[06/13] Url-Location of git-repo", "git@github.com:hanseventures/#{@app_name}.git")
-    @is_rails = yes_or_no?("[07/13] Is this a RAILS project ?", (rails_present? ? "yes" : "no"))
-    @needs_imagemagick = yes_or_no?("[08/13] Does this project need ImageMagick ?", (needs_imagemagick? ? "yes" : "no"))
-    @uses_sidekiq = yes_or_no?("[09/13] Does this project use Sidekiq ?", (uses_sidekiq? ? "yes" : "no"))
-    @branch_name = ask("[10/13] Branch to deploy '#{@stage_name}' from", "dev")
-    @host_name = ask("[11/13] Web-URL for '#{@stage_name}'", "#{@stage_name}.#{@app_name}")
-    @environment = ask("[12/13] #{@stage_name}'s environment (RACK_ENV/RAILS_ENV)", "#{@stage_name}")
-    @needs_elasticsearch = yes_or_no?("[13/13] Do you need ElasticSearch on this machine ?", "no")
+    @app_name = ask("[01/14] App-Name (for nginx, servers, etc.)", guess_app_name)
+    @stage_name = ask("[02/14] Give the first stage a name", "prestage")
+    @ssh_name = ask("[03/14] SSH-Hostname for the server", "#{@app_name}-#{@stage_name}")
+    @ruby_version = ask("[04/14] Ruby-Version (the RVM-way, e.g. ruby-2.2.0)", guess_ruby_version)
+    @db_engine = ask_until("[05/14] What db are you using?", %w( postgresql mysql ), "mysql")
+    @app_server = ask_until("[06/14] What app server do you want to use?", %w( unicorn puma ), "unicorn")
+    @repo_url = ask("[07/14] Url-Location of git-repo", "git@github.com:hanseventures/#{@app_name}.git")
+    @is_rails = yes_or_no?("[08/14] Is this a RAILS project ?", (rails_present? ? "yes" : "no"))
+    @needs_imagemagick = yes_or_no?("[09/14] Does this project need ImageMagick ?", (needs_imagemagick? ? "yes" : "no"))
+    @uses_sidekiq = yes_or_no?("[10/14] Does this project use Sidekiq ?", (uses_sidekiq? ? "yes" : "no"))
+    @branch_name = ask("[11/14] Branch to deploy '#{@stage_name}' from", "dev")
+    @host_name = ask("[12/14] Web-URL for '#{@stage_name}'", "#{@stage_name}.#{@app_name}")
+    @environment = ask("[13/14] #{@stage_name}'s environment (RACK_ENV/RAILS_ENV)", "#{@stage_name}")
+    @needs_elasticsearch = yes_or_no?("[14/14] Do you need ElasticSearch on this machine ?", "no")
 
     puts "Aye!"
     puts "Worrrrking..."
@@ -106,4 +107,4 @@ end
 
 def cat_file(filename)
   File.open(filename, 'rb') { |f| f.read } if File.exist?(filename)
-end
+end

data/lib/deploy_mate/templates/deploy/stage.rb.erb

@@ -1,4 +1,4 @@
-server "<%= @ssh_name %>", roles: [:app, :web<% if @needs_elasticsearch %>, :search<%end %>], :primary => true
+server "<%= @ssh_name %>", roles: [:app, :db, :web<% if @needs_elasticsearch %>, :search<% end %>], :primary => true
 
 set :unicorn_workers, "2"
 set :nginx_server_name, "<%= @host_name %>"

data/lib/deploy_mate/templates/deploy.rb.erb

@@ -10,6 +10,7 @@ set :stages, %w(<%= @stage_name %>)
 set :default_stage, '<%= @stage_name %>'
 set :repo_url, '<%= @repo_url %>'
 set :db_engine, '<%= @db_engine %>'
+set :app_server, '<%= @app_server %>'
 
 set :imagemagick, <%= @needs_imagemagick %>
 set :sidekiq, <%= @uses_sidekiq %>
@@ -20,4 +21,4 @@ set :sidekiq, <%= @uses_sidekiq %>
 # set :whenever_identifier, ->{ "#{fetch(:application)}_#{fetch(:stage)}" }
 # set :whenever_environment, fetch(:stage)
 # set :whenever_roles, [:cronjobs]
-# before "whenever:update_crontab", 'rvm:hook'
+# before "whenever:update_crontab", 'rvm:hook'

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: deploy_mate
 version: !ruby/object:Gem::Version
-  version: 0.17.4
+  version: 0.17.5
 platform: ruby
 authors:
 - Tim Adler
+- Marcus Geißler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -67,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: This is how we deploy around here.
-email: tim.adler (at) hanseventures (dot) com
+email: development (at) hanseventures (dot) com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -86,6 +87,7 @@ files:
 - lib/capistrano/configs/logrotate.erb
 - lib/capistrano/configs/nginx_app.conf.erb
 - lib/capistrano/configs/nginx_base.conf.erb
+- lib/capistrano/configs/puma.rb.erb
 - lib/capistrano/configs/unicorn.rb.erb
 - lib/capistrano/configs/upstart.conf.erb
 - lib/capistrano/deploy_mate_capfile.rb
@@ -104,6 +106,7 @@ files:
 - lib/capistrano/tasks/logrotate.rake
 - lib/capistrano/tasks/machine.rake
 - lib/capistrano/tasks/nginx.rake
+- lib/capistrano/tasks/puma.rake
 - lib/capistrano/tasks/rvm.rake
 - lib/capistrano/tasks/seeds.rake
 - lib/capistrano/tasks/unicorn.rake
@@ -132,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: This is how we deploy around here.