From bbc165137f7aff3e9ac88c8716eabf59dd36830a Mon Sep 17 00:00:00 2001 From: Tray Torrance Date: Mon, 14 Nov 2011 11:07:14 -0800 Subject: [PATCH] Adds capistrano_colors gem; deprecates custom red method Also adjusts current_git_branch to use Capistrano's logger for printing to STDOUT --- Gemfile | 1 + Gemfile.lock | 2 ++ config/deploy.rb | 8 ++------ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 2efbc6983..9724db6da 100644 --- a/Gemfile +++ b/Gemfile @@ -138,6 +138,7 @@ end group :development do gem 'capistrano', '2.5.19', :require => false + gem 'capistrano_colors', :require => false gem 'capistrano-ext', '1.2.1', :require => false gem 'linecache', '0.43', :platforms => :mri_18 gem 'parallel_tests' diff --git a/Gemfile.lock b/Gemfile.lock index fd73dbd54..7cfa16026 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -104,6 +104,7 @@ GEM net-ssh-gateway (>= 1.0.0) capistrano-ext (1.2.1) capistrano (>= 1.0.0) + capistrano_colors (0.5.5) capybara (0.3.9) culerity (>= 0.2.4) mime-types (>= 1.16) @@ -478,6 +479,7 @@ DEPENDENCIES bundler (>= 1.0.0) capistrano (= 2.5.19) capistrano-ext (= 1.2.1) + capistrano_colors capybara (~> 0.3.9) carrierwave (= 0.5.3) chef (= 0.9.12) diff --git a/config/deploy.rb b/config/deploy.rb index cdb1f8aac..44ab9053c 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -4,6 +4,7 @@ set :config_yaml, YAML.load_file(File.dirname(__FILE__) + '/deploy_config.yml') +require './config/cap_colors' require 'bundler/capistrano' require './config/boot' require 'hoptoad_notifier/capistrano' @@ -20,15 +21,10 @@ set :scm_verbose, true set :repository_cache, "remote_cache" set :deploy_via, :checkout -# Bonus! Colors are pretty! -def red(str) - "\e[31m#{str}\e[0m" -end - # Figure out the name of the current local branch def current_git_branch branch = `git symbolic-ref HEAD 2> /dev/null`.strip.gsub(/^refs\/heads\//, '') - puts "Deploying branch #{red branch}" + logger.info "Deploying branch #{branch}" branch end