joyent-cloud-pricing 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7222aa546480d563b40f139b9678c17b6855780a
-  data.tar.gz: 5100b881cfc5e2cf42c3862a121049d53a71b8db
+  metadata.gz: abf4af6ca921b105e367ac1235c83b136ba0cf17
+  data.tar.gz: c555428055b9b12a35199ee16bacfac178441150
 SHA512:
-  metadata.gz: 446c0daa3bfd9431ea8bbf61400ea0f269352901abe21194dfd6968cde81e540b21bb936b0534e946d61f4fcb73d5fc6b52387b85f86d04a3e9374b28c4a05e3
-  data.tar.gz: b5d4beb509476cbcd89671043bb7cf7fa03262d1a7d6a7117b4d75caf7e3faf4720ea8ba123d3b9cb5cc1158fee1d1d0745bb3ba6dca3796b82440eb0dcd955e
+  metadata.gz: aa060031a58028cd6c8cbc15a40aceddbbb29a4a8ffa3c16dc6650685c951f5a833d96a379ed24af9a9f998b1174a9064be90c7ac33d491452bebaec3cf4d0b0
+  data.tar.gz: 4cf153950979dfa5c0f87f0966529c93c4fadc40780e52871c1c6150a41c4cfdfb3a25bb2619d10b46d9997e7ad49ec052c0af3cf5629d1e7f961486e8e89606

data/README.md

@@ -113,7 +113,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.excess_monthly_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
 ```
 
@@ -124,45 +124,48 @@ 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)
-puts reporter.render```
-
-Output (prices are arbitrary in this sample output):
-
-```bash
-
-SUMMARY:
-  Total # of zones                         :                  123
-  Total # of reserved zones                :                   98
-  Total # of reserved but WASTED zones     :                    0
-  Reserve Pricing Term/Duration (years)    :                    1
-
-ONE TIME:
-  Reserve Pricing Upfront Payments         :          $211,717.18
-
-MONTHLY:
-  Monthly Cost of Reserve Pricing Zones    :           $12,457.51
-  On Demand Resources Cost                 :           $23,679.68
-  Total Monthly (reserve + on demand)      :           $41,087.19
-
-YEARLY TOTALS:
-  With reserve discounts                   :          $331,607.30
-  Without reserve discounts                :          $926,224.00
-  Savings %                                :                  41%
-
-UNRESERVED FLAVORS MONTHLY COST
-  9 x g3-highmemory-68.375-smartos         :           $10,562.40
-  1 x g3-highmemory-256-smartos-cc         :            $4,393.44
-  6 x g3-standard-7.5-smartos              :            $1,036.80
-  1 x g3-highmemory-34.25-smartos          :              $588.24
-  4 x g3-highcpu-1.75-kvm                  :              $365.76
-  4 x g3-standard-0.5-smartos              :               $46.08
-  1 x g3-standard-0.625-smartos            :               $14.40
+reporter          = Joyent::Cloud::Pricing::Reporter.new('config/reserve-commit.yml', current_zone_list)
+
+puts reporter.render
 ```
 
-## Command Line Tools
+Example output with commit pricing used:
 
-TBD.
+```
+ZONE COUNTS:
+  Total # of zones                                             33
+  Total # of reserved zones                                    27
+  Total # of reserved but absent zones                          1
+  Reserve Pricing Term/Duration (years)                         1
+.................................................................
+
+RESERVE UPFRONT COST:
+  Reserve Pricing Upfront Payments                     $98,600.00
+.................................................................
+
+MONTHLY COSTS:
+  List of on-demand flavors by price
+  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
+                                                      ___________
+  Total                                                $15,152.48
+.................................................................
+
+YEARLY COSTS:
+  Savings due to Reserved Pricing                     $145,522.24
+  Savings %                                                   34%
+
+  Reserve Yearly                                      $203,240.00
+  On Demand Yearly                                     $77,189.76
+                                                      ___________
+  Total                                               $280,429.76
+```
 
 ## Contributing
 

data/joyent-cloud-pricing.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'nokogiri'
-  spec.add_dependency 'mixlib-cli'
   spec.add_dependency 'colored'
 
   spec.add_development_dependency 'bundler', '~> 1.5'

data/lib/pricing.rb

@@ -22,5 +22,3 @@ require "pricing/formatter"
 require "pricing/commit"
 require "pricing/analyzer"
 require "pricing/reporter"
-
-require "pricing/cli"

data/lib/pricing/analyzer.rb

@@ -30,31 +30,50 @@ module Joyent::Cloud::Pricing
     end
 
     # Excess zones cost this much
-    def excess_monthly_price
+    def monthly_overages_price
       monthly_full_price_for(excess_zone_list)
     end
 
     # Monthly for all of the commits
-    def commit_monthly_price
+    def monthly_commit_price
       commit.monthly_price
     end
 
     # Commits + excess non reserved zones
-    def total_monthly_price
-      excess_monthly_price + commit_monthly_price
+    def monthly_total_price
+      monthly_overages_price + monthly_commit_price
     end
 
     def upfront
       commit.upfront
     end
 
-
     def monthly_full_price_for zones
       total_price_for zones do |flavor|
         pricing.monthly(flavor)
       end
     end
 
+    def yearly_overages_price
+      monthly_overages_price * 12
+    end
+
+    def yearly_full_price
+      monthly_full_price * 12
+    end
+
+    def yearly_total
+      yearly_overages_price + commit.yearly_price
+    end
+
+    def yearly_savings
+      yearly_full_price - yearly_total
+    end
+
+    def yearly_savings_percent
+      100 * (yearly_full_price - yearly_total) / yearly_full_price
+    end
+
     private
 
     def total_price_for zones, &block

data/lib/pricing/reporter.rb

@@ -27,7 +27,7 @@ module Joyent::Cloud::Pricing
     def render
       @r = self
       @f = formatter
-      ERB.new(REPORT_ASCII).result(binding)
+      ERB.new(REPORT_ASCII, 0, '-').result(binding)
     end
 
     def reserve?
@@ -42,10 +42,6 @@ module Joyent::Cloud::Pricing
       Configuration.instance
     end
 
-    def monthly_without_commit_discount
-      analyzer.monthly_full_price_for(analyzer.zone_list)
-    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
@@ -54,33 +50,54 @@ module Joyent::Cloud::Pricing
     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).red)
+        sprintf(" %2d x %-36s   %20s",
+          count, flavor, formatter.format_price(monthly, 20).yellow)
       end.join("\n")
     end
 
+    SEPARATOR = ('.' * 65).cyan
     REPORT_ASCII = <<ASCII
-SUMMARY:
-  Total # of zones                         : <%= sprintf("%20d", @r.zones).blue %>
-<% if @r.reserve? %>  Total # of reserved zones                : <%= sprintf("%20d", @r.commit.total_zones).green %>
-  Total # of reserved but WASTED zones     : <%= sprintf("%20d", @r.analyzer.over_reserved_zone_list.size || 0).red %>
-  Reserve Pricing Term/Duration (years)    : <%= sprintf("%20d", @r.commit.years || 0).green %>
-
-ONE TIME:
-  Reserve Pricing Upfront Payments         : <%= @f.format_price(@r.commit.upfront_price, 20).green %>
-<% end %>
-MONTHLY:
-<% if @r.reserve? %>  Monthly Cost of Reserve Pricing Zones    : <%= @f.format_price(@r.commit.monthly_price, 20).green %>
-<% end %>  On Demand Resources Cost                 : <%= @f.format_price(@r.analyzer.excess_monthly_price, 20).red %>
-<% if @r.reserve? %>  Total Monthly (reserve + on demand)      : <%= @f.format_price(@r.analyzer.total_monthly_price, 20).blue %><% end %>
-
-YEARLY TOTALS:
-<% if @r.reserve? %>  With reserve discounts                   : <%= @f.format_price(@r.commit.yearly_price, 20).green %>
-<% end %>  Without reserve discounts                : <%= @f.format_price(@r.monthly_without_commit_discount * 12, 20).red %>
-<% if @r.reserve? %>  Savings %                                : <%= (sprintf "%19d", (100 * (@r.monthly_without_commit_discount * 12 - @r.commit.yearly_price) / (@r.monthly_without_commit_discount * 12))).green %>%<% end %>
-
-UNRESERVED FLAVORS MONTHLY COST
+
+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 %>
+<%- end -%>
+<%= SEPARATOR %>
+
+MONTHLY COSTS:
+  List of on-demand flavors by price
 <%= @r.excess_zone_list %>
+                                                      <%= "___________".yellow %>
+  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? -%>
+  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 %>
+                                                      <%= "___________".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 -%>
 
 ASCII
 

data/lib/pricing/version.rb

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

data/spec/pricing/analyze_spec.rb

@@ -70,8 +70,8 @@ describe 'Joyent::Cloud::Pricing::Analyze' do
                                               })
   end
 
-  it '#excess_monthly_price' do
-    expect(analyzer.excess_monthly_price).to eql( 6432.48 )
+  it '#monthly_overages_price' do
+    expect(analyzer.monthly_overages_price).to eql( 6432.48 )
   end
 
   it '#over_reserved_zone_list' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joyent-cloud-pricing
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mixlib-cli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
@@ -112,8 +98,7 @@ description: Various set of tools and helpers to calculate infrastructure footpr
   and cost on Joyent Cloud. Supports commit discounts.
 email:
 - kigster@gmail.com
-executables:
-- joyent-price-helper
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -124,14 +109,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/joyent-price-helper
 - config/commit_pricing.yml.example
 - config/joyent_pricing.yml
 - config/legacy_prices.yml
 - joyent-cloud-pricing.gemspec
 - lib/pricing.rb
 - lib/pricing/analyzer.rb
-- lib/pricing/cli.rb
 - lib/pricing/commit.rb
 - lib/pricing/configuration.rb
 - lib/pricing/formatter.rb

data/bin/joyent-price-helper

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'rubygems'
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-require 'pricing'
-
-Joyent::Cloud::Pricing::CLI.new.run
-

data/lib/pricing/cli.rb

@@ -1,36 +0,0 @@
-require 'mixlib/cli'
-
-module Joyent
-  module Cloud
-    module Pricing
-      class CLI
-        include Mixlib::CLI
-
-        banner 'Usage: joyent-price-helper [--commit <path-to-commit.yml] '
-
-        option :commit_config,
-               short: '-c COMMIT_CONFIG',
-               long: '--commit COMMIT_CONFIG',
-               description: 'Path to the config file for commit pricing (YML), default is "config/commit_pricing.yml"',
-               required: false
-
-        option :help,
-               short: '-h',
-               long: '--help',
-               description: 'Show this message',
-               on: :tail,
-               boolean: true,
-               show_options: true,
-               exit: 0
-
-        attr_reader :args
-
-        def run argv = ARGV
-          parse_options(argv)
-        end
-
-      end
-    end
-  end
-end
-