awful 0.0.132 → 0.0.133

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14133429fbba1f41a835d8d45c39f5373a970934
-  data.tar.gz: c78d296568121425e737eb1101ab6227b4145f1f
+  metadata.gz: f20fa5e02041068d58d0a6eb5303dccf56af9bf4
+  data.tar.gz: ac99595963ec8e583cf7e80fa96866f15e884b56
 SHA512:
-  metadata.gz: 5d8e26ea411a4c35a932113c54a8123110c5e8bb3910f8514779a3c84b1a6aae59951cfa94cde2b9d3f30606d32db5e7ffb2057a6198ab5ace642a20b2aa8157
-  data.tar.gz: 5535193a7a7fa50171676f61ec315b1ef228a1d041241e4bd29569aff95316abc8ebee71e58b31580b6e85a243c22bfdad676e081fb22687617953bdd0ab694b
+  metadata.gz: 2a87db67e4ddea50a875c5f2b38d149921536227585b7abcaf0e79470b817ed47fc17788057ccb54b6a9c54992529fdf05c4945c705887738e52ec5f2481cb67
+  data.tar.gz: 924d74990c82d76e26acd21317557df931d96f14f80439680af6cf1573840038e3873068e12cb8aced59cf644def20e2d6b8ac6909fced12aee4e510a417e7f7

data/lib/awful/ami.rb

@@ -37,7 +37,7 @@ module Awful
     def ls(name = /./)
       images(options).select do |image|
         image.name.match(name)
-      end.tap do |list|
+      end.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(',') ]
@@ -52,7 +52,7 @@ module Awful
     def delete(id)
       images(options).find do |image|
         image.image_id.match(id)
-      end.tap do |ami|
+      end.output do |ami|
         if yes? "Really deregister image #{ami.name} (#{ami.image_id})?", :yellow
           ec2.deregister_image(image_id: ami.image_id)
         end
@@ -61,7 +61,7 @@ module Awful
 
     desc 'dump IDS', 'describe images'
     def dump(*ids)
-      ec2.describe_images(image_ids: ids).images.tap do |images|
+      ec2.describe_images(image_ids: ids).images.output do |images|
         images.each do |image|
           puts YAML.dump(stringify_keys(image.to_hash))
         end
@@ -71,7 +71,7 @@ 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.tap do |list|
+        ec2.describe_images(image_ids: [id]).images.first.tags.output do |list|
           print_table list.map { |t| [t.key, t.value] }
         end
       else
@@ -104,7 +104,7 @@ module Awful
         image.name.match(name)
       end.sort_by(&:creation_date).last(options[:count]).map do |image|
         image.image_id
-      end.tap do |list|
+      end.output do |list|
         puts list
       end
     end

data/lib/awful/dynamodb_streams.rb

@@ -36,14 +36,14 @@ module Awful
 
     desc 'dump ARN', 'describe the stream with ARN as yaml'
     def dump(arn)
-      streams.describe_stream(stream_arn: arn).stream_description.tap do |stream|
+      streams.describe_stream(stream_arn: arn).stream_description.output do |stream|
         puts YAML.dump(stringify_keys(stream.to_hash))
       end
     end
 
     desc 'shards ARN', 'list shards for stream with ARN'
     def shards(arn)
-      streams.describe_stream(stream_arn: arn).stream_description.shards.tap do |shards|
+      streams.describe_stream(stream_arn: arn).stream_description.shards.output do |shards|
         puts shards.map(&:shard_id)
       end
     end
@@ -52,7 +52,7 @@ module Awful
     def get_records(arn, shard_id)
       iterator = streams.get_shard_iterator(stream_arn: arn, shard_id: shard_id, shard_iterator_type: 'TRIM_HORIZON').shard_iterator
 
-      streams.get_records(shard_iterator: iterator).records.tap do |records|
+      streams.get_records(shard_iterator: iterator).records.output do |records|
         print_table records.map { |r| [r.event_id, r.event_name, r.dynamodb.sequence_number, r.dynamodb.size_bytes] }
       end
     end

data/lib/awful/ec2.rb

@@ -56,7 +56,7 @@ module Awful
       instances.select! { |i| tag_name(i, '').match(name) } if name
 
       ## output
-      instances.tap do |list|
+      instances.output do |list|
         if options[:long]
           print_table list.map { |i|
             [
@@ -81,7 +81,7 @@ module Awful
     def dump(name)
       ec2.describe_instances.map(&:reservations).flatten.map(&:instances).flatten.find do |instance|
         instance.instance_id == name or tag_name(instance) == name
-      end.tap do |instance|
+      end.output do |instance|
         puts YAML.dump(stringify_keys(instance.to_hash))
       end
     end
@@ -106,7 +106,7 @@ module Awful
         opt[:network_interfaces] ? (opt[:network_interfaces][0][:subnet_id] = subnet) : (opt[:subnet_id] = subnet)
       end
 
-      (opt[:tags] = opt.fetch(:tags, [])).find_index { |t| t[:key] == 'Name' }.tap do |index|
+      (opt[:tags] = opt.fetch(:tags, [])).find_index { |t| t[:key] == 'Name' }.output do |index|
         opt[:tags][index || 0] = {key: 'Name', value: name}
       end
 
@@ -135,7 +135,7 @@ module Awful
       ## report DNS or IP for instance
       ec2.describe_instances(instance_ids: ids).map(&:reservations).flatten.map(&:instances).flatten.map do |instance|
         instance.public_dns_name or instance.public_ip_address or instance.private_ip_address
-      end.tap do |list|
+      end.output do |list|
         puts list
       end
     end
@@ -143,7 +143,7 @@ module Awful
     desc 'az', 'list availability zones'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'
     def az
-      ec2.describe_availability_zones.availability_zones.tap do |zones|
+      ec2.describe_availability_zones.availability_zones.output do |zones|
         if options[:long]
           print_table zones.map { |z| [z.zone_name, z.state, z.messages.join(',')] }
         else
@@ -154,14 +154,14 @@ module Awful
 
     desc 'allocate', 'allocate a new elastic IP address'
     def allocate
-      ec2.allocate_address(domain: 'vpc').first.tap do |eip|
+      ec2.allocate_address(domain: 'vpc').first.output do |eip|
         puts eip.allocation_id, eip.public_ip
       end
     end
 
     desc 'associate NAME IP', 'associate a public ip with an instance'
     def associate(name, eip)
-      ec2.associate_address(instance_id: find_instance(name), allocation_id: eip).map(&:association_id).tap do |id|
+      ec2.associate_address(instance_id: find_instance(name), allocation_id: eip).map(&:association_id).output do |id|
         puts id
       end
     end
@@ -170,7 +170,7 @@ module Awful
     def addresses
       ec2.describe_addresses.map(&:addresses).flatten.map do |ip|
         [ ip.allocation_id, ip.public_ip, ip.instance_id, ip.domain ]
-      end.tap do |list|
+      end.output do |list|
         print_table list
       end
     end
@@ -179,7 +179,7 @@ module Awful
     def dns(name)
       ec2.describe_instances.map(&:reservations).flatten.map(&:instances).flatten.find do |instance|
         instance.instance_id == name or (n = tag_name(instance) and n.match(name))
-      end.public_dns_name.tap do |dns|
+      end.public_dns_name.output do |dns|
         puts dns
       end
     end
@@ -189,7 +189,7 @@ module Awful
     #   opt = load_cfg(options)
     #   ec2.describe_instances.map(&:reservations).flatten.map(&:instances).flatten.find do |instance|
     #     instance.instance_id == name or (n = tag_name(instance) and n.match(name))
-    #   end.tap do |instance|
+    #   end.output do |instance|
     #     ec2.modify_instance_attribute(instance_id: instance.instance_id, user_data: {
     #       #value: Base64.strict_encode64(opt[:user_data])
     #       value: opt[:user_data]
@@ -201,8 +201,8 @@ module Awful
     def user_data(name)
       ec2.describe_instances.map(&:reservations).flatten.map(&:instances).flatten.find do |instance|
         instance.instance_id == name or tag_name(instance) == name
-      end.tap do |instance|
-        ec2.describe_instance_attribute(instance_id: instance.instance_id, attribute: 'userData').user_data.value.tap do |user_data|
+      end.output do |instance|
+        ec2.describe_instance_attribute(instance_id: instance.instance_id, attribute: 'userData').user_data.value.output do |user_data|
           puts Base64.strict_decode64(user_data)
         end
       end
@@ -212,7 +212,7 @@ module Awful
     def stop(name)
       ec2.describe_instances.map(&:reservations).flatten.map(&:instances).flatten.find do |instance|
         instance.instance_id == name or (n = tag_name(instance) and n == name)
-      end.instance_id.tap do |id|
+      end.instance_id.output do |id|
         if yes? "Really stop instance #{name} (#{id})?", :yellow
           ec2.stop_instances(instance_ids: Array(id))
         end
@@ -223,7 +223,7 @@ module Awful
     def start(name)
       ec2.describe_instances.map(&:reservations).flatten.map(&:instances).flatten.find do |instance|
         instance.instance_id == name or (n = tag_name(instance) and n == name)
-      end.instance_id.tap do |id|
+      end.instance_id.output do |id|
         ec2.start_instances(instance_ids: Array(id))
       end
     end

data/lib/awful/s3.rb

@@ -35,7 +35,7 @@ module Awful
     def buckets(name = /./)
       s3.list_buckets.buckets.select do |bucket|
         bucket.name.match(/#{name}/)
-      end.tap do |list|
+      end.output do |list|
         if options[:long]
           print_table list.map { |b| [ b.name, b.creation_date ] }
         else
@@ -48,7 +48,7 @@ module Awful
     def objects(bucket, prefix = nil)
       s3_resource.bucket(bucket).objects(prefix: prefix).map do |object|
         object.key
-      end.tap { |list| puts list }
+      end.output { |list| puts list }
     end
 
     desc 'exists? NAME', 'test if bucket exists'
@@ -57,12 +57,12 @@ module Awful
         s3.head_bucket(bucket: bucket_name) && true
       rescue Aws::S3::Errors::NotFound
         false
-      end.tap(&method(:puts))
+      end.output(&method(:puts))
     end
 
     desc 'empty? NAME', 'test if bucket is empty'
     def empty?(bucket_name)
-      s3.list_objects(bucket: bucket_name, max_keys: 1).contents.empty?.tap(&method(:puts))
+      s3.list_objects(bucket: bucket_name, max_keys: 1).contents.empty?.output(&method(:puts))
     end
 
     desc 'tagged [NAME_PREFIX]', 'list buckets matching given tags'
@@ -89,7 +89,7 @@ module Awful
         tags.any? do |set|
           conditions.any? { |c| c.call(set) }
         end && bucket
-      end.select{|b| b}.tap do |buckets|
+      end.select{|b| b}.output do |buckets|
         puts buckets.map(&:name)
       end
     end

data/lib/awful/security_group.rb

@@ -91,7 +91,9 @@ module Awful
       ## invoked from code, process ip_permissions objects as args
       perms = ip_permissions.map do |p|
         p.to_hash.tap do |h|
-          h[:user_id_group_pairs] = nil if h[:user_id_group_pairs].empty? # sdk will complain if this is empty
+          h.each do |k,v|
+            h[k] = nil if (v.respond_to?(:empty?) && v.empty?) # no empty arrays, e.g. user_group_id_pairs, prefix_list_ids
+          end
         end
       end
 

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = '0.0.132'
+  VERSION = '0.0.133'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.132
+  version: 0.0.133
 platform: ruby
 authors:
 - Ric Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler