aws_public_ips 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a083bab67810085c9610fee6ca593420f077afd
-  data.tar.gz: eec41af99070ed34d83759f3f042bb3461618e3d
+  metadata.gz: 2130ff4b9f59ac6e30c1217be05ae4f3c4f73d17
+  data.tar.gz: 24669a0a29799a74acb37e501c467a59865081a3
 SHA512:
-  metadata.gz: 78688710a288065d81d6ce4ab60170cbbd3e1f83bed09d3c07efb89a4ad11e92155451ff03836b747554e485081db14b0f262c25636b38ae1c001c7556da80fc
-  data.tar.gz: 96ab667b2321e1c5f8b656551db71d92c1690715cba785900895493b8f402b48a3e8ea7ae56d9d8b575a2f5ccaa3412ac58f52f895bf2d5e005b616e09307560
+  metadata.gz: e4656877db332ff9b05c6b2eda71cb3266280c063dd64528e1da74d4cc18e3618a57feb057b64da9f5cf60dd6deba4edce78db0d3894e215b6ee0f34e8fe322a
+  data.tar.gz: 4505daa9cd54e8ca666b9725e25cdd70954155b381de47a4f9cab35393156fc34971371d0430ed6ed5d9b61c6352b54294f957067dbbc5a268841197b433d131

data/lib/aws_public_ips/cli.rb

@@ -96,10 +96,10 @@ module AwsPublicIps
       ::AwsPublicIps::Checks.const_get(service.capitalize).run
     end
 
-    def output(formatter, results)
+    def output(formatter, options, results)
       require "aws_public_ips/formatters/#{formatter}.rb"
       formatter_klass = ::AwsPublicIps::Formatters.const_get(formatter.capitalize)
-      output = formatter_klass.new(results).format
+      output = formatter_klass.new(results, options).format
       ::STDOUT.puts output unless output.empty?
     end
 
@@ -111,7 +111,7 @@ module AwsPublicIps
         [service.to_sym, check_service(service)]
       end.to_h
 
-      output(options[:format], results)
+      output(options[:format], options, results)
     rescue ::StandardError, ::Interrupt => ex
       ::STDERR.puts ex.inspect
       ::STDERR.puts ex.backtrace if options && options[:verbose]

data/lib/aws_public_ips/formatters/json.rb

@@ -5,8 +5,9 @@ require 'json'
 module AwsPublicIps
   module Formatters
     class Json
-      def initialize(results)
+      def initialize(results, options)
         @results = results
+        @options = options
       end
 
       def format

data/lib/aws_public_ips/formatters/prettyjson.rb

@@ -5,8 +5,9 @@ require 'json'
 module AwsPublicIps
   module Formatters
     class Prettyjson
-      def initialize(results)
+      def initialize(results, options)
         @results = results
+        @options = options
       end
 
       def format

data/lib/aws_public_ips/formatters/text.rb

@@ -3,14 +3,31 @@
 module AwsPublicIps
   module Formatters
     class Text
-      def initialize(results)
+      def initialize(results, options)
         @results = results
+        @options = options
       end
 
       def format
+        lines = @options[:verbose] ? format_verbose : format_normal
+        lines.uniq.join("\n")
+      end
+
+      def format_normal
         @results.values.flatten.flat_map do |hash|
           hash[:ip_addresses]
-        end.uniq.join("\n")
+        end
+      end
+
+      def format_verbose
+        @results.flat_map do |service, hashes|
+          next [] if hashes.empty?
+          ["## #{service}"] + hashes.flat_map do |hash|
+            [hash[:id], hash[:hostname]].compact.map do |line|
+              "# #{line}"
+            end + hash[:ip_addresses]
+          end
+        end
       end
     end
   end

data/lib/aws_public_ips/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AwsPublicIps
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws_public_ips
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Arkadiy Tetelman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-apigateway