awsome 0.0.46 → 0.0.59

data/bin/awsome

@@ -22,32 +22,32 @@ OptionParser.new do |opts|
 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
+  puts task
+  puts '=' * task.length
+  yield task
 end
 
 requirements = nil
 instances = nil
 matches = nil
 
-perform_task "Gathering Instance Requirements" do
+perform_task "Step 1: Gathering Instance Requirements" do
   requirements = Awsome::Requirements.from_yaml_file(requirements_file)
-  puts Awsome::Requirements.to_table(requirements.instances, 'Required Instances')
+  puts Awsome::Requirements.to_table(requirements.instances, 'Instance Requirements')
 end
 
-perform_task "Analyzing Running Instances" do
+perform_task "Step 2: Analyzing Running Instances" do
   filters = {'instance-state-name' => 'running'}.merge(requirements.filters)
   instances = Awsome::Ec2.describe_instances(filters)
   puts Awsome::Ec2::Instance.to_table(instances, 'Running Instances')
 end
 
-perform_task "Matching Requirements to Instances" do
+perform_task "Step 3: Planning" do
   matches = Awsome::Matchmaker.new(instances, requirements).matches
-  puts Awsome::Matchmaker.to_table(matches, 'Requirement/Instance Match Plan')
+  puts Awsome::Matchmaker.to_table(matches, 'The Plan')
 end
 
-perform_task "Executing Plan" do
-  Awsome::Executor.new(matches).execute
+perform_task "Step 4: Execution" do
+  Awsome::Executor.new(matches, requirements).execute
 end

data/lib/awsome.rb

@@ -8,7 +8,7 @@ module Awsome
     if config.verbose
       puts
       puts command
-      puts '='*command.length
+      puts '-' * [command.length, 100].min
     end
     if options[:system]
       result = system(command)

data/lib/awsome/debian.rb

@@ -16,7 +16,9 @@ module Awsome
 
       Awsome::Ssh.ssh hostname, "sudo apt-get update"
 
-      packages.each { |p| Awsome::Ssh.ssh hostname, "sudo apt-get remove -y --force-yes #{p}" }
+      packages.each do |p| 
+        Awsome::Ssh.ssh hostname, "sudo apt-get remove -y --force-yes #{p}"
+      end
 
       Awsome::Ssh.ssh hostname, "echo #{remaining.to_a.join(',')} > ~/packages.csv"
     end
@@ -25,11 +27,18 @@ module Awsome
       installed = describe_debian_packages(hostname)
       remaining = installed.to_set + packages.to_set
 
-      Awsome::Ssh.ssh hostname, "sudo apt-get update"
+      return if remaining.empty?
 
-      remaining.each { |p| Awsome::Ssh.ssh hostname, "sudo apt-get install -y --force-yes #{p}" }
+      remaining.each do |p| 
+        Awsome::Ssh.ssh hostname, "sudo apt-get update"
+        Awsome::Ssh.ssh hostname, "sudo apt-get install -y --force-yes #{p}" 
+      end
 
       Awsome::Ssh.ssh hostname, "echo #{remaining.to_a.join(',')} > ~/packages.csv"
     end
+
+    def self.autoremove_debian_packages(hostname)
+      Awsome::Ssh.ssh hostname, "sudo apt-get autoremove -y --force-yes"
+    end
   end
 end

data/lib/awsome/ec2/instance.rb

@@ -10,14 +10,16 @@ module Awsome
         @properties = property_hash.clone
       end
 
-      def packages
-        Awsome::Debian.describe_debian_packages(@properties['public_dns_name']).to_set
+      def packages(options={})
+        return @cached_packages if @cached_packages && options[:cached_ok]
+        @cached_packages = Awsome::Debian.describe_debian_packages(@properties['public_dns_name']).to_set
       end
 
-      def volumes
-        Awsome::Ec2.describe_attachments('attachment.instance-id' => @properties['instance_id']).collect do |p| 
-          p['volume_id'] 
-        end.to_set
+      def volumes(options={})
+        return @cached_volumes if @cached_volumes && options[:cached_ok]
+        @cached_volumes = Awsome::Ec2.describe_attachments(
+          'attachment.instance-id' => @properties['instance_id']
+        ).collect{ |p| p['volume_id'] }.to_set
       end
 
       def wait_until_running!
@@ -38,9 +40,12 @@ module Awsome
       def associate_cnames(*cnames)
         cnames.each do |cname| 
           zone = cname['zone']
-          cname['names'].each do |name| 
+          (cname['private'] || []).each do |name| 
             Awsome::R53.redefine_cname(zone, name, @properties['private_dns_name'])
           end
+          (cname['public'] || []).each do |name| 
+            Awsome::R53.redefine_cname(zone, name, @properties['public_dns_name'])
+          end
         end
       end
 
@@ -58,6 +63,12 @@ module Awsome
         end
       end
 
+      def detach_volumes(*volumes)
+        volumes.each do |info|
+          Awsome::Ec2.detach_volume(info['id'], info['dir'], info['preumount'])
+        end
+      end
+
       def deregister_from_elbs
         elbs.each { |elb| elb.deregister(@properties['instance_id']) }
       end
@@ -75,6 +86,10 @@ module Awsome
         Awsome::Debian.install_debian_packages(@properties['public_dns_name'], *packages)
       end
 
+      def autoremove_packages
+        Awsome::Debian.autoremove_debian_packages(@properties['public_dns_name'])
+      end
+
       def terminate
         Awsome::Ec2.terminate_instances(@properties['instance_id'])
       end
@@ -89,6 +104,8 @@ module Awsome
         # add instance rows
         instances.each do |instance|
           rows << [
+            instance.id,
+            instance.public_dns_name,
             instance.packages.to_a.join("\n"),
             instance.volumes.to_a.join("\n"),
             instance.elbs.collect(&:name).join("\n"),
@@ -104,7 +121,7 @@ module Awsome
         # remove last unnecessary separator
         rows.pop if rows.any?
 
-        headings = %w(packages volumes elbs ami key type zone secgroup)
+        headings = %w(id dns packages volumes elbs ami key type zone secgroup)
         Terminal::Table.new :headings => headings, :rows => rows, :title => title
       end
 
@@ -116,6 +133,10 @@ module Awsome
         @properties['instance_id']
       end
 
+      def public_dns_name
+        @properties['public_dns_name']
+      end
+
       def ami_id
         @properties['ami_id']
       end

data/lib/awsome/executor.rb

@@ -1,7 +1,8 @@
 module Awsome
   class Executor
-    def initialize(matches)
+    def initialize(matches, requirements)
       @matches = matches
+      @requirements = requirements
     end
 
     def execute
@@ -64,6 +65,7 @@ module Awsome
           instance.deregister_from_elbs
           instance.remove_packages(*requirement.packages_to_remove(instance))
           instance.install_packages(*requirement.packages_to_install(instance))
+          instance.autoremove_packages
           instance.associate_cnames(*requirement.cnames)
           instance.associate_ips(*requirement.elastic_ips)
           instance.register_with_elbs(*requirement.elbs)
@@ -73,6 +75,7 @@ module Awsome
       def terminate
         instances_to_terminate do |instance|
           instance.deregister_from_elbs
+          instance.detach_volumes(*instance.volumes.collect{|id|@requirements.options.find_volume(id)})
           instance.terminate
         end
       end

data/lib/awsome/instance_requirement.rb

@@ -79,11 +79,11 @@ module Awsome
     private 
 
       def packages_installed_on(instance)
-        instance ? instance.packages : Set[]
+        instance ? instance.packages(cached_ok: true) : Set[]
       end
 
       def volumes_attached_to(instance)
-        instance ? @options.filter_volume_ids(instance.volumes) : Set[]
+        instance ? @options.filter_volume_ids(instance.volumes(cached_ok: true)) : Set[]
       end
   end
 end

data/lib/awsome/matchmaker.rb

@@ -72,13 +72,24 @@ module Awsome
         best = nil
 
         permute i_pool do |i_pool_perm|
-          best = score_match(i_pool_perm, r_pool, best)
+          best = winner(best, build_match(i_pool_perm, r_pool))
         end
 
         best
       end
 
-      def score_match(i_pool, r_pool, best)
+      def winner(m1, m2)
+        return m1 if m2.nil?
+        return m2 if m1.nil?
+        raise 'cannot declare winner between 2 nil contestants' if m1.nil? && m2.nil?
+        return m1 if m1[:v_delta] < m2[:v_delta]
+        return m2 if m2[:v_delta] < m1[:v_delta]
+        return m1 if m1[:p_delta] < m2[:p_delta]
+        return m2 if m2[:p_delta] < m1[:p_delta]
+        return m1
+      end
+
+      def build_match(i_pool, r_pool)
         v_delta = 0
         p_delta = 0
 
@@ -90,27 +101,12 @@ module Awsome
           end
         end
 
-        top_score({ 
+        return { 
           v_delta: v_delta,
           p_delta: p_delta,
           i_pool: i_pool,
           r_pool: r_pool
-        }, best)
-      end
-
-      def top_score(*scores)
-        scores.sort_by do |s1, s2| 
-          case
-          when s1.nil? && s2.nil? then 0
-          when s2.nil? then -1
-          when s1.nil? then 1
-          when s1[:v_delta] < s2[:v_delta] then -1
-          when s1[:v_delta] > s2[:v_delta] then 1
-          when s1[:p_delta] < s2[:p_delta] then -1
-          when s1[:p_delta] > s2[:p_delta] then 1
-          else 0
-          end
-        end.first
+        }
       end
 
       def permute(array, permutation=[], &block)

metadata

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