awful 0.0.46 → 0.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d157d01948ca24e5720e4bb99092ac61f59f94d
-  data.tar.gz: 883ecf5a96b431922f6a49277e251a8ecdc35945
+  metadata.gz: a9ba35ecdd70ca8fee5d800ba790c62c1f408155
+  data.tar.gz: 6b50ea11a998dadc5373a87178c26bde4304b789
 SHA512:
-  metadata.gz: cabb8bd5d87cd0107884fb47fbb4ef3ea7c911c99c6d73bd06b004a24fe90434cfdedd0beb2c567e332564995689e14127c428a6d651cf1af0ffb389bdad0366
-  data.tar.gz: 2331c69b58f074f94e779385c9c4b17af4112e8040059e8215834c73025b1aa3ca33c7eb07b00886dc36dca454f8b24290cbc4b39827e6728a781fa15cab86e5
+  metadata.gz: 876875b8a02dfc3fd79987da6bf1941911106fba7167b0a0b363222df69f4adbec0cb8e742b46a390af49437ea7711c549e2784a7b373ac912648b4987ae7d9c
+  data.tar.gz: 46ba584635090d505144bfd5d2791d2dcbe8e95f738919a31cd0b5fc8a0f521fc5dacc0d5ce8be2a42b11fb73883c015dcc9bf4a4ae1113c07fed8fc23d47435

data/lib/awful/auto_scaling.rb

@@ -2,6 +2,20 @@ module Awful
 
   class AutoScaling < Cli
 
+    COLORS = {
+      Pending:     :yellow,
+      InService:   :green,
+      Terminating: :red,
+      HEALTHY:     :green,
+      UNHEALTHY:   :red,
+    }
+
+    no_commands do
+      def color(string)
+        set_color(string, COLORS.fetch(string.to_sym, :yellow))
+      end
+    end
+
     desc 'ls [PATTERN]', 'list autoscaling groups with name matching PATTERN'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'
     def ls(name = /./)
@@ -38,20 +52,19 @@ module Awful
     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)
-      fields = if options[:long]
-                 %i[ instance_id auto_scaling_group_name availability_zone lifecycle_state health_status launch_configuration_name ]
-               elsif options[:launch_configuration]
-                 %i[ instance_id launch_configuration_name ]
-               else
-                 %i[ instance_id ]
-               end
-
       autoscaling.describe_auto_scaling_instances.map(&:auto_scaling_instances).flatten.select do |instance|
         instance.auto_scaling_group_name.match(name)
       end.tap do |instances|
-        instances.map do |instance|
-          fields.map { |field| instance.send(field) }
-        end.tap { |list| print_table list }
+        if options[:long]
+          print_table instances.map { |i|
+            [i.instance_id, i.auto_scaling_group_name, i.availability_zone, color(i.lifecycle_state),
+             color(i.health_status), i.launch_configuration_name]
+          }
+        elsif options[:launch_configuration]
+          print_table instances.map { |i| [i.instance_id, i.launch_configuration_name] }
+        else
+          puts instances.map(&:instance_id)
+        end
       end
     end
 

data/lib/awful/cloudformation.rb

@@ -2,10 +2,30 @@ module Awful
 
   class CloudFormation < Cli
 
+    COLORS = {
+      create_in_progress:                  :yellow,
+      delete_in_progress:                  :yellow,
+      update_in_progress:                  :yellow,
+      update_complete_cleanup_in_progress: :yellow,
+      create_failed:                       :red,
+      delete_failed:                       :red,
+      update_failed:                       :red,
+      create_complete:                     :green,
+      delete_complete:                     :green,
+      update_complete:                     :green,
+      delete_skipped:                      :yellow,
+      rollback_in_progress:                :red,
+      rollback_complete:                   :red,
+    }
+
     no_commands do
       def cf
         @cf ||= Aws::CloudFormation::Client.new
       end
+
+      def color(string)
+        set_color(string, COLORS.fetch(string.downcase.to_sym, :blue))
+      end
     end
 
     desc 'ls [PATTERN]', 'list cloudformation stacks matching PATTERN'
@@ -23,7 +43,7 @@ module Awful
 
       stacks.tap do |stacks|
         if options[:long]
-          print_table stacks.map { |s| [s.stack_name, s.creation_time, s.stack_status, s.template_description] }
+          print_table stacks.map { |s| [s.stack_name, s.creation_time, color(s.stack_status), s.template_description] }
         else
           puts stacks.map(&:stack_name)
         end
@@ -85,7 +105,7 @@ module Awful
     desc 'events NAME', 'show events for stack with name NAME'
     def events(name)
       cf.describe_stack_events(stack_name: name).stack_events.tap do |events|
-        print_table events.map { |e| [e.timestamp, e.resource_status, e.resource_type, e.logical_resource_id, e.resource_status_reason] }
+        print_table events.map { |e| [e.timestamp, color(e.resource_status), e.resource_type, e.logical_resource_id, e.resource_status_reason] }
       end
     end
 

data/lib/awful/ec2.rb

@@ -4,11 +4,23 @@ module Awful
 
   class Ec2 < Cli
 
+    COLORS = {
+      running:    :green,
+      stopped:    :yellow,
+      terminated: :red,
+    }
+
+    no_commands do
+      def color(string)
+        set_color(string, COLORS.fetch(string.to_sym, :yellow))
+      end
+    end
+
     desc 'ls [PATTERN]', 'list EC2 instances [with id or tags matching PATTERN]'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'
     def ls(name = /./)
       fields = options[:long] ?
-        ->(i) { [ (tag_name(i) || '-').slice(0..40), i.instance_id, i.instance_type, i.virtualization_type, i.placement.availability_zone, i.state.name,
+        ->(i) { [ (tag_name(i) || '-').slice(0..40), i.instance_id, i.instance_type, i.virtualization_type, i.placement.availability_zone, color(i.state.name),
                   i.security_groups.map(&:group_name).join(',').slice(0..30), i.private_ip_address, i.public_ip_address ] } :
         ->(i) { [ tag_name(i) || i.instance_id ] }
 

data/lib/awful/elb.rb

@@ -2,6 +2,17 @@ module Awful
 
   class Elb < Cli
 
+    COLORS = {
+      InService:    :green,
+      OutOfService: :red,
+    }
+
+    no_commands do
+      def color(string)
+        set_color(string, COLORS.fetch(string.to_sym, :yellow))
+      end
+    end
+
     desc 'ls [PATTERN]', 'list vpcs [with any tags matching PATTERN]'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'
     def ls(name = /./)
@@ -30,7 +41,7 @@ module Awful
           ec2.describe_instances(instance_ids: instances_by_id.keys).map(&:reservations).flatten.map(&:instances).flatten.map do |instance|
             health = instances_by_id[instance.instance_id]
             instance_name = tag_name(instance) || '-'
-            [ instance.instance_id, instance_name, instance.public_ip_address, health.state, health.reason_code, health.description ]
+            [ instance.instance_id, instance_name, instance.public_ip_address, color(health.state), health.reason_code, health.description ]
           end.tap { |list| print_table list }
         else
           instances_by_id.keys.tap { |list| puts list }

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = "0.0.46"
+  VERSION = "0.0.47"
 end

metadata

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