awful 0.0.70 → 0.0.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 023f1990584357d114dc7e70c8d2971c1ecd00ce
-  data.tar.gz: 6b7861723e772dbc5c36902c433fb7ba95d16d18
+  metadata.gz: 03463a7d6e810bc35c1e6046e1c7146f169c6c3b
+  data.tar.gz: b2fb9f9635cee738269536462100adf340afb3ea
 SHA512:
-  metadata.gz: 9ebd3dd3cf71c1bdbb0c300f119953278fc27732749188fdbe0d9e37ba985eebfdb1a13436b0423b792fbe3f57eb90017e50c665f3374f46190c7dccdfb460ff
-  data.tar.gz: ddf52bcfe5a26b5fc6830d7631a20fc8310b0093ef1b3af6acf53613de636f9d2a3ccce09fda5e384f8ae9bfa141b765019eea8c62d0b96657aa8261ddcb2828
+  metadata.gz: 080d501cbb006811a5d344975f1f8ffb25ba571eab9924c3f576ff1b7da6eddd69eb4db7264f07ef1d1d58e712301aa83325591bb8846218dc5a850396a2a0aa
+  data.tar.gz: 340922621b2549bd82b732c5737871685401492096f647e671149e00eef66ec977f618699d9196af8a7f479fee098f11b6c5af56f862d781d292e82423d43274

data/lib/awful/ec2.rb

@@ -16,20 +16,56 @@ module Awful
       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, 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 ] }
-
-      ec2.describe_instances.map(&:reservations).flatten.map(&:instances).flatten.select do |instance|
-        instance.instance_id.match(name) or instance.tags.any? { |tag| tag.value.match(name) }
-      end.map do |instance|
-        fields.call(instance)
-      end.tap do |list|
-        print_table list.sort
+    desc 'ls [NAME]', 'get instances with given name regex'
+    method_option :long,        aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
+    method_option :ids,         aliases: '-i', type: :array,   default: [],    desc: 'List of instance ids to retrieve'
+    method_option :tags,        aliases: '-t', type: :array,   default: [],    desc: 'List of tags to filter, as key:value'
+    method_option :stack,       aliases: '-s', type: :string,  default: nil,   desc: 'Filter by given stack'
+    method_option :resource,    aliases: '-r', type: :string,  default: nil,   desc: 'Filter by given stack resource logical id'
+    method_option :autoscaling, aliases: '-a', type: :string,  default: nil,   desc: 'Filter by given autoscaling group'
+    def ls(name = nil)
+      params = {instance_ids: [], filters: []}
+
+      ## filter by ids
+      options[:ids].each do |id|
+        params[:instance_ids] << id
+      end
+
+      ## filter by arbitrary tags
+      options[:tags].each do |tag|
+        key, value = tag.split(/[:=]/)
+        params[:filters] << {name: "tag:#{key}", values: [value]}
+      end
+
+      ## filter shortcuts for stack, resource, autoscaling group
+      params[:filters] << {name: 'tag:aws:cloudformation:stack-name', values: [options[:stack]]}       if options[:stack]
+      params[:filters] << {name: 'tag:aws:cloudformation:logical-id', values: [options[:resource]]}    if options[:resource]
+      params[:filters] << {name: 'tag:aws:autoscaling:groupName',     values: [options[:autoscaling]]} if options[:autoscaling]
+
+      ## get list of instances
+      instances = ec2.describe_instances(params.reject{ |k,v| v.empty? }).reservations.map(&:instances).flatten
+
+      ## filter by Name tag as a regex
+      instances.select! { |i| tag_name(i, '').match(name) } if name
+
+      ## output
+      instances.tap do |list|
+        if options[:long]
+          print_table list.map { |i|
+            [
+              tag_name(i),
+              i.instance_id,
+              i.instance_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
+            ]
+          }
+        else
+          puts list.map(&:instance_id)
+        end
       end
     end
 

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = '0.0.70'
+  VERSION = '0.0.71'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.70
+  version: 0.0.71
 platform: ruby
 authors:
 - Ric Lister