awsome 0.0.33 → 0.0.34

data/bin/awsome

@@ -2,6 +2,7 @@
 
 require 'awsome'
 require 'optparse'
+require 'terminal-table'
 
 requirements_file = 'requirements.yml'
 OptionParser.new do |opts|
@@ -20,10 +21,35 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-requirements = Awsome::Requirements.from_yaml_file(requirements_file)
-filters = {'instance-state-name' => 'running'}.merge(requirements.filters)
-instances = Awsome::Ec2.describe_instances(filters)
-matchmaker = Awsome::Matchmaker.new(instances, requirements)
-executor = Awsome::Executor.new(matchmaker.matches)
+def perform_task(task, &block)
+  puts Terminal::Table.new(:rows => ["[#{task}] Started"])
+  retval = yield task
+  puts Terminal::Table.new(:rows => ["[#{task}] Complete"])
+  retval
+end
 
-executor.execute
+requirements = perform_task "Gathering Instance Requirements" do
+  Awsome::Requirements.from_yaml_file(requirements_file)
+end
+
+# print out the required instances
+puts Awsome::Requirements.to_table(requirements.instances)
+
+instances = perform_task "Analyzing Running Instances" do
+  filters = {'instance-state-name' => 'running'}.merge(requirements.filters)
+  Awsome::Ec2.describe_instances(filters)
+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
+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

@@ -1,3 +1,5 @@
+require 'terminal-table'
+
 module Awsome
   module Ec2
     class Instance
@@ -81,7 +83,53 @@ module Awsome
         Awsome::Ec2.create_tags(@properties['instance_id'], tags)
       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 do |instance|
+            t << [
+              'Not built', #req.tags.join("\n"),
+              instance.packages.join("\n"),
+              instance.volumes.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
+          end
+        end
+      end
+
       private 
+        def id
+          properties['instance_id']
+        end
+
+        def ami_id
+          properties['ami_id']
+        end
+
+        def key
+          properties['key']
+        end
+
+        def instance_type
+          properties['instance_type']
+        end
+
+        def availability_zone
+          properties['availability_zone']
+        end
+
+        def security_group_ids
+          properties['security_group_ids']
+        end
+
         def reload!
           instance = Awsome::Ec2.describe_instances('instance-id' => @properties['instance_id']).first
           raise "instance #{@properties['instance_id']} not found" if instance.nil?

data/lib/awsome/instance_requirement.rb

@@ -24,6 +24,26 @@ module Awsome
       @properties['tags'] || {}
     end
 
+    def ami_id
+      @properties['ami_id']
+    end
+
+    def key
+      @properties['key']
+    end
+
+    def instance_type
+      @properties['instance_type']
+    end
+
+    def availability_zone
+      @properties['availability_zone']
+    end
+
+    def security_group_ids
+      @properties['security_group_ids']
+    end
+
     def volumes_to_attach(instance)
       (volumes - volumes_attached_to(instance)).collect { |v| @options.find_volume(v) }
     end
@@ -48,14 +68,15 @@ module Awsome
       packages_to_install(instance).size + packages_to_remove(instance).size
     end
 
-    private 
-      def packages
-        (@properties['packages'] || []).to_set
-      end
+    def packages
+      (@properties['packages'] || []).to_set
+    end
 
-      def volumes
-        @options.filter_volume_ids(@properties['volumes'] || [])
-      end
+    def volumes
+      @options.filter_volume_ids(@properties['volumes'] || [])
+    end
+
+    private 
 
       def packages_installed_on(instance)
         instance ? instance.packages : Set[]

data/lib/awsome/matchmaker.rb

@@ -1,3 +1,5 @@
+require 'terminal-table'
+
 module Awsome
   class Matchmaker
     def initialize(instances, requirements)
@@ -31,6 +33,29 @@ module Awsome
       @signatures.reduce({}) { |memo, s| memo.merge(s => best_match(s)) }
     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 do |match|
+          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,
+            ]
+          end
+        end
+      end
+    end
+
     private
 
       def best_match(signature)

data/lib/awsome/requirements.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'terminal-table'
 
 module Awsome
   class Requirements
@@ -14,7 +15,7 @@ module Awsome
     end
 
     def instances
-      @requirements['instances'].collect do |req| 
+      @instances ||= @requirements['instances'].collect do |req| 
         instance = req.clone
         instance = inflate(instance, instance.delete('traits'))
         Awsome::InstanceRequirement.new(instance, @options) 
@@ -29,6 +30,28 @@ module Awsome
       @requirements['traits'] || {}
     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 do |req|
+          t << [
+            req.tags.join("\n"),
+            req.packages.join("\n"),
+            req.volumes.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
+        end
+      end
+    end
+
     private 
 
       def find_trait(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsome
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: AWS library targeted specifically for continuous integration.
 email: sebastian@foodocs.com
 executables: