Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Capistrano 2.13 #19

Merged
merged 2 commits into from

2 participants

@goodtouch

Quick patch to use Capistrano 2.13 and remove CapistranoMonkey::Configuration as self.default_io_proc has been merged in Capistrano.

It fixes some loading bugs with multistage (Capistrano::Configuration.instance.load trigger used in multistage seems not to like CapistranoMonkey::Configuration)

goodtouch added some commits
@goodtouch goodtouch Update Gemfile 95889ec
@goodtouch goodtouch 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)
3dbc619
@joelmoss joelmoss merged commit 3d812d3 into joelmoss:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 19, 2012
  1. @goodtouch

    Update Gemfile

    goodtouch authored
  2. @goodtouch

    self.default_io_proc has been added to capistrano

    goodtouch authored
    Also, don't use CapistranoMonkey::Configuration as it messes with capistrano/ext/multistage (Capistrano::Configuration.instance.load trigger seems not to like CapistranoMonkey::Configuration)
This page is out of date. Refresh to see the latest.
View
2  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'
View
8 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
View
16 lib/capistrano_monkey/configuration.rb
@@ -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
View
4 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
+end
Something went wrong with that request. Please try again.