awful 0.0.161 → 0.0.162

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 468c76dd67311ec96f097e6d05ecf53287800b64
-  data.tar.gz: f3a59e49c7c61e4d05941b18368a09292450f7a3
+  metadata.gz: 5c108b1b219d5b3b1f34c50c775a06e12070a5e8
+  data.tar.gz: 98a86eee58b229adc6ca819d1882ae29feccbdb3
 SHA512:
-  metadata.gz: 06d367fe21ee33f8c58ea6308e4160caa937209f8f8238afffbbb8b40b0033a2be48df59bc1e3182284fcde9f88891b804ebce43ebd26c13fc5ca0829688c12f
-  data.tar.gz: 5dfa3f87196eff10c0df6565561b9694d73ecec663e8fd264041bcbb15933cb32376cc2ff7cb5a02d8c7acdb705a2bf0e7b084f2f307c6cce49a0f750cfa0fcc
+  metadata.gz: 0777d9f98e288504f35f990422d7dec9d8911061b2825a577a4b27cf4adba37607ca70da86894953fe14274ed49a894d8378cbb5f0da160373a9421c68027490
+  data.tar.gz: 60db36d4cf8a4dade79edb173fe7738b1ee6a9bc848ba428111d37ab14ceb229036254276b387d530facee916b5bd90cb35e5fc94339815301f5e7f8485c1a15

data/lib/awful/ami.rb

@@ -6,8 +6,8 @@ module Awful
   end
 
   class Ami < Cli
-    class_option :owners,  aliases: '-o', type: :string, default: 'self', desc: 'List images with this owner'
-    class_option :filters, aliases: '-f', type: :array,  default: [],     desc: 'Filter using name=value, eg tag:Foo=bar, multiples are ANDed'
+    class_option :owners,  aliases: '-o', type: :array, default: %w[self], desc: 'List images with this owner'
+    class_option :filters, aliases: '-f', type: :array, default: [],       desc: 'Filter using name=value, eg tag:Foo=bar, multiples are ANDed'
 
     COLORS = {
       available: :green,
@@ -16,15 +16,17 @@ module Awful
     }
 
     no_commands do
-      def images(options)
+      def images(*image_ids)
         params = {
-          owners:  options[:owners].split(','),
+          image_ids: Array(image_ids),
+          owners:  options[:owners],
           filters: options[:filters].map do |tag|
             k, v = tag.split('=')
             {name: k, values: v.split(',')}
           end
         }.reject { |k,v| v.empty? }
-        ec2.describe_images(params).map(&:images).flatten
+
+        ec2.describe_images(params).images
       end
 
       def color(string)
@@ -32,12 +34,10 @@ module Awful
       end
     end
 
-    desc 'ls [PATTERN]', 'list AMIs'
+    desc 'ls [IDS]', 'list AMIs'
     method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
-    def ls(name = /./)
-      images(options).select do |image|
-        image.name.match(name)
-      end.output do |list|
+    def ls(*ids)
+      images(*ids).output do |list|
         if options[:long]
           print_table list.map { |i|
             [ i.name, i.image_id, i.root_device_type, color(i.state), i.creation_date, i.tags.map{ |t| "#{t.key}=#{t.value}" }.sort.join(',') ]
@@ -48,20 +48,17 @@ module Awful
       end
     end
 
-    desc 'delete NAME', 'delete AMI'
+    desc 'delete ID', 'delete AMI'
     def delete(id)
-      images(options).find do |image|
-        image.image_id.match(id)
-      end.output do |ami|
-        if yes? "Really deregister image #{ami.name} (#{ami.image_id})?", :yellow
-          ec2.deregister_image(image_id: ami.image_id)
-        end
+      ami = images(id).first
+      if yes? "Really deregister image #{ami.name} (#{ami.image_id})?", :yellow
+        ec2.deregister_image(image_id: ami.image_id)
       end
     end
 
     desc 'dump IDS', 'describe images'
     def dump(*ids)
-      ec2.describe_images(image_ids: ids).images.output do |images|
+      images(*ids).output do |images|
         images.each do |image|
           puts YAML.dump(stringify_keys(image.to_hash))
         end
@@ -71,8 +68,8 @@ module Awful
     desc 'tags ID [TAGS]', 'get tags for AMI, or set multiple tags as key:value'
     def tags(id, *tags)
       if tags.empty?
-        ec2.describe_images(image_ids: [id]).images.first.tags.output do |list|
-          print_table list.map { |t| [t.key, t.value] }
+        images(id).first.tags.output do |tags|
+          print_table tags.map { |t| [t.key, t.value] }
         end
       else
         ec2.create_tags(
@@ -100,7 +97,7 @@ module Awful
     desc 'last NAME', 'get ids of last (by creation date) AMIs [matching NAME]'
     method_option :count, aliases: '-n', type: :numeric, default: 1, desc: 'Return N results'
     def last(name = /./)
-      images(options).select do |image|
+      images.select do |image|
         image.name.match(name)
       end.sort_by(&:creation_date).last(options[:count]).map do |image|
         image.image_id

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = '0.0.161'
+  VERSION = '0.0.162'
 end

metadata

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