joyent-cloud-pricing 1.0.10 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffe763f26373c4c9dd19d269cabb8d34be18204b
-  data.tar.gz: e1454babed191bb8e3ddd4f3a6d0f768396a5c76
+  metadata.gz: 2111e58865d22fde24d32147061b876f61abd621
+  data.tar.gz: 8fc86f5970562d9758afe1638f58095022cc5ffb
 SHA512:
-  metadata.gz: 8ee3d92c075e5bd7bd352b59b6e16bf1e6fcd57b5312888b9ae8d802d63bd206138ae8c36c8a95226c56546bae3fd4125fbab1e75d16d53c3a13a207ef0007fb
-  data.tar.gz: a37d969d4682497eb6380875b9fa7380190145b1d6b3946de4b15d1885f638e2b416c3f51647a47c4a6480058d4d692d223c40cbaac4ca088e56182fdf3859fe
+  metadata.gz: d9f9cf9eefc2c6f429830316b550ee2705441b5697a58bbffe2f47caa0bfb5304ae758748c1c120e1e55b1c50225b3ad3807282534d896ea9c889a6e7313aa5f
+  data.tar.gz: 4dbe5bc3c410a42f14f722fc8057a6088c27db829101d1ebfa4169141d11caa4d499bf4b338d761391fc45e74a66743165dacf08bae637d05ded22f030e5eac3

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --format progress
+--require rspec/legacy_formatters

data/joyent-cloud-pricing.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-mocks'
+  spec.add_development_dependency 'rspec-legacy_formatters'
 end

data/lib/pricing.rb

@@ -23,3 +23,4 @@ require 'pricing/formatter'
 require 'pricing/commit'
 require 'pricing/analyzer'
 require 'pricing/reporter'
+require 'pricing/discount'

data/lib/pricing/analyzer.rb

@@ -10,7 +10,7 @@ module Joyent::Cloud::Pricing
       @zone_counts = count_dupes(flavors).symbolize_keys
     end
 
-    # Zones that are not on commit
+    # Zones that are not on commit, i.e on demand
     def excess_zone_counts
       h = {}
       zone_counts.each_pair { |flavor, count| diff = count - quantity_for(flavor); h[flavor] = diff if diff > 0 }
@@ -75,7 +75,7 @@ module Joyent::Cloud::Pricing
 
     def monthly_full_price_for zones
       count_for_all zones do |flavor|
-        pricing.monthly(flavor)
+        (commit.discount.nil?) ? pricing.monthly(flavor) : commit.discount.apply(pricing.monthly(flavor))
       end
     end
 

data/lib/pricing/commit.rb

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

data/lib/pricing/discount.rb

@@ -0,0 +1,34 @@
+module Joyent::Cloud::Pricing
+  class Discount
+    def apply(amount)
+      raise 'Abstract method'
+    end
+
+  end
+
+  class PercentDiscount < Discount
+    attr_accessor :value
+    def initialize(value)
+      @value = value
+      raise 'Discount value must be between 0% and 100%' unless self.value <= 100 && self.value >= 0
+    end
+
+    def apply(amount)
+      amount - 0.01 * value * amount
+    end
+
+    def to_s
+      "#{value}%"
+    end
+  end
+
+  class Discount
+    CALCULATORS = { percent: PercentDiscount }
+    def self.type(type_name, *args)
+      calc     = CALCULATORS[type_name]
+      raise   "Type #{type_name} is unknown!" unless calc.is_a?(Class)
+      calc.new *args
+    end
+  end
+
+end

data/lib/pricing/report.txt.erb

@@ -31,6 +31,9 @@ ZONE COUNTS:
 <%= separator %>
 
 MONTHLY COSTS:
+<%- if commit.discount %>
+  NOTE: additional discount of <%= commit.discount.to_s.green %> applies to all on-demand instances
+<%- end %>
 <%- if print_zone_list -%>
   List of on-demand flavors by price <%= have_commit_pricing? ? "(in excess of reserve)" : "" %>
 

data/lib/pricing/version.rb

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

data/spec/fixtures/commit_with_discount.yml

@@ -0,0 +1,27 @@
+defaults: &defaults
+    years: 1
+
+discount:
+  type: :percent
+  value: 30
+
+reserved:
+  "g3-highcpu-32-smartos-cc":
+    <<: *defaults
+    prepay: 8000.00
+    monthly: 500
+    quantity: 10
+  "g3-highmemory-17.125-smartos":
+    <<: *defaults
+    prepay: 800.00
+    monthly: 60
+    quantity: 12
+  "g3-highio-60.5-smartos":
+    <<: *defaults
+    prepay: 1800.00
+    monthly: 600
+    quantity: 5
+
+custom:
+  :some-instance:
+    :cost: 2.451

data/spec/pricing/analyzer_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Joyent::Cloud::Pricing::Analyzer' do
+RSpec.describe 'Joyent::Cloud::Pricing::Analyzer' do
 
   FLAVORS =  %w(
       g3-highcpu-16-smartos
@@ -113,4 +113,21 @@ describe 'Joyent::Cloud::Pricing::Analyzer' do
     end
   end
 
+  context 'for commit with discount' do
+    let(:commit) { Joyent::Cloud::Pricing::Commit.from_yaml 'spec/fixtures/commit_with_discount.yml' }
+    let(:discount) { 0.7 }
+
+    context 'should apply discount only to on demand instances' do
+      it '#monthly_full_price' do
+        expect(analyzer.monthly_full_price).to be_within(0.01).of(35496.0 * discount)
+      end
+
+      it '#monthly_overages_price' do
+        expect(analyzer.monthly_overages_price).to be_within(0.01).of(6432.48 * discount)
+      end
+
+    end
+
+  end
+
 end

data/spec/pricing/commit_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Joyent::Cloud::Pricing::Commit' do
+RSpec.describe 'Joyent::Cloud::Pricing::Commit' do
 
   context 'when some reserve pricing is defined' do
     let(:commit) { Joyent::Cloud::Pricing::Commit.from_yaml 'spec/fixtures/commit.yml' }

data/spec/pricing/configuration_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Joyent::Cloud::Pricing::Configuration' do
+RSpec.describe 'Joyent::Cloud::Pricing::Configuration' do
   expected_prices = {
       'g3-standard-48-smartos' => 1.536,
       'g3-standard-0.625-smartos' => 0.02,

data/spec/pricing/discount_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+RSpec.describe 'Joyent::Cloud::Pricing::Discount' do
+  let(:pricing) { Joyent::Cloud::Pricing::Configuration.from_yaml }
+  let(:discount) { Joyent::Cloud::Pricing::Discount.type(:percent, 30)  }
+  let(:commit) { Joyent::Cloud::Pricing::Commit.from_yaml 'spec/fixtures/commit_with_discount.yml' }
+
+  it "should apply percent discount correctly" do
+    expect(discount.apply(10)).to eql(7.0)
+  end
+
+  it "should read discount from yaml correctly" do
+    expect(commit.discount.value).to eq(discount.value)
+  end
+
+
+
+end

data/spec/pricing/formatter_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe' Joyent::Cloud::Pricing::Formatter' do
+RSpec.describe' Joyent::Cloud::Pricing::Formatter' do
 
   let(:config) { Joyent::Cloud::Pricing::Configuration.new(
                  {'g3-standard-48-smartos' => {cost: 1.536},

data/spec/pricing/reporter_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Joyent::Cloud::Pricing::Reporter' do
+RSpec.describe 'Joyent::Cloud::Pricing::Reporter' do
 
   let(:flavors) { %w(
     g3-highcpu-16-smartos
@@ -39,7 +39,7 @@ describe 'Joyent::Cloud::Pricing::Reporter' do
     some-fake-flavor-without-pricing
     some-fake-flavor-again
   ) }
-  let(:commit) { Joyent::Cloud::Pricing::Commit.from_yaml 'spec/fixtures/commit.yml' }
+  let(:commit) { Joyent::Cloud::Pricing::Commit.from_yaml 'spec/fixtures/commit_with_discount.yml' }
   let(:reporter) { Joyent::Cloud::Pricing::Reporter.new(commit, flavors) }
 
   before do
@@ -62,6 +62,7 @@ describe 'Joyent::Cloud::Pricing::Reporter' do
         expect(output).to_not be_nil
         expect(output).to include('MONTHLY COSTS')
         expect(output).to include('YEARLY RESERVE SAVINGS')
+        expect(output).to include('NOTE: additional discount of')
       end
     end
 

data/spec/pricing/reserve_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Joyent::Cloud::Pricing::Reserve' do
+RSpec.describe 'Joyent::Cloud::Pricing::Reserve' do
   let(:pricing) { Joyent::Cloud::Pricing::Configuration.from_yaml }
   let(:flavor)  { "g3-highcpu-32-smartos-cc" }
   let(:reserve) {

data/spec/pricing/scraper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Joyent::Cloud::Pricing::Scraper' do
+RSpec.describe 'Joyent::Cloud::Pricing::Scraper' do
   context 'scraping from URL'
   let(:scraper) { Joyent::Cloud::Pricing::Scraper.new }
 

data/spec/spec_helper.rb

@@ -19,6 +19,7 @@ RSpec.configure do |config|
   # the filtering metadata and `run_all_when_everything_filtered = true` then
   # all specs will run.
   #config.filter_run :focus
+  config.disable_monkey_patching!
 
   # Run all specs when none match the provided filter. This works well in
   # conjunction with `config.filter_run :focus`, as it will run the entire

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joyent-cloud-pricing
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.0
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-legacy_formatters
+  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'
 description: Various set of tools and helpers to calculate infrastructure footprint
   and cost on Joyent Cloud. Supports commit discounts.
 email:
@@ -132,6 +146,7 @@ files:
 - lib/pricing/analyzer.rb
 - lib/pricing/commit.rb
 - lib/pricing/configuration.rb
+- lib/pricing/discount.rb
 - lib/pricing/flavor.rb
 - lib/pricing/formatter.rb
 - lib/pricing/helpers.rb
@@ -144,10 +159,12 @@ files:
 - lib/tasks/update.rake
 - spec/fixtures/commit.yml
 - spec/fixtures/commit_noreserve.yml
+- spec/fixtures/commit_with_discount.yml
 - spec/fixtures/pricing.yml
 - spec/pricing/analyzer_spec.rb
 - spec/pricing/commit_spec.rb
 - spec/pricing/configuration_spec.rb
+- spec/pricing/discount_spec.rb
 - spec/pricing/formatter_spec.rb
 - spec/pricing/reporter_spec.rb
 - spec/pricing/reserve_spec.rb
@@ -181,10 +198,12 @@ summary: Tools for calculating monthly and yearly price of infrastructure hosted
 test_files:
 - spec/fixtures/commit.yml
 - spec/fixtures/commit_noreserve.yml
+- spec/fixtures/commit_with_discount.yml
 - spec/fixtures/pricing.yml
 - spec/pricing/analyzer_spec.rb
 - spec/pricing/commit_spec.rb
 - spec/pricing/configuration_spec.rb
+- spec/pricing/discount_spec.rb
 - spec/pricing/formatter_spec.rb
 - spec/pricing/reporter_spec.rb
 - spec/pricing/reserve_spec.rb