joyent-cloud-pricing 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53bb4dcbcc11ef172f4dee489d822a8321376c14
-  data.tar.gz: 1e5f59d10f6e583c0d169e306d62cec68c590841
+  metadata.gz: ffe763f26373c4c9dd19d269cabb8d34be18204b
+  data.tar.gz: e1454babed191bb8e3ddd4f3a6d0f768396a5c76
 SHA512:
-  metadata.gz: 6acc5a126679a3cb3188b274ebed7b1569b51a62191a48f40e5e65e253f26284768dbcb95f8dd2c2d2862e2b234ffec9f04e7b02681a1bb46388d29cebd0edd1
-  data.tar.gz: 143cbf0c084214bf76d67cac0f4377f590607c597e5eb908d3cbb13e6e1633ac2a106351b658288ab22f82f53c08a5801de70a674cdd3d2fcc4f79fcfe1b8c27
+  metadata.gz: 8ee3d92c075e5bd7bd352b59b6e16bf1e6fcd57b5312888b9ae8d802d63bd206138ae8c36c8a95226c56546bae3fd4125fbab1e75d16d53c3a13a207ef0007fb
+  data.tar.gz: a37d969d4682497eb6380875b9fa7380190145b1d6b3946de4b15d1885f638e2b416c3f51647a47c4a6480058d4d692d223c40cbaac4ca088e56182fdf3859fe

data/README.md

@@ -54,15 +54,16 @@ Or install it yourself as:
 
 Most recent pricing structure is stored in the YAML file under ```config/joyent_pricing.yml```.
 
-To update this file, run provided rake task:
+To update this file using prices published on Joyent's website, run the provided rake
+task, and if YAML file changed, please feel free to submit a pull request.
 
 ```ruby
 rake joyent:pricing:update
 ```
 
-## Full Pricing
+### Full Pricing
 
-Full price is stored in the configuration instance.
+Full price is stored in the configuration instance and is read from YAML file.
 
 ```ruby
 c = Joyent::Cloud::Pricing::Configuration.instance
@@ -74,7 +75,7 @@ f.name
 # => "g3-highmemory-34.25-kvm"
 ```
 
-## Analysis of Commit Pricing
+### Analysis of Commit Pricing
 
 >  DISCLAIMER: please note that prices specified in this sample commit configuration
 >  are completely arbitrary and have no relationship to any actual discounts issued by Joyent, Inc.
@@ -126,7 +127,30 @@ analyzer.monthly_overages_price   # => monthly $$ for instances in excess of res
 analyzer.over_reserved_zone_list  # => list of zones in reserve, but not in reality
 ```
 
-## Reporter
+### Custom Pricing
+
+If you have some zones with flavors that are either old, or created specifically for you,
+they may not be known to this library.  If they are known to you, you can use the reserve
+pricing YAML file, and add a 'custom' section to it to define prices (and other attributes)
+for any of the custom flavors, as follows (note that the 'reserved' section is not required).
+
+```yaml
+defaults: &defaults
+    years: 1
+
+custom:
+  :flavor-just-for-me:
+    :cost: 1.22
+    :disk: 800
+    :ram: 96
+    :cpus: 32
+
+```
+
+The structure is the same as in the main file ```joyent_pricing.yml```, and the contents will
+simply be merged on top of Joyent's standard pricing, so you can even overwrite existing flavors.
+
+### Reporter
 
 This module is used by ```knife joyent server price``` plugin to calculate pricing with and without
 reserve discounts.
@@ -144,23 +168,28 @@ puts reporter.render
 Example output with commit pricing used:
 
 ```
+Joyent Pricing Calculator: https://github.com/kigster/joyent-cloud-pricing
+.................................................................
 ZONE COUNTS:
   Total # of zones                                             33
   Total # of reserved zones                                    27
-  Total # of reserved but absent zones                          1
+  Total # of reserved but absent flavors                        6
+      4 x g3-highmemory-68.375-smartos
+      2 x g3-highcpu-7-smartos
+.................................................................
 
   Resources in use:      Reserved       On-Demand           Total
            CPUs               384             118             494
            RAM               828G            140G            907G
            DISK               23T              5T             27T
-.................................................................
 
 MONTHLY COSTS:
   List of on-demand flavors by price (in excess of reserve)
-  2 x g3-highcpu-32-smartos-cc                          $3,339.36
-  2 x g3-highcpu-16-smartos                             $1,670.40
-  2 x g3-highcpu-7-smartos                                $731.52
-  1 x g3-standard-30-smartos                              $691.20
+
+      2 x g3-highcpu-32-smartos-cc                      $3,339.36
+      2 x g3-highcpu-16-smartos                         $1,670.40
+      2 x g3-highcpu-7-smartos                            $731.52
+      1 x g3-standard-30-smartos                          $691.20
                                                       ___________
   On demand monthly                                     $6,432.48
   Zones under reserve pricing                           $8,720.00
@@ -181,14 +210,18 @@ YEARLY RESERVE SAVINGS:
 .................................................................
 ```
 
-## Usage with knife joyent
+### Color
+
+You can turn off color output by setting ```NO_COLOR``` environment variable.
+
+### Usage with knife joyent
 
-This gem is integrated with latest version of [knife-joyent](https://github.com/joyent/knife-joyent) gem.
+This gem is integrated into [knife-joyent](https://github.com/joyent/knife-joyent) gem.
 
-Use it as follows:
+Use it with ```knife joyent``` as follows:
 
 ```
-knife joyent server pricing -z -r config/my-reserve-config.yml
+knife joyent server pricing -z -r config/my-reserve-config.yml [ --no-color ]
 ```
 
 ## Contributing

data/config/commit_pricing.yml.example

@@ -12,3 +12,9 @@ reserved:
     prepay: 800.00
     monthly: 60
     number: 12
+
+custom:
+  :my-special-custom-flavor-pricing-hourly:
+    :cost: 2.451
+  :another-flavor-just-for-me:
+    :cost: 1.22

data/config/{legacy_prices.yml → joyent_pricing_unpublished.yml}

@@ -1,8 +1,19 @@
 :g3-standard-8-smartos:
   :cost: 0.26
+  :ram: 8.0
+  :cpus: 4.0
+  :disk: 738
 :g3-highcpu-8-smartos:
   :cost: 0.58
+  :ram: 8.0
+  :cpus: 8.0
+  :disk: 738
 :g3-standard-0.5-smartos:
   :cost: 0.016
+  :ram: 0.5
+  :cpus: 0.5
 :g3-highmemory-96-smartos:
   :cost: 2.451
+  :ram: 7.5
+  :cpus: 32.0
+  :disk: 3100

data/lib/pricing.rb

@@ -6,7 +6,7 @@ module Joyent
     module Pricing
 
       PRICING_FILENAME  = File.expand_path('../../config/joyent_pricing.yml', __FILE__)
-      LEGACY_FILENAME   = File.expand_path('../../config/legacy_prices.yml', __FILE__)
+      LEGACY_FILENAME   = File.expand_path('../../config/joyent_pricing_unpublished.yml', __FILE__)
       COMMIT_FILENAME   = 'config/commit_pricing.yml'
       JOYENT_URL        = 'http://www.joyent.com/products/compute-service/pricing'
       HOURS_PER_MONTH   = 720

data/lib/pricing/analyzer.rb

@@ -31,10 +31,20 @@ module Joyent::Cloud::Pricing
       h
     end
 
+    def unknown_zone_total
+      count_for_all(unknown_zone_counts) do |flavor|
+        1
+      end.to_i
+    end
+
     def have_unknown_zones?
       unknown_zone_counts.size > 0
     end
 
+    def have_excess_zones?
+      excess_zone_counts.size > 0
+    end
+
     def have_over_reserved_zones?
       over_reserved_zone_counts.size > 0
     end

data/lib/pricing/commit.rb

@@ -5,19 +5,23 @@ module Joyent::Cloud::Pricing
   class Commit
     class << self
       def from_yaml(filename = COMMIT_FILENAME)
-        new(YAML.load(File.read(filename))['reserved'])
+        hash = YAML.load(File.read(filename))
+        new(hash['reserved'] || {}, hash['custom'])
       end
     end
 
     # map of image names to prices
-    attr_accessor :reserves
+    attr_accessor :reserves, :custom
 
-    def initialize(hash = {})
+    def initialize(hash = {}, custom = nil)
       @config = hash.symbolize_keys
       self.reserves = {}
       @config.each_pair do |flavor, config|
         self.reserves[flavor] = Reserve.new(flavor, config)
       end
+      if custom
+        Joyent::Cloud::Pricing::Configuration.instance.merge(custom)
+      end
     end
 
     def reserve_for flavor

data/lib/pricing/configuration.rb

@@ -64,6 +64,10 @@ module Joyent::Cloud::Pricing
       end
     end
 
+    def merge(additional_pricing)
+      config.merge!(additional_pricing)
+    end
+
   end
 end
 

data/lib/pricing/report.txt.erb

@@ -0,0 +1,66 @@
+<%- separator = ('.' * 65).cyan -%>
+Joyent Pricing Calculator: https://github.com/kigster/joyent-cloud-pricing
+<%= separator %>
+<%- if have_unknown_zones? -%>
+  <%= "WARNING!".red %>: Some 'flavors' in your list were not recognized, and
+  were excluded from calculations. You could add them to the "custom"
+  section of your reserve pricing file, and specify their cost.
+
+  Total # of zones with unknown flavors:     <%= sprintf("%20d", unknown_zone_total).red %>
+  List of unknown flavors below:
+
+<%= unknown_zones_for_print.red %>
+<%= separator %>
+
+<%- end -%>
+ZONE COUNTS:
+  Total # of zones                           <%= sprintf("%20d", zones_in_use.size).cyan %>
+<%- if have_commit_pricing? -%>
+  Total # of reserved zones                  <%= sprintf("%20d", commit.total_zones).green %>
+<%-     if have_over_reserved_zones? -%>
+  Total # of reserved but absent flavors     <%= value = sprintf("%20d", over_reserved_zone_counts.size || 0); value == "0" ? value.blue : value.red %>
+<%= over_reserved_zones_for_print.magenta %>
+<%-     end -%>
+<%- end -%>
+<%= separator %>
+
+  Resources in use:<%= sprintf('%14s %15s %15s', 'Reserved', 'On-Demand', 'Total') %>
+           CPUs  <%= props = zone_props_to_string(:cpus, 16); props[0].green + props[1].yellow + props[2].cyan %>
+           RAM   <%= props = zone_props_to_string(:ram,  15, 'G'); props[0].green + props[1].yellow + props[2].cyan %>
+           DISK  <%= props = zone_props_to_string(:disk, 15, 'T', 1024); props[0].green + props[1].yellow + props[2].cyan %>
+<%= separator %>
+
+MONTHLY COSTS:
+<%- if print_zone_list -%>
+  List of on-demand flavors by price <%= have_commit_pricing? ? "(in excess of reserve)" : "" %>
+
+<%= excess_zones_for_print %>
+                                                      <%= "___________".yellow %>
+<%- end -%>
+  On demand monthly                          <%= format_price(monthly_overages_price, 20).yellow %>
+<%- if have_commit_pricing? -%>
+  Zones under reserve pricing                <%= format_price(commit.monthly_price, 20).green %>
+<%- end -%>
+<%- if have_commit_pricing? -%>
+                                                      <%= "___________".cyan %>
+  Total                                      <%= format_price(monthly_total_price, 20).cyan %>
+<%- end -%>
+<%= separator %>
+
+YEARLY COSTS:
+<%- if have_commit_pricing? -%>
+  On demand yearly                           <%= format_price(yearly_overages_price, 20).yellow %>
+  Reserve prepay one time fee                <%= format_price(commit.upfront_price, 20).green %>
+  Reserve sum of all monthly fees            <%= format_price(commit.monthly_price * 12, 20).green %>
+                                                      <%= "___________".cyan %>
+  Total                                      <%= format_price(yearly_total, 20).cyan %>
+<%- else -%>
+  On demand yearly                           <%= format_price(yearly_full_price, 20).cyan %>
+<%- end -%>
+<%- if have_commit_pricing? -%>
+
+YEARLY RESERVE SAVINGS:
+  Savings due to reserved pricing            <%= format_price(yearly_savings, 20).green %>
+  Savings %                                  <%= sprintf("%19d", yearly_savings_percent).green + '%'.green %>
+<%- end -%>
+<%= separator %>

data/lib/pricing/reporter.rb

@@ -5,7 +5,7 @@ require 'colored'
 module Joyent::Cloud::Pricing
   class Reporter
 
-    attr_accessor :commit, :zones_in_use, :analyzer, :formatter, :print_zone_list
+    attr_accessor :commit, :zones_in_use, :analyzer, :formatter, :print_zone_list, :template
 
     def initialize(commit = COMMIT, zones_in_use = [])
       @commit = case commit
@@ -20,130 +20,100 @@ module Joyent::Cloud::Pricing
                 end
 
       @zones_in_use = zones_in_use
-      @analyzer  = Joyent::Cloud::Pricing::Analyzer.new(@commit, @zones_in_use)
+      @analyzer = Joyent::Cloud::Pricing::Analyzer.new(@commit, @zones_in_use)
       @formatter = Joyent::Cloud::Pricing::Formatter.new(pricing.config)
       @print_zone_list = true
+      @template = File.read(File.expand_path('../report.txt.erb', __FILE__))
     end
 
-    def render
+    def render(options = {})
+      disable_color if (options && options[:disable_color]) || ENV['NO_COLOR']
       @r = self
-      @f = formatter
-      ERB.new(REPORT_ASCII, 0, '-').result(binding)
+      ERB.new(template, 0, '-').result(binding)
     end
 
-    def reserve?
-      commit.reserves.size > 0
+    def pricing
+      Joyent::Cloud::Pricing::Configuration.instance
     end
 
-    def zones
-      zones_in_use.size
+    # Various formatting helpers follow below
+    # Note that we delegate to analyzer for majority of calls.
+    # Sorry about that method_missing :(
+
+    def method_missing(method, *args, &block)
+      if @analyzer.respond_to?(method)
+        @analyzer.send(method, *args, &block)
+      else
+        super
+      end
     end
 
-    def pricing
-      Joyent::Cloud::Pricing::Configuration.instance
+    def format_price *args
+      @formatter.format_price *args
     end
 
-    def excess_zones
-      zones = analyzer.excess_zone_counts.each_pair.
-          map{|flavor, count| [ flavor, count, pricing.monthly(flavor) * count ]}.
-          sort{|x,y| y[2] <=> x[2]}
-      zones
+    def have_commit_pricing?
+      commit.reserves.size > 0
     end
 
-    def excess_zone_list
-      excess_zones.map do |tuple|
-        flavor, count, monthly = tuple
-        sprintf(" %2d x %-36s   %20s",
-          count, flavor, formatter.format_price(monthly, 20).yellow)
-      end.join("\n")
+    def excess_zones_for_print
+      zones_for_print(zone_counts_to_list(analyzer.excess_zone_counts), :yellow)
     end
 
-    def zone_props_to_string(prop_type, width, suffix = '', divide_by = 1)
-      props = analyzer.send(prop_type)
-      [ props[:reserved], props[:unreserved], props[:total] ].map do |value|
-        sprintf("%#{width}d#{suffix}", value / divide_by)
-      end
+    def over_reserved_zones_for_print
+      zones_for_print(analyzer.over_reserved_zone_counts)
     end
 
-    def unknown_flavor_zone_list
-      analyzer.unknown_zone_counts.keys
+    def unknown_zones_for_print
+      zone_list_for_print(analyzer.unknown_zone_counts.keys)
     end
 
-    def over_reserved_zone_list
-      analyzer.over_reserved_zone_counts.keys
+    def zones_for_print(zone_list, color = nil)
+      zone_list.map do |tuple|
+        flavor, count, monthly = tuple
+        price = formatter.format_price(monthly, 16)
+        price = price.send(color) if color
+        sprintf("     %2d x %-36s   %16s", count, flavor, price)
+      end.join("\n")
     end
 
     def zone_list_for_print(list, format = '    %-40s')
-      list.map{|k| sprintf(format, k) }.join("\n")
+      list.map { |k| sprintf(format, k) }.join("\n")
     end
 
-    SEPARATOR = ('.' * 65).cyan
-    PROPS_FORMAT= '%20d %20d %20d'
-    REPORT_ASCII = <<ASCII
-
-<%- if @r.analyzer.have_unknown_zones? -%>
-  <%= "WARNING!".red %>: flavor list has values which were not recognized, and
-  were excluded from calculations. Add them to legacy_prices.yml.
-
-  List of flavors with unknown properties:
-  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 -%>
-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 %>
-           RAM   <%= props = @r.zone_props_to_string(:ram,  15, 'G'); props[0].green + props[1].yellow + props[2].cyan %>
-           DISK  <%= props = @r.zone_props_to_string(:disk, 15, 'T', 1024); props[0].green + props[1].yellow + props[2].cyan %>
-<%= SEPARATOR %>
-
-MONTHLY COSTS:
-<%- if @r.print_zone_list -%>
-  List of on-demand flavors by price <%= @r.reserve? ? "(in excess of reserve)" : "" %>
-<%= @r.excess_zone_list %>
-                                                      <%= "___________".yellow %>
-<%- end -%>
-  On demand monthly                          <%= @f.format_price(@r.analyzer.monthly_overages_price, 20).yellow %>
-<%- if @r.reserve? -%>
-  Zones under reserve pricing                <%= @f.format_price(@r.commit.monthly_price, 20).green %>
-<%- end -%>
-<%- if @r.reserve? -%>
-                                                      <%= "___________".cyan %>
-  Total                                      <%= @f.format_price(@r.analyzer.monthly_total_price, 20).cyan %>
-<%- end -%>
-<%= SEPARATOR %>
-
-YEARLY COSTS:
-<%- if @r.reserve? -%>
-  On demand yearly                           <%= @f.format_price(@r.analyzer.yearly_overages_price, 20).yellow %>
-  Reserve prepay one time fee                <%= @f.format_price(@r.commit.upfront_price, 20).green %>
-  Reserve sum of all monthly fees            <%= @f.format_price(@r.commit.monthly_price * 12, 20).green %>
-                                                      <%= "___________".cyan %>
-  Total                                      <%= @f.format_price(@r.analyzer.yearly_total, 20).cyan %>
-<%- else -%>
-  On demand yearly                           <%= @f.format_price(@r.analyzer.yearly_full_price, 20).cyan %>
-<%- end -%>
-<%- if @r.reserve? -%>
-
-YEARLY RESERVE SAVINGS:
-  Savings due to reserved pricing            <%= @f.format_price(@r.analyzer.yearly_savings, 20).green %>
-  Savings %                                  <%= sprintf("%19d", @r.analyzer.yearly_savings_percent).green + '%'.green %>
-<%- end -%>
-<%= SEPARATOR %>
-
-ASCII
+    def zone_counts_to_list zone_count_hash
+      zones = zone_count_hash.each_pair.
+          map { |flavor, count| [flavor, count, pricing.monthly(flavor) * count] }.
+          sort { |x, y| y[2] <=> x[2] }
+      zones
+    end
 
-  end
+    def zone_props_to_string(prop_type, width, suffix = '', divide_by = 1)
+      props = analyzer.send(prop_type)
+      [props[:reserved], props[:unreserved], props[:total]].map do |value|
+        sprintf("%#{width}d#{suffix}", value / divide_by)
+      end
+    end
 
+    private
+
+    def disable_color
+      String.instance_eval do
+        %w(
+          black
+          red
+          green
+          yellow
+          blue
+          magenta
+          cyan
+          white
+        ).each do |color|
+            define_method(color) do
+              self
+            end
+        end
+      end
+    end
+  end
 end

data/lib/pricing/version.rb

@@ -1,7 +1,7 @@
 module Joyent
   module Cloud
     module Pricing
-      VERSION = '1.0.9'
+      VERSION = '1.0.10'
     end
   end
 end

data/spec/fixtures/commit.yml

@@ -17,3 +17,7 @@ reserved:
     prepay: 1800.00
     monthly: 600
     quantity: 5
+
+custom:
+  :some-instance:
+    :cost: 2.451

data/spec/fixtures/commit_noreserve.yml

@@ -0,0 +1,6 @@
+defaults: &defaults
+    years: 1
+
+custom:
+  :some-fake-flavor-again:
+    :cost: 5.1

data/spec/pricing/analyzer_spec.rb

@@ -37,6 +37,8 @@ describe 'Joyent::Cloud::Pricing::Analyzer' do
       g3-highmemory-17.125-smartos
       g3-highmemory-17.125-smartos
       some-unknown-flavor
+      some-other-unknown-flavor
+      some-other-unknown-flavor
     )
 
   let(:flavors) { FLAVORS }
@@ -57,7 +59,8 @@ describe 'Joyent::Cloud::Pricing::Analyzer' do
                                              :'g3-highio-60.5-smartos' => 4,
                                              :'g3-highmemory-17.125-smartos' => 12,
                                              :'g3-standard-30-smartos' => 1,
-                                             :'some-unknown-flavor' => 1
+                                             :'some-unknown-flavor' => 1,
+                                             :'some-other-unknown-flavor' => 2
                                             })
   end
 
@@ -78,7 +81,8 @@ describe 'Joyent::Cloud::Pricing::Analyzer' do
                                                   :'g3-highcpu-32-smartos-cc' => 2,
                                                   :'g3-highcpu-7-smartos' => 2,
                                                   :'g3-standard-30-smartos' => 1,
-                                                  :'some-unknown-flavor' => 1
+                                                  :'some-unknown-flavor' => 1,
+                                                  :'some-other-unknown-flavor' => 2
                                                  })
     end
 
@@ -103,7 +107,9 @@ describe 'Joyent::Cloud::Pricing::Analyzer' do
 
   context 'for unknown instances' do
     it 'should return some-unknown-flavor' do
-      expect(analyzer.unknown_zone_counts).to eql({ :'some-unknown-flavor' => 1 })
+      expect(analyzer.unknown_zone_counts).to eql({ :'some-unknown-flavor' => 1,
+                                                    :'some-other-unknown-flavor' => 2 })
+      expect(analyzer.unknown_zone_total).to eql(3)
     end
   end
 

data/spec/pricing/commit_spec.rb

@@ -1,22 +1,43 @@
 require 'spec_helper'
 
 describe 'Joyent::Cloud::Pricing::Commit' do
-  let(:commit) { Joyent::Cloud::Pricing::Commit.from_yaml 'spec/fixtures/commit.yml' }
 
-  let(:expected_commit) { {
-      'g3-highcpu-32-smartos-cc'      => {prepay: 8000.0, monthly: 500.0, years: 1, quantity: 10},
-      'g3-highmemory-17.125-smartos'  => {prepay: 800.0, monthly: 60.0, years: 1, quantity: 12},
-      'g3-highio-60.5-smartos'        => {prepay: 1800.0, monthly: 600.0, years: 1, quantity: 5}
-  } }
+  context 'when some reserve pricing is defined' do
+    let(:commit) { Joyent::Cloud::Pricing::Commit.from_yaml 'spec/fixtures/commit.yml' }
+    let(:config) { Joyent::Cloud::Pricing::Configuration.instance }
 
-  it 'should correctly load commit from the file' do
-    expected_commit.keys.each do |flavor|
-      expect(expected_commit[flavor]).to eql(commit.reserve_for(flavor).to_hash)
+    let(:expected_commit) { {
+        'g3-highcpu-32-smartos-cc'      => {prepay: 8000.0, monthly: 500.0, years: 1, quantity: 10},
+        'g3-highmemory-17.125-smartos'  => {prepay: 800.0, monthly: 60.0, years: 1, quantity: 12},
+        'g3-highio-60.5-smartos'        => {prepay: 1800.0, monthly: 600.0, years: 1, quantity: 5}
+    } }
+
+    it 'should correctly load commit from the file' do
+      expected_commit.keys.each do |flavor|
+        expect(expected_commit[flavor]).to eql(commit.reserve_for(flavor).to_hash)
+      end
+    end
+
+    it '#monthly_price' do
+      expect(commit.monthly_price).to eql(8720.0)
+    end
+
+    it 'should have different custom pricing' do
+      expect(commit.reserves.keys.size).to eql(3)
+      expect(config.config[:'some-instance'][:cost]).to eql(2.451)
     end
   end
 
-  it '#monthly_price' do
-    expect(commit.monthly_price).to eql(8720.0)
+  context 'when no reserve but custom pricing is available' do
+    let(:commit) { Joyent::Cloud::Pricing::Commit.from_yaml 'spec/fixtures/commit_noreserve.yml' }
+    let(:config) { Joyent::Cloud::Pricing::Configuration.instance }
+    let(:custom_flavor) { :'some-fake-flavor-again' }
+    it 'should load properly and add custom to config' do
+
+      expect(commit.reserves).to be_empty
+      expect(config.config[custom_flavor.to_sym][:cost]).to eql(5.1)
+      config.config.delete(custom_flavor.to_sym)
+    end
   end
 
 end

data/spec/pricing/reporter_spec.rb

@@ -55,17 +55,25 @@ describe 'Joyent::Cloud::Pricing::Reporter' do
   end
 
   context '#render' do
-    it 'should propertly render an ERB template' do
-      output = reporter.render
-      expect(output).to_not be_nil
+    context 'with existing commit pricing' do
+      it 'should propertly render an ERB template' do
+        output = reporter.render
+        STDOUT.puts output if ENV['DEBUG_REPORTER']
+        expect(output).to_not be_nil
+        expect(output).to include('MONTHLY COSTS')
+        expect(output).to include('YEARLY RESERVE SAVINGS')
+      end
     end
 
-    context 'blank commit configuration' do
+    context 'without any commit configuration' do
       let(:commit) { Joyent::Cloud::Pricing::Commit.new }
       it 'should still properly render an ERB template' do
         expect(commit.reserves.size).to eql(0)
         output = reporter.render
+        STDOUT.puts output if ENV['DEBUG_REPORTER']
         expect(output).to_not be_nil
+        expect(output).to_not include('YEARLY RESERVE SAVINGS')
+        expect(output).to include('some-fake-flavor-without-pricing')
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joyent-cloud-pricing
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Konstantin Gredeskoul
@@ -126,7 +126,7 @@ files:
 - Rakefile
 - config/commit_pricing.yml.example
 - config/joyent_pricing.yml
-- config/legacy_prices.yml
+- config/joyent_pricing_unpublished.yml
 - joyent-cloud-pricing.gemspec
 - lib/pricing.rb
 - lib/pricing/analyzer.rb
@@ -135,6 +135,7 @@ files:
 - lib/pricing/flavor.rb
 - lib/pricing/formatter.rb
 - lib/pricing/helpers.rb
+- lib/pricing/report.txt.erb
 - lib/pricing/reporter.rb
 - lib/pricing/reserve.rb
 - lib/pricing/scraper.rb
@@ -142,6 +143,7 @@ files:
 - lib/pricing/version.rb
 - lib/tasks/update.rake
 - spec/fixtures/commit.yml
+- spec/fixtures/commit_noreserve.yml
 - spec/fixtures/pricing.yml
 - spec/pricing/analyzer_spec.rb
 - spec/pricing/commit_spec.rb
@@ -178,6 +180,7 @@ summary: Tools for calculating monthly and yearly price of infrastructure hosted
   Joyent Public Cloud.
 test_files:
 - spec/fixtures/commit.yml
+- spec/fixtures/commit_noreserve.yml
 - spec/fixtures/pricing.yml
 - spec/pricing/analyzer_spec.rb
 - spec/pricing/commit_spec.rb