awful 0.0.53 → 0.0.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36753e59ef159b9d7324d78ecba2678a44c231ee
-  data.tar.gz: 1d9fa838a6078bafb5b926a6c4be5c74c17b7a59
+  metadata.gz: 224ca11d5105f088200d1934aa706cb2efea2b7e
+  data.tar.gz: aa9b1247d4fcaeed7d6a19c38a9f3fae935c02a8
 SHA512:
-  metadata.gz: a58985a2a470ffe7bffccdf01f167264c6736cb9d2562191fccd02f6bb4ef0b691ff2d5bb3603a655e6ce8ce7070326a100296599e767c083383e221c0759d78
-  data.tar.gz: 9bf66255c04821000a9d6dd7964f6acad4d901ccf42ac99b7e923f08ff0d3151d05e056dd4a4626df38458a35d918d0430e538f796e01b7194e29c00725188b3
+  metadata.gz: dda428258e10bdaf181bc41c42243ee6661ab4e00dd1094ae7250c41652158be6efd3513a7ca6485a512ac353b26a1e4d31e060ec23053c2236d0502cf7abc7a
+  data.tar.gz: eaf7fb32203c5dc76686d2bb2df19644875a2d9b21d317d76939666ceb60be6c436553b63761f633489d312e420af9f8ede9a5a025a1667aede900ec36b42bd2

data/lib/awful.rb

@@ -109,9 +109,9 @@ module Awful
         end
       end
 
-      def tag_name(thing)
+      def tag_name(thing, default = nil)
         tn = thing.tags.find { |tag| tag.key == 'Name' }
-        tn && tn.value
+        tn ? tn.value : default
       end
 
       ## return id for instance by name

data/lib/awful/auto_scaling.rb

@@ -27,11 +27,12 @@ module Awful
     def ls(name = /./)
       fields = if options[:long]
                  ->(a) { [
-                           a.auto_scaling_group_name,
-                           a.launch_configuration_name,
+                           tag_name(a, '-')[0,40],
+                           a.auto_scaling_group_name[0,40],
+                           a.launch_configuration_name[0,40],
                            "#{a.instances.length}/#{a.desired_capacity}",
                            "#{a.min_size}-#{a.max_size}",
-                           a.availability_zones.sort.join(','),
+                           a.availability_zones.map{ |az| az[-1,1] }.sort.join(','),
                            a.created_time
                          ] }
                else
@@ -39,7 +40,7 @@ module Awful
                end
 
       autoscaling.describe_auto_scaling_groups.map(&:auto_scaling_groups).flatten.select do |asg|
-        asg.auto_scaling_group_name.match(name)
+        asg.auto_scaling_group_name.match(name) or tag_name(asg, '').match(name)
       end.map do |asg|
         fields.call(asg)
       end.tap do |list|

data/lib/awful/version.rb

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

metadata

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