capper 0.9.23 → 1.0.0

data/.rvmrc

@@ -1 +1 @@
-rvm use --create ruby-1.9.3-p125@capper
+rvm use --create ruby-1.9.3-p194@capper

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    capper (0.9.20)
-      capistrano (~> 2.9.0)
+    capper (0.9.23)
+      capistrano (~> 2.12.0)
       capistrano_colors (~> 0.5.5)
       erubis
-      rvm-capistrano
+      rvm-capistrano (~> 1.2.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    capistrano (2.9.0)
+    capistrano (2.12.0)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -18,15 +18,15 @@ GEM
       net-ssh-gateway (>= 1.1.0)
     capistrano_colors (0.5.5)
     erubis (2.7.0)
-    highline (1.6.12)
+    highline (1.6.13)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.3.0)
+    net-ssh (2.5.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    rvm-capistrano (1.1.0)
+    rvm-capistrano (1.2.3)
       capistrano (>= 2.0.0)
 
 PLATFORMS

data/README.rst

@@ -19,6 +19,12 @@ Capper provides sane defaults and many recipes for technologies typically used
 with Ruby and Python deployments to make ``config/deploy.rb`` much more
 declarative and terse.
 
+Release Notes
+=============
+
+v1.0.0 (14/07/2012)
+  capper has been in production for about 1 year and its API is now considered stable.
+
 Usage
 =====
 
@@ -133,6 +139,18 @@ The above snippet will create symlinks from
 ``#{release_path}/public/uploads`` after ``deploy:update_code`` has run.
 
 
+airbrake
+--------
+
+The airbrake recipe is merely a copy of airbrakes native capistrano integration
+without after/before hooks, so airbrake notifications can be enabled on-demand
+in stage blocks::
+
+  stage :production do
+    ...
+    after "deploy", "airbrake:notify"
+  end
+
 bundler
 -------
 
@@ -170,18 +188,6 @@ django
 
 The django recipe provides setup and migrate tasks for Django.
 
-hoptoad
--------
-
-The hoptoad recipe is merely a copy of hoptoads native capistrano integration
-without after/before hooks, so hoptoad notifications can be enabled on-demand
-in stage blocks::
-
-  stage :production do
-    ...
-    after "deploy", "hoptoad:notify"
-  end
-
 monit
 -----
 
@@ -203,23 +209,6 @@ The rails recipe sets the default ``rails_env`` to production and includes
 tasks for deploying the asset pipeline for rails 3.1 applications. It also
 provdes a migrate task for Rails applications.
 
-resque
-------
-
-The resque recipe provides integration with Resque. A script to
-start/stop resque workers is uploaded to ``#{bin_path}/resque``. The
-script supports multiple instances with queue names.
-
-If monit integration has been enabled via ``capper/monit`` workers are
-automatically (re)started during deploy and can be specified via
-``resque_workers``::
-
-  set :resque_workers, {
-    :important => :important,
-    :worker1 => :default,
-    :worker2 => :default
-  }
-
 rvm
 ---
 
@@ -227,8 +216,8 @@ The rvm recipe is an extension to RVMs native capistrano integration. The
 recipe forces the ``rvm_type`` to ``:user`` and will automatically determine
 the ruby version and gemset via the projects ``.rvmrc``.
 
-A ``deploy:setup`` hook is provided to ensure the correct ruby and rubygems
-version is installed on all servers.
+A ``deploy:setup`` hook is provided to ensure the correct rvm, ruby and rubygems
+versions are installed on all servers.
 
 ruby
 ----
@@ -296,5 +285,4 @@ Contributing to capper
 Copyright
 =========
 
-Copyright (c) 2011 Benedikt Böhm. See LICENSE for
-further details.
+Copyright (c) 2011-2012 Benedikt Böhm. See LICENSE for further details.

data/capper.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths    = ["lib"]
 
   s.add_dependency "erubis"
-  s.add_dependency "capistrano", "~> 2.9.0"
+  s.add_dependency "capistrano", "~> 2.12.0"
   s.add_dependency "capistrano_colors", "~> 0.5.5"
-  s.add_dependency "rvm-capistrano"
+  s.add_dependency "rvm-capistrano", "~> 1.2.3"
 end

data/lib/capper/base.rb

@@ -30,9 +30,6 @@ _cset(:deploy_via, :remote_cache)
 _cset(:deploy_to) { "/var/app/#{application}" }
 _cset(:revision)  { source.head }
 
-_cset(:ruby_exec_prefix, "")
-_cset(:rake) { "#{ruby_exec_prefix} rake" }
-
 _cset(:maintenance_basename, "maintenance")
 
 # =========================================================================
@@ -200,7 +197,7 @@ namespace :deploy do
   task :update do
     transaction do
       update_code
-      symlink
+      create_symlink
     end
   end
 
@@ -237,6 +234,14 @@ namespace :deploy do
     end.join(" && "))
   end
 
+  desc <<-DESC
+    Deprecated API. This has become deploy:create_symlink, please update your recipes
+  DESC
+  task :symlink, :except => { :no_release => true } do
+    Kernel.warn "[Deprecation Warning] This API has changed, please hook `deploy:create_symlink` instead of `deploy:symlink`."
+    create_symlink
+  end
+
   desc <<-DESC
     Updates the symlink to the most recently deployed version. Capistrano works \
     by putting each new release of your application in its own directory. When \
@@ -246,7 +251,7 @@ namespace :deploy do
     deploy, including `restart') or the 'update' task (which does everything \
     except `restart').
   DESC
-  task :symlink, :except => { :no_release => true } do
+  task :create_symlink, :except => { :no_release => true } do
     on_rollback do
       if previous_release
         run "rm -f #{current_path}; ln -s #{previous_release} #{current_path}; true"
@@ -300,7 +305,7 @@ namespace :deploy do
   task :migrations do
     update_code
     migrate
-    symlink
+    create_symlink
     restart
   end
 
@@ -422,11 +427,11 @@ namespace :deploy do
     DESC
     task :disable, :roles => :web, :except => { :no_release => true } do
       require 'erb'
-      on_rollback { run "rm #{shared_path}/system/#{maintenance_basename}.html" }
+      on_rollback { run "rm -f #{shared_path}/system/#{maintenance_basename}.html" }
 
       warn <<-EOHTACCESS
 
-        # Please add something like this to your site's htaccess to redirect users to the maintenance page.
+        # Please add something like this to your site's Apache htaccess to redirect users to the maintenance page.
         # More Info: http://www.shiftcommathree.com/articles/make-your-rails-maintenance-page-respond-with-a-503
 
         ErrorDocument 503 /system/#{maintenance_basename}.html
@@ -435,6 +440,21 @@ namespace :deploy do
         RewriteCond %{DOCUMENT_ROOT}/system/#{maintenance_basename}.html -f
         RewriteCond %{SCRIPT_FILENAME} !#{maintenance_basename}.html
         RewriteRule ^.*$  -  [redirect=503,last]
+
+        # Or if you are using Nginx add this to your server config:
+
+        root #{current_path}/public;
+        try_files $uri/index.html $uri.html $uri @application;
+
+        error_page 503 /system/maintenance.html;
+
+        location @application {
+            if (-f $document_root/system/maintenance.html) {
+                return 503;
+            }
+
+            proxy_pass ...;
+        }
       EOHTACCESS
 
       upload_template_file("maintenance.html",
@@ -449,7 +469,7 @@ namespace :deploy do
       web-accessible again.
     DESC
     task :enable, :roles => :web, :except => { :no_release => true } do
-      run "rm #{shared_path}/system/#{maintenance_basename}.html"
+      run "rm -f #{shared_path}/system/#{maintenance_basename}.html"
     end
   end
 end

data/lib/capper/bundler.rb

@@ -28,9 +28,4 @@ namespace :bundle do
         "fi"
     run "mkdir -p #{bundle_dir}"
   end
-
-  desc "Clear the current bundle"
-  task :clear do
-    run "rm -rf #{bundle_dir}"
-  end
 end

data/lib/capper/django.rb

@@ -5,7 +5,7 @@ after 'deploy:update_code', 'django:setup'
 before 'deploy:migrate', 'django:migrate'
 
 namespace :django do
-  desc "Generate rails configuration and helpers"
+  desc "Generate django configuration and helpers"
   task :setup, :roles => :app, :except => { :no_release => true } do
     upload_template_file("manage.py",
                          File.join(bin_path, "manage.py"),

data/lib/capper/ruby.rb

@@ -1,4 +1,5 @@
 _cset(:ruby_exec_prefix, "")
+_cset(:ruby) { "#{ruby_exec_prefix} ruby" }
 _cset(:rake) { "#{ruby_exec_prefix} rake" }
 
 before "deploy:setup", "gemrc:setup"

data/lib/capper/rvm.rb

@@ -1,20 +1,28 @@
 load "capper/ruby"
 
-require 'rvm/capistrano'
+# workaround broken capistrano detection in rvm
+require "capistrano"
+Kernel.const_set("Capistrano", Capistrano)
+
+require "rvm/capistrano"
 
 set(:rvm_type, :user)
 set(:rvm_ruby_string, File.read(".rvmrc").gsub(/^rvm( use)? --create (.*)/, '\2').strip)
 
-_cset(:rvm_version, "1.11.7")
-_cset(:rvm_installer_url, "http://get.rvm.io")
+_cset(:rvm_version, "1.14.5")
+set(:rvm_install_type) { rvm_version }
+
+before "deploy:setup", "rvm:install_ruby"
+before "rvm:install_ruby", "rvm:install_rvm"
+before "rvm:install_rvm", "rvm:install_rvmrc"
+after "rvm:install_ruby", "rvm:auto_gem"
+after "rvm:install_ruby", "rvm:install_rubygems"
 
-before "deploy:setup", "rvm:setup"
-after "deploy:symlink", "rvm:trust_rvmrc"
+after "deploy:create_symlink", "rvm:trust_rvmrc"
 
 namespace :rvm do
-  desc "Install RVM and Ruby"
-  task :setup, :except => {:no_release => true} do
-    # setup rvmrc
+  desc "Install a global .rvmrc"
+  task :install_rvmrc, :except => {:no_release => true} do
     rvmrc = <<-EOS
 export rvm_path="#{deploy_to}/.rvm"
 export rvm_verbose_flag=0
@@ -22,41 +30,16 @@ export rvm_gem_options="--no-rdoc --no-ri"
     EOS
 
     put(rvmrc, "#{deploy_to}/.rvmrc")
+  end
 
-    # download rvm installer
-    run("curl -s -L #{rvm_installer_url} > #{deploy_to}/rvm-installer; " +
-        "chmod +x #{deploy_to}/rvm-installer",
-        :shell => "/bin/bash")
-
-    # install rvm
-    run("if ! test -d #{deploy_to}/.rvm; then " +
-        "#{deploy_to}/rvm-installer --branch #{rvm_version}; fi",
-        :shell => "/bin/bash")
-
-    # update rvm if version differs
-    run("source ~/.rvm/scripts/rvm && " +
-        "if ! rvm version | grep -q 'rvm #{rvm_version}'; then " +
-        "#{deploy_to}/rvm-installer --branch #{rvm_version}; fi",
-        :shell => "/bin/bash")
-
-    # remove rvm installer
-    run("rm -f #{deploy_to}/rvm-installer",
-        :shell => "/bin/bash")
-
-    # install requested ruby version
-    wo_gemset = rvm_ruby_string.gsub(/@.*/, '')
-
-    run("echo silent > ~/.curlrc", :shell => "/bin/bash")
-    run("source ~/.rvm/scripts/rvm && " +
-        "if ! rvm list rubies | grep -q #{wo_gemset}; then " +
-        "rvm install #{wo_gemset}; fi && " +
-        "rvm use --create #{rvm_ruby_string} >/dev/null",
-        :shell => "/bin/bash")
-    run("rm ~/.curlrc")
-
-    # this ensures that Gentoos declare -x RUBYOPT="-rauto_gem" is ignored.
+  desc "Ensure that Gentoos declare -x RUBYOPT=\"-rauto_gem\" is ignored"
+  task :auto_gem do
+    wo_gemset = rvm_ruby_string.split('@').first
     run "touch ~/.rvm/rubies/#{wo_gemset}/lib/ruby/site_ruby/auto_gem.rb"
+  end
 
+  desc "Install the specified rubygems version"
+  task :install_rubygems do
     # if specified freeze rubygems version, otherwise don't touch it
     if fetch(:rvm_rubygems_version, false)
       run("rvm rubygems #{rvm_rubygems_version}")
@@ -68,6 +51,11 @@ export rvm_gem_options="--no-rdoc --no-ri"
     run "cd #{current_release} && rvm --force gemset empty"
   end
 
+  desc "Reinstall the current ruby version"
+  task :reinstall do
+    set(:rvm_install_ruby, :reinstall)
+  end
+
   # prevents interactive rvm dialog
   task :trust_rvmrc, :except => {:no_release => true} do
     run "rvm rvmrc trust #{release_path} >/dev/null"

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

@@ -19,4 +19,4 @@ if [[ $# -ge 1 ]]; then
   MAX="--max-priority $1" && shift
 fi
 
-exec <%= ruby_exec_prefix %> ./script/delayed_job $CMD --prefix <%= application %> --identifier $ID --pid-dir=<%= pid_path %> $MIN $MAX
+exec <%= ruby %> ./script/delayed_job $CMD --prefix <%= application %> --identifier $ID --pid-dir=<%= pid_path %> $MIN $MAX

data/lib/capper/templates/rails.console.sh.erb

@@ -9,7 +9,7 @@ fi
 cd <%= current_path %> >/dev/null
 
 if [[ -e ./script/console ]]; then
-  exec <%= ruby_exec_prefix %> ruby ./script/console
+  exec <%= ruby %> ./script/console
 else
-  exec <%= ruby_exec_prefix %> ruby ./script/rails console
+  exec <%= ruby %> ./script/rails console
 fi

data/lib/capper/version.rb

@@ -1,3 +1,3 @@
 module Capper
-  VERSION = "0.9.23"
+  VERSION = "1.0.0"
 end

data/lib/capper/whenever.rb

@@ -7,7 +7,7 @@ set(:whenever_update_flags) { "--update-crontab #{whenever_identifier} --set env
 set(:whenever_clear_flags) { "--clear-crontab #{whenever_identifier}" }
 
 after "deploy:update_code", "whenever:clear_crontab"
-after "deploy:symlink", "whenever:update_crontab"
+after "deploy:create_symlink", "whenever:update_crontab"
 after "deploy:rollback", "whenever:update_crontab"
 
 namespace :whenever do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capper
 version: !ruby/object:Gem::Version
-  version: 0.9.23
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &16657880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16657880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &16654740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *16654740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &16651620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,18 +53,28 @@ dependencies:
         version: 0.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *16651620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: rvm-capistrano
-  requirement: &16666500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *16666500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.3
 description: Capper is a collection of opinionated Capistrano recipes
 email:
 - bb@xnull.de
@@ -81,14 +101,12 @@ files:
 - lib/capper/multistage.rb
 - lib/capper/python.rb
 - lib/capper/rails.rb
-- lib/capper/resque.rb
 - lib/capper/ruby.rb
 - lib/capper/rvm.rb
 - 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/resque.sh.erb
 - lib/capper/templates/unicorn.rb.erb
 - lib/capper/templates/unicorn.sh.erb
 - lib/capper/templates/uwsgi.sh.erb
@@ -121,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Capper is a collection of opinionated Capistrano recipes

data/lib/capper/resque.rb

@@ -1,40 +0,0 @@
-# configuration variables
-_cset(:resque_workers, {})
-
-# these cannot be overriden
-set(:resque_script) { File.join(bin_path, "resque") }
-
-after "deploy:update_code", "resque:setup"
-after "deploy:restart", "resque:restart"
-
-monit_config "resque", <<EOF, :roles => :worker
-<% resque_workers.each do |name, queue| %>
-check process resque_<%= name %>
-with pidfile <%= pid_path %>/resque.<%= name %>.pid
-<% if queue.nil? %>
-start program = "<%= resque_script %> <%= name %> * start"
-stop program = "<%= resque_script %> <%= name %> * stop"
-<% else %>
-start program = "<%= resque_script %> <%= name %> <%= queue %> start"
-stop program = "<%= resque_script %> <%= name %> <%= queue %> stop"
-<% end %>
-group resque
-
-<% end %>
-EOF
-
-namespace :resque do
-  desc "Generate resque configuration files"
-  task :setup, :roles => :worker, :except => { :no_release => true } do
-    upload_template_file("resque.sh",
-                         resque_script,
-                         :mode => "0755")
-  end
-
-  desc "Restart resque workers"
-  task :restart, :roles => :worker, :except => { :no_release => true } do
-    if fetch(:monitrc, false)
-      run "monit -g resque restart all"
-    end
-  end
-end

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

@@ -1,34 +0,0 @@
-#!/bin/bash
-export HOME=<%= deploy_to %>
-export RAILS_ENV=<%= rails_env %>
-
-if [[ -e "${HOME}"/.rvm/scripts/rvm ]]; then
-  source "${HOME}"/.rvm/scripts/rvm
-fi
-
-WORKER="$1" && shift
-QUEUE="$1" && shift
-
-PIDFILE=<%= pid_path %>/resque.${WORKER}.pid
-CMD="<%= rake %> environment resque:work QUEUE=${QUEUE} PIDFILE=${PIDFILE}"
-
-cd <%= current_path %> >/dev/null
-
-sig () {
-  test -s "$PIDFILE" && kill -$1 $(<$PIDFILE)
-}
-
-case $1 in
-start)
-  sig 0 && echo >&2 "Already running" && exit 0
-  exec $CMD
-  ;;
-stop)
-  sig TERM && exit 0
-  echo >&2 "Not running"
-  ;;
-*)
-  echo >&2 "Usage: $0 <start|stop>"
-  exit 1
-  ;;
-esac