joyent-cloud-pricing 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6830b1d71aec26c98b251688edacd2a40448eac1
-  data.tar.gz: bfdeb0a822f1f8f6b15122402c4dbc491a061349
+  metadata.gz: aac73146144562c99dbb072fc766712d3793029d
+  data.tar.gz: ff9efc1f136467be58322a9ce8335ae1b5c81f88
 SHA512:
-  metadata.gz: 8c8bf089f0fe1f5e7361061ab4dcad2bc10845f64b2bdd92c40a20391910b59bdb8cc47540a5318eb9b656a0aef4552230c04bab1a6c8af5db9a3b40da0be958
-  data.tar.gz: cca584aaaecb758178cf1212a04400e1e8856a1c7c81b04a6b4e7ee6d6910ee137b2cc28da2f9d6e4f638e89fc6fc3f9242d67a4bb7e08a01f841236776267a8
+  metadata.gz: 0835ae276c4a763e3534662c5adfafc79ad3139fe5b77606e095eb87e28029fef851d5e5a852707ca450dd3838cd9722ed448fcedc100d551c03a07143f10205
+  data.tar.gz: 3fbb855a0a63c05a872320e557e944b48c2f55c3c035a008b2ce2abcde463607d19473c0100b13c9a3f7365ba136906c6568d560c29b86e35e7f36d215ed3e8a

data/lib/pricing/analyzer.rb

@@ -35,6 +35,10 @@ module Joyent::Cloud::Pricing
       unknown_zone_counts.size > 0
     end
 
+    def have_over_reserved_zones?
+      over_reserved_zone_counts.size > 0
+    end
+
     # Non-discounted full price
     def monthly_full_price
       monthly_full_price_for(zone_counts)

data/lib/pricing/reporter.rb

@@ -65,6 +65,18 @@ module Joyent::Cloud::Pricing
       end
     end
 
+    def unknown_flavor_zone_list
+      analyzer.unknown_zone_counts.keys
+    end
+
+    def over_reserved_zone_list
+      analyzer.over_reserved_zone_counts.keys
+    end
+
+    def zone_list_for_print(list, format = '    %-40s')
+      list.map{|k| sprintf(format, k) }.join("\n")
+    end
+
     SEPARATOR = ('.' * 65).cyan
     PROPS_FORMAT= '%20d %20d %20d'
     REPORT_ASCII = <<ASCII
@@ -74,7 +86,8 @@ module Joyent::Cloud::Pricing
   were excluded from calculations. Add them to legacy_prices.yml.
 
   List of flavors with unknown properties:
-<%= @r.analyzer.unknown_zone_counts.keys.map{|k| sprintf("    %20s", k) }.join("\n").red %>
+  Total # of unrecognized flavor zones       <%= sprintf("%20d", @r.analyzer.unknown_zone_counts.keys.size).red %>
+<%= @r.zone_list_for_print(@r.unknown_flavor_zone_list).red %>
 <%= SEPARATOR %>
 
 <%- end -%>
@@ -82,8 +95,12 @@ ZONE COUNTS:
   Total # of zones                           <%= sprintf("%20d", @r.zones).cyan %>
 <%- if @r.reserve? -%>
   Total # of reserved zones                  <%= sprintf("%20d", @r.commit.total_zones).green %>
+<%- if @r.analyzer.have_over_reserved_zones? -%>
   Total # of reserved but absent zones       <%= value = sprintf("%20d", @r.analyzer.over_reserved_zone_counts.size || 0); value == "0" ? value.blue : value.red %>
+<%= @r.zone_list_for_print(@r.over_reserved_zone_list).red %>
 <%- end -%>
+<%- end -%>
+<%= SEPARATOR %>
 
   Resources in use:<%= sprintf('%14s %15s %15s', 'Reserved', 'On-Demand', 'Total') %>
            CPUs  <%= props = @r.zone_props_to_string(:cpus, 16); props[0].green + props[1].yellow + props[2].cyan %>

data/lib/pricing/version.rb

@@ -1,7 +1,7 @@
 module Joyent
   module Cloud
     module Pricing
-      VERSION = '1.0.7'
+      VERSION = '1.0.8'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joyent-cloud-pricing
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Konstantin Gredeskoul