capper 0.7.3 → 0.8.0

data/capper.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = "capper"
-  s.version = "0.7.3"
+  s.version = "0.8.0"
   s.platform = Gem::Platform::RUBY
   s.licenses = ["MIT"]
   s.authors = ["Benedikt Böhm"]
   s.email = ["bb@xnull.de"]
-  s.homepage = "http://github.com/hollow/capper"
-  s.summary = %q{Capistrano is a collection of opinionated Capistrano recipes}
-  s.description = %q{Capistrano is a collection of opinionated Capistrano recipes}
+  s.homepage = "http://github.com/zenops/capper"
+  s.summary = %q{Capper is a collection of opinionated Capistrano recipes}
+  s.description = %q{Capper is a collection of opinionated Capistrano recipes}
 
   s.add_dependency "erubis"
   s.add_dependency "capistrano"

data/lib/capper.rb

@@ -0,0 +1,16 @@
+# mixin various helpers
+require 'capper/utils/templates'
+include Capper::Utils::Templates
+
+require 'capper/utils/multistage'
+include Capper::Utils::Multistage
+
+require 'capper/utils/monit'
+include Capper::Utils::Monit
+
+# make sure capper recipes can be found by load() too
+Capistrano::Configuration.instance(true).load do
+  load_paths << File.expand_path(File.dirname(__FILE__))
+  load 'deploy'
+  load 'capper/base'
+end

data/lib/capper/base.rb

@@ -1,94 +1,79 @@
-require 'capistrano'
-
-unless Capistrano::Configuration.respond_to?(:instance)
-  abort "capper requires Capistrano 2"
-end
-
-# mixin various helpers
+# add custom color scheme
 require 'capistrano_colors/configuration'
 require 'capistrano_colors/logger'
 
-require 'capper/utils/load'
-
-require 'capper/utils/templates'
-include Capper::Utils::Templates
-
-require 'capper/utils/multistage'
-include Capper::Utils::Multistage
-
-require 'capper/utils/monit'
-include Capper::Utils::Monit
-
-# define a bunch of defaults that make sense
-Capper.load do
-  # do not trace by default
-  logger.level = Capistrano::Logger::DEBUG
-
-  # add custom color scheme
-  colorize([
-    { :match => /executing `.*/,             :color => :yellow,  :level => 2, :prio => -10, :attribute => :bright, :prepend => "== Currently " },
-    { :match => /executing ".*/,             :color => :magenta, :level => 2, :prio => -20 },
-    { :match => /sftp upload complete/,      :color => :hide,    :level => 2, :prio => -20 },
-
-    { :match => /sftp upload/,               :color => :hide,    :level => 1, :prio => -10 },
-    { :match => /^transaction:.*/,           :color => :blue,    :level => 1, :prio => -10, :attribute => :bright },
-    { :match => /.*out\] (fatal:|ERROR:).*/, :color => :red,     :level => 1, :prio => -10 },
-    { :match => /Permission denied/,         :color => :red,     :level => 1, :prio => -20 },
-    { :match => /sh: .+: command not found/, :color => :magenta, :level => 1, :prio => -30 },
-
-    { :match => /^err ::/,                   :color => :red,     :level => 0, :prio => -10 },
-    { :match => /.*/,                        :color => :blue,    :level => 0, :prio => -20, :attribute => :bright },
-  ])
-
-  # apps should not require root access
-  set(:use_sudo, false)
-  set(:group_writable, false)
-
-  # default app layout
-  _cset(:user) { application }
-
-  _cset(:base_path) { "/var/app" }
-  set(:deploy_to) { "#{base_path}/#{application}" }
-
-  _cset(:bin_path) { File.join(deploy_to, "bin") }
-  _cset(:pid_path) { File.join(shared_path, "pids") }
-  _cset(:config_path) { File.join(shared_path, "config") }
-
-  # set proper unicode locale, so gemspecs with unicode chars will not crash
-  # bundler. see https://github.com/capistrano/capistrano/issues/70
-  _cset(:default_environment, { 'LANG' => 'en_US.UTF-8' })
-
-  # overwrite deploy:setup to get rid of the annoying chmod g+w which makes ssh
-  # logins impossible
-  namespace :deploy do
-    desc <<-DESC
-      Prepares one or more servers for deployment. Before you can use any \
-      of the Capistrano deployment tasks with your project, you will need to \
-      make sure all of your servers have been prepared with `cap deploy:setup'. When \
-      you add a new server to your cluster, you can easily run the setup task \
-      on just that server by specifying the HOSTS environment variable:
-
-        $ cap HOSTS=new.server.com deploy:setup
-
-      It is safe to run this task on servers that have already been set up; it \
-      will not destroy any deployed revisions or data.
-    DESC
-    task :setup, :except => { :no_release => true } do
-      shared = %w(system log pids) | shared_children
-      dirs = [releases_path, shared_path]
-      dirs += shared.map { |d| File.join(shared_path, d) }
-      run "mkdir -p #{dirs.join(' ')}"
-    end
+colorize([
+  { :match => /executing `multistage.*/,   :color => :hide,    :level => 2, :prio => 0 },
+  { :match => /executing `.*/,             :color => :yellow,  :level => 2, :prio => -10, :attribute => :bright, :prepend => "== Currently " },
+  { :match => /executing ".*/,             :color => :magenta, :level => 2, :prio => -20 },
+  { :match => /sftp upload complete/,      :color => :hide,    :level => 2, :prio => -20 },
+
+  { :match => /sftp upload/,               :color => :hide,    :level => 1, :prio => -10 },
+  { :match => /^transaction:.*/,           :color => :blue,    :level => 1, :prio => -10, :attribute => :bright },
+  { :match => /.*out\] (fatal:|ERROR:).*/, :color => :red,     :level => 1, :prio => -10 },
+  { :match => /Permission denied/,         :color => :red,     :level => 1, :prio => -20 },
+  { :match => /sh: .+: command not found/, :color => :magenta, :level => 1, :prio => -30 },
+
+  { :match => /^err ::/,                   :color => :red,     :level => 0, :prio => -10 },
+  { :match => /.*/,                        :color => :blue,    :level => 0, :prio => -20, :attribute => :bright },
+])
+
+# do not trace by default
+logger.level = Capistrano::Logger::DEBUG
+
+# default app layout
+_cset(:user) { application }
+
+_cset(:base_path) { "/var/app" }
+set(:deploy_to) { "#{base_path}/#{application}" }
+
+_cset(:bin_path) { File.join(deploy_to, "bin") }
+_cset(:pid_path) { File.join(shared_path, "pids") }
+_cset(:config_path) { File.join(shared_path, "config") }
+
+# apps should not require root access
+set(:use_sudo, false)
+set(:group_writable, false)
+
+# set proper unicode locale, so gemspecs with unicode chars will not crash
+# bundler. see https://github.com/capistrano/capistrano/issues/70
+_cset(:default_environment, { 'LANG' => 'en_US.UTF-8' })
+
+# set a global (empty) prefix for ruby applications so that
+# other recipes (bundler) can override it (with bundle exec)
+_cset(:ruby_exec_prefix, "")
+set(:rake) { "#{ruby_exec_prefix} rake" }
+
+# cleanup by default
+after "deploy:update", "deploy:cleanup"
+after "deploy:update_code", "deploy:symlink_shared"
+
+# overwrite deploy:setup to get rid of the annoying chmod g+w which makes ssh
+# logins impossible
+namespace :deploy do
+  desc <<-DESC
+    Prepares one or more servers for deployment. Before you can use any \
+    of the Capistrano deployment tasks with your project, you will need to \
+    make sure all of your servers have been prepared with `cap deploy:setup'. When \
+    you add a new server to your cluster, you can easily run the setup task \
+    on just that server by specifying the HOSTS environment variable:
+
+      $ cap HOSTS=new.server.com deploy:setup
+
+    It is safe to run this task on servers that have already been set up; it \
+    will not destroy any deployed revisions or data.
+  DESC
+  task :setup, :except => { :no_release => true } do
+    shared = %w(system log pids) | shared_children
+    dirs = [releases_path, shared_path]
+    dirs += shared.map { |d| File.join(shared_path, d) }
+    run "mkdir -p #{dirs.join(' ')}"
+  end
 
-    desc "Create symlinks from shared to current"
-    task :symlink_shared, :roles => :app, :except => { :no_release => true } do
-      fetch(:symlinks, {}).each do |source, dest|
-        run "rm -rf #{release_path}/#{dest} && ln -nfs #{shared_path}/#{source} #{release_path}/#{dest}"
-      end
+  desc "Create symlinks from shared to current"
+  task :symlink_shared, :roles => :app, :except => { :no_release => true } do
+    fetch(:symlinks, {}).each do |source, dest|
+      run "rm -rf #{release_path}/#{dest} && ln -nfs #{shared_path}/#{source} #{release_path}/#{dest}"
     end
   end
-
-  # cleanup by default
-  after "deploy:update", "deploy:cleanup"
-  after "deploy:update_code", "deploy:symlink_shared"
 end

data/lib/capper/bundler.rb

@@ -1,29 +1,29 @@
-require File.dirname(__FILE__) + '/base' unless defined?(Capper)
 require 'bundler/capistrano'
 
-# bundler requires rvm
-require "capper/rvm"
+# use bundle exec for all ruby programs
+set(:ruby_exec_prefix, "bundle exec")
 
-Capper.load do
-  # always execute rake with bundler to make sure we use the right version
-  set(:rake, "bundle exec rake")
+# do not install a global bundle if rvm has been enabled
+# instead, use the gemset selected by rvm_ruby_string
+set(:bundle_dir) do
+  begin
+    File.join(shared_path, 'bundle', rvm_ruby_string)
+  rescue NoMethodError
+    File.join(shared_path, 'bundle')
+  end
+end
 
-  # do not install a global bundle
-  # instead, use the gemset selected by rvm_ruby_string
-  set(:bundle_dir) { File.join(shared_path, 'bundle', rvm_ruby_string) }
+# freeze bundler version
+_cset(:bundler_version, "1.0.17")
 
-  # freeze bundler version
-  _cset(:bundler_version, "1.0.17")
+before "bundle:install", "bundle:setup"
 
-  namespace :bundle do
-    desc "Setup bundler"
-    task :setup, :except => {:no_release => true} do
-      run "if ! gem query -i -n ^bundler$ -v #{bundler_version} >/dev/null; then " +
-          "gem install bundler -v #{bundler_version}; " +
-          "fi"
-      run "mkdir -p #{bundle_dir}"
-    end
+namespace :bundle do
+  desc "Setup bundler"
+  task :setup, :except => {:no_release => true} do
+    run "if ! gem query -i -n ^bundler$ -v #{bundler_version} >/dev/null; then " +
+        "gem install bundler -v #{bundler_version}; " +
+        "fi"
+    run "mkdir -p #{bundle_dir}"
   end
-
-  before "bundle:install", "bundle:setup"
 end

data/lib/capper/config.rb

@@ -1,26 +1,24 @@
-require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+_cset(:config_repo, nil)
 
-Capper.load do
-  _cset(:config_repo, nil)
+after "deploy:setup", "config:setup"
+after "deploy:update_code", "config:deploy"
 
-  after "deploy:setup" do
+namespace :config do
+  desc "Setup configuration repository if any"
+  task :setup, :roles => :app, :except => { :no_release => true } do
     unless config_repo.nil?
       run "rm -rf #{config_path} && git clone -q #{config_repo} #{config_path}"
     end
   end
 
-  namespace :config do
-    desc "Setup configuration files from config repo"
-    task :setup, :roles => :app, :except => { :no_release => true } do
-      unless config_repo.nil?
-        run "cd #{config_path} && git pull -q"
-      end
+  desc "Deploy config files from shared/config to current release"
+  task :deploy, :roles => :app, :except => { :no_release => true } do
+    unless config_repo.nil?
+      run "cd #{config_path} && git pull -q"
+    end
 
-      fetch(:config_files, []).each do |f|
-        run "cp #{config_path}/#{f} #{release_path}/config/"
-      end
+    fetch(:config_files, []).each do |f|
+      run "cp #{config_path}/#{f} #{release_path}/config/"
     end
   end
-
-  after "deploy:update_code", "config:setup"
 end

data/lib/capper/delayed_job.rb

@@ -1,45 +1,40 @@
-require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+load 'capper/monit'
 
-require 'capper/bundler'
-require 'capper/monit'
+# configuration variables
+_cset(:delayed_job_workers, {})
 
-Capper.load do
-  # configuration variables
-  _cset(:delayed_job_workers, {})
+# these cannot be overriden
+set(:delayed_job_script) { File.join(bin_path, "delayed_job") }
 
-  # these cannot be overriden
-  set(:delayed_job_script) { File.join(bin_path, "delayed_job") }
+after "deploy:update_code", "delayed_job:setup"
+after "deploy:restart", "delayed_job:restart"
 
-  monit_config "delayed_job", <<EOF, :roles => :worker
+monit_config "delayed_job", <<EOF, :roles => :worker
 <% delayed_job_workers.each do |name, range| %>
 check process delayed_job_<%= name %>
-  with pidfile <%= pid_path %>/delayed_job.<%= name %>.pid
+with pidfile <%= pid_path %>/delayed_job.<%= name %>.pid
 <% if range.nil? %>
-  start program = "<%= delayed_job_script %> start <%= name %>"
-  stop program = "<%= delayed_job_script %> stop <%= name %>"
+start program = "<%= delayed_job_script %> start <%= name %>"
+stop program = "<%= delayed_job_script %> stop <%= name %>"
 <% else %>
-  start program = "<%= delayed_job_script %> start <%= name %> <%= range.begin %> <%= range.end %>"
-  stop program = "<%= delayed_job_script %> stop <%= name %> <%= range.begin %> <%= range.end %>"
+start program = "<%= delayed_job_script %> start <%= name %> <%= range.begin %> <%= range.end %>"
+stop program = "<%= delayed_job_script %> stop <%= name %> <%= range.begin %> <%= range.end %>"
 <% end %>
-  group delayed_job
+group delayed_job
 
 <% end %>
 EOF
 
-  namespace :delayed_job do
-    desc "Generate DelayedJob configuration files"
-    task :setup, :except => { :no_release => true } do
-      upload_template_file("delayed_job.sh",
-                           delayed_job_script,
-                           :mode => "0755")
-    end
-
-    desc "Restart DelayedJob workers"
-    task :restart, :roles => :worker, :except => { :no_release => true } do
-      run "monit -g delayed_job restart all"
-    end
+namespace :delayed_job do
+  desc "Generate DelayedJob configuration files"
+  task :setup, :roles => :worker, :except => { :no_release => true } do
+    upload_template_file("delayed_job.sh",
+                         delayed_job_script,
+                         :mode => "0755")
   end
 
-  after "deploy:update_code", "delayed_job:setup"
-  after "deploy:restart", "delayed_job:restart"
+  desc "Restart DelayedJob workers"
+  task :restart, :roles => :worker, :except => { :no_release => true } do
+    run "monit -g delayed_job restart all"
+  end
 end

data/lib/capper/gem.rb

@@ -1,10 +1,8 @@
-require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+before "deploy:setup", "gemrc:setup"
 
-Capper.load do
-  namespace :gemrc do
-    desc "Setup global ~/.gemrc file"
-    task :setup do
-      put("gem: --no-ri --no-rdoc", "#{deploy_to}/.gemrc")
-    end
+namespace :gemrc do
+  desc "Setup global ~/.gemrc file"
+  task :setup do
+    put("gem: --no-ri --no-rdoc", "#{deploy_to}/.gemrc")
   end
 end

data/lib/capper/git.rb

@@ -1,6 +1,2 @@
-require File.dirname(__FILE__) + '/base' unless defined?(Capper)
-
-Capper.load do
-  set(:scm, :git)
-  set(:deploy_via, :remote_cache)
-end
+set(:scm, :git)
+set(:deploy_via, :remote_cache)

data/lib/capper/hoptoad.rb

@@ -1,25 +1,18 @@
-require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+# redefine the notify task without after hooks, so we can use them in
+# specific stages only.
+namespace :hoptoad do
+  desc "Notify Hoptoad of the deployment"
+  task :notify, :except => { :no_release => true } do
+    rails_env = fetch(:hoptoad_env, fetch(:rails_env, "production"))
+    local_user = ENV['USER'] || ENV['USERNAME']
+    executable = fetch(:rake, 'rake')
 
-# hoptoad requires bundler
-require 'capper/bundler'
+    notify_command = "#{executable} hoptoad:deploy TO=#{rails_env} REVISION=#{current_revision} REPO=#{repository} USER=#{local_user}"
+    notify_command << " DRY_RUN=true" if dry_run
+    notify_command << " API_KEY=#{ENV['API_KEY']}" if ENV['API_KEY']
 
-Capper.load do
-  # redefine the notify task without after hooks, so we can use them in
-  # specific stages only.
-  namespace :hoptoad do
-    desc "Notify Hoptoad of the deployment"
-    task :notify, :except => { :no_release => true } do
-      rails_env = fetch(:hoptoad_env, fetch(:rails_env, "production"))
-      local_user = ENV['USER'] || ENV['USERNAME']
-      executable = fetch(:rake, 'rake')
-
-      notify_command = "#{executable} hoptoad:deploy TO=#{rails_env} REVISION=#{current_revision} REPO=#{repository} USER=#{local_user}"
-      notify_command << " DRY_RUN=true" if dry_run
-      notify_command << " API_KEY=#{ENV['API_KEY']}" if ENV['API_KEY']
-
-      puts "Notifying Hoptoad of Deploy (#{notify_command})"
-      `#{notify_command}`
-      puts "Hoptoad Notification Complete."
-    end
+    puts "Notifying Hoptoad of Deploy (#{notify_command})"
+    `#{notify_command}`
+    puts "Hoptoad Notification Complete."
   end
 end

data/lib/capper/monit.rb

@@ -1,36 +1,32 @@
-require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+set(:monitrc) { "#{deploy_to}/.monitrc.local" }
 
-Capper.load do
-  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
+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.keys.select do |name|
-          roles = configs[name][: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|
-          "# #{name}\n#{configs[name][:body]}"
-        end.join("\n\n")
-      end
-    end
-
-    desc "Reload monit configuration"
-    task :reload do
-      run "monit reload &>/dev/null && sleep 1"
+    upload_template(monitrc, :mode => "0644") do |server|
+      configs.keys.select do |name|
+        roles = configs[name][: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|
+        "# #{name}\n#{configs[name][:body]}"
+      end.join("\n\n")
     end
   end
 
-  after "deploy:update_code", "monit:setup"
-  before "deploy:restart", "monit:reload"
+  desc "Reload monit configuration"
+  task :reload do
+    run "monit reload &>/dev/null && sleep 1"
+  end
 end

data/lib/capper/multistage.rb

@@ -1,20 +1,16 @@
-require File.dirname(__FILE__) + '/base' unless defined?(Capper)
-
-Capper.load do
-  # execute the specified stage so that recipes required in stage can contribute to task list
-  on :load do
-    if stages.include?(ARGV.first)
-      find_and_execute_task(ARGV.first) if ARGV.any?{ |option| option =~ /-T|--tasks|-e|--explain/ }
-    end
+# execute the specified stage so that recipes required in stage can contribute to task list
+on :load do
+  if stages.include?(ARGV.first)
+    find_and_execute_task(ARGV.first) if ARGV.any?{ |option| option =~ /-T|--tasks|-e|--explain/ }
   end
+end
 
-  namespace :multistage do
-    task :ensure do
-      unless exists?(:current_stage)
-        abort "No stage specified. Please specify one of: #{stages.join(', ')} (e.g. `cap #{stages.first} #{ARGV.last}')"
-      end
+namespace :multistage do
+  task :ensure do
+    unless exists?(:current_stage)
+      abort "No stage specified. Please specify one of: #{stages.join(', ')} (e.g. `cap #{stages.first} #{ARGV.last}')"
     end
   end
-
-  on :start, "multistage:ensure", :except => stages
 end
+
+on :start, "multistage:ensure", :except => stages

data/lib/capper/rails.rb

@@ -1,20 +1,80 @@
-require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+_cset(:rails_env, "production")
 
-# rails uses rvm and bundler
-require 'capper/rvm'
-require 'capper/bundler'
+_cset(:asset_pipeline, true)
+_cset(:asset_env, "RAILS_GROUPS=assets")
+_cset(:assets_prefix, "assets")
 
-Capper.load do
-  _cset(:rails_env, "production")
+set(:normalize_asset_timestamps) do
+  if asset_pipeline
+    false
+  else
+    true
+  end
+end
 
-  namespace :rails do
-    desc "Generate rails configuration and helpers"
-    task :setup, :roles => :app, :except => { :no_release => true } do
-      upload_template_file("rails.console.sh",
-                           File.join(bin_path, "con"),
-                           :mode => "0755")
-    end
+before 'deploy:finalize_update', 'rails:assets:symlink'
+after 'deploy:update_code', 'rails:assets:precompile'
+after 'deploy:update_code', 'rails:setup'
+
+namespace :rails do
+  desc "Generate rails configuration and helpers"
+  task :setup, :roles => :app, :except => { :no_release => true } do
+    upload_template_file("rails.console.sh",
+                         File.join(bin_path, "con"),
+                         :mode => "0755")
   end
 
-  after "deploy:update_code", "rails:setup"
+  namespace :assets do
+    desc <<-DESC
+      [internal] This task will set up a symlink to the shared directory \
+      for the assets directory. Assets are shared across deploys to avoid \
+      mid-deploy mismatches between old application html asking for assets \
+      and getting a 404 file not found error. The assets cache is shared \
+      for efficiency. If you cutomize the assets path prefix, override the \
+      :assets_prefix variable to match.
+    DESC
+    task :symlink, :roles => [:web, :asset], :except => { :no_release => true } do
+      if asset_pipeline
+        run <<-CMD
+          rm -rf #{latest_release}/public/#{assets_prefix} &&
+          mkdir -p #{latest_release}/public &&
+          mkdir -p #{shared_path}/assets &&
+          ln -s #{shared_path}/assets #{latest_release}/public/#{assets_prefix}
+        CMD
+      end
+    end
+
+    desc <<-DESC
+      Run the asset precompilation rake task. You can specify the full path \
+      to the rake executable by setting the rake variable. You can also \
+      specify additional environment variables to pass to rake via the \
+      asset_env variable. The defaults are:
+
+        set :rake,      "rake"
+        set :rails_env, "production"
+        set :asset_env, "RAILS_GROUPS=assets"
+    DESC
+    task :precompile, :roles => [:web, :asset], :except => { :no_release => true } do
+      if asset_pipeline
+        run "cd #{latest_release} && #{rake} RAILS_ENV=#{rails_env} #{asset_env} assets:precompile"
+      end
+    end
+
+    desc <<-DESC
+      Run the asset clean rake task. Use with caution, this will delete \
+      all of your compiled assets. You can specify the full path \
+      to the rake executable by setting the rake variable. You can also \
+      specify additional environment variables to pass to rake via the \
+      asset_env variable. The defaults are:
+
+        set :rake,      "rake"
+        set :rails_env, "production"
+        set :asset_env, "RAILS_GROUPS=assets"
+    DESC
+    task :clean, :roles => [:web, :asset], :except => { :no_release => true } do
+      if asset_pipeline
+        run "cd #{latest_release} && #{rake} RAILS_ENV=#{rails_env} #{asset_env} assets:clean"
+      end
+    end
+  end
 end

data/lib/capper/resque.rb

@@ -1,45 +1,38 @@
-require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+# configuration variables
+_cset(:resque_workers, {})
 
-require 'capper/bundler'
-require 'capper/monit'
+# these cannot be overriden
+set(:resque_script) { File.join(bin_path, "resque") }
 
-Capper.load do
-  # configuration variables
-  _cset(:resque_workers, {})
+after "deploy:update_code", "resque:setup"
+after "deploy:restart", "resque:restart"
 
-  # these cannot be overriden
-  set(:resque_script) { File.join(bin_path, "resque") }
-
-  monit_config "resque", <<EOF, :roles => :worker
+monit_config "resque", <<EOF, :roles => :worker
 <% resque_workers.each do |name, queue| %>
 check process resque_<%= name %>
-  with pidfile <%= pid_path %>/resque.<%= name %>.pid
+with pidfile <%= pid_path %>/resque.<%= name %>.pid
 <% if queue.nil? %>
-  start program = "<%= resque_script %> <%= name %> * start"
-  stop program = "<%= resque_script %> <%= name %> * stop"
+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"
+start program = "<%= resque_script %> <%= name %> <%= queue %> start"
+stop program = "<%= resque_script %> <%= name %> <%= queue %> stop"
 <% end %>
-  group resque
+group resque
 
 <% end %>
 EOF
 
-  namespace :resque do
-    desc "Generate resque configuration files"
-    task :setup, :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
-      run "monit -g resque restart all"
-    end
+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
 
-  after "deploy:update_code", "resque:setup"
-  after "deploy:restart", "resque:restart"
+  desc "Restart resque workers"
+  task :restart, :roles => :worker, :except => { :no_release => true } do
+    run "monit -g resque restart all"
+  end
 end

data/lib/capper/rvm.rb

@@ -1,44 +1,40 @@
-require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+load "capper/gem"
 
 $:.unshift(File.expand_path('./lib', ENV['rvm_path']))
 require 'rvm/capistrano'
 
-require "capper/gem"
-
-Capper.load do
-  set(:rvm_type, :user)
-  set(:rvm_ruby_string, File.read(".rvmrc").gsub(/^rvm use --create (.*)/, '\1').strip)
-  _cset(:rvm_rubygems_version, "1.6.2")
-
-  namespace :rvm do
-    # install the requested ruby if missing
-    desc "Install the selected ruby version using RVM."
-    task :setup, :except => {:no_release => true} do
-      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.
-      run "touch ~/.rvm/rubies/#{wo_gemset}/lib/ruby/site_ruby/auto_gem.rb"
-
-      # freeze rubygems version
-      run("rvm rubygems #{rvm_rubygems_version}")
-    end
-
-    # prevents interactive rvm dialog
-    task :trust_rvmrc, :except => {:no_release => true} do
-      run "rvm rvmrc trust #{release_path} >/dev/null"
-      run "rvm rvmrc trust #{current_path} >/dev/null"
-    end
+set(:rvm_type, :user)
+set(:rvm_ruby_string, File.read(".rvmrc").gsub(/^rvm use --create (.*)/, '\1').strip)
+
+_cset(:rvm_rubygems_version, "1.6.2")
+
+before "deploy:setup", "rvm:setup"
+after "deploy:symlink", "rvm:trust_rvmrc"
+
+namespace :rvm do
+  # install the requested ruby if missing
+  desc "Install the selected ruby version using RVM."
+  task :setup, :except => {:no_release => true} do
+    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.
+    run "touch ~/.rvm/rubies/#{wo_gemset}/lib/ruby/site_ruby/auto_gem.rb"
+
+    # freeze rubygems version
+    run("rvm rubygems #{rvm_rubygems_version}")
   end
 
-  before "rvm:setup", "gemrc:setup"
-  before "deploy:setup", "rvm:setup"
-  after "deploy:symlink", "rvm:trust_rvmrc"
+  # prevents interactive rvm dialog
+  task :trust_rvmrc, :except => {:no_release => true} do
+    run "rvm rvmrc trust #{release_path} >/dev/null"
+    run "rvm rvmrc trust #{current_path} >/dev/null"
+  end
 end

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

@@ -1,8 +1,11 @@
 #!/bin/bash
 export HOME=<%= deploy_to %>
-source <%= deploy_to %>/.rvm/scripts/rvm
 export RAILS_ENV=<%= rails_env %>
 
+if [[ -e "${HOME}"/.rvm/scripts/rvm ]]; then
+  source "${HOME}"/.rvm/scripts/rvm
+fi
+
 cd <%= current_path %> >/dev/null
 
 CMD=$1 && shift
@@ -16,4 +19,4 @@ if [[ $# -ge 1 ]]; then
   MAX="--max-priority $1" && shift
 fi
 
-exec bundle exec ./script/delayed_job $CMD --prefix <%= application %> --identifier $ID --pid-dir=<%= pid_path %> $MIN $MAX
+exec <%= ruby_exec_prefix %> ./script/delayed_job $CMD --prefix <%= application %> --identifier $ID --pid-dir=<%= pid_path %> $MIN $MAX

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

@@ -1,12 +1,15 @@
 #!/bin/bash
 export HOME=<%= deploy_to %>
-source <%= deploy_to %>/.rvm/scripts/rvm
 export RAILS_ENV=<%= rails_env %>
 
+if [[ -e "${HOME}"/.rvm/scripts/rvm ]]; then
+  source "${HOME}"/.rvm/scripts/rvm
+fi
+
 cd <%= current_path %> >/dev/null
 
 if [[ -e ./script/console ]]; then
-	exec bundle exec ruby ./script/console
+  exec <%= ruby_exec_prefix %> ruby ./script/console
 else
-	exec bundle exec ruby ./script/rails console
+  exec <%= ruby_exec_prefix %> ruby ./script/rails console
 fi

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

@@ -1,13 +1,16 @@
 #!/bin/bash
 export HOME=<%= deploy_to %>
-source <%= deploy_to %>/.rvm/scripts/rvm
 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="bundle exec rake environment resque:work QUEUE=${QUEUE} PIDFILE=${PIDFILE}"
+CMD="<%= rake %> environment resque:work QUEUE=${QUEUE} PIDFILE=${PIDFILE}"
 
 cd <%= current_path %> >/dev/null
 

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

@@ -1,11 +1,14 @@
 #!/bin/bash
 export HOME=<%= deploy_to %>
-source <%= deploy_to %>/.rvm/scripts/rvm
 export RAILS_ENV=<%= rails_env %>
 
+if [[ -e "${HOME}"/.rvm/scripts/rvm ]]; then
+  source "${HOME}"/.rvm/scripts/rvm
+fi
+
 PIDFILE=<%= shared_path %>/pids/unicorn.pid
 CONFIG=<%= shared_path %>/config/unicorn.rb
-CMD="bundle exec unicorn -c $CONFIG -E $RAILS_ENV -D config.ru"
+CMD="<%= ruby_exec_prefix %> unicorn -c $CONFIG -E $RAILS_ENV -D config.ru"
 
 cd <%= current_path %> >/dev/null
 

data/lib/capper/unicorn.rb

@@ -1,75 +1,65 @@
-require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+# unicorn configuration variables
+_cset(:unicorn_worker_processes, 4)
+_cset(:unicorn_timeout, 30)
 
-# Unicorn capistrano controls.
-# See http://unicorn.bogomips.org/SIGNALS.html for signals that can be sent to unicorn.
+# these cannot be overriden
+set(:unicorn_script) { File.join(bin_path, "unicorn") }
+set(:unicorn_config) { File.join(config_path, "unicorn.rb") }
+set(:unicorn_pidfile) { File.join(pid_path, "unicorn.pid") }
 
-# unicorn requires bundler
-require 'capper/bundler'
+after "deploy:update_code", "unicorn:setup"
+after "deploy:restart", "unicorn:restart"
 
-Capper.load do
-  # unicorn configuration variables
-  _cset(:unicorn_worker_processes, 4)
-  _cset(:unicorn_timeout, 30)
-
-  # these cannot be overriden
-  set(:unicorn_script) { File.join(bin_path, "unicorn") }
-  set(:unicorn_config) { File.join(config_path, "unicorn.rb") }
-  set(:unicorn_pidfile) { File.join(pid_path, "unicorn.pid") }
-
-  monit_config "unicorn", <<EOF, :roles => :app
+monit_config "unicorn", <<EOF, :roles => :app
 check process unicorn
-  with pidfile "<%= unicorn_pidfile %>"
-  start program = "<%= unicorn_script %> start" with timeout 60 seconds
-  stop program = "<%= unicorn_script %> stop"
+with pidfile "<%= unicorn_pidfile %>"
+start program = "<%= unicorn_script %> start" with timeout 60 seconds
+stop program = "<%= unicorn_script %> stop"
 EOF
 
-  namespace :unicorn do
-    desc "Generate unicorn configuration files"
-    task :setup, :roles => :app, :except => { :no_release => true } do
-      upload_template_file("unicorn.rb",
-                           unicorn_config,
-                           :mode => "0644")
-      upload_template_file("unicorn.sh",
-                           unicorn_script,
-                           :mode => "0755")
-    end
-
-    desc "Start unicorn"
-    task :start, :roles => :app, :except => { :no_release => true } do
-      run "#{unicorn_script} start"
-    end
+namespace :unicorn do
+  desc "Generate unicorn configuration files"
+  task :setup, :roles => :app, :except => { :no_release => true } do
+    upload_template_file("unicorn.rb",
+                         unicorn_config,
+                         :mode => "0644")
+    upload_template_file("unicorn.sh",
+                         unicorn_script,
+                         :mode => "0755")
+  end
 
-    desc "Stop unicorn"
-    task :stop, :roles => :app, :except => { :no_release => true } do
-      run "#{unicorn_script} stop"
-    end
+  desc "Start unicorn"
+  task :start, :roles => :app, :except => { :no_release => true } do
+    run "#{unicorn_script} start"
+  end
 
-    desc "Restart unicorn with zero downtime"
-    task :restart, :roles => :app, :except => { :no_release => true } do
-      run "#{unicorn_script} upgrade"
-    end
+  desc "Stop unicorn"
+  task :stop, :roles => :app, :except => { :no_release => true } do
+    run "#{unicorn_script} stop"
+  end
 
-    desc "Kill unicorn (this should only be used if all else fails)"
-    task :kill, :roles => :app, :except => { :no_release => true } do
-      run "#{unicorn_script} kill"
-    end
+  desc "Restart unicorn with zero downtime"
+  task :restart, :roles => :app, :except => { :no_release => true } do
+    run "#{unicorn_script} upgrade"
+  end
 
-    desc "Add a new worker to the currently running process"
-    task :addworker, :roles => :app, :except => { :no_release => true } do
-      run "#{unicorn_script} addworker"
-    end
+  desc "Kill unicorn (this should only be used if all else fails)"
+  task :kill, :roles => :app, :except => { :no_release => true } do
+    run "#{unicorn_script} kill"
+  end
 
-    desc "Remove a worker from the currently running process"
-    task :delworker, :roles => :app, :except => { :no_release => true } do
-      run "#{unicorn_script} delworker"
-    end
+  desc "Add a new worker to the currently running process"
+  task :addworker, :roles => :app, :except => { :no_release => true } do
+    run "#{unicorn_script} addworker"
+  end
 
-    desc "Rotate all logfiles in the currently running process"
-    task :logrotate, :roles => :app, :except => { :no_release => true } do
-      run "#{unicorn_script} logrotate"
-    end
+  desc "Remove a worker from the currently running process"
+  task :delworker, :roles => :app, :except => { :no_release => true } do
+    run "#{unicorn_script} delworker"
   end
 
-  after "deploy:update_code", "unicorn:setup"
-  after "deploy:restart", "unicorn:restart"
+  desc "Rotate all logfiles in the currently running process"
+  task :logrotate, :roles => :app, :except => { :no_release => true } do
+    run "#{unicorn_script} logrotate"
+  end
 end

data/lib/capper/whenever.rb

@@ -1,49 +1,29 @@
-require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+set(:whenever_command) { "#{ruby_exec_prefix} whenever" }
+set(:whenever_identifier) { application }
+set(:whenever_environment) { fetch(:rails_env, "production") }
+set(:whenever_update_flags) { "--update-crontab #{whenever_identifier} --set environment=#{whenever_environment}" }
+set(:whenever_clear_flags) { "--clear-crontab #{whenever_identifier}" }
 
-# whenever requires bundler
-require 'capper/bundler'
+after "deploy:update_code", "whenever:clear_crontab"
+after "deploy:symlink", "whenever:update_crontab"
+after "deploy:rollback", "whenever:update_crontab"
 
-Capper.load do
-  set(:whenever_command) { "bundle exec whenever" }
-  set(:whenever_identifier) { application }
-  set(:whenever_environment) { fetch(:rails_env, "production") }
-  set(:whenever_update_flags) { "--update-crontab #{whenever_identifier} --set environment=#{whenever_environment}" }
-  set(:whenever_clear_flags) { "--clear-crontab #{whenever_identifier}" }
-
-  # Disable cron jobs at the begining of a deploy.
-  after "deploy:update_code", "whenever:clear_crontab"
-  # Write the new cron jobs near the end.
-  after "deploy:symlink", "whenever:update_crontab"
-  # If anything goes wrong, undo.
-  after "deploy:rollback", "whenever:update_crontab"
-
-  namespace :whenever do
-    desc <<-DESC
-      Update application's crontab entries using Whenever. You can configure \
-      the command used to invoke Whenever by setting the :whenever_command \
-      variable, which can be used with Bundler to set the command to \
-      "bundle exec whenever". You can configure the identifier used by setting \
-      the :whenever_identifier variable, which defaults to the same value configured \
-      for the :application variable. You can configure the environment by setting \
-      the :whenever_environment variable, which defaults to the same value \
-      configured for the :rails_env variable which itself defaults to "production". \
-      Finally, you can completely override all arguments to the Whenever command \
-      by setting the :whenever_update_flags variable.
-    DESC
-    task :update_crontab do
-      on_rollback do
-        if previous_release
-          run "cd #{previous_release} && #{whenever_command} #{whenever_update_flags}"
-        else
-          run "crontab /dev/null"
-        end
+namespace :whenever do
+  desc "Update application's crontab entries"
+  task :update_crontab do
+    on_rollback do
+      if previous_release
+        run "cd #{previous_release} && #{whenever_command} #{whenever_update_flags}"
+      else
+        run "crontab /dev/null"
       end
-
-      run "cd #{current_path} && #{whenever_command} #{whenever_update_flags}"
     end
 
-    task :clear_crontab do
-      run "crontab /dev/null"
-    end
+    run "cd #{current_path} && #{whenever_command} #{whenever_update_flags}"
+  end
+
+  desc "Remove all entries from application's crontab"
+  task :clear_crontab do
+    run "crontab /dev/null"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: capper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors: 
 - "Benedikt B\xC3\xB6hm"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 +02:00
+date: 2011-10-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,7 +57,7 @@ dependencies:
         version: 1.0.0
   type: :development
   version_requirements: *id004
-description: Capistrano is a collection of opinionated Capistrano recipes
+description: Capper is a collection of opinionated Capistrano recipes
 email: 
 - bb@xnull.de
 executables: []
@@ -77,6 +77,7 @@ files:
 - README.md
 - Rakefile
 - capper.gemspec
+- lib/capper.rb
 - lib/capper/base.rb
 - lib/capper/bundler.rb
 - lib/capper/config.rb
@@ -89,7 +90,6 @@ files:
 - lib/capper/rails.rb
 - lib/capper/resque.rb
 - lib/capper/rvm.rb
-- lib/capper/sass.rb
 - lib/capper/templates/delayed_job.sh.erb
 - lib/capper/templates/rails.console.sh.erb
 - lib/capper/templates/resque.sh.erb
@@ -102,7 +102,7 @@ files:
 - lib/capper/utils/templates.rb
 - lib/capper/whenever.rb
 has_rdoc: true
-homepage: http://github.com/hollow/capper
+homepage: http://github.com/zenops/capper
 licenses: 
 - MIT
 post_install_message: 
@@ -128,6 +128,6 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Capistrano is a collection of opinionated Capistrano recipes
+summary: Capper is a collection of opinionated Capistrano recipes
 test_files: []
 

data/lib/capper/sass.rb

@@ -1,14 +0,0 @@
-require File.dirname(__FILE__) + '/base' unless defined?(Capper)
-
-require "capper/rails"
-
-Capper.load do
-  namespace :sass do
-    desc "Updates the stylesheets generated by Sass"
-    task :update, :roles => :app do
-      run "cd #{release_path} && RAILS_ENV=#{rails_env} bundle exec rake --silent sass:update"
-    end
-  end
-
-  before "deploy:symlink", "sass:update"
-end