capistrano-ext 1.0.1 → 1.1.0

data/lib/capistrano/ext/monitor.rb

@@ -36,8 +36,9 @@ module MonitorServers
         print header * size, "  "
       else
         print header
-        padding = size - header.length - 1
-        print " ", "-" * padding if padding > 0
+        padding = size - header.length
+        print " " if padding > 0
+        print "-" * (padding - 1) if padding > 1
         print "  "
       end
     end
@@ -57,14 +58,14 @@ module MonitorServers
   # 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(/^(\w+)/)[1] }
+    names = servers.map { |s| s.match(/^([^.]+)/)[1] }
     time = date_column(:init)
     load_column_width = "0.00".length * 3 + 2
 
     puts "connecting..."
     connect!
 
-    parser = Proc.new { |text| text.match(/averages: (.*)$/)[1].split(/, /) }
+    parser = Proc.new { |text| text.match(/average.*: (.*)$/)[1].split(/, /) }
     delay = (options[:delay] || 30).to_i
 
     running = true
@@ -225,6 +226,63 @@ module MonitorServers
   def put_asset(name, to)
     put(File.read("#{File.dirname(__FILE__)}/assets/#{name}"), to)
   end
+
+  def uptime
+    results = {}
+
+    puts "querying servers..."
+    run "uptime" do |ch, stream, out|
+      if stream == :err
+        results[ch[:host]] = { :error => "error: #{out.strip}" }
+      else
+        if out.strip =~ /(\S+)\s+up\s+(.*?),\s+(\d+) users?,\s+load averages?: (.*)/
+          time   = $1
+          uptime = $2
+          users  = $3
+          loads  = $4
+
+          results[ch[:host]] = { :uptime => uptime.strip.gsub(/  +/, " "),
+                                 :loads  => loads,
+                                 :users  => users,
+                                 :time   => time }
+        else
+          results[ch[:host]] = { :error => "unknown uptime format: #{out.strip}" }
+        end
+      end
+    end
+
+    longest_hostname = results.keys.map { |k| k.length }.max
+    longest_uptime = results.values.map { |v| (v[:uptime] || "").length }.max
+
+    by_role = {}
+    roles.each do |name, list|
+      by_role[name] = {}
+      list.each do |role|
+        next unless results[role.host]
+        by_role[name][role.host] = results.delete(role.host)
+      end
+    end
+
+    by_role[:zzz] = results unless results.empty?
+
+    add_newline = false
+    by_role.keys.sort_by { |k| k.to_s }.each do |role|
+      results = by_role[role]
+      next if results.empty?
+
+      puts "\n" if add_newline
+      add_newline = true
+
+      results.keys.sort.each do |server|
+        print "[%-*s] " % [longest_hostname, server]
+        if results[server][:error]
+          puts results[server][:error]
+        else
+          puts "up %*s, load %s" % [longest_uptime, results[server][:uptime], results[server][:loads]]
+        end
+      end
+    end
+  end
 end
 
 Capistrano.plugin :monitor, MonitorServers
@@ -247,4 +305,12 @@ STR
 task :watch_requests, :roles => :app do
   monitor.requests_per_second("#{shared_path}/log/#{self[:log_name] || "production.log"}")
 end
+
+desc <<-STR
+Display the current uptime and load for all servers, nicely formatted with
+columns all lined up for easy scanning.
+STR
+task :uptime do
+  monitor.uptime
+end
 end

data/lib/capistrano/ext/version.rb

@@ -2,8 +2,8 @@ module Capistrano
   module Ext
     module Version #:nodoc:
       MAJOR = 1
-      MINOR = 0
-      TINY  = 1
+      MINOR = 1
+      TINY  = 0
 
       STRING = [MAJOR, MINOR, TINY].join(".")
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: capistrano-ext
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2006-03-06 00:00:00 -07:00
+  version: 1.1.0
+date: 2006-09-14 00:00:00 -06:00
 summary: Capistrano Extensions is a set of useful task libraries and methods that     other developers may reference in their own recipe files.
 require_paths: 
-  - lib
+- lib
 email: jamis@37signals.com
 homepage: http://www.rubyonrails.com
 rubyforge_project: 
@@ -18,37 +18,42 @@ bindir: bin
 has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
-  - Jamis Buck
+- Jamis Buck
 files: 
-  - lib/capistrano
-  - lib/capistrano/ext
-  - lib/capistrano/ext/assets
-  - lib/capistrano/ext/monitor.rb
-  - lib/capistrano/ext/version.rb
-  - lib/capistrano/ext/assets/request-counter.rb
+- lib/capistrano
+- lib/capistrano/ext
+- lib/capistrano/ext/assets
+- lib/capistrano/ext/monitor.rb
+- lib/capistrano/ext/version.rb
+- lib/capistrano/ext/assets/request-counter.rb
 test_files: []
+
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: []
+
 extensions: []
+
 requirements: []
+
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: capistrano
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.0.0
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: capistrano
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: