Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 7 commits
  • 4 files changed
  • 0 commit comments
  • 3 contributors
Commits on Jun 14, 2008
@jamis jamis Version bump. 662d0d7
Commits on Aug 26, 2008
@jamis jamis Merge branch 'master' of git://github.com/mikehale/capistrano-ext int…
…o mikehale/master
8daccb3
@jamis jamis update changelog f8e7e65
Commits on Sep 17, 2008
@baldowl baldowl Fixed load and requests_per_second.
Changes in Capistrano's internals put watch_load and
watch_requests "out of order".
b4acfed
Commits on Oct 16, 2008
@jamis jamis Merge branch 'master' of git://github.com/mikehale/capistrano-ext int…
…o mikehale/master
eaba1d9
Commits on Jan 03, 2009
@rouffj rouffj Add require 'fileutils' to multistage.rb 930ca84
Commits on Jan 05, 2009
@jamis jamis Update changelog a76b7f6
View
9 CHANGELOG.rdoc
@@ -1,4 +1,11 @@
-== unreleased
+== (unreleased)
+
+* Added explicit dependency on 'fileutils' [github.com/rouffj]
+* Fixed load and requests_per_second to work with cap2 [Gufo Pelato]
+* Allow tasks in staging files to be invoked without explicitly specifying the stage [Michael Hale]
+
+
+== 1.2.1 (June 14, 2008)
* Exclude multistage:prepare from the multistage:ensure check [Matt Sanders]
* Don't clobber pre-existing stage definitions on
View
10 lib/capistrano/ext/monitor.rb
@@ -57,8 +57,8 @@ def remote_env(value)
# Monitor the load of the servers tied to the current task.
def load(options={})
- servers = current_task.servers.sort
- names = servers.map { |s| s.match(/^([^.]+)/)[1] }
+ servers = find_servers_for_task(current_task).sort
+ names = servers.map { |s| s.host.match(/^([^.]+)/)[1] }
time = date_column(:init)
load_column_width = "0.00".length * 3 + 2
@@ -88,7 +88,7 @@ def load(options={})
header.call if time[:rows] % 40 == 0
print(date_column(:show, time), " ")
- servers.each { |server| print(uptimes[server].join("/"), " ") }
+ servers.each { |server| print(uptimes[server.host].join("/"), " ") }
puts
# sleep this way, so that CTRL-C works immediately
@@ -108,7 +108,7 @@ def requests_per_second(*logs)
# set up the date column formatter, and get the list of servers
time = date_column(:init)
- servers = current_task.servers.sort
+ servers = find_servers_for_task(current_task).sort
# initialize various helper variables we'll be using
mutex = Mutex.new
@@ -156,7 +156,7 @@ def requests_per_second(*logs)
# compute the stuff we need to know for displaying the header
num_len = (num_format % 1).length
column_width = num_len * (servers.length + 1) + servers.length
- abbvs = servers.map { |server| server.match(/^(\w+)/)[1][0,num_len] }
+ abbvs = servers.map { |server| server.host.match(/^(\w+)/)[1][0,num_len] }
col_header = abbvs.map { |v| "%-*s" % [num_len, v] }.join("/")
# write both rows of the header
View
2  lib/capistrano/ext/multistage.rb
@@ -1,3 +1,5 @@
+require 'fileutils'
+
unless Capistrano::Configuration.respond_to?(:instance)
abort "capistrano/ext/multistage requires Capistrano 2"
end
View
2  lib/capistrano/ext/version.rb
@@ -3,7 +3,7 @@ module Ext
module Version #:nodoc:
MAJOR = 1
MINOR = 2
- TINY = 0
+ TINY = 1
STRING = [MAJOR, MINOR, TINY].join(".")
end

No commit comments for this range

Something went wrong with that request. Please try again.