capper 0.2.4 → 0.3.0

data/capper.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "capper"
-  s.version = "0.2.4"
+  s.version = "0.3.0"
   s.platform = Gem::Platform::RUBY
   s.licenses = ["MIT"]
   s.authors = ["Benedikt Böhm"]

data/lib/capper/base.rb

@@ -4,10 +4,10 @@ unless Capistrano::Configuration.respond_to?(:instance)
   abort "capper requires Capistrano 2"
 end
 
-# add some nice colors
-require "capistrano_colors"
-
 # mixin various helpers
+require 'capistrano_colors/configuration'
+require 'capistrano_colors/logger'
+
 require 'capper/utils/load'
 
 require 'capper/utils/templates'
@@ -18,6 +18,24 @@ include Capper::Utils::Multistage
 
 # 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 => /^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)
@@ -46,8 +64,9 @@ Capper.load do
       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_children.map { |d| File.join(shared_path, d) }
+      dirs += shared.map { |d| File.join(shared_path, d) }
       run "mkdir -p #{dirs.join(' ')}"
     end
   end

data/lib/capper/bundler.rb

@@ -5,6 +5,9 @@ require 'bundler/capistrano'
 require "capper/rvm"
 
 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
   # instead, use the gemset selected by rvm_ruby_string
   set(:bundle_dir) { File.join(shared_path, 'bundle', rvm_ruby_string) }

data/lib/capper/config.rb

@@ -1,13 +1,25 @@
 require File.dirname(__FILE__) + '/base' unless defined?(Capper)
 
 Capper.load do
-  _cset(:config_repo) { abort "Please specify the config repository, set :config_repo, 'foo'" }
+  _cset(:config_repo, nil)
 
   after "deploy:setup" do
-    run "rm -rf #{config_path} && git clone #{config_repo} #{config_path}"
+    unless config_repo.nil?
+      run "rm -rf #{config_path} && git clone -q #{config_repo} #{config_path}"
+    end
   end
 
   after "deploy:update_code" do
-    run "cd #{config_path} && git pull"
+    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(:symlinks, {}).each do |source, dest|
+      run "rm -rf #{release_path}/#{dest} && ln -nfs #{shared_path}/#{source} #{release_path}/#{dest}"
+    end
   end
 end

data/lib/capper/gem.rb

@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+
+Capper.load do
+  task "gem:setup" do
+    put("gem: --no-ri --no-rdoc", "#{deploy_to}/.gemrc")
+  end
+end

data/lib/capper/hoptoad.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+
+# hoptoad requires bundler
+require 'capper/bundler'
+
+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
+  end
+end

data/lib/capper/rvm.rb

@@ -3,6 +3,8 @@ require File.dirname(__FILE__) + '/base' unless defined?(Capper)
 $:.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)
@@ -28,6 +30,7 @@ Capper.load do
     end
   end
 
+  before "rvm:setup", "gem:setup"
   before "deploy:setup", "rvm:setup"
   after "deploy:symlink", "rvm:trust_rvmrc"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capper
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-29 00:00:00.000000000Z
+date: 2011-08-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &12597200 !ruby/object:Gem::Requirement
+  requirement: &22259260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12597200
+  version_requirements: *22259260
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &12596760 !ruby/object:Gem::Requirement
+  requirement: &22258820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12596760
+  version_requirements: *22258820
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &12596340 !ruby/object:Gem::Requirement
+  requirement: &22258400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12596340
+  version_requirements: *22258400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &12595840 !ruby/object:Gem::Requirement
+  requirement: &22257900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *12595840
+  version_requirements: *22257900
 description: Capistrano is a collection of opinionated Capistrano recipes
 email:
 - bb@xnull.de
@@ -76,7 +76,9 @@ files:
 - lib/capper/base.rb
 - lib/capper/bundler.rb
 - lib/capper/config.rb
+- lib/capper/gem.rb
 - lib/capper/git.rb
+- lib/capper/hoptoad.rb
 - lib/capper/multistage.rb
 - lib/capper/rails.rb
 - lib/capper/rvm.rb