awful 0.0.128 → 0.0.129

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0da7e8c9d19b6ce0b6188f1e1c32c81c9c75eaa
-  data.tar.gz: 97a8e87f2f1e5e83e1e1d5ec3e1c8fae26a83727
+  metadata.gz: 0b42c1307ba85f1ac5d4d7b891a89b31e2eb81db
+  data.tar.gz: e41231a0ce6fe31bdd0053b913f70da625284b82
 SHA512:
-  metadata.gz: 135c8ae7944cdd637c553000d5997e282b682c8b65db6d45f940d12a9c1c7b582868f789126e1cd704113ea8f7ed5c9d890ef081ed0fb4a46935a4b209bd1ff6
-  data.tar.gz: 8360d46cd3a3ab4caac731d72a289b4811063727ed689bd474f7bef4e78b52fada39af9b80d0bac6efa675a5061231540f47d16cacb9249f918b24fb3eb49083
+  metadata.gz: 05d39485efefac9c059141353c8559ad7da30ef07e3855e281f1e45131c044d7d1d01c614bd3cd1a47787af2d27a9e1f1d2c5032df1981c608bf45d70582c47a
+  data.tar.gz: 9a175c7d3fab01a0768d50536803f2e1cef69f46c9b429f4b2ce484dbc984aadf48b1aea3eef96ed64a07132449caa70e8a32ab0ae805ce6fbae493124fdb99c

data/lib/awful/elb.rb

@@ -22,12 +22,19 @@ module Awful
           elb.load_balancer_name.match(name)
         end
       end
+
+      ## get array of instance_id hashes in form expected by get methods
+      def instance_ids(*ids)
+        ids.map do |id|
+          {instance_id: id}
+        end
+      end
     end
 
     desc 'ls [NAME]', 'list load-balancers matching NAME'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'
     def ls(name = /./)
-      all_matching_elbs(name).tap do |elbs|
+      all_matching_elbs(name).output do |elbs|
         if options[:long]
           print_table elbs.map { |e|
             [e.load_balancer_name, e.instances.length, e.availability_zones.join(','), e.dns_name]
@@ -46,7 +53,7 @@ module Awful
       end.flatten
 
       if instances.empty?
-        instances.tap { puts 'no instances' }
+        instances.output { puts 'no instances' }
       else
         instances_by_id = instances.inject({}) { |hash,instance| hash[instance.instance_id] = instance; hash }
         if options[:long]
@@ -54,16 +61,16 @@ module Awful
             health = instances_by_id[instance.instance_id]
             instance_name = tag_name(instance) || '-'
             [ instance.instance_id, instance_name, instance.public_ip_address, color(health.state), health.reason_code, health.description ]
-          end.tap { |list| print_table list }
+          end.output { |list| print_table list }
         else
-          instances_by_id.keys.tap { |list| puts list }
+          instances_by_id.keys.output { |list| puts list }
         end
       end
     end
 
     desc 'dump NAME', 'dump VPC with id or tag NAME as yaml'
     def dump(name)
-      all_matching_elbs(name).map(&:to_hash).tap do |elbs|
+      all_matching_elbs(name).map(&:to_hash).output do |elbs|
         elbs.each do |elb|
           puts YAML.dump(stringify_keys(elb))
         end
@@ -72,7 +79,7 @@ module Awful
 
     desc 'tags NAME', 'dump tags on all ELBs matching NAME (up to 20)'
     def tags(name)
-      elb.describe_tags(load_balancer_names: all_matching_elbs(name).map(&:load_balancer_name)).tag_descriptions.tap do |tags|
+      elb.describe_tags(load_balancer_names: all_matching_elbs(name).map(&:load_balancer_name)).tag_descriptions.output do |tags|
         tags.each do |tag|
           puts YAML.dump(stringify_keys(tag.to_hash))
         end
@@ -83,14 +90,14 @@ module Awful
     def tag(name, key)
       elb.describe_tags(load_balancer_names: [name]).tag_descriptions.first.tags.find do |tag|
         tag.key == key
-      end.tap do |tag|
+      end.output do |tag|
         puts tag.value
       end
     end
 
     desc 'dns NAME', 'get DNS names for load-balancers matching NAME'
     def dns(name)
-      all_matching_elbs(name).map(&:dns_name).tap do |dns_names|
+      all_matching_elbs(name).map(&:dns_name).output do |dns_names|
         puts dns_names
       end
     end
@@ -104,7 +111,7 @@ module Awful
       opt.delete(:availability_zones) unless opt.fetch(:subnets, []).empty?
       opt = remove_empty_strings(opt)
       opt = only_keys_matching(opt, whitelist)
-      elb.create_load_balancer(opt).map(&:dns_name).flatten.tap { |dns| puts dns }
+      elb.create_load_balancer(opt).map(&:dns_name).flatten.output { |dns| puts dns }
       health_check(name) if opt[:health_check]
     end
 
@@ -117,7 +124,7 @@ module Awful
     def health_check(name)
       opt = load_cfg.merge(options.reject(&:nil?))
       hc = elb.configure_health_check(load_balancer_name: name, health_check: opt[:health_check])
-      hc.map(&:health_check).flatten.first.tap do |h|
+      hc.map(&:health_check).flatten.first.output do |h|
         print_table h.to_hash
       end
     end
@@ -130,23 +137,23 @@ module Awful
     end
 
     desc 'register INSTANCES', 'register listed instance IDs with ELB'
-    def register(name, *instance_ids)
-      elb.register_instances_with_load_balancer(load_balancer_name: name, instances: instance_ids.map{ |id| {instance_id: id} })
+    def register(name, *instances)
+      elb.register_instances_with_load_balancer(load_balancer_name: name, instances: instance_ids(*instances))
     end
 
     desc 'deregister INSTANCES', 'deregister listed instance IDs from ELB'
-    def deregister(name, *instance_ids)
-      elb.deregister_instances_from_load_balancer(load_balancer_name: name, instances: instance_ids.map{ |id| {instance_id: id} })
+    def deregister(name, *instances)
+      elb.deregister_instances_from_load_balancer(load_balancer_name: name, instances: instance_ids(*instances))
     end
 
     desc 'state [INSTANCE_IDS]', 'show health state for all instances, or listed instance ids'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'
-    def state(name, *instance_ids)
-      elb.describe_instance_health(load_balancer_name: name, instances: instance_ids.map { |id| {instance_id: id} }).instance_states.tap do |instances|
+    def state(name, *instances)
+      elb.describe_instance_health(load_balancer_name: name, instances: instance_ids(*instances)).instance_states.output do |list|
         if options[:long]
-          print_table instances.map { |i| [ i.instance_id, i.state, i.reason_code, i.description ] }
+          print_table list.map { |i| [ i.instance_id, i.state, i.reason_code, i.description ] }
         else
-          puts instances.map { |i| i.state }
+          puts list.map(&:state)
         end
       end
     end

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = '0.0.128'
+  VERSION = '0.0.129'
 end

metadata

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