awsome 0.0.39 → 0.0.40

data/lib/awsome/ec2/instance.rb

@@ -84,25 +84,28 @@ module Awsome
       end
 
       def self.to_table(instances)
-        headings = %w(tags packages volumes elbs elasticips cnames ami key type zone secgroup)
-        Terminal::Table.new :headings => headings do |t|
-          instances.each_with_index do |instance, i|
-            t << [
-              'Not built', #req.tags.join("\n"),
-              instance.packages.to_a.join("\n"),
-              instance.volumes.to_a.join("\n"),
-              instance.elbs.join("\n"),
-              'Not built', #req.elastic_ips.join("\n"),
-              'Not built', #req.cnames.collect{|c|c['names']}.flatten.join("\n"),
-              instance.ami_id,
-              instance.key,
-              instance.instance_type,
-              instance.availability_zone,
-              instance.security_group_ids
-            ]
-            t << :separator unless i == instances.length-1
-          end
+        rows = []
+
+        # add instance rows
+        instances.each do |instance|
+          rows << [
+            instance.packages.to_a.join("\n"),
+            instance.volumes.to_a.join("\n"),
+            instance.elbs.collect(&:name).join("\n"),
+            instance.ami_id,
+            instance.key,
+            instance.instance_type,
+            instance.availability_zone,
+            instance.security_group_ids
+          ]
+          rows << :separator
         end
+
+        # remove last unnecessary separator
+        rows.pop if rows.any?
+
+        headings = %w(packages volumes elbs ami key type zone secgroup)
+        Terminal::Table.new :headings => headings, :rows => rows
       end
 
       def elbs
@@ -110,27 +113,27 @@ module Awsome
       end
 
       def id
-        properties['instance_id']
+        @properties['instance_id']
       end
 
       def ami_id
-        properties['ami_id']
+        @properties['ami_id']
       end
 
       def key
-        properties['key']
+        @properties['key']
       end
 
       def instance_type
-        properties['instance_type']
+        @properties['instance_type']
       end
 
       def availability_zone
-        properties['availability_zone']
+        @properties['availability_zone']
       end
 
       def security_group_ids
-        properties['security_group_ids']
+        @properties['security_group_ids']
       end
 
       private 

data/lib/awsome/elb/load_balancer.rb

@@ -19,6 +19,10 @@ module Awsome
         Awsome::Elb.register_instance_with_lb(@properties['name'], instance_id)
       end
 
+      def name
+        @properties['name']
+      end
+
       private
         def reload!
           elb = Awsome::Elb.describe_lbs(@properties['name']).first

data/lib/awsome/matchmaker.rb

@@ -34,27 +34,32 @@ module Awsome
     end
 
     def self.to_table(matches)
-      headings = %w(instance packages volumes elbs ami key type zone secgroup)
-      Terminal::Table.new :headings => headings do |t|
-        matches.each_with_index do |match, midx|
-          1.upto(match['i_pool'].length) do |idx|
-            i = match['i_pool'][idx]
-            r = match['r_pool'][idx]
-            t << [
-              i.nil? ? '(new)' : i.id,
-              r.packages.join("\n"),
-              r.volumes.join("\n"),
-              r.elbs.join("\n"),
-              r.ami_id,
-              r.key,
-              r.instance_type,
-              r.availability_zone,
-              r.security_group_ids,
-            ]
-            t << :separator unless idx == match['i_pool'].length-1 && midx == matches.length-1
-          end
+      rows = []
+
+      # enumerate match rows
+      matches.each do |signature, match|
+        match['i_pool'].each_with_index do |i, idx|
+          r = match['r_pool'][idx]
+          rows << [
+            i.nil? ? '(new)' : i.id,
+            r.packages.join("\n"),
+            r.volumes.join("\n"),
+            r.elbs.join("\n"),
+            r.ami_id,
+            r.key,
+            r.instance_type,
+            r.availability_zone,
+            r.security_group_ids,
+          ]
+          rows << :separator
         end
       end
+      
+      # remove last unnecessary separator
+      rows.pop if rows.any?
+
+      headings = %w(instance packages volumes elbs ami key type zone secgroup)
+      Terminal::Table.new :headings => headings, :rows => rows
     end
 
     private

data/lib/awsome/requirements.rb

@@ -31,25 +31,31 @@ module Awsome
     end
 
     def self.to_table(requirements)
-      headings = %w(tags packages volumes elbs elasticips cnames ami key type zone secgroup)
-      Terminal::Table.new :headings => headings do |t|
-        requirements.each_with_index do |req, i|
-          t << [
-            req.tags.collect { |v| "#{v[0]}: #{v[1]}" }.join("\n"),
-            req.packages.to_a.join("\n"),
-            req.volumes.to_a.join("\n"),
-            req.elbs.join("\n"),
-            req.elastic_ips.join("\n"),
-            req.cnames.collect{|c|c['names']}.flatten.join("\n"),
-            req.ami_id,
-            req.key,
-            req.instance_type,
-            req.availability_zone,
-            req.security_group_ids
-          ]
-          t << :separator unless i == requirements.length-1
-        end
+      rows = []
+
+      #add requirement rows
+      requirements.each do |req|
+        rows << [
+          req.tags.collect { |v| "#{v[0]}: #{v[1]}" }.join("\n"),
+          req.packages.to_a.join("\n"),
+          req.volumes.to_a.join("\n"),
+          req.elbs.join("\n"),
+          req.elastic_ips.join("\n"),
+          req.cnames.collect{|c|c['names']}.flatten.join("\n"),
+          req.ami_id,
+          req.key,
+          req.instance_type,
+          req.availability_zone,
+          req.security_group_ids
+        ]
+        rows << :separator
       end
+
+      # remove last unnecessary separator
+      rows.pop if rows.any?
+
+      headings = %w(tags packages volumes elbs elasticips cnames ami key type zone secgroup)
+      Terminal::Table.new :headings => headings, :rows => rows
     end
 
     private 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsome
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
   prerelease: 
 platform: ruby
 authors: