awsborn 0.8.5 → 0.8.6

data/VERSION

@@ -1 +1 @@
-0.8.5
+0.8.6

data/awsborn.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{awsborn}
-  s.version = "0.8.5"
+  s.version = "0.8.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Vrensk", "Jean-Louis Giordano"]
-  s.date = %q{2011-08-26}
+  s.date = %q{2011-08-30}
   s.description = %q{Awsborn lets you define and launch a server cluster on Amazon EC2.}
   s.email = %q{david@icehouse.se}
   s.extra_rdoc_files = [

data/lib/awsborn/rake.rb

@@ -87,12 +87,40 @@ module Awsborn
 
       desc "List running servers"
       task :list do |t,args|
-        running = cluster(args).select { |server| server.running? }
-        max_name_length = running.map { |server| server.name.to_s.size }.max
-        running.each do |server|
-          h = server.describe_instance
-          puts "%-#{max_name_length}s -- %s -- %s -- %s (%s) %s" %
-            [server.name, server.host_name, h[:aws_availability_zone], h[:aws_instance_type], h[:architecture], h[:aws_instance_id]]
+        # Disable annoying "Waiting for console output.."
+        Awsborn.verbose = false
+
+        cluster_name = args[:c] || args[:cluster]
+        if cluster_name
+          clusters = Awsborn::ServerCluster.clusters.select {|cluster| cluster.name == cluster_name}
+        else
+          clusters = Awsborn::ServerCluster.clusters
+        end
+
+        clusters.each do |cluster|
+          servers = cluster.select { |server| server.running? }
+          balancers = cluster.load_balancers.select { |balancer| balancer.running? }
+
+          next if servers.empty? && balancers.empty?
+
+          cluster_header = "Cluster: #{cluster.name}"
+          puts cluster_header
+          puts '=' * cluster_header.length
+
+          balancers.each do |balancer|
+            desc = balancer.description
+            instances = desc[:instances].any? ? desc[:instances].join(', ') : 'None'
+            puts "Balancer: %s -- %s -- %s -- Instances: %s" % [balancer.name, balancer.dns_alias, desc[:availability_zones].join(', '), instances]
+          end
+
+          max_name_length = servers.map { |server| server.name.to_s.size }.max
+          servers.each do |server|
+            h = server.describe_instance
+            puts "Server:   %-#{max_name_length}s -- %s -- %s -- %s (%s) %s" %
+              [server.name, server.host_name, h[:aws_availability_zone], h[:aws_instance_type], h[:architecture], h[:aws_instance_id]]
+          end
+
+          puts
         end
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awsborn
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 8
-  - 5
-  version: 0.8.5
+  - 6
+  version: 0.8.6
 platform: ruby
 authors: 
 - David Vrensk
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-26 00:00:00 +02:00
+date: 2011-08-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency