awful 0.0.33 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f37094621cce1973896114b3806bbc9c9fbf8ab0
-  data.tar.gz: 5447b9590bf70c2b9289c069c8395c3f79806744
+  metadata.gz: a551cb4dbe1136540c75856683dae9bb4b0b970c
+  data.tar.gz: 822ff26d3ff6b5e645cf9e8be199dad68229bbe9
 SHA512:
-  metadata.gz: 4ac0de6a8d3cb0c8d702827e20155d25193ed44ce9614f31c6b79ee7b14c00fa24ac5d7c0af5cb4c870c1205013bf68b92dbbe6b102cfe93e8e8d8920f6e8d28
-  data.tar.gz: 12d1a194550ff815ddb52f830c6b1f7de94bf28cf1eefd2b67366c6f5c6f7143bf2718332ebecddcb115764bdf0f53119c444c759b19f6141e81af9249e6500a
+  metadata.gz: 6b326241de113bd37d6be5f8ed57e010442735f24113ca08c8c7ef2e7a67baa672e5d89283c28cd9b358cd23773ca16d14091a83a32c5cbe2fff427ff1142223
+  data.tar.gz: d918d16882a24b63d36222fab8923d858ecdf2f1a674ff011430066e5e6a69ce1f15d45603b09522379f89c0365dbaca581375d8588d28c18bc9f614274d01a4

data/lib/awful/auto_scaling.rb

@@ -252,34 +252,41 @@ module Awful
       end
     end
 
-    desc 'old_instances NAME', 'Deal with instances that are not on the ASG current launch config'
+    desc 'old_instances ASGS', 'Deal with instances that are not on their ASG current launch config'
     method_option :long,       aliases: '-l', default: false, desc: 'Long listing'
+    method_option :groups,     aliases: '-g', default: false, desc: 'Just list names of ASGs with outdated instances'
     method_option :detach,     aliases: '-D', default: false, desc: 'Detach old instances from this ASG'
     method_option :decrement,  aliases: '-d', default: false, desc: 'should decrement desired capacity when detaching instances from ASG'
     method_option :deregister, aliases: '-E', default: false, desc: 'Deregister old instances from ELB for this ASG'
     method_option :terminate,  aliases: '-t', default: false, desc: 'Terminate old instances'
-    def old_instances(name)
-      asg = autoscaling.describe_auto_scaling_groups(auto_scaling_group_names: [name]).map(&:auto_scaling_groups).flatten.first
-      autoscaling.describe_auto_scaling_instances.map(&:auto_scaling_instances).flatten.select do |instance|
-        instance.auto_scaling_group_name.match(name) and instance.launch_configuration_name != asg.launch_configuration_name
+    def old_instances(*names)
+      asgs = autoscaling.describe_auto_scaling_groups(auto_scaling_group_names: names).map(&:auto_scaling_groups).flatten
+
+      asgs.each_with_object({}) do |asg, hash|
+        outdated = asg.instances.select do |instance|
+          instance.launch_configuration_name != asg.launch_configuration_name
+        end
+        hash[asg.auto_scaling_group_name] = outdated unless outdated.empty?
       end.tap do |olds|
         if olds.empty?
           # noop
         elsif options[:detach]
-          autoscaling.detach_instances(auto_scaling_group_name: name, instance_ids: olds.map(&:instance_id), should_decrement_desired_capacity: options[:decrement])
+          autoscaling.detach_instances(auto_scaling_group_name: name, instance_ids: olds.values.flatten.map(&:instance_id), should_decrement_desired_capacity: options[:decrement])
         elsif options[:deregister]
           asg.load_balancer_names.map do |elb_name|
-            elb.deregister_instances_from_load_balancer(load_balancer_name: elb_name, instances: olds.map { |i| { instance_id: i.instance_id } })
+            elb.deregister_instances_from_load_balancer(load_balancer_name: elb_name, instances: olds.values.flatten.map { |i| { instance_id: i.instance_id } })
           end.tap { puts "Deregistered: #{olds.map(&:instance_id).join(',')}" }
         elsif options[:terminate]
-          olds.map do |instance|
+          olds.values.flatten.map do |instance|
             autoscaling.terminate_instance_in_auto_scaling_group(instance_id: instance.instance_id, should_decrement_desired_capacity: options[:decrement] && true)
             instance.instance_id
           end.tap { |ids| say("Terminated: #{ids.join(',')}", :yellow) }
+        elsif options[:groups]
+          puts olds.keys
         elsif options[:long]
-          print_table olds.map { |i| [ i.instance_id, i.launch_configuration_name ] }
+          print_table olds.map { |asg, ins| ins.map { |i| [i.instance_id, asg, i.launch_configuration_name] }.flatten }
         else
-          puts olds.map(&:instance_id)
+          puts olds.values.flatten.map(&:instance_id)
         end
       end
     end

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = "0.0.33"
+  VERSION = "0.0.34"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
 platform: ruby
 authors:
 - Ric Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler