awful 0.0.125 → 0.0.126

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 344579f6b39568f6f3c56f62baad2d3c8a31cc61
-  data.tar.gz: fb71401f43a220dabe1a6275ceb3c32992715a3d
+  metadata.gz: ba519bdf7cee6a75862b71cb6e48e23fefdeabdf
+  data.tar.gz: 2c33ac07d9460d2650bb6987e02eb89dd2f602cd
 SHA512:
-  metadata.gz: dc6f9ae6a2b727b69604e8239802ba082a33731edee4c6d5486f22536d043aa29f12c90cf249d916881d2ca54a9c3c3e103383ec712ee0c38d1a03972ef928bf
-  data.tar.gz: 95a417937a0068dc135ede81034a0e992559ff0b324cc90401b63c1d5d0088a19408cbef3a2ad3f3d904e53fcd36ba67e628731d1f3167d03a63dca1a6f92e84
+  metadata.gz: d8d89602eb2213cf4f9ee90972bc2760f04224d0b653413a789e8309af5ee5ac451ebee0279478395699fe515148b234e8799d8a47e9b6e31c7dce2bfa01e44a
+  data.tar.gz: 8c221dcfb174f17b3e5b288f4dcf69a1615078acd3781626388da49bf865858fd5cffbf034d709a24fe70b4296b6174dca9bf89f9688e2bf9dd18e83873deab1

data/lib/awful/auto_scaling.rb

@@ -14,6 +14,9 @@ module Awful
       ## health statuses
       Healthy:     :green,
       Unhealthy:   :red,
+      ## same for asg instances describe
+      HEALTHY:     :green,
+      UNHEALTHY:   :red,
       ## activity status
       Successful:   :green,
       Failed:      :red,
@@ -43,7 +46,7 @@ module Awful
     desc 'ls [PATTERN]', 'list autoscaling groups with name matching PATTERN'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'
     def ls(name = /./)
-      all_matching_asgs(name).tap do |asgs|
+      all_matching_asgs(name).output do |asgs|
         if options[:long]
           print_table asgs.map { |a|
             [
@@ -69,23 +72,31 @@ module Awful
       end
     end
 
-    desc 'instances', 'list instances for instances in groups matching NAME'
-    method_option :long,                 aliases: '-l', default: false, desc: 'Long listing'
-    method_option :launch_configuration, aliases: '-L', default: false, desc: 'Get instance launch_configs'
-    def instances(name)
-      all_matching_asgs(name).map(&:instances).flatten.tap do |instances|
+    desc 'instances ASGS', 'describe autoscaling instances for groups'
+    method_option :long,     aliases: '-l', type: :boolean, default: false, desc: 'long listing'
+    method_option :describe, aliases: '-d', type: :boolean, default: false, desc: 'make extra call to get ASG name for each instance'
+    def instances(*names)
+      instances = autoscaling.describe_auto_scaling_groups(auto_scaling_group_names: names).auto_scaling_groups.map(&:instances).flatten
+
+      ## make extra call to get asg name as part of object
+      if options[:describe]
+        instances = autoscaling.describe_auto_scaling_instances(instance_ids: instances.map(&:instance_id)).auto_scaling_instances
+      end
+
+      instances.output do |list|
         if options[:long]
-          print_table instances.map { |i|
+          print_table list.map { |i|
             [
               i.instance_id,
+              options[:describe] ? i.auto_scaling_group_name : nil,
               i.availability_zone,
               color(i.lifecycle_state),
               color(i.health_status),
               i.launch_configuration_name,
-            ]
+            ].compact
           }
         else
-          puts instances.map(&:instance_id)
+          puts list.map(&:instance_id)
         end
       end
     end
@@ -97,7 +108,7 @@ module Awful
       ids = all_matching_asgs(name).map(&:instances).flatten.map(&:instance_id)
 
       ## get instance details for these IDs
-      ec2.describe_instances(instance_ids: ids).map(&:reservations).flatten.map(&:instances).flatten.sort_by(&:launch_time).tap do |instances|
+      ec2.describe_instances(instance_ids: ids).map(&:reservations).flatten.map(&:instances).flatten.sort_by(&:launch_time).output do |instances|
         if options[:long]
           print_table instances.map { |i|
             [ i.public_ip_address, i.private_ip_address, i.instance_id, i.image_id, i.instance_type, i.placement.availability_zone, color(i.state.name), i.launch_time ]
@@ -124,7 +135,7 @@ module Awful
 
     desc 'dump NAME', 'dump existing autoscaling group as yaml'
     def dump(name)
-      all_matching_asgs(name).map(&:to_hash).tap do |asgs|
+      all_matching_asgs(name).map(&:to_hash).output do |asgs|
         asgs.each do |asg|
           puts YAML.dump(stringify_keys(asg)) unless options[:quiet]
         end
@@ -233,7 +244,7 @@ module Awful
     method_option :newest, aliases: '-n', default: false, type: :boolean, desc: 'Stop newest instances instead of oldest'
     def stop(name, num = 1)
       ins = options[:newest] ? newest(name) : oldest(name)
-      ins.first(num.to_i).map(&:instance_id).tap do |ids|
+      ins.first(num.to_i).map(&:instance_id).output do |ids|
         if yes? "Really stop #{num} instances: #{ids.join(',')}?", :yellow
           ec2.stop_instances(instance_ids: ids)
         end
@@ -242,7 +253,7 @@ module Awful
 
     desc 'processes', 'describe scaling process types for use with suspend/resume'
     def processes
-      autoscaling.describe_scaling_process_types.processes.map(&:process_name).sort.tap do |procs|
+      autoscaling.describe_scaling_process_types.processes.map(&:process_name).sort.output do |procs|
         puts procs
       end
     end
@@ -251,7 +262,9 @@ module Awful
     method_option :list, aliases: '-l', default: false, type: :boolean, desc: 'list currently suspended processes'
     def suspend(name, *procs)
       if options[:list]
-        autoscaling.describe_auto_scaling_groups(auto_scaling_group_names: Array(name)).map(&:auto_scaling_groups).flatten.first.suspended_processes.tap do |list|
+        autoscaling.describe_auto_scaling_groups(
+          auto_scaling_group_names: Array(name)
+        ).map(&:auto_scaling_groups).flatten.first.suspended_processes.output do |list|
           print_table list.map{ |proc| [ proc.process_name, proc.suspension_reason] }
         end
       elsif procs.empty?
@@ -284,9 +297,11 @@ module Awful
     desc 'launch_configuration NAMES', 'get launch configs for given ASGs'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'
     def launch_configuration(*names)
-      autoscaling.describe_auto_scaling_groups(auto_scaling_group_names: names).map(&:auto_scaling_groups).flatten.each_with_object({}) do |asg, h|
+      autoscaling.describe_auto_scaling_groups(
+        auto_scaling_group_names: names
+      ).map(&:auto_scaling_groups).flatten.each_with_object({}) do |asg, h|
         h[asg.auto_scaling_group_name] = asg.launch_configuration_name
-      end.tap do |hash|
+      end.output do |hash|
         if options[:long]
           print_table hash
         else
@@ -314,7 +329,7 @@ module Awful
       end
 
       if olds.empty?
-        # noop
+      # noop
       elsif options[:detach]
         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]
@@ -331,7 +346,7 @@ module Awful
         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) }
+        end.output { |ids| say("Terminated: #{ids.join(',')}", :yellow) }
       elsif options[:groups]
         puts olds.keys
       elsif options[:long]
@@ -347,7 +362,7 @@ module Awful
     method_option :long,  aliases: '-l', default: false, desc: 'Long listing'
     method_option :cause, aliases: '-c', default: false, desc: 'Long listing with cause of activity'
     def activities(name)
-      autoscaling.describe_scaling_activities(auto_scaling_group_name: name).activities.tap do |activities|
+      autoscaling.describe_scaling_activities(auto_scaling_group_name: name).activities.output do |activities|
         if options[:long]
           print_table activities.map { |a| [color(a.status_code), a.description, a.start_time, a.end_time] }
         elsif options[:cause]

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = '0.0.125'
+  VERSION = '0.0.126'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.125
+  version: 0.0.126
 platform: ruby
 authors:
 - Ric Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler