awful 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63e2c2d2613cc6d46e8381310a6f6472cb23c7e8
-  data.tar.gz: 72c0e79eb528599b66356a6a6867a5ca0571c959
+  metadata.gz: e3c48ef8ad16b349fc7e1d0d15a8cf17e4ea7a67
+  data.tar.gz: 8382b4c4a018639909af71234e1b7efffb2b3b35
 SHA512:
-  metadata.gz: d5ff883d31896a42ae60e6319f38cef5a52e6ddd4684eb8963e73338c9ccd5d4b6da9cb0100c6100252cb0dbf917159031b5cf1e82fa92a2e917edea0c87fefa
-  data.tar.gz: e5568b15699fee31554ad0a908f42e52656ab4ee915aa273814e0be1bdb166623e29cba22fbdaefb5d031a9d778d6223dac63bd0d82376ada197471955cf8bd4
+  metadata.gz: 47ed8385d4cfe2d8d48e7499f27ed2b5874c871ef48ea5a1dadfe1bbfaca6cf6b509fa3c64f8f70f3468d52cf14b273d54cff8f19192612b09011a49fea01f66
+  data.tar.gz: 3aa7f6b767cdef46965e4681aef007612003de1c74a9f708872b052d874c768c69f7144c8449654199bdff90554255ab213e3caeaa897e4f4b85ce1b67542a0f

data/lib/awful/datapipeline.rb

@@ -11,13 +11,12 @@ module Awful
       end
 
       if options[:long]
-        fields = %w[ @name @creationTime ]
         datapipeline.describe_pipelines(pipeline_ids: dps.map(&:id)).pipeline_description_list.map do |dp|
           dp.fields.each_with_object({}) do |f, h|
             h[f.key] = f.string_value # convert array of structs to hash
-          end
+          end.merge('id' => dp.pipeline_id)
         end.tap do |list|
-          print_table list.map { |d| d.values_at('@creationTime', 'name', '@pipelineState', '@healthStatus') }.sort
+          print_table list.map { |d| d.values_at('@creationTime', 'id', '@pipelineState', '@healthStatus', 'name') }.sort
         end
       else
         puts dps.map(&:name).sort

data/lib/awful/elb.rb

@@ -19,17 +19,22 @@ module Awful
     end
 
     desc 'instances NAME', 'list instances and states for elb NAME'
+    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
     def instances(name)
       instances = elb.describe_instance_health(load_balancer_name: name).map(&:instance_states).flatten
       if instances.empty?
-        puts 'no instances'
+        instances.tap { puts 'no instances' }
       else
         instances_by_id = instances.inject({}) { |hash,instance| hash[instance.instance_id] = instance; hash }
-        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.tags.map(&:value).sort.join(','), instance.public_ip_address, health.state, health.reason_code, health.description ]
-        end.tap do |list|
-          print_table list
+        if options[:long]
+          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.instance_id, instance.tags.map(&:value).sort.join(','), instance.public_ip_address, health.state, health.reason_code, health.description ]
+          end.tap do |list|
+            print_table list
+          end
+        else
+          instances_by_id.keys.tap { |list| puts list }
         end
       end
     end
@@ -93,6 +98,18 @@ module Awful
       elb.deregister_instances_from_load_balancer(load_balancer_name: name, instances: instance_ids.map{ |id| {instance_id: id} })
     end
 
+    desc 'state [INSTANCE_IDS]', 'show health state for all instances, or listed instance ids'
+    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    def state(name, *instance_ids)
+      elb.describe_instance_health(load_balancer_name: name, instances: instance_ids.map { |id| {instance_id: id} }).instance_states.tap do |instances|
+        if options[:long]
+          print_table instances.map { |i| [ i.instance_id, i.state, i.reason_code, i.description ] }
+        else
+          puts instances.map { |i| i.state }
+        end
+      end
+    end
+
   end
 
 end

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

metadata

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