joyent-cloud-pricing 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b380b01b5301c09ce4946aed2d0d55879ea978a
-  data.tar.gz: 1eddbc97807b98e7e7ec1144226e47e61fef5414
+  metadata.gz: 6830b1d71aec26c98b251688edacd2a40448eac1
+  data.tar.gz: bfdeb0a822f1f8f6b15122402c4dbc491a061349
 SHA512:
-  metadata.gz: bba5bd633fa5e1d02037487c549d130bb43cf8b473c33544e623aea153e3a71fdc17ec8f0a395c31fe2efcd79fc4f5e3ee6bb3db29dceba3169120d23c5f2c62
-  data.tar.gz: 3ab4786f322d28b6077395eb2042a51ae079d78b88230ba5069745f0b43fe2314b49cda55208e0b58067c18cca224096201b1b05365d019c483d5f48705e8fd1
+  metadata.gz: 8c8bf089f0fe1f5e7361061ab4dcad2bc10845f64b2bdd92c40a20391910b59bdb8cc47540a5318eb9b656a0aef4552230c04bab1a6c8af5db9a3b40da0be958
+  data.tar.gz: cca584aaaecb758178cf1212a04400e1e8856a1c7c81b04a6b4e7ee6d6910ee137b2cc28da2f9d6e4f638e89fc6fc3f9242d67a4bb7e08a01f841236776267a8

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .idea/**
+**.DS_Store

data/README.md

@@ -1,6 +1,7 @@
 [![Gem Version](https://badge.fury.io/rb/joyent-cloud-pricing.png)](http://badge.fury.io/rb/joyent-cloud-pricing)
 [![Build status](https://secure.travis-ci.org/kigster/joyent-cloud-pricing.png)](http://travis-ci.org/kigster/joyent-cloud-pricing)
 [![Code Climate](https://codeclimate.com/github/kigster/joyent-cloud-pricing.png)](https://codeclimate.com/github/kigster/joyent-cloud-pricing)
+[![Coverage Status](https://coveralls.io/repos/kigster/joyent-cloud-pricing/badge.png?branch=master)](https://coveralls.io/r/kigster/joyent-cloud-pricing?branch=master)
 
 # Joyent Cloud Pricing
 
@@ -64,14 +65,19 @@ rake joyent:pricing:update
 Full price is stored in the configuration instance.
 
 ```ruby
-Joyent::Cloud::Pricing::Configuration.instance["g3-standard-48-smartos"]
-# => 1.536
+c = Joyent::Cloud::Pricing::Configuration.instance
+f = c.flavor "g3-highmemory-34.25-kvm"
+f.to_h
+# => {:name=>"g3-highmemory-34.25-kvm", :os=>"Linux",
+#     :cost=>0.817, :cpus=>4.0, :disk=>843, :ram=>34.25}
+f.name
+# => "g3-highmemory-34.25-kvm"
 ```
 
 ## 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.
+>  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.
@@ -116,7 +122,7 @@ flavors = %w(
 commit   = Joyent::Cloud::Pricing::Commit.from_yaml 'my_company/config/joyent-commit-pricing.yml'
 analyzer = Joyent::Cloud::Pricing::Analyzer.new(commit, flavors)
 
-analyzer.monthly_overages_price     # => monthly $$ for instances in excess of reserve
+analyzer.monthly_overages_price   # => monthly $$ for instances in excess of reserve
 analyzer.over_reserved_zone_list  # => list of zones in reserve, but not in reality
 ```
 
@@ -126,15 +132,11 @@ 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
-                       # ....
-                      )
+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)
+reporter          = Joyent::Cloud::Pricing::Reporter.new(
+                      'config/reserve-commit.yml',
+                       current_zone_list)
 
 puts reporter.render
 ```
@@ -169,7 +171,7 @@ MONTHLY COSTS:
 YEARLY COSTS:
   On demand yearly                                     $77,189.76
   Reserve prepay one time fee                          $98,600.00
-  Reserve monthly fees                                $104,640.00
+  Reserve sum of all monthly fees                     $104,640.00
                                                       ___________
   Total                                               $280,429.76
 
@@ -179,6 +181,16 @@ YEARLY RESERVE SAVINGS:
 .................................................................
 ```
 
+## Usage with knife joyent
+
+This gem is integrated with latest version of [knife-joyent](https://github.com/joyent/knife-joyent) gem.
+
+Use it as follows:
+
+```
+knife joyent server pricing -z -r config/my-reserve-config.yml
+```
+
 ## Contributing
 
 1. Fork it
@@ -189,9 +201,9 @@ YEARLY RESERVE SAVINGS:
 
 ## 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.
+> 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
 

data/joyent-cloud-pricing.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'coveralls'
 
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-mocks'

data/lib/pricing/analyzer.rb

@@ -24,6 +24,17 @@ module Joyent::Cloud::Pricing
       h
     end
 
+    # Zones with flavor that's not recognized, and therefore unknown
+    def unknown_zone_counts
+      h = {}
+      zone_counts.each_pair { |flavor, count|  h[flavor] = count if pricing.flavor(flavor).nil? }
+      h
+    end
+
+    def have_unknown_zones?
+      unknown_zone_counts.size > 0
+    end
+
     # Non-discounted full price
     def monthly_full_price
       monthly_full_price_for(zone_counts)
@@ -91,7 +102,8 @@ module Joyent::Cloud::Pricing
     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)
+          f = pricing.flavor(flavor)
+          f.respond_to?(operation.to_sym) ? f.send(operation) : 0
         end
       end
       { total: results[0], unreserved: results[1], reserved: results[2] }

data/lib/pricing/configuration.rb

@@ -4,7 +4,7 @@ require_relative 'flavor'
 
 module Joyent::Cloud::Pricing
   class Configuration
-    @@lock = Mutex.new # just in case
+    @@lock = Mutex.new
 
     class << self
       def instance(reload = false)
@@ -54,13 +54,7 @@ module Joyent::Cloud::Pricing
 
     def monthly(flavor)
       f = self.cost(flavor)
-      if f.nil?
-        STDERR.puts "WARNING: can't find flavor #{flavor}, assuming 0"
-        0
-      else
-        monthly_from_hourly f
-      end
-
+      f.nil? ? 0 : monthly_from_hourly(f)
     end
 
     def save_yaml(filename = PRICING_FILENAME)

data/lib/pricing/reporter.rb

@@ -20,7 +20,7 @@ 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
     end
@@ -44,7 +44,9 @@ module Joyent::Cloud::Pricing
     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 = analyzer.excess_zone_counts.each_pair.
+          map{|flavor, count| [ flavor, count, pricing.monthly(flavor) * count ]}.
+          sort{|x,y| y[2] <=> x[2]}
       zones
     end
 
@@ -67,6 +69,15 @@ module Joyent::Cloud::Pricing
     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:
+<%= @r.analyzer.unknown_zone_counts.keys.map{|k| sprintf("    %20s", k) }.join("\n").red %>
+<%= SEPARATOR %>
+
+<%- end -%>
 ZONE COUNTS:
   Total # of zones                           <%= sprintf("%20d", @r.zones).cyan %>
 <%- if @r.reserve? -%>
@@ -100,7 +111,7 @@ 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 monthly fees                       <%= @f.format_price(@r.commit.monthly_price * 12, 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 -%>

data/lib/pricing/version.rb

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

data/spec/pricing/analyzer_spec.rb

@@ -2,41 +2,44 @@ 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
-  ) }
+  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
+      some-unknown-flavor
+    )
+
+  let(:flavors) { FLAVORS }
   let(:commit) { Joyent::Cloud::Pricing::Commit.from_yaml 'spec/fixtures/commit.yml' }
   let(:analyzer) { Joyent::Cloud::Pricing::Analyzer.new(commit, flavors) }
 
@@ -53,7 +56,8 @@ describe 'Joyent::Cloud::Pricing::Analyzer' do
                                              :'g3-highcpu-7-smartos' => 2,
                                              :'g3-highio-60.5-smartos' => 4,
                                              :'g3-highmemory-17.125-smartos' => 12,
-                                             :'g3-standard-30-smartos' => 1
+                                             :'g3-standard-30-smartos' => 1,
+                                             :'some-unknown-flavor' => 1
                                             })
   end
 
@@ -73,7 +77,8 @@ describe 'Joyent::Cloud::Pricing::Analyzer' do
                                                  {:'g3-highcpu-16-smartos' => 2,
                                                   :'g3-highcpu-32-smartos-cc' => 2,
                                                   :'g3-highcpu-7-smartos' => 2,
-                                                  :'g3-standard-30-smartos' => 1
+                                                  :'g3-standard-30-smartos' => 1,
+                                                  :'some-unknown-flavor' => 1
                                                  })
     end
 
@@ -95,4 +100,11 @@ describe 'Joyent::Cloud::Pricing::Analyzer' do
       expect(analyzer.disk).to eql({total: 28655.0, unreserved: 5807.0, reserved: 24300.0})
     end
   end
+
+  context 'for unknown instances' do
+    it 'should return some-unknown-flavor' do
+      expect(analyzer.unknown_zone_counts).to eql({ :'some-unknown-flavor' => 1 })
+    end
+  end
+
 end

data/spec/pricing/reporter_spec.rb

@@ -36,6 +36,8 @@ describe 'Joyent::Cloud::Pricing::Reporter' do
     g3-highmemory-17.125-smartos
     g3-highmemory-17.125-smartos
     g3-highmemory-17.125-smartos
+    some-fake-flavor-without-pricing
+    some-fake-flavor-again
   ) }
   let(:commit) { Joyent::Cloud::Pricing::Commit.from_yaml 'spec/fixtures/commit.yml' }
   let(:reporter) { Joyent::Cloud::Pricing::Reporter.new(commit, flavors) }

data/spec/spec_helper.rb

@@ -3,6 +3,8 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 require 'rubygems'
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
 require 'pricing'
+require 'coveralls'
+Coveralls.wear!
 
 # Dir['spec/support/**/*.rb'].each { |filename| require_relative "../#{filename}" }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joyent-cloud-pricing
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +116,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"