capper 1.2.4 → 2.0.0.pre1

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capper (1.2.2)
+    capper (2.0.0.pre1)
       capistrano (~> 2.12.0)
       capistrano_colors (~> 0.5.5)
       dedent
@@ -9,7 +9,7 @@ PATH
       rvm-capistrano (~> 1.2.7)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     capistrano (2.12.0)
       highline
@@ -21,13 +21,13 @@ GEM
     dedent (0.0.2)
     erubis (2.7.0)
     highline (1.6.15)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.6.3)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
+    net-scp (1.1.0)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.5)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
     rvm-capistrano (1.2.7)
       capistrano (>= 2.0.0)
 

data/README.rst

@@ -272,6 +272,9 @@ The whenever recipe is a simplified version of whenevers native capistrano
 integration. With one application per user account the whole crontab can be
 used for whenever. Additionally this recipe take the ``ruby_exec_prefix``
 setting into account.
+To define the target servers user the cron role.
+
+    server "app1.example.com", :app, :cron
 
 node deployment
 --------

data/lib/capper.rb

@@ -9,11 +9,8 @@ include Capper::Utils::Templates
 require 'capper/utils/multistage'
 include Capper::Utils::Multistage
 
-require 'capper/utils/monit'
-include Capper::Utils::Monit
-
-require 'capper/utils/bluepill'
-include Capper::Utils::Bluepill
+require 'capper/utils/systemd'
+include Capper::Utils::Systemd
 
 # see https://github.com/capistrano/capistrano/issues/168
 Capistrano::Configuration::Namespaces::Namespace.class_eval do

data/lib/capper/base.rb

@@ -59,6 +59,7 @@ _cset(:bin_path)          { File.join(deploy_to, "bin") }
 _cset(:pid_path)          { File.join(shared_path, "pids") }
 _cset(:log_path)          { File.join(shared_path, "log") }
 _cset(:config_path)       { File.join(shared_path, "config") }
+_cset(:units_path)        { File.join(deploy_to, ".config/systemd/user") }
 
 _cset(:releases)          { capture("ls -x #{releases_path}", :except => { :no_release => true }).split.sort }
 _cset(:current_release)   { releases.length > 0 ? File.join(releases_path, releases.last) : nil }

data/lib/capper/delayed_job.rb

@@ -23,25 +23,6 @@ monit_config "delayed_job", <<EOF.dedent, :roles => :worker
   <% end %>
 EOF
 
-bluepill_config "delayed_job", <<EOF, :roles => :worker
-  <% delayed_job_workers.each do |name, range| %>
-  app.process("delayed_job_<%= name %>") do |process|
-    process.group = "delayed_job"
-
-    process.pid_file = "<%= pid_path %>/delayed_job.<%= name %>.pid"
-    process.working_dir = "<%= current_path %>"
-
-    <% if range.nil? %>
-    process.start_command = "<%= delayed_job_script %> start <%= name %>"
-    process.stop_command = "<%= delayed_job_script %> stop <%= name %>"
-    <% else %>
-    process.start_command = "<%= delayed_job_script %> start <%= name %> <%= range.begin %> <%= range.end %>"
-    process.stop_command = "<%= delayed_job_script %> stop <%= name %> <%= range.begin %> <%= range.end %>"
-    <% end %>
-  end
-  <% end %>
-EOF
-
 namespace :delayed_job do
   desc "Generate DelayedJob configuration files"
   task :setup, :roles => :worker, :except => { :no_release => true } do

data/lib/capper/templates/thin.service.erb

@@ -0,0 +1,11 @@
+[Unit]
+Description=Thin Server
+
+[Service]
+Type=forking
+PIDFile=<%= thin_pidfile %>
+ExecStart=<%= thin_script %> start
+ExecStop=/bin/kill -QUIT $MAINPID
+
+[Install]
+WantedBy=default.target

data/lib/capper/templates/unicorn.service.erb

@@ -0,0 +1,12 @@
+[Unit]
+Description=Unicorn Server
+
+[Service]
+Type=forking
+PIDFile=<%= unicorn_pidfile %>
+ExecStart=<%= unicorn_script %> start
+ExecReload=/bin/kill -HUP $MAINPID
+ExecStop=/bin/kill -QUIT $MAINPID
+
+[Install]
+WantedBy=default.target

data/lib/capper/templates/unicorn.sh.erb

@@ -31,13 +31,11 @@ kill)
   ;;
 reload)
   sig HUP && echo reloaded OK && exit 0
-  echo >&2 "Couldn't reload, starting '$CMD' instead"
-  $CMD
+  echo >&2 "Couldn't reload, process dead?" && exit 1
   ;;
 upgrade)
   sig USR2 && exit 0
-  echo >&2 "Couldn't upgrade, starting '$CMD' instead"
-  $CMD
+  echo >&2 "Couldn't upgrade, process dead?" && exit 1
   ;;
 addworker)
   sig TTIN && echo added one worker to the pool OK && exit 0

data/lib/capper/templates/uwsgi.service.erb

@@ -0,0 +1,12 @@
+[Unit]
+Description=UWSGi Server
+
+[Service]
+Type=forking
+PIDFile=<%= uwsgi_pidfile %>
+ExecStart=<%= uwsgi_script %> start
+ExecReload=/bin/kill -HUP $MAINPID
+ExecStop=/bin/kill -QUIT $MAINPID
+
+[Install]
+WantedBy=default.target

data/lib/capper/templates/uwsgi.sh.erb

@@ -23,8 +23,7 @@ stop)
   ;;
 reload)
   sig HUP && echo reloaded OK && exit 0
-  echo >&2 "Couldn't reload, starting '$CMD' instead"
-  $CMD
+  echo >&2 "Couldn't reload, process dead?"
   ;;
 *)
   echo >&2 "Usage: $0 <start|stop|reload>"

data/lib/capper/thin.rb

@@ -1,31 +1,14 @@
 # these cannot be overriden
 set(:thin_script) { File.join(bin_path, "thin") }
+set(:thin_service) { File.join(bin_path, "thin.service") }
 set(:thin_pidfile) { File.join(pid_path, "thin.pid") }
 
 _cset(:thin_port, 3000)
 
 after "deploy:update_code", "thin:setup"
 after "deploy:restart", "thin:restart"
-
-monit_config "thin", <<EOF.dedent, :roles => :app
-  check process thin
-  with pidfile "<%= thin_pidfile %>"
-  start program = "<%= thin_script %> start" with timeout 60 seconds
-  stop program = "<%= thin_script %> stop"
-EOF
-
-bluepill_config "thin", <<EOF, :roles => :app
-  app.process("thin") do |process|
-    process.pid_file = "<%= thin_pidfile %>"
-    process.working_dir = "<%= current_path %>"
-
-    process.start_command = "<%= thin_script %> start"
-    process.start_grace_time = 60.seconds
-
-    process.stop_signals = [:quit, 5.seconds, :quit, 30.seconds, :term, 5.seconds, :kill]
-    process.stop_grace_time = 45.seconds
-  end
-EOF
+after "deploy:start", "thin:start"
+after "deploy:stop", "thin:stop"
 
 namespace :thin do
   desc "Generate thin configuration files"
@@ -33,26 +16,25 @@ namespace :thin do
     upload_template_file("thin.sh",
                          thin_script,
                          :mode => "0755")
+    upload_template_file("thin.service",
+                         thin_service,
+                         :mode => "0755")
+    systemctl "daemon-reload"
+    systemctl :enable, :thin
   end
 
   desc "Start thin"
   task :start, :roles => :app, :except => { :no_release => true } do
-    run "#{thin_script} start"
+    systemctl :start, :thin
   end
 
   desc "Stop thin"
   task :stop, :roles => :app, :except => { :no_release => true } do
-    run "#{thin_script} stop"
+    systemctl :stop, :thin
   end
 
   desc "Restart thin with zero downtime"
   task :restart, :roles => :app, :except => { :no_release => true } do
-    run "#{thin_script} kill"
-    run "#{thin_script} start"
-  end
-
-  desc "Kill thin (this should only be used if all else fails)"
-  task :kill, :roles => :app, :except => { :no_release => true } do
-    run "#{thin_script} kill"
+    systemctl :restart, :thin
   end
 end

data/lib/capper/unicorn.rb

@@ -4,31 +4,14 @@ _cset(:unicorn_timeout, 30)
 
 # these cannot be overriden
 set(:unicorn_script) { File.join(bin_path, "unicorn") }
+set(:unicorn_service) { File.join(units_path, "unicorn.service") }
 set(:unicorn_config) { File.join(config_path, "unicorn.rb") }
 set(:unicorn_pidfile) { File.join(pid_path, "unicorn.pid") }
 
 after "deploy:update_code", "unicorn:setup"
-after "deploy:restart", "unicorn:restart"
-
-monit_config "unicorn", <<EOF.dedent, :roles => :app
-  check process unicorn
-  with pidfile "<%= unicorn_pidfile %>"
-  start program = "<%= unicorn_script %> start" with timeout 60 seconds
-  stop program = "<%= unicorn_script %> stop"
-EOF
-
-bluepill_config "unicorn", <<EOF, :roles => :app
-  app.process("unicorn") do |process|
-    process.pid_file = "<%= unicorn_pidfile %>"
-    process.working_dir = "<%= current_path %>"
-
-    process.start_command = "<%= unicorn_script %> start"
-    process.start_grace_time = 60.seconds
-
-    process.stop_signals = [:quit, 5.seconds, :quit, 30.seconds, :term, 5.seconds, :kill]
-    process.stop_grace_time = 45.seconds
-  end
-EOF
+after "deploy:restart", "unicorn:upgrade"
+after "deploy:start", "unicorn:start"
+after "deploy:stop", "unicorn:stop"
 
 namespace :unicorn do
   desc "Generate unicorn configuration files"
@@ -39,20 +22,30 @@ namespace :unicorn do
     upload_template_file("unicorn.sh",
                          unicorn_script,
                          :mode => "0755")
+    upload_template_file("unicorn.service",
+                         unicorn_service,
+                         :mode => "0755")
+    systemctl "daemon-reload"
+    systemctl :enable, :unicorn
   end
 
   desc "Start unicorn"
   task :start, :roles => :app, :except => { :no_release => true } do
-    run "#{unicorn_script} start"
+    systemctl :start, :unicorn
   end
 
   desc "Stop unicorn"
   task :stop, :roles => :app, :except => { :no_release => true } do
-    run "#{unicorn_script} stop"
+    systemctl :stop, :unicorn
   end
 
-  desc "Restart unicorn with zero downtime"
+  desc "Restart unicorn"
   task :restart, :roles => :app, :except => { :no_release => true } do
+    systemctl :restart, :unicorn
+  end
+
+  desc "Upgrade unicorn with zero downtime"
+  task :upgrade, :roles => :app, :except => { :no_release => true } do
     run "#{unicorn_script} upgrade"
   end
 

data/lib/capper/utils/systemd.rb

@@ -0,0 +1,13 @@
+require "erubis"
+
+module Capper
+  module Utils
+    module Systemd
+
+      def systemctl(*args)
+        run("systemctl --user " + [args].flatten.map(&:to_s).join(" "))
+      end
+
+    end
+  end
+end

data/lib/capper/uwsgi.rb

@@ -3,31 +3,14 @@ _cset(:uwsgi_worker_processes, 4)
 
 # these cannot be overriden
 set(:uwsgi_script) { File.join(bin_path, "uwsgi") }
+set(:uwsgi_service) { File.join(units_path, "uwsgi.service") }
 set(:uwsgi_config) { File.join(config_path, "uwsgi.xml") }
 set(:uwsgi_pidfile) { File.join(pid_path, "uwsgi.pid") }
 
 after "deploy:update_code", "uwsgi:setup"
-after "deploy:restart", "uwsgi:restart"
-
-monit_config "uwsgi", <<EOF.dedent, :roles => :app
-  check process uwsgi
-  with pidfile "<%= uwsgi_pidfile %>"
-  start program = "<%= uwsgi_script %> start" with timeout 60 seconds
-  stop program = "<%= uwsgi_script %> stop"
-EOF
-
-bluepill_config "uwsgi", <<EOF, :roles => :app
-  app.process("uwsgi") do |process|
-    process.pid_file = "<%= uwsgi_pidfile %>"
-    process.working_dir = "<%= current_path %>"
-
-    process.start_command = "<%= uwsgi_script %> start"
-    process.start_grace_time = 60.seconds
-
-    process.stop_signals = [:quit, 5.seconds, :quit, 30.seconds, :term, 5.seconds, :kill]
-    process.stop_grace_time = 45.seconds
-  end
-EOF
+after "deploy:restart", "uwsgi:reload"
+after "deploy:start", "uwsgi:start"
+after "deploy:stop", "uwsgi:stop"
 
 namespace :uwsgi do
   desc "Generate uwsgi configuration files"
@@ -38,20 +21,30 @@ namespace :uwsgi do
     upload_template_file("uwsgi.sh",
                          uwsgi_script,
                          :mode => "0755")
+    upload_template_file("uwsgi.service",
+                         uwsgi_service,
+                         :mode => "0755")
+    systemctl "daemon-reload"
+    systemctl :enable, :uwsgi
   end
 
   desc "Start uwsgi"
   task :start, :roles => :app, :except => { :no_release => true } do
-    run "#{uwsgi_script} start"
+    systemctl :start, :uwsgi
   end
 
   desc "Stop uwsgi"
   task :stop, :roles => :app, :except => { :no_release => true } do
-    run "#{uwsgi_script} stop"
+    systemctl :stop, :uwsgi
   end
 
   desc "Reload uwsgi"
   task :restart, :roles => :app, :except => { :no_release => true } do
+    systemctl :restart, :uwsgi
+  end
+
+  desc "Reload uwsgi"
+  task :reload, :roles => :app, :except => { :no_release => true } do
     run "#{uwsgi_script} reload"
   end
 end

data/lib/capper/version.rb

@@ -1,3 +1,3 @@
 module Capper
-  VERSION = "1.2.4"
+  VERSION = "2.0.0.pre1"
 end

data/lib/capper/whenever.rb

@@ -12,7 +12,7 @@ after "deploy:rollback", "whenever:update_crontab"
 
 namespace :whenever do
   desc "Update application's crontab entries"
-  task :update_crontab do
+  task :update_crontab, :roles => :cron, :on_no_matching_servers => :continue do
     on_rollback do
       if previous_release
         run "cd #{previous_release} && #{whenever_command} #{whenever_update_flags}"
@@ -25,7 +25,7 @@ namespace :whenever do
   end
 
   desc "Remove all entries from application's crontab"
-  task :clear_crontab do
+  task :clear_crontab, :roles => :cron, :on_no_matching_servers => :continue do
     run "crontab /dev/null"
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: capper
 version: !ruby/object:Gem::Version
-  version: 1.2.4
-  prerelease: 
+  version: 2.0.0.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Benedikt Böhm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -110,12 +110,10 @@ files:
 - lib/capper.rb
 - lib/capper/airbrake.rb
 - lib/capper/base.rb
-- lib/capper/bluepill.rb
 - lib/capper/bundler.rb
 - lib/capper/delayed_job.rb
 - lib/capper/django.rb
 - lib/capper/forever.rb
-- lib/capper/monit.rb
 - lib/capper/multistage.rb
 - lib/capper/nave.rb
 - lib/capper/npm.rb
@@ -123,21 +121,22 @@ files:
 - lib/capper/rails.rb
 - lib/capper/ruby.rb
 - lib/capper/rvm.rb
-- lib/capper/templates/bluepill.sh.erb
 - lib/capper/templates/delayed_job.sh.erb
 - lib/capper/templates/maintenance.html.erb
 - lib/capper/templates/manage.py.erb
 - lib/capper/templates/rails.console.sh.erb
+- lib/capper/templates/thin.service.erb
 - lib/capper/templates/thin.sh.erb
 - lib/capper/templates/unicorn.rb.erb
+- lib/capper/templates/unicorn.service.erb
 - lib/capper/templates/unicorn.sh.erb
+- lib/capper/templates/uwsgi.service.erb
 - lib/capper/templates/uwsgi.sh.erb
 - lib/capper/templates/uwsgi.xml.erb
 - lib/capper/thin.rb
 - lib/capper/unicorn.rb
-- lib/capper/utils/bluepill.rb
-- lib/capper/utils/monit.rb
 - lib/capper/utils/multistage.rb
+- lib/capper/utils/systemd.rb
 - lib/capper/utils/templates.rb
 - lib/capper/uwsgi.rb
 - lib/capper/version.rb
@@ -158,9 +157,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/capper/bluepill.rb

@@ -1,43 +0,0 @@
-set(:bluepill_script) { File.join(bin_path, "bluepill") }
-set(:bluepillrc) { "#{latest_release}/.bluepillrc" }
-
-after "deploy:update_code", "bluepill:setup"
-before "deploy:restart", "bluepill:start"
-
-namespace :bluepill do
-  desc "Setup bluepill config"
-  task :setup do
-    servers = find_servers
-    configs = fetch(:bluepill_configs, {})
-
-    upload_template(bluepillrc, :mode => "0644") do |server|
-      config = configs.select do |name, config|
-        roles = config[:options][:roles]
-        if roles.nil?
-          true
-        else
-          [roles].flatten.select do |r|
-            self.roles[r.to_sym].include?(server)
-          end.any?
-        end
-      end.map do |name, config|
-        "# #{name}\n#{config[:body]}"
-      end.join("\n\n")
-
-      <<-EOS.dedent
-        Bluepill.application("#{application}", :base_dir => "#{shared_path}") do |app|
-          #{config}
-        end
-      EOS
-    end
-
-    upload_template_file("bluepill.sh",
-                         bluepill_script,
-                         :mode => "0755")
-  end
-
-  desc "Load bluepill configuration and start it"
-  task :start, :roles => :app, :except => { :no_release => true } do
-    run "cd #{current_path} && #{bluepill_script} load #{bluepillrc}"
-  end
-end

data/lib/capper/monit.rb

@@ -1,32 +0,0 @@
-set(:monitrc) { "#{deploy_to}/.monitrc.local" }
-
-after "deploy:update_code", "monit:setup"
-before "deploy:restart", "monit:reload"
-
-namespace :monit do
-  desc "Setup monit configuration files"
-  task :setup do
-    configs = fetch(:monit_configs, {})
-    servers = find_servers
-
-    upload_template(monitrc, :mode => "0644") do |server|
-      configs.select do |name, config|
-        roles = config[:options][:roles]
-        if roles.nil?
-          true
-        else
-          [roles].flatten.select do |r|
-            self.roles[r.to_sym].include?(server)
-          end.any?
-        end
-      end.map do |name, config|
-        "# #{name}\n#{config[:body]}"
-      end.join("\n\n")
-    end
-  end
-
-  desc "Reload monit configuration"
-  task :reload do
-    run "monit reload &>/dev/null && sleep 1"
-  end
-end

data/lib/capper/templates/bluepill.sh.erb

@@ -1,11 +0,0 @@
-#!/bin/bash
-export HOME=<%= deploy_to %>
-export RAILS_ENV=<%= rails_env rescue "production" %>
-
-if [[ -e "${HOME}"/.rvm/scripts/rvm ]]; then
-  source "${HOME}"/.rvm/scripts/rvm
-fi
-
-cd <%= current_path %> >/dev/null
-
-exec <%= ruby_exec_prefix %> bluepill -c <%= shared_path %> "$@"

data/lib/capper/utils/bluepill.rb

@@ -1,13 +0,0 @@
-module Capper
-  module Utils
-    module Bluepill
-
-      def bluepill_config(name, body, options={})
-        set(:bluepill_configs, fetch(:bluepill_configs, {}).merge(name => {
-          :options => options, :body => body
-        }))
-      end
-
-    end
-  end
-end

data/lib/capper/utils/monit.rb

@@ -1,13 +0,0 @@
-module Capper
-  module Utils
-    module Monit
-
-      def monit_config(name, body, options={})
-        set(:monit_configs, fetch(:monit_configs, {}).merge(name => {
-          :options => options, :body => body
-        }))
-      end
-
-    end
-  end
-end