awful 0.0.52 → 0.0.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 250b30414e77e87830cc9ec2422af351a073a28a
-  data.tar.gz: 52d5c1cad70199c2bc205dd8c8d863ab7659261d
+  metadata.gz: 36753e59ef159b9d7324d78ecba2678a44c231ee
+  data.tar.gz: 1d9fa838a6078bafb5b926a6c4be5c74c17b7a59
 SHA512:
-  metadata.gz: d0bd67f11073df6f92d6ce1933b98df9c6867e376afe200ad0fc75bcfb17ba24eac88189e700fa995a38882f51750c12c58d96bc039f5eacbcef4f69696a06f0
-  data.tar.gz: 60c43fc00df65857509f6ec8bc5c946c42fc449318453b8516ea2410a772df75dc79cea0b21b56cf1464b9160086a6c4c10d18fd4ef4ff0cb0d9f6a484f92870
+  metadata.gz: a58985a2a470ffe7bffccdf01f167264c6736cb9d2562191fccd02f6bb4ef0b691ff2d5bb3603a655e6ce8ce7070326a100296599e767c083383e221c0759d78
+  data.tar.gz: 9bf66255c04821000a9d6dd7964f6acad4d901ccf42ac99b7e923f08ff0d3151d05e056dd4a4626df38458a35d918d0430e538f796e01b7194e29c00725188b3

data/lib/awful/security_group.rb

@@ -6,7 +6,7 @@ module Awful
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'
     def ls(name = /./)
       fields = options[:long] ?
-        ->(s) { [tag_name(s), s.group_id, s.group_name, s.vpc_id, s.description] } :
+        ->(s) { [tag_name(s), s.group_id, s.group_name[0..50], s.vpc_id, s.description] } :
         ->(s) { [s.group_name] }
 
       ec2.describe_security_groups.map(&:security_groups).flatten.select do |sg|
@@ -18,11 +18,21 @@ module Awful
       end
     end
 
-    desc 'dump NAME', 'dump security group with NAME as yaml'
+    no_commands do
+
+      ## return first SG that matches name to id, group_name, or Name tag
+      def first_matching_sg(name)
+        field = name.match(/^sg-[\d[a-f]]{8}$/) ? :group_id : :group_name
+        ec2.describe_security_groups.map(&:security_groups).flatten.find do |sg|
+          sg.send(field).match(name) or (tag_name(sg)||'').match(name)
+        end
+      end
+
+    end
+
+    desc 'dump NAME', 'dump security group with NAME [or ID] as yaml'
     def dump(name)
-      ec2.describe_security_groups.map(&:security_groups).flatten.find do |sg|
-        sg.group_name == name
-      end.tap do |sg|
+      first_matching_sg(name).tap do |sg|
         puts YAML.dump(stringify_keys(sg.to_hash))
       end
     end
@@ -30,9 +40,7 @@ module Awful
     desc 'inbound NAME', 'show inbound rules for named security group'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'
     def inbound(name)
-      ec2.describe_security_groups.map(&:security_groups).flatten.find do |sg|
-        sg.group_name == name
-      end.ip_permissions.tap do |perms|
+      first_matching_sg(name).ip_permissions.tap do |perms|
         sources = ->(perm) { perm.ip_ranges.map(&:cidr_ip) + perm.user_id_group_pairs.map(&:group_id) }
         if options[:long]
           perms.map do |p|

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = "0.0.52"
+  VERSION = "0.0.53"
 end

metadata

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