awful 0.0.84 → 0.0.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 061a57cbafc480c2390c56f2288fc467761217a3
-  data.tar.gz: 9e55aeb98b4a61257d985f43f857dd07e9a1e8a2
+  metadata.gz: 5ea847fc9ccbe41557aa03a8c907026ec7db9863
+  data.tar.gz: a6ce1b258f5b1f3e7037d928a51bdb893847ee6c
 SHA512:
-  metadata.gz: 947490027f14f03a92e00b108f036cbbc82a83971ee3f477caf5c81dab944adae3e56f6f08cbb50ff9187d1e03dcc8ee4fb0f5a653225db2e13b5779083d4f83
-  data.tar.gz: 9116f2c60c1d0b8207d6e1d9fe0a0eaa0379da7a289a5179fcd2e0fed5fff1ac0e1acb1503125424951f049e06ac4940d48e3748d79edc76326b8155b4ac873e
+  metadata.gz: 0783b62e7b7420ef52d7eecc670944479deee1e47d912bca2360a21f42a87ce3cf000f027bfbfaf287b3441a86d86c7695b39dfb56056bf03008b53224dc8765
+  data.tar.gz: 0bd451ebadc45a1057db2a5e0d8c616746301a4af3e63110da1367424ccebbda486ae08939fbc388bf4b3df22efb2c0db7bc733e0f6c9b987fe769f2452d81b2

data/lib/awful/cloudformation.rb

@@ -133,21 +133,25 @@ module Awful
     end
 
     desc 'resources NAME', 'list resources for stack with name NAME'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
-    method_option :type, aliases: '-t', default: '.',   desc: 'Filter by regex matching type of resource'
+    method_option :long,  aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
+    method_option :type,  aliases: '-t', type: :array,   default: nil,   desc: 'Filter by given resource types, e.g. AWS::IAM::Role'
+    method_option :match, aliases: '-m', type: :string,  default: nil,   desc: 'Filter by case-insensitive regex matching type of resource'
     def resources(name)
-      ## get first stack beginning with name
-      stack = cf.list_stacks.stack_summaries.select do |stack|
-        stack.stack_name.match(/^#{name}/)
-      end.first
-
-      ## bail if no stack found with this name
-      return [] if stack.nil?
-
-      ## get resource from stack
-      cf.list_stack_resources(stack_name: stack.stack_name).stack_resource_summaries.select do |resource|
-        resource.resource_type.match(/#{options[:type]}/i)
-      end.tap do |resources|
+      resources = cf.list_stack_resources(stack_name: name).stack_resource_summaries
+
+      if options[:type]
+        resources.select! do |resource|
+          options[:type].include?(resource.resource_type)
+        end
+      end
+
+      if options[:match]
+        resources.select! do |resource|
+          Regexp.new(options[:match], Regexp::IGNORECASE).match(resource.resource_type)
+        end
+      end
+
+      resources.tap do |resources|
         if options[:long]
           print_table resources.map { |r| [r.logical_resource_id, r.physical_resource_id, r.resource_type, color(r.resource_status), r.resource_status_reason] }
         else

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = '0.0.84'
+  VERSION = '0.0.85'
 end

metadata

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