awsutils 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5f6821233efc5b2ccae58b7e1704ca710677d7f
-  data.tar.gz: b410ed5b1d984f78502e6a1644e52b633f23ced6
+  metadata.gz: 85c4d31eee5853d0a2671122c63f9545534a9e91
+  data.tar.gz: 3f1f387a73456e368d762743ca7ba6c6a9548a9a
 SHA512:
-  metadata.gz: dc700cf9f38ef4160a961960c6dec9a2a68841743c829c00fab076bbb6ed8590d4a756257e6cbfd05320cf3ea35bb1a8bf3dfad79592d739c7b03034a9cf9989
-  data.tar.gz: cf9fd37811b4847d91739efbf9ada4b8b5690c646f164330824d625e9bb62f680cc0dc0339f6510bbe307d89a122b8b28d3e43d446791a648b700d64aab5a545
+  metadata.gz: d58121f23d06c6e3f149e4e3694336f3c34317087e3aba2f6793d037e93592f72086b26c95144f43ac17b6bcb606541dc244d8d08d53f66112547caf4040f8bc
+  data.tar.gz: 0a47336c477fe8b97faf165c7d5f06fb1d50a0bce6045a5acbb9895f4f1588b6938822d4536ee317acee1e37344b2c97f35eb72e183d9b4fd55d26f431dc78c9

data/lib/awsutils/ec2info.rb

@@ -1,10 +1,27 @@
 require 'rubygems'
 require 'fog/aws'
+require 'awesome_print'
 
 class String
+  def underscore
+    gsub(/::/, '/')
+      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+      .tr('-', '_')
+      .downcase
+  end
+
   def title_case
-    return self if self !~ /_/ && self =~ /[A-Z]+.*/
-    split('_').map { |e| e.capitalize }.join(' ')
+    underscore.split('_').map do |word|
+      # Recognize certain special cases (e.g. acronyms)
+      if %w(iam ebs id dns vpc).include? word.downcase
+        word.upcase
+      elsif word.casecmp('ids').zero?
+        'IDs'
+      else
+        word.capitalize
+      end
+    end.join(' ')
   end
 end
 
@@ -31,14 +48,14 @@ module AwsUtils
       @ec2 ||= Fog::Compute.new(provider: 'AWS')
     end
 
-    def instance_ids
+    def instances
       @instance_ids ||= begin
         if $DEBUG
           puts 'Entering instance_ids'
           puts "Search Term: #{search_terms.inspect}"
         end
 
-        results = search_terms.each_with_object([]) do |search_term, m|
+        instance_ids = search_terms.each_with_object([]) do |search_term, m|
           if (/^i-/ =~ search_term) && !(/\./ =~ search_term)
             m << search_term
           else
@@ -51,14 +68,14 @@ module AwsUtils
           end
         end
 
-        if results.empty?
+        if instance_ids.empty?
           puts 'No instances by that Name/ID in this account'
           exit 1
         end
 
         puts "Found instances: #{results.inspect}" if $DEBUG
 
-        results
+        ec2.servers.all 'instance-id' => instance_ids
       end
     end
 
@@ -133,12 +150,28 @@ module AwsUtils
       end
     end
 
-    def describe_instance
-      instance_attribute_index = ec2.servers.first.class.attributes
-        # ec2.servers.first.class.attributes.reject { |attr| attr == :vpc_id }
+    def printkv(key, value)
+      key_color = "\033[30;1m" # Style: Bold; Color: Default
+      reset_color = "\033[0m"
 
-      puts "Built attribute index: #{instance_attribute_index.inspect}" if $DEBUG
+      print "#{key_color}#{key.to_s.title_case}:#{reset_color} "
+      case
+      when value.respond_to?(:to_sym)
+        puts value
+      when value.respond_to?(:key?)
+        puts
+        value.each { |k, v| printkv "  #{k}", v }
+      when (
+        value.respond_to?(:join) &&
+        value.reject { |item| item.respond_to?(:to_sym) }.empty? # If value only contains strings, do this
+      )
+        value.join(', ')
+      else
+        puts value.inspect
+      end
+    end
 
+    def describe_instance
       col_green = "\033[32;1m" # Style: Bold; Color: Green
       col_red = "\033[31;1m" # Style: Bold; Color: Red
       # col_blinking_red = "\033[31;5m"
@@ -146,22 +179,14 @@ module AwsUtils
       key_color = "\033[30;1m" # Style: Bold; Color: Default
       reset_color = "\033[0m"
 
-      instance_ids.each do |instance_id|
-        instance = ec2.servers.get instance_id
-
+      instances.each do |instance|
         puts "#{key_color}NAME:#{reset_color} #{instance.tags['Name']}"
         puts
 
-        instance_attribute_index.each do |instance_attribute|
+        instance.attributes.each do |instance_attribute, _value|
           puts "Instance attribute: #{instance_attribute}" if $DEBUG
 
           case instance_attribute
-          when :id
-            puts "#{key_color}ID:#{reset_color} #{instance.id}"
-          when :ami_launch_index
-            puts "#{key_color}AMI Launch Index:#{reset_color} #{instance.ami_launch_index}"
-          when :availability_zone
-            puts "#{key_color}Availability Zone:#{reset_color} #{instance.availability_zone}"
           when :block_device_mapping
             puts "#{key_color}Block Devices:#{reset_color} "
 
@@ -230,8 +255,6 @@ module AwsUtils
             elsif $DEBUG
               puts "#{key_color}Client Token:#{reset_color} N/A"
             end
-          when :dns_name
-            puts "#{key_color}DNS Name:#{reset_color} #{instance.dns_name}"
           when :groups
             instance.groups.each do |group_id|
               group = ec2.security_groups.get(group_id)
@@ -279,36 +302,12 @@ module AwsUtils
                 puts "\t\t#{key_color}#{image_tag}: #{image_tag_value}"
               end
             end
-          when :kernel_id
-            puts "#{key_color}Kernel ID:#{reset_color} #{instance.kernel_id}"
-          when :key_name
-            puts "#{key_color}SSH Key:#{reset_color} #{instance.key_name}"
-          when :created_at
-            puts "#{key_color}Created Date:#{reset_color} #{instance.created_at}"
-          when :monitoring
-            puts "#{key_color}Monitoring:#{reset_color} #{instance.monitoring}"
-          when :placement_group
-            if instance.placement_group
-              puts "#{key_color}Placement Group:#{reset_color} #{instance.placement_group}"
-            elsif $DEBUG
-              puts "#{key_color}Placement Group:#{reset_color} N/A"
-            end
-          when :platform
-            if instance.platform
-              puts "#{key_color}Platform:#{reset_color} #{instance.platform}"
-            elsif $DEBUG
-              puts "#{key_color}Platform:#{reset_color} N/A"
-            end
           when :product_codes
             if instance.product_codes.any?
               puts "#{key_color}Product Codes:#{reset_color} #{instance.product_codes.join(',')}"
             elsif $DEBUG
               puts "#{key_color}Product Codes:#{reset_color} N/A"
             end
-          when :private_dns_name
-            puts "#{key_color}Private DNS Name:#{reset_color} #{instance.private_dns_name}"
-          when :private_ip_address
-            puts "#{key_color}Private IP Address:#{reset_color} #{instance.private_ip_address}"
           when :public_ip_address
             if ec2.addresses.get(instance.public_ip_address)
               puts "#{key_color}Public IP Address:#{reset_color} " \
@@ -317,36 +316,6 @@ module AwsUtils
               puts "#{key_color}Public IP Address:#{reset_color} " \
                    "#{instance.public_ip_address} (#{col_red}DYNAMIC#{reset_color})"
             end
-          when :ramdisk_id
-            if instance.ramdisk_id
-              puts "#{key_color}Ramdisk ID:#{reset_color} #{instance.ramdisk_id}"
-            elsif $DEBUG
-              puts "#{key_color}Ramdisk ID:#{reset_color} N/A"
-            end
-          when :reason
-            if instance.reason
-              puts "#{key_color}State Reason:#{reset_color} #{instance.reason}"
-            elsif $DEBUG
-              puts "#{key_color}State Reason:#{reset_color} N/A"
-            end
-          when :root_device_name
-            if instance.root_device_name
-              puts "#{key_color}Root Device Name:#{reset_color} #{instance.root_device_name}"
-            elsif $DEBUG
-              puts "#{key_color}Root Device Name:#{reset_color} N/A"
-            end
-          when :root_device_type
-            if instance.root_device_type
-              puts "#{key_color}Root Device Type:#{reset_color} #{instance.root_device_type}"
-            elsif $DEBUG
-              puts "#{key_color}Root Device Name:#{reset_color} N/A"
-            end
-          when :security_group_ids
-            if instance.security_group_ids
-              puts "#{key_color}Security Group IDs:#{reset_color} #{instance.security_group_ids}"
-            elsif $DEBUG
-              puts "#{key_color}Security Group IDs:#{reset_color} N/A"
-            end
           when :state
             state_color = get_state_color(instance.state)
             puts "#{key_color}State:#{reset_color} #{state_color}#{instance.state}#{reset_color}"
@@ -356,14 +325,6 @@ module AwsUtils
             elsif $DEBUG
               puts "#{key_color}State Reason Code:#{reset_color} N/A"
             end
-          when :subnet_id
-            if instance.subnet_id
-              puts "#{key_color}Subnet ID:#{reset_color} #{instance.subnet_id}"
-            elsif $DEBUG
-              puts "#{key_color}Subnet ID:#{reset_color} N/A"
-            end
-          when :tenancy
-            puts "#{key_color}Tenancy:#{reset_color} #{instance.tenancy}"
           when :tags
             if instance.tags.any?
               puts "#{key_color}Tags:#{reset_color} "
@@ -374,21 +335,12 @@ module AwsUtils
             else
               puts "#{key_color}Tags:#{reset_color} None"
             end
-          when :user_data
-            if instance.user_data
-              puts "#{key_color}User Data:#{reset_color} #{instance.user_data}"
-            elsif $DEBUG
-              puts "#{key_color}User Data:#{reset_color} N/A"
-            end
-          when :vpc_id
-            if instance.vpc_id
-              puts "#{key_color}VPC ID:#{reset_color} #{instance.vpc_id}"
-            elsif $DEBUG
-              puts "#{key_color}VPC ID: #{reset_color} N/A"
-            end
           else
-            print "#{key_color}#{instance_attribute.to_s.title_case}:#{reset_color} "
-            puts instance.respond_to?(:instance_attribute) ? '' : '<NULL>'
+            if instance.respond_to?(instance_attribute) && !instance.send(instance_attribute).nil?
+              printkv instance_attribute, instance.send(instance_attribute)
+            else
+              printkv instance_attribute, '<NULL>'
+            end
           end
         end
 
@@ -399,7 +351,7 @@ module AwsUtils
           puts "#{key_color}Shutdown Behavior:#{reset_color} Do nothing"
         end
 
-        if instance_id != instance_ids.last
+        if instance.id != instances.last.id
           puts '------------------------------------------------------------------------------------'
         end
       end

data/lib/awsutils/version.rb

@@ -1,3 +1,3 @@
 module AwsUtils
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awsutils
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Eric Herot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler