joyent-cloud-pricing 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abf4af6ca921b105e367ac1235c83b136ba0cf17
-  data.tar.gz: c555428055b9b12a35199ee16bacfac178441150
+  metadata.gz: af9e7e7a7f24831b00088ee284035a3ab1c5d385
+  data.tar.gz: f7de3d3f2c71529d6a5a9a8fc64fa2ac2f6a0e03
 SHA512:
-  metadata.gz: aa060031a58028cd6c8cbc15a40aceddbbb29a4a8ffa3c16dc6650685c951f5a833d96a379ed24af9a9f998b1174a9064be90c7ac33d491452bebaec3cf4d0b0
-  data.tar.gz: 4cf153950979dfa5c0f87f0966529c93c4fadc40780e52871c1c6150a41c4cfdfb3a25bb2619d10b46d9997e7ad49ec052c0af3cf5629d1e7f961486e8e89606
+  metadata.gz: de8614e7801059dd5ee1f9886a05c4a1ae750857c26215197a5a7ea3da276556037762415ede75f9cf7652bc8d822eb53b7816217bade8a1b3320a70eac2b786
+  data.tar.gz: ee977c931ab860210802396ef2f920169e7610808b9bde394c0eb6d13c724c17716eb99faef8287488c753689c51590d3646b90c21bebd5266f3855e7eb5e9b0

data/README.md

@@ -70,8 +70,11 @@ Joyent::Cloud::Pricing::Configuration.instance["g3-standard-48-smartos"]
 
 ## 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.
+
 Reserve pricing is meant to be defined by a YAML file, outside of the gem folder,
-somewhere on the file system. File looks like this:
+somewhere on the file system. File looks like this.
 
 ```yaml
 defaults: &defaults
@@ -123,8 +126,15 @@ This module is used by ```knife joyent server price``` plugin to calculate prici
 reserve discounts.
 
 ```ruby
-current_zone_list = %w(g3-highcpu-8-smartos g3-highcpu-8-smartos ... )
-reporter          = Joyent::Cloud::Pricing::Reporter.new('config/reserve-commit.yml', current_zone_list)
+current_zone_list = %w(
+                       g3-highcpu-8-smartos
+                       g3-highcpu-8-smartos
+                       # ....
+                      )
+
+reporter = Joyent::Cloud::Pricing::Reporter.new(
+                'config/reserve-commit.yml',
+                 current_zone_list)
 
 puts reporter.render
 ```
@@ -175,6 +185,12 @@ YEARLY COSTS:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+## Disclaimer
+
+This gem is provided as a convenience tool in understanding and comparing cloud pricing. No warranties,
+explicit or implied, are made in relation to correctness or accuracy of the calculations provided by this
+library. Use at your own risk.
+
 ## Author
 
 Konstantin Gredeskoul, [@kig on twitter](http://twitter.com/kig), [@kigster on github](http://github.com/kigster)

data/config/joyent_pricing.yml

@@ -1,47 +1,311 @@
 ---
-:date: '2014-03-28 22:06:51 -0700'
+:date: '2014-03-30 00:02:20 -0700'
 :pricing:
-  :g3-standard-0.625-smartos: 0.02
-  :g3-standard-1.75-smartos: 0.056
-  :g3-standard-3.75-smartos: 0.12
-  :g3-standard-7.5-smartos: 0.24
-  :g3-standard-15-smartos: 0.48
-  :g3-standard-30-smartos: 0.96
-  :g3-standard-48-smartos: 1.536
-  :g3-standard-64-smartos: 2.048
-  :g3-standard-80-smartos: 2.56
-  :g3-standard-96-smartos: 3.072
-  :g3-standard-128-smartos-cc: 4.096
-  :g3-highmemory-17.125-smartos: 0.409
-  :g3-highmemory-34.25-smartos: 0.817
-  :g3-highmemory-68.375-smartos: 1.63
-  :g3-highmemory-144-smartos: 3.433
-  :g3-highmemory-256-smartos-cc: 6.102
-  :g3-highcpu-1.75-smartos: 0.127
-  :g3-highcpu-7-smartos: 0.508
-  :g3-highcpu-16-smartos: 1.16
-  :g3-highcpu-24-smartos: 1.739
-  :g3-highcpu-32-smartos-cc: 2.319
-  :g3-highio-15-smartos: 0.76
-  :g3-highio-30-smartos: 1.52
-  :g3-highio-60.5-smartos: 3.067
-  :g3-highio-128-smartos: 6.488
-  :g3-highio-256-smartos-cc: 12.976
-  :g3-highstorage-32-smartos: 0.863
-  :g3-highstorage-64-smartos: 1.726
-  :g3-highstorage-128-smartos-cc: 3.451
-  :g3-standard-0.625-kvm: 0.02
-  :g3-standard-1.75-kvm: 0.056
-  :g3-standard-3.75-kvm: 0.12
-  :g3-standard-7.5-kvm: 0.24
-  :g3-standard-15-kvm: 0.48
-  :g3-standard-30-kvm: 0.96
-  :g3-highmemory-17.125-kvm: 0.409
-  :g3-highmemory-34.25-kvm: 0.817
-  :g3-highmemory-68.375-kvm: 1.63
-  :g3-highcpu-1.75-kvm: 0.127
-  :g3-highcpu-7-kvm: 0.508
-  :g3-highio-15-kvm: 0.76
-  :g3-highio-30-kvm: 1.52
-  :g3-highio-60.5-kvm: 3.067
-  :g3-highstorage-32-kvm: 0.863
+  :g3-standard-0.625-smartos:
+    :name: g3-standard-0.625-smartos
+    :os: SmartOS
+    :cost: 0.02
+    :cpus: 0.15
+    :disk: 20
+    :ram: 0.625
+  :g3-standard-1.75-smartos:
+    :name: g3-standard-1.75-smartos
+    :os: SmartOS
+    :cost: 0.056
+    :cpus: 1.0
+    :disk: 56
+    :ram: 1.75
+  :g3-standard-3.75-smartos:
+    :name: g3-standard-3.75-smartos
+    :os: SmartOS
+    :cost: 0.12
+    :cpus: 1.0
+    :disk: 123
+    :ram: 3.75
+  :g3-standard-7.5-smartos:
+    :name: g3-standard-7.5-smartos
+    :os: SmartOS
+    :cost: 0.24
+    :cpus: 2.0
+    :disk: 738
+    :ram: 7.5
+  :g3-standard-15-smartos:
+    :name: g3-standard-15-smartos
+    :os: SmartOS
+    :cost: 0.48
+    :cpus: 4.0
+    :disk: 1467
+    :ram: 15.0
+  :g3-standard-30-smartos:
+    :name: g3-standard-30-smartos
+    :os: SmartOS
+    :cost: 0.96
+    :cpus: 8.0
+    :disk: 1683
+    :ram: 30.0
+  :g3-standard-48-smartos:
+    :name: g3-standard-48-smartos
+    :os: SmartOS
+    :cost: 1.536
+    :cpus: 12.0
+    :disk: 1683
+    :ram: 48.0
+  :g3-standard-64-smartos:
+    :name: g3-standard-64-smartos
+    :os: SmartOS
+    :cost: 2.048
+    :cpus: 16.0
+    :disk: 2100
+    :ram: 64.0
+  :g3-standard-80-smartos:
+    :name: g3-standard-80-smartos
+    :os: SmartOS
+    :cost: 2.56
+    :cpus: 20.0
+    :disk: 2625
+    :ram: 80.0
+  :g3-standard-96-smartos:
+    :name: g3-standard-96-smartos
+    :os: SmartOS
+    :cost: 3.072
+    :cpus: 24.0
+    :disk: 3150
+    :ram: 96.0
+  :g3-standard-128-smartos-cc:
+    :name: g3-standard-128-smartos-cc
+    :os: SmartOS
+    :cost: 4.096
+    :cpus: 32.0
+    :disk: 4200
+    :ram: 128.0
+  :g3-highmemory-17.125-smartos:
+    :name: g3-highmemory-17.125-smartos
+    :os: SmartOS
+    :cost: 0.409
+    :cpus: 2.0
+    :disk: 420
+    :ram: 17.125
+  :g3-highmemory-34.25-smartos:
+    :name: g3-highmemory-34.25-smartos
+    :os: SmartOS
+    :cost: 0.817
+    :cpus: 4.0
+    :disk: 843
+    :ram: 34.25
+  :g3-highmemory-68.375-smartos:
+    :name: g3-highmemory-68.375-smartos
+    :os: SmartOS
+    :cost: 1.63
+    :cpus: 8.0
+    :disk: 1122
+    :ram: 68.375
+  :g3-highmemory-144-smartos:
+    :name: g3-highmemory-144-smartos
+    :os: SmartOS
+    :cost: 3.433
+    :cpus: 18.0
+    :disk: 2363
+    :ram: 144.0
+  :g3-highmemory-256-smartos-cc:
+    :name: g3-highmemory-256-smartos-cc
+    :os: SmartOS
+    :cost: 6.102
+    :cpus: 32.0
+    :disk: 4200
+    :ram: 256.0
+  :g3-highcpu-1.75-smartos:
+    :name: g3-highcpu-1.75-smartos
+    :os: SmartOS
+    :cost: 0.127
+    :cpus: 2.0
+    :disk: 75
+    :ram: 1.75
+  :g3-highcpu-7-smartos:
+    :name: g3-highcpu-7-smartos
+    :os: SmartOS
+    :cost: 0.508
+    :cpus: 7.0
+    :disk: 262
+    :ram: 7.0
+  :g3-highcpu-16-smartos:
+    :name: g3-highcpu-16-smartos
+    :os: SmartOS
+    :cost: 1.16
+    :cpus: 16.0
+    :disk: 600
+    :ram: 16.0
+  :g3-highcpu-24-smartos:
+    :name: g3-highcpu-24-smartos
+    :os: SmartOS
+    :cost: 1.739
+    :cpus: 24.0
+    :disk: 900
+    :ram: 24.0
+  :g3-highcpu-32-smartos-cc:
+    :name: g3-highcpu-32-smartos-cc
+    :os: SmartOS
+    :cost: 2.319
+    :cpus: 32.0
+    :disk: 1200
+    :ram: 32.0
+  :g3-highio-15-smartos:
+    :name: g3-highio-15-smartos
+    :os: SmartOS
+    :cost: 0.76
+    :cpus: 2.0
+    :disk: 360
+    :ram: 15.0
+  :g3-highio-30-smartos:
+    :name: g3-highio-30-smartos
+    :os: SmartOS
+    :cost: 1.52
+    :cpus: 4.0
+    :disk: 725
+    :ram: 30.0
+  :g3-highio-60.5-smartos:
+    :name: g3-highio-60.5-smartos
+    :os: SmartOS
+    :cost: 3.067
+    :cpus: 8.0
+    :disk: 1452
+    :ram: 60.5
+  :g3-highio-128-smartos:
+    :name: g3-highio-128-smartos
+    :os: SmartOS
+    :cost: 6.488
+    :cpus: 16.0
+    :disk: 3072
+    :ram: 128.0
+  :g3-highio-256-smartos-cc:
+    :name: g3-highio-256-smartos-cc
+    :os: SmartOS
+    :cost: 12.976
+    :cpus: 32.0
+    :disk: 6144
+    :ram: 256.0
+  :g3-highstorage-32-smartos:
+    :name: g3-highstorage-32-smartos
+    :os: SmartOS
+    :cost: 0.863
+    :cpus: 8.0
+    :disk: 7680
+    :ram: 32.0
+  :g3-highstorage-64-smartos:
+    :name: g3-highstorage-64-smartos
+    :os: SmartOS
+    :cost: 1.726
+    :cpus: 16.0
+    :disk: 15360
+    :ram: 64.0
+  :g3-highstorage-128-smartos-cc:
+    :name: g3-highstorage-128-smartos-cc
+    :os: SmartOS
+    :cost: 3.451
+    :cpus: 32.0
+    :disk: 30720
+    :ram: 128.0
+  :g3-standard-0.625-kvm:
+    :name: g3-standard-0.625-kvm
+    :os: Linux
+    :cost: 0.02
+    :cpus: 0.15
+    :disk: 20
+    :ram: 0.625
+  :g3-standard-1.75-kvm:
+    :name: g3-standard-1.75-kvm
+    :os: Linux
+    :cost: 0.056
+    :cpus: 1.0
+    :disk: 56
+    :ram: 1.75
+  :g3-standard-3.75-kvm:
+    :name: g3-standard-3.75-kvm
+    :os: Linux
+    :cost: 0.12
+    :cpus: 1.0
+    :disk: 123
+    :ram: 3.75
+  :g3-standard-7.5-kvm:
+    :name: g3-standard-7.5-kvm
+    :os: Linux
+    :cost: 0.24
+    :cpus: 2.0
+    :disk: 738
+    :ram: 7.5
+  :g3-standard-15-kvm:
+    :name: g3-standard-15-kvm
+    :os: Linux
+    :cost: 0.48
+    :cpus: 4.0
+    :disk: 1467
+    :ram: 15.0
+  :g3-standard-30-kvm:
+    :name: g3-standard-30-kvm
+    :os: Linux
+    :cost: 0.96
+    :cpus: 8.0
+    :disk: 1683
+    :ram: 30.0
+  :g3-highmemory-17.125-kvm:
+    :name: g3-highmemory-17.125-kvm
+    :os: Linux
+    :cost: 0.409
+    :cpus: 2.0
+    :disk: 420
+    :ram: 17.125
+  :g3-highmemory-34.25-kvm:
+    :name: g3-highmemory-34.25-kvm
+    :os: Linux
+    :cost: 0.817
+    :cpus: 4.0
+    :disk: 843
+    :ram: 34.25
+  :g3-highmemory-68.375-kvm:
+    :name: g3-highmemory-68.375-kvm
+    :os: Linux
+    :cost: 1.63
+    :cpus: 8.0
+    :disk: 1122
+    :ram: 68.375
+  :g3-highcpu-1.75-kvm:
+    :name: g3-highcpu-1.75-kvm
+    :os: Linux
+    :cost: 0.127
+    :cpus: 2.0
+    :disk: 75
+    :ram: 1.75
+  :g3-highcpu-7-kvm:
+    :name: g3-highcpu-7-kvm
+    :os: Linux
+    :cost: 0.508
+    :cpus: 7.0
+    :disk: 262
+    :ram: 7.0
+  :g3-highio-15-kvm:
+    :name: g3-highio-15-kvm
+    :os: Linux
+    :cost: 0.76
+    :cpus: 2.0
+    :disk: 360
+    :ram: 15.0
+  :g3-highio-30-kvm:
+    :name: g3-highio-30-kvm
+    :os: Linux
+    :cost: 1.52
+    :cpus: 4.0
+    :disk: 725
+    :ram: 30.0
+  :g3-highio-60.5-kvm:
+    :name: g3-highio-60.5-kvm
+    :os: Linux
+    :cost: 3.067
+    :cpus: 8.0
+    :disk: 1452
+    :ram: 60.5
+  :g3-highstorage-32-kvm:
+    :name: g3-highstorage-32-kvm
+    :os: Linux
+    :cost: 0.863
+    :cpus: 8.0
+    :disk: 7680
+    :ram: 32.0

data/config/legacy_prices.yml

@@ -1,3 +1,6 @@
-:g3-standard-8-smartos: 0.26
-:g3-highcpu-8-smartos: 0.58
-:g3-standard-0.5-smartos: 0.016
+:g3-standard-8-smartos:
+  :cost: 0.26
+:g3-highcpu-8-smartos:
+  :cost: 0.58
+:g3-standard-0.5-smartos:
+  :cost: 0.016

data/joyent-cloud-pricing.gemspec

@@ -4,20 +4,20 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pricing/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "joyent-cloud-pricing"
+  spec.name          = 'joyent-cloud-pricing'
   spec.version       = Joyent::Cloud::Pricing::VERSION
-  spec.authors       = ["Konstantin Gredeskoul"]
-  spec.email         = ["kigster@gmail.com"]
+  spec.authors       = ['Konstantin Gredeskoul']
+  spec.email         = ['kigster@gmail.com']
   spec.summary       = %q{Tools for calculating monthly and yearly price of infrastructure hosted on Joyent Public Cloud.}
   spec.description   = %q{Various set of tools and helpers to calculate infrastructure footprint and cost on Joyent Cloud. Supports commit discounts.}
-  spec.homepage      = "https://github.com/kigster/joyent-cloud-pricing"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/kigster/joyent-cloud-pricing'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'colored'

data/lib/pricing.rb

@@ -1,5 +1,5 @@
-require "pricing/version"
-require "pricing/symbolize_keys"
+require 'pricing/version'
+require 'pricing/symbolize_keys'
 
 module Joyent
   module Cloud
@@ -15,10 +15,11 @@ module Joyent
   end
 end
 
-require "pricing/helpers"
-require "pricing/configuration"
-require "pricing/scraper"
-require "pricing/formatter"
-require "pricing/commit"
-require "pricing/analyzer"
-require "pricing/reporter"
+require 'pricing/flavor'
+require 'pricing/helpers'
+require 'pricing/configuration'
+require 'pricing/scraper'
+require 'pricing/formatter'
+require 'pricing/commit'
+require 'pricing/analyzer'
+require 'pricing/reporter'

data/lib/pricing/analyzer.rb

@@ -3,35 +3,35 @@ require_relative 'commit'
 module Joyent::Cloud::Pricing
   class Analyzer
 
-    attr_accessor :commit, :zone_list
+    attr_accessor :commit, :zone_counts
 
     def initialize(commit, flavors = [])
       @commit = commit
-      @zone_list = count_dupes(flavors).symbolize_keys
+      @zone_counts = count_dupes(flavors).symbolize_keys
     end
 
     # Zones that are not on commit
-    def excess_zone_list
+    def excess_zone_counts
       h = {}
-      zone_list.each_pair { |flavor, count| diff = count - quantity_for(flavor); h[flavor] = diff if diff > 0 }
+      zone_counts.each_pair { |flavor, count| diff = count - quantity_for(flavor); h[flavor] = diff if diff > 0 }
       h
     end
 
     # Zones that are committed, but do not exist
-    def over_reserved_zone_list
+    def over_reserved_zone_counts
       h = {}
-      zone_list.each_pair { |flavor, count| diff = count - quantity_for(flavor); h[flavor] = -diff if diff < 0 }
+      zone_counts.each_pair { |flavor, count| diff = count - quantity_for(flavor); h[flavor] = -diff if diff < 0 }
       h
     end
 
     # Non-discounted full price
     def monthly_full_price
-      monthly_full_price_for(zone_list)
+      monthly_full_price_for(zone_counts)
     end
 
     # Excess zones cost this much
     def monthly_overages_price
-      monthly_full_price_for(excess_zone_list)
+      monthly_full_price_for(excess_zone_counts)
     end
 
     # Monthly for all of the commits
@@ -49,7 +49,7 @@ module Joyent::Cloud::Pricing
     end
 
     def monthly_full_price_for zones
-      total_price_for zones do |flavor|
+      count_for_all zones do |flavor|
         pricing.monthly(flavor)
       end
     end
@@ -74,9 +74,31 @@ module Joyent::Cloud::Pricing
       100 * (yearly_full_price - yearly_total) / yearly_full_price
     end
 
+    def cpus
+      count_props(:cpus)
+    end
+
+    def ram
+      count_props(:ram)
+    end
+
+    def disk
+      count_props(:disk)
+    end
+
     private
 
-    def total_price_for zones, &block
+    def count_props(operation)
+      results = [ zone_counts, excess_zone_counts, commit.flavor_counts ].map do |list|
+        count_for_all list do |flavor|
+          pricing.flavor(flavor).send(operation)
+        end
+      end
+      { total: results[0], unreserved: results[1], reserved: results[2] }
+    end
+
+
+    def count_for_all zones, &block
       zones.keys.inject(0) do |sum, flavor|
         sum += zones[flavor] * yield(flavor); sum
       end.round(2)

data/lib/pricing/commit.rb

@@ -44,6 +44,12 @@ module Joyent::Cloud::Pricing
       reserves.empty? ? 0 : reserves.values.first.years
     end
 
+    def flavor_counts
+      zone_list = {}
+      reserves.keys.each{|zone| zone_list[zone] = reserves[zone].quantity}
+      zone_list
+    end
+
     private
 
     def sum_of

data/lib/pricing/configuration.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require_relative 'helpers'
+require_relative 'flavor'
 
 module Joyent::Cloud::Pricing
   class Configuration
@@ -39,12 +40,20 @@ module Joyent::Cloud::Pricing
       @config = hash.symbolize_keys
     end
 
-    def [] flavor
-      self.config[flavor.to_sym]
+    def cost(flavor)
+      f = config[flavor.to_sym]
+      f.nil? ? nil : f[:cost]
     end
 
-    def monthly flavor
-      f = self[flavor]
+    def flavor(flavor)
+      f = config[flavor.to_sym]
+      return nil if f.nil?
+      f.delete(:name) # name is saved in YAML, but it's not in Flavor class hash attributes
+      Flavor.new(flavor, f)
+    end
+
+    def monthly(flavor)
+      f = self.cost(flavor)
       if f.nil?
         STDERR.puts "WARNING: can't find flavor #{flavor}, assuming 0"
         0

data/lib/pricing/flavor.rb

@@ -0,0 +1,25 @@
+module Joyent::Cloud::Pricing
+  class Flavor
+    attr_accessor :name, :os, :cost, :ram, :cpus, :disk
+
+    def initialize(name, os: os, cost: cost, ram: ram, cpus: cpus, disk: disk)
+      @name = name
+      @os = os
+      @cost = (cost == 'N/A') ? nil : cost.to_f
+      @cpus = cpus.to_f
+      @disk = disk.to_i
+      @ram = ram.to_f
+    end
+
+    def to_h
+      {
+        name: name,
+        os: os,
+        cost: cost,
+        cpus: cpus,
+        disk: disk,
+        ram: ram
+      }
+    end
+  end
+end

data/lib/pricing/formatter.rb

@@ -16,7 +16,7 @@ module Joyent
         end
 
         def monthly_price(flavor)
-          monthly_from_hourly(config[flavor] || 0)
+          monthly_from_hourly(config.cost(flavor) || 0)
         end
 
         def format_price(value, width = 0)

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
+    attr_accessor :commit, :zones_in_use, :analyzer, :formatter, :print_zone_list
 
     def initialize(commit = COMMIT, zones_in_use = [])
       @commit = case commit
@@ -20,8 +20,9 @@ module Joyent::Cloud::Pricing
                 end
 
       @zones_in_use = zones_in_use
-      @analyzer = Analyzer.new(@commit, @zones_in_use)
-      @formatter = Formatter.new(pricing.config)
+      @analyzer = Joyent::Cloud::Pricing::Analyzer.new(@commit, @zones_in_use)
+      @formatter = Joyent::Cloud::Pricing::Formatter.new(pricing.config)
+      @print_zone_list = true
     end
 
     def render
@@ -39,11 +40,11 @@ module Joyent::Cloud::Pricing
     end
 
     def pricing
-      Configuration.instance
+      Joyent::Cloud::Pricing::Configuration.instance
     end
 
     def excess_zones
-      zones = analyzer.excess_zone_list.each_pair.map{|flavor, count| [ flavor, count, pricing.monthly(flavor) * count ]}.sort{|x,y| y[2] <=> x[2]}
+      zones = analyzer.excess_zone_counts.each_pair.map{|flavor, count| [ flavor, count, pricing.monthly(flavor) * count ]}.sort{|x,y| y[2] <=> x[2]}
       zones
     end
 
@@ -55,30 +56,39 @@ module Joyent::Cloud::Pricing
       end.join("\n")
     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
+
     SEPARATOR = ('.' * 65).cyan
+    PROPS_FORMAT= '%20d %20d %20d'
     REPORT_ASCII = <<ASCII
 
 ZONE COUNTS:
   Total # of zones                           <%= sprintf("%20d", @r.zones).cyan %>
 <%- if @r.reserve? -%>
   Total # of reserved zones                  <%= sprintf("%20d", @r.commit.total_zones).green %>
-  Total # of reserved but absent zones       <%= value = sprintf("%20d", @r.analyzer.over_reserved_zone_list.size || 0); value == "0" ? value.blue : value.red %>
-  Reserve Pricing Term/Duration (years)      <%= sprintf("%20d", @r.commit.years || 0).blue %>
-<%= SEPARATOR %>
-
-RESERVE UPFRONT COST:
-  Reserve Pricing Upfront Payments           <%= @f.format_price(@r.commit.upfront_price, 20).green %>
+  Total # of reserved but absent zones       <%= value = sprintf("%20d", @r.analyzer.over_reserved_zone_counts.size || 0); value == "0" ? value.blue : value.red %>
 <%- end -%>
+
+  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:
-  List of on-demand flavors by price
+<%- if @r.print_zone_list -%>
+  List of on-demand flavors by price <%= @r.reserve? ? "(in excess of reserve)" : "" %>
 <%= @r.excess_zone_list %>
                                                       <%= "___________".yellow %>
-  On Demand Monthly                          <%= @f.format_price(@r.analyzer.monthly_overages_price, 20).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 %>
+  Zones under reserve pricing                <%= @f.format_price(@r.commit.monthly_price, 20).green %>
 <%- end -%>
 <%- if @r.reserve? -%>
                                                       <%= "___________".cyan %>
@@ -88,16 +98,21 @@ MONTHLY COSTS:
 
 YEARLY COSTS:
 <%- if @r.reserve? -%>
-  Savings due to Reserved Pricing            <%= @f.format_price(@r.analyzer.yearly_savings, 20).green %>
-  Savings %                                  <%= sprintf("%19d", @r.analyzer.yearly_savings_percent).green + '%'.green %>
-
-  Reserve Yearly                             <%= @f.format_price(@r.commit.yearly_price, 20).green %>
-  On Demand Yearly                           <%= @f.format_price(@r.analyzer.yearly_overages_price, 20).yellow %>
+  On demand yearly                           <%= @f.format_price(@r.analyzer.yearly_overages_price, 20).yellow %>
+  Commit prepay one time fee                 <%= @f.format_price(@r.commit.upfront_price, 20).green %>
+  Reserve yearly                             <%= @f.format_price(@r.commit.yearly_price, 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 %>
+  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
 

data/lib/pricing/scraper.rb

@@ -12,15 +12,14 @@ module Joyent::Cloud::Pricing
     end
 
     class Parser < Struct.new(:doc)
-      class PriceTuple < Struct.new(:os, :cost, :flavor); end
 
       def result
         config = Hash.new
-        self.doc.css("ul.full-specs").each do |ul|
-          tuple = extract_price(ul)
-          next if tuple.cost == "N/A"
-          next if tuple.flavor =~ /kvm/ && tuple.os !~ /linux/i
-          config[tuple.flavor]= tuple.cost.to_f
+        self.doc.css('ul.full-specs').each do |ul|
+          flavor = extract_price(ul)
+          next if flavor.cost.nil?
+          next if flavor.name =~ /kvm/ && flavor.os !~ /linux/i
+          config[flavor.name]= flavor.to_h
         end
         config
       end
@@ -30,8 +29,14 @@ module Joyent::Cloud::Pricing
       def extract_price(ul)
         lis = ul.css("span").map(&:content)
         # grab last two <li> elements in each <ul class="full-spec"> block
-        #PriceTuple.new(lis[-3], lis[-2].gsub(/^\$/, ''),  lis[-1])
-        PriceTuple.new(lis[-3], lis[-2].gsub(/^\$/, ''),  lis[-1])
+        # and first few for cpu/ram/disk
+        # note: this obviously depends on Joyent website markup and is subject to break.
+        Flavor.new(lis[-1], # flavor
+                   os: lis[-3],
+                   cost: lis[-2].gsub(/^\$/, ''),
+                   ram: lis[0],
+                   cpus: lis[1],
+                   disk: lis[2])
       end
     end
   end

data/lib/pricing/version.rb

@@ -1,7 +1,7 @@
 module Joyent
   module Cloud
     module Pricing
-      VERSION = "1.0.3"
+      VERSION = '1.0.4'
     end
   end
 end

data/spec/fixtures/pricing.yml

@@ -1,7 +1,13 @@
 ---
 :date: '2014-03-23 21:51:04 -0700'
 :pricing:
-  g3-standard-0.625-smartos: 0.02
-  g3-standard-30-kvm: 0.96
-  g3-standard-48-smartos: 1.536
-  g3-standard-64-smartos: 2.048
+  g3-standard-0.625-smartos:
+    :cost: 0.02
+  g3-standard-30-kvm:
+    :cost: 0.96
+  g3-standard-48-smartos:
+    :cost: 1.536
+    :ram: 12
+    :cpus: 16.0
+  g3-standard-64-smartos:
+    :cost: 2.048

data/spec/pricing/analyzer_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+describe 'Joyent::Cloud::Pricing::Analyzer' do
+
+  let(:flavors) { %w(
+    g3-highcpu-16-smartos
+    g3-highcpu-16-smartos
+    g3-standard-30-smartos
+    g3-highcpu-32-smartos-cc
+    g3-highcpu-32-smartos-cc
+    g3-highcpu-32-smartos-cc
+    g3-highcpu-32-smartos-cc
+    g3-highcpu-32-smartos-cc
+    g3-highcpu-32-smartos-cc
+    g3-highcpu-32-smartos-cc
+    g3-highcpu-32-smartos-cc
+    g3-highcpu-32-smartos-cc
+    g3-highcpu-32-smartos-cc
+    g3-highcpu-32-smartos-cc
+    g3-highcpu-32-smartos-cc
+    g3-highcpu-7-smartos
+    g3-highcpu-7-smartos
+    g3-highio-60.5-smartos
+    g3-highio-60.5-smartos
+    g3-highio-60.5-smartos
+    g3-highio-60.5-smartos
+    g3-highmemory-17.125-smartos
+    g3-highmemory-17.125-smartos
+    g3-highmemory-17.125-smartos
+    g3-highmemory-17.125-smartos
+    g3-highmemory-17.125-smartos
+    g3-highmemory-17.125-smartos
+    g3-highmemory-17.125-smartos
+    g3-highmemory-17.125-smartos
+    g3-highmemory-17.125-smartos
+    g3-highmemory-17.125-smartos
+    g3-highmemory-17.125-smartos
+    g3-highmemory-17.125-smartos
+  ) }
+  let(:commit) { Joyent::Cloud::Pricing::Commit.from_yaml 'spec/fixtures/commit.yml' }
+  let(:analyzer) { Joyent::Cloud::Pricing::Analyzer.new(commit, flavors) }
+
+  # need to have pricing so that it reloads from real price TODO: fix this
+  before do
+    Joyent::Cloud::Pricing::Configuration.from_yaml
+  end
+
+  it '#initialize' do
+    expect(analyzer.zone_counts).to_not be_empty
+    expect(analyzer.zone_counts).to eql (
+                                            {:'g3-highcpu-16-smartos' => 2,
+                                             :'g3-highcpu-32-smartos-cc' => 12,
+                                             :'g3-highcpu-7-smartos' => 2,
+                                             :'g3-highio-60.5-smartos' => 4,
+                                             :'g3-highmemory-17.125-smartos' => 12,
+                                             :'g3-standard-30-smartos' => 1
+                                            })
+  end
+
+  context 'monthly prices' do
+    it '#monthly_full_price' do
+      expect(analyzer.monthly_full_price).to eql(35496.0)
+    end
+
+    it '#monthly_overages_price' do
+      expect(analyzer.monthly_overages_price).to eql(6432.48)
+    end
+  end
+
+  context 'zone frequency counts' do
+    it '#excess_zone_counts' do
+      expect(analyzer.excess_zone_counts).to eql(
+                                                 {:'g3-highcpu-16-smartos' => 2,
+                                                  :'g3-highcpu-32-smartos-cc' => 2,
+                                                  :'g3-highcpu-7-smartos' => 2,
+                                                  :'g3-standard-30-smartos' => 1
+                                                 })
+    end
+
+    it '#over_reserved_zone_counts' do
+      expect(analyzer.over_reserved_zone_counts).to eql({:'g3-highio-60.5-smartos' => 1})
+    end
+  end
+
+  context 'reserved and unreserved totals for flavor properties' do
+    it '#cpus' do
+      expect(analyzer.cpus).to eql({total: 494.0, reserved: 384.0, unreserved: 118.0})
+    end
+
+    it '#ram' do
+      expect(analyzer.ram).to eql({total: 907.5, unreserved: 140.0, reserved: 828.0})
+    end
+
+    it '#disk' do
+      expect(analyzer.disk).to eql({total: 28655.0, unreserved: 5807.0, reserved: 24300.0})
+    end
+  end
+end

data/spec/pricing/configuration_spec.rb

@@ -2,28 +2,28 @@ require 'spec_helper'
 
 describe 'Joyent::Cloud::Pricing::Configuration' do
   expected_prices = {
-      "g3-standard-48-smartos" => 1.536,
-      "g3-standard-0.625-smartos" => 0.02,
-      "g3-standard-30-kvm" => 0.960,
-      "g3-standard-8-smartos" => 0.26,
-      "g3-highcpu-8-smartos" => 0.58,
-      "g3-standard-0.5-smartos" => 0.016
+      'g3-standard-48-smartos' => 1.536,
+      'g3-standard-0.625-smartos' => 0.02,
+      'g3-standard-30-kvm' => 0.960,
+      'g3-standard-8-smartos' => 0.26,
+      'g3-highcpu-8-smartos' => 0.58,
+      'g3-standard-0.5-smartos' => 0.016
   }
 
   let(:config) {
     Joyent::Cloud::Pricing::Configuration.from_yaml 'spec/fixtures/pricing.yml'
   }
 
-  context "#from_yaml" do
+  context '#from_yaml' do
     expected_prices.keys.each do |flavor|
       it "should load pricing for #{flavor}" do
-        expect(config[flavor]).to eql(expected_prices[flavor])
+        expect(config.cost(flavor)).to eql(expected_prices[flavor])
       end
     end
   end
 
-  context "#instance" do
-    it "should be able to create new instance, but remember the last once" do
+  context '#instance' do
+    it 'should be able to create new instance, but remember the last once' do
       c1 = Joyent::Cloud::Pricing::Configuration.from_yaml 'spec/fixtures/pricing.yml'
       c2 = Joyent::Cloud::Pricing::Configuration.from_yaml 'spec/fixtures/pricing.yml'
 
@@ -31,8 +31,19 @@ describe 'Joyent::Cloud::Pricing::Configuration' do
       expect(Joyent::Cloud::Pricing::Configuration.instance).not_to eql(c1)
     end
 
-    it "should have instance set" do
+    it 'should have instance set' do
       expect(Joyent::Cloud::Pricing::Configuration.instance).not_to be_nil
     end
   end
+
+  context '#flavor' do
+    it 'should properly instantiate Flavor instance from hash' do
+      flavor = config.flavor 'g3-standard-48-smartos'
+      expect(flavor.class).to eql(Joyent::Cloud::Pricing::Flavor)
+
+      expect(flavor.ram).to eql(12.0)
+      expect(flavor.cpus).to eql(16.0)
+      expect(flavor.cost).to eql(1.536)
+    end
+  end
 end

data/spec/pricing/formatter_spec.rb

@@ -2,34 +2,35 @@ require 'spec_helper'
 
 describe' Joyent::Cloud::Pricing::Formatter' do
 
-  let(:config) { {"g3-standard-48-smartos" => 1.536,
-                  "g3-standard-0.625-smartos" => 0.02,
-                  "g3-standard-30-kvm" => 0.960} }
+  let(:config) { Joyent::Cloud::Pricing::Configuration.new(
+                 {'g3-standard-48-smartos' => {cost: 1.536},
+                  'g3-standard-0.625-smartos' => {cost: 0.02},
+                  'g3-standard-30-kvm' => {cost: 0.960} }) }
 
   let(:formatter) { Joyent::Cloud::Pricing::Formatter.new(config) }
 
-  context "#format_monthly_price" do
-    it "should return properly formatted monthly price" do
-      expect(formatter.format_monthly_price "g3-standard-0.625-smartos").to eql("$14.40")
-      expect(formatter.format_monthly_price "g3-standard-30-kvm").to eql("$691.20")
+  context '#format_monthly_price' do
+    it 'should return properly formatted monthly price' do
+      expect(formatter.format_monthly_price 'g3-standard-0.625-smartos').to eql('$14.40')
+      expect(formatter.format_monthly_price 'g3-standard-30-kvm').to eql('$691.20')
     end
   end
-  context "#monthly_formatted_price_for_flavor" do
-    it "should return properly formatted monthly price" do
-      expect(formatter.format_monthly_price "g3-standard-48-smartos", 10).to eql(" $1,105.92")
+  context '#monthly_formatted_price_for_flavor' do
+    it 'should return properly formatted monthly price' do
+      expect(formatter.format_monthly_price 'g3-standard-48-smartos', 10).to eql(' $1,105.92')
     end
-    it "should return blank when no match was found" do
-      expect(formatter.format_monthly_price "asdfkasdfasdlfkjasl;dkjf").to eql("")
+    it 'should return blank when no match was found' do
+      expect(formatter.format_monthly_price 'asdfkasdfasdlfkjasl;dkjf').to eql('')
     end
   end
-  context "#format_price" do
-    it "should return properly formatted price" do
-      expect(formatter.format_price 24566.34, 10).to eql("$24,566.34")
-      expect(formatter.format_price 4566.34,  10).to eql(" $4,566.34")
+  context '#format_price' do
+    it 'should return properly formatted price' do
+      expect(formatter.format_price 24566.34, 10).to eql('$24,566.34')
+      expect(formatter.format_price 4566.34,  10).to eql(' $4,566.34')
     end
-    it "should return blank string of given width for 0 or nil" do
-      expect(formatter.format_price 0, 10).to eql("          ")
-      expect(formatter.format_price nil, 10).to eql("          ")
+    it 'should return blank string of given width for 0 or nil' do
+      expect(formatter.format_price 0, 10).to eql('          ')
+      expect(formatter.format_price nil, 10).to eql('          ')
     end
   end
 end

data/spec/pricing/reporter_spec.rb

@@ -44,23 +44,23 @@ describe 'Joyent::Cloud::Pricing::Reporter' do
     Joyent::Cloud::Pricing::Configuration.instance(true)
   end
 
-  context "#initialize" do
-    it "should not be empty when created" do
+  context '#initialize' do
+    it 'should not be empty when created' do
       expect(reporter).to_not be_nil
       expect(reporter.analyzer).to_not be_nil
       expect(reporter.zones_in_use.size).to eql(flavors.size)
     end
   end
 
-  context "#render" do
-    it "should propertly render an ERB template" do
+  context '#render' do
+    it 'should propertly render an ERB template' do
       output = reporter.render
       expect(output).to_not be_nil
     end
 
-    context "blank commit configuration" do
+    context 'blank commit configuration' do
       let(:commit) { Joyent::Cloud::Pricing::Commit.new }
-      it "should still properly render an ERB template" do
+      it 'should still properly render an ERB template' do
         expect(commit.reserves.size).to eql(0)
         output = reporter.render
         expect(output).to_not be_nil

data/spec/pricing/scraper_spec.rb

@@ -1,21 +1,29 @@
 require 'spec_helper'
 
 describe 'Joyent::Cloud::Pricing::Scraper' do
-  context "scraping from URL"
+  context 'scraping from URL'
   let(:scraper) { Joyent::Cloud::Pricing::Scraper.new }
 
-  let(:prices) { {"g3-standard-48-smartos" => 1.536,
-                  "g3-standard-0.625-smartos" => 0.02,
-                  "g3-standard-30-kvm" => 0.960
+  let(:prices) { {'g3-standard-48-smartos' => 1.536,
+                  'g3-standard-0.625-smartos' => 0.02,
+                  'g3-standard-30-kvm' => 0.960
+               } }
+
+  let(:cpus) { {'g3-standard-48-smartos' => 12.0,
+                  'g3-standard-0.625-smartos' => 0.15,
+                  'g3-standard-30-kvm' => 8.0
                } }
 
   before do
     @config = scraper.scrape
   end
 
-  it "should load pricing configuration hash from Joyent Website" do
+  it 'should load pricing configuration hash from Joyent Website' do
     prices.keys.each do |flavor|
-      expect(@config[flavor]).to eql(prices[flavor])
+      expect(@config[flavor][:cost]).to eql(prices[flavor])
+    end
+    cpus.keys.each do |flavor|
+      expect(@config[flavor][:cpus]).to eql(cpus[flavor])
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joyent-cloud-pricing
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Konstantin Gredeskoul
@@ -117,6 +117,7 @@ files:
 - lib/pricing/analyzer.rb
 - lib/pricing/commit.rb
 - lib/pricing/configuration.rb
+- lib/pricing/flavor.rb
 - lib/pricing/formatter.rb
 - lib/pricing/helpers.rb
 - lib/pricing/reporter.rb
@@ -127,7 +128,7 @@ files:
 - lib/tasks/update.rake
 - spec/fixtures/commit.yml
 - spec/fixtures/pricing.yml
-- spec/pricing/analyze_spec.rb
+- spec/pricing/analyzer_spec.rb
 - spec/pricing/commit_spec.rb
 - spec/pricing/configuration_spec.rb
 - spec/pricing/formatter_spec.rb
@@ -163,7 +164,7 @@ summary: Tools for calculating monthly and yearly price of infrastructure hosted
 test_files:
 - spec/fixtures/commit.yml
 - spec/fixtures/pricing.yml
-- spec/pricing/analyze_spec.rb
+- spec/pricing/analyzer_spec.rb
 - spec/pricing/commit_spec.rb
 - spec/pricing/configuration_spec.rb
 - spec/pricing/formatter_spec.rb

data/spec/pricing/analyze_spec.rb

@@ -1,82 +0,0 @@
-require 'spec_helper'
-
-describe 'Joyent::Cloud::Pricing::Analyze' do
-
-  let(:flavors) { %w(
-    g3-highcpu-16-smartos
-    g3-highcpu-16-smartos
-    g3-standard-30-smartos
-    g3-highcpu-32-smartos-cc
-    g3-highcpu-32-smartos-cc
-    g3-highcpu-32-smartos-cc
-    g3-highcpu-32-smartos-cc
-    g3-highcpu-32-smartos-cc
-    g3-highcpu-32-smartos-cc
-    g3-highcpu-32-smartos-cc
-    g3-highcpu-32-smartos-cc
-    g3-highcpu-32-smartos-cc
-    g3-highcpu-32-smartos-cc
-    g3-highcpu-32-smartos-cc
-    g3-highcpu-32-smartos-cc
-    g3-highcpu-7-smartos
-    g3-highcpu-7-smartos
-    g3-highio-60.5-smartos
-    g3-highio-60.5-smartos
-    g3-highio-60.5-smartos
-    g3-highio-60.5-smartos
-    g3-highmemory-17.125-smartos
-    g3-highmemory-17.125-smartos
-    g3-highmemory-17.125-smartos
-    g3-highmemory-17.125-smartos
-    g3-highmemory-17.125-smartos
-    g3-highmemory-17.125-smartos
-    g3-highmemory-17.125-smartos
-    g3-highmemory-17.125-smartos
-    g3-highmemory-17.125-smartos
-    g3-highmemory-17.125-smartos
-    g3-highmemory-17.125-smartos
-    g3-highmemory-17.125-smartos
-  ) }
-  let(:commit)   { Joyent::Cloud::Pricing::Commit.from_yaml 'spec/fixtures/commit.yml' }
-  let(:analyzer) { Joyent::Cloud::Pricing::Analyzer.new(commit, flavors) }
-
-  # need to have pricing so that it reloads from real price TODO: fix this
-  before do
-    Joyent::Cloud::Pricing::Configuration.from_yaml
-  end
-
-  it '#initialize' do
-    expect(analyzer.zone_list).to_not be_empty
-    expect(analyzer.zone_list).to eql (
-                                          {:"g3-highcpu-16-smartos" => 2,
-                                           :"g3-highcpu-32-smartos-cc" => 12,
-                                           :"g3-highcpu-7-smartos" => 2,
-                                           :"g3-highio-60.5-smartos" => 4,
-                                           :"g3-highmemory-17.125-smartos" => 12,
-                                           :"g3-standard-30-smartos" => 1
-                                          })
-  end
-
-  it '#monthly_full_price' do
-    expect(analyzer.monthly_full_price).to eql(35496.0)
-  end
-
-  it '#excess_zone_list' do
-    expect(analyzer.excess_zone_list).to eql(
-                                              {:"g3-highcpu-16-smartos" => 2,
-                                               :"g3-highcpu-32-smartos-cc" => 2,
-                                               :"g3-highcpu-7-smartos" => 2,
-                                               :"g3-standard-30-smartos" => 1
-                                              })
-  end
-
-  it '#monthly_overages_price' do
-    expect(analyzer.monthly_overages_price).to eql( 6432.48 )
-  end
-
-  it '#over_reserved_zone_list' do
-    expect(analyzer.over_reserved_zone_list).to eql( {:"g3-highio-60.5-smartos" => 1 })
-  end
-
-
-end