awsome 0.0.38 → 0.0.39

data/bin/awsome

@@ -24,32 +24,30 @@ end.parse!
 def perform_task(task, &block)
   puts Terminal::Table.new { |t| t << ["[#{task}] Started"] }
   retval = yield task
-  puts Terminal::Table.new { |t| t << ["[#{task}] Complete"] }
-  retval
+  #puts Terminal::Table.new { |t| t << ["[#{task}] Complete"] }
+  #retval
 end
 
-requirements = perform_task "Gathering Instance Requirements" do
-  Awsome::Requirements.from_yaml_file(requirements_file)
-end
+requirements = nil
+instances = nil
+matches = nil
 
-# print out the required instances
-puts Awsome::Requirements.to_table(requirements.instances)
+perform_task "Gathering Instance Requirements" do
+  requirements = Awsome::Requirements.from_yaml_file(requirements_file)
+  puts Awsome::Requirements.to_table(requirements.instances)
+end
 
-instances = perform_task "Analyzing Running Instances" do
+perform_task "Analyzing Running Instances" do
   filters = {'instance-state-name' => 'running'}.merge(requirements.filters)
-  Awsome::Ec2.describe_instances(filters)
+  instances = Awsome::Ec2.describe_instances(filters)
+  puts Awsome::Ec2::Instance.to_table(instances)
 end
 
-# print out the scouted instances
-puts Awsome::Ec2::Instance.to_table(instances)
-
-matches = perform_task "Matching Requirements to Instances" do
-  Awsome::Matchmaker.new(instances, requirements).matches
+perform_task "Matching Requirements to Instances" do
+  matches = Awsome::Matchmaker.new(instances, requirements).matches
+  puts Awsome::Matchmaker.to_table(matches)
 end
 
-# print out the matches
-puts Awsome::Matchmaker.to_table(matches)
-
 perform_task "Executing Plan" do
   Awsome::Executor.new(matches).execute
 end

data/lib/awsome/ec2/instance.rb

@@ -86,7 +86,7 @@ module Awsome
       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 do |instance|
+          instances.each_with_index do |instance, i|
             t << [
               'Not built', #req.tags.join("\n"),
               instance.packages.to_a.join("\n"),
@@ -100,35 +100,40 @@ module Awsome
               instance.availability_zone,
               instance.security_group_ids
             ]
-            t << :separator
+            t << :separator unless i == instances.length-1
           end
         end
       end
 
-      private 
-        def id
-          properties['instance_id']
-        end
+      def elbs
+        Awsome::Elb.describe_lbs.select { |elb| elb.instances.include?(@properties['instance_id']) }
+      end
 
-        def ami_id
-          properties['ami_id']
-        end
+      def id
+        properties['instance_id']
+      end
 
-        def key
-          properties['key']
-        end
+      def ami_id
+        properties['ami_id']
+      end
 
-        def instance_type
-          properties['instance_type']
-        end
+      def key
+        properties['key']
+      end
 
-        def availability_zone
-          properties['availability_zone']
-        end
+      def instance_type
+        properties['instance_type']
+      end
 
-        def security_group_ids
-          properties['security_group_ids']
-        end
+      def availability_zone
+        properties['availability_zone']
+      end
+
+      def security_group_ids
+        properties['security_group_ids']
+      end
+
+      private 
 
         def reload!
           instance = Awsome::Ec2.describe_instances('instance-id' => @properties['instance_id']).first
@@ -140,10 +145,6 @@ module Awsome
           Awsome::Ssh.has_ssh?(@properties['public_dns_name'])
         end
 
-        def elbs
-          Awsome::Elb.describe_lbs.select { |elb| elb.instances.include?(@properties['instance_id']) }
-        end
-
     end
   end
 end

data/lib/awsome/matchmaker.rb

@@ -36,7 +36,7 @@ module Awsome
     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 do |match|
+        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]
@@ -51,6 +51,7 @@ module Awsome
               r.availability_zone,
               r.security_group_ids,
             ]
+            t << :separator unless idx == match['i_pool'].length-1 && midx == matches.length-1
           end
         end
       end

data/lib/awsome/requirements.rb

@@ -33,7 +33,7 @@ module Awsome
     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 do |req|
+        requirements.each_with_index do |req, i|
           t << [
             req.tags.collect { |v| "#{v[0]}: #{v[1]}" }.join("\n"),
             req.packages.to_a.join("\n"),
@@ -47,7 +47,7 @@ module Awsome
             req.availability_zone,
             req.security_group_ids
           ]
-          t << :separator
+          t << :separator unless i == requirements.length-1
         end
       end
     end

metadata

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