From 95889ec80d53054670e2ba3c15cb10cee8d86979 Mon Sep 17 00:00:00 2001
From: Jean-Paul Bonnetouche <jean-paul.bonnetouche@mobile-devices.fr>
Date: Wed, 19 Sep 2012 11:14:41 +0200
Subject: [PATCH 1/2] Update Gemfile

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 843c217..a046a58 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ gem 'yajl-ruby'
 gem 'faraday'
 gem 'faraday-stack'
 gem 'faraday_middleware'
-gem 'capistrano', '~> 2.11'
+gem 'capistrano', '~> 2.13'
 gem 'capistrano_colors'
 gem 'grit'
 gem 'dotiw'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0e0ed99..4ba2369 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,7 +35,7 @@ GEM
     ansible (0.2.0)
     arel (3.0.2)
     builder (3.0.0)
-    capistrano (2.11.2)
+    capistrano (2.13.3)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -94,7 +94,7 @@ GEM
       guard (>= 0.10.0)
     has_scope (0.5.1)
     hashie (1.2.0)
-    highline (1.6.11)
+    highline (1.6.15)
     hike (1.2.1)
     i18n (0.6.0)
     inherited_resources (1.3.1)
@@ -129,7 +129,7 @@ GEM
       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)
     newrelic_rpm (3.3.3)
@@ -252,7 +252,7 @@ PLATFORMS
 DEPENDENCIES
   airbrake
   ansible
-  capistrano (~> 2.11)
+  capistrano (~> 2.13)
   capistrano_colors
   coffee-rails (~> 3.2.1)
   database_cleaner

From 3dbc6198173415bf108f6be01b1c3cbb1821edbd Mon Sep 17 00:00:00 2001
From: Jean-Paul Bonnetouche <jean-paul.bonnetouche@mobile-devices.fr>
Date: Wed, 19 Sep 2012 11:23:08 +0200
Subject: [PATCH 2/2] self.default_io_proc has been added to capistrano

Also, don't use CapistranoMonkey::Configuration as it messes with capistrano/ext/multistage (Capistrano::Configuration.instance.load trigger seems not to like CapistranoMonkey::Configuration)
---
 lib/capistrano_monkey/configuration.rb | 16 ----------------
 lib/strano/cli.rb                      |  4 ++--
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 lib/capistrano_monkey/configuration.rb

diff --git a/lib/capistrano_monkey/configuration.rb b/lib/capistrano_monkey/configuration.rb
deleted file mode 100644
index 0b1084c..0000000
--- a/lib/capistrano_monkey/configuration.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# Implementation of Capistrano::Configuration that uses a Strano::Logger as the
-# logger in order to log to the DB.
-module CapistranoMonkey
-  class Configuration < Capistrano::Configuration
-
-    # default callback to handle all output that
-    # the other callbacks not explicitly handle.
-    def self.default_io_proc
-      Proc.new do |ch, stream, out|
-        level = stream == :err ? :important : :info
-        ch[:options][:logger].send(level, out, "#{stream} :: #{ch[:server]}")
-      end
-    end
-
-  end
-end
\ No newline at end of file
diff --git a/lib/strano/cli.rb b/lib/strano/cli.rb
index fb61ee6..32b380d 100644
--- a/lib/strano/cli.rb
+++ b/lib/strano/cli.rb
@@ -19,7 +19,7 @@ def self.parse(logger, args)
 
     # Override in order to use DB logger
     def instantiate_configuration(options={})
-      config = CapistranoMonkey::Configuration.new(options)
+      config = Capistrano::Configuration.new(options)
       config.logger = logger
       config
     end
@@ -37,4 +37,4 @@ def handle_error(error)
     end
 
   end
-end
\ No newline at end of file
+end