awful 0.0.154 → 0.0.155

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2bd24fb889ffd0a4f8e3d4570a4e74fa66e4373
-  data.tar.gz: 67688dcd9f19ecd29307959cd6f031a9b1f51e01
+  metadata.gz: 3066108e8af44c4e49963df6e3939454cd62cd70
+  data.tar.gz: a9f3bec7a08eef96b2b72d9c795c682b565cc436
 SHA512:
-  metadata.gz: bdb25917f93b8debe1b61cfae9a19c138aad86d56174b086b67046536e03e3f469d43fe94f780a3686d6b83501c2f9aec89ecc00c69dfde0340ec387a95b14e6
-  data.tar.gz: cc732c8f9b8f83f9d603f6ec832a9be05c48a80b7d9c395e145a04bf0468b1004b8628b8b25bad21f4dc0073cf3af7463f32a28ce96f896817b7cb0b7cc6554c
+  metadata.gz: 915ff6520f33673d422daa38275626cbfeabc6eeae7b739ed49730a5c33703138bb5a1e7f7bf8f2da23767905f7a57e06e94d2016e5e5a64ba123e7b1b378e99
+  data.tar.gz: ab8d2e34eaae205dcc563990b9a50222e208f8ee2058fc8ca4b66d75508239604e1e22a3bfe8dff246329a7821e92ed9cbd5691629568c09dbf410185993a4d2

data/lib/awful/auto_scaling.rb

@@ -38,6 +38,17 @@ module Awful
         end
       end
 
+      ## return instances for named ASGs
+      def asg_instances(*names)
+        autoscaling.describe_auto_scaling_groups(auto_scaling_group_names: names).auto_scaling_groups.map(&:instances).flatten
+      end
+
+      ## lookup ec2 details for instances in named ASGs
+      def asg_instance_details(*names)
+        ids = asg_instances(*names).map(&:instance_id)
+        ec2.describe_instances(instance_ids: ids).map(&:reservations).flatten.map(&:instances).flatten.sort_by(&:launch_time)
+      end
+
       def instance_lifecycle_state(*instance_ids)
         autoscaling.describe_auto_scaling_instances(instance_ids: instance_ids).auto_scaling_instances.map(&:lifecycle_state)
       end
@@ -76,7 +87,7 @@ module Awful
     method_option :long,     aliases: '-l', type: :boolean, default: false, desc: 'long listing'
     method_option :describe, aliases: '-d', type: :boolean, default: false, desc: 'make extra call to get ASG name for each instance'
     def instances(*names)
-      instances = autoscaling.describe_auto_scaling_groups(auto_scaling_group_names: names).auto_scaling_groups.map(&:instances).flatten
+      instances = asg_instances(*names)
 
       ## make extra call to get asg name as part of object
       if options[:describe]
@@ -101,14 +112,10 @@ module Awful
       end
     end
 
-    desc 'ips NAME', 'list IPs for instances in groups matching NAME'
+    desc 'ips NAMES', 'list IPs for instances in named groups'
     method_option :long, aliases: '-l', default: false, desc: 'Long listing'
-    def ips(name)
-      ## get instance IDs for matching ASGs
-      ids = all_matching_asgs(name).map(&:instances).flatten.map(&:instance_id)
-
-      ## get instance details for these IDs
-      ec2.describe_instances(instance_ids: ids).map(&:reservations).flatten.map(&:instances).flatten.sort_by(&:launch_time).output do |instances|
+    def ips(*names)
+      asg_instance_details(*names).output do |instances|
         if options[:long]
           print_table instances.map { |i|
             [ i.public_ip_address, i.private_ip_address, i.instance_id, i.image_id, i.instance_type, i.placement.availability_zone, color(i.state.name), i.launch_time ]
@@ -117,18 +124,29 @@ module Awful
           puts instances.map(&:public_ip_address)
         end
       end
-
     end
 
     desc 'ssh NAME [ARGS]', 'ssh to an instance for this autoscaling group'
-    method_option :all,        aliases: '-a', default: false, desc: 'ssh to all instances'
-    method_option :number,     aliases: '-n', default: 1,     desc: 'number of instances to ssh'
-    method_option :login_name, aliases: '-l', default: nil,   desc: 'login name to pass to ssh'
+    method_option :all,        aliases: '-a', type: :boolean, default: false, desc: 'ssh to all instances'
+    method_option :number,     aliases: '-n', type: :numeric, default: 1,     desc: 'number of instances to ssh'
+    method_option :login_name, aliases: '-l', type: :string,  default: nil,   desc: 'login name to pass to ssh'
+    method_option :instances,  aliases: '-i', type: :array,   default: nil,   desc: 'list of partial instance IDs to filter'
+    method_option :verbose,    aliases: '-v', type: :boolean, default: false, desc: 'show IPs before running ssh'
     def ssh(name, *args)
-      ips = ips(name).map(&:public_ip_address)
+      instances = asg_instance_details(name)
+
+      ## filter by list of instance id patterns
+      if options[:instances]
+        instances.select! do |i|
+          options[:instances].map{ |pattern| i.instance_id.match(pattern) }.any?
+        end
+      end
+
+      ips = instances.map(&:public_ip_address)
       num = options[:all] ? ips.count : options[:number].to_i
       login_name = options[:login_name] ? "-l #{options[:login_name]}" : ''
       ips.last(num).each do |ip|
+        puts ip if options[:verbose]
         system "ssh #{login_name} #{ip} #{Array(args).join(' ')}"
       end
     end

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = '0.0.154'
+  VERSION = '0.0.155'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.154
+  version: 0.0.155
 platform: ruby
 authors:
 - Ric Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler