joyent-cloud-pricing 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c956c3b6d23704b5a0ff89975f65fe38c8d0e260
-  data.tar.gz: f94a8d4de88c804634865f9b853948680407fca9
+  metadata.gz: 9b380b01b5301c09ce4946aed2d0d55879ea978a
+  data.tar.gz: 1eddbc97807b98e7e7ec1144226e47e61fef5414
 SHA512:
-  metadata.gz: 0213e2bdaa2245eaa6f3b25ac3f730499e1a038e4eea2d19ac0847d55ab630efec5ec8cb313eb77ef4b07ec2beb5206eeff02d90c1ce5a1efc8ac494efe72964
-  data.tar.gz: 128b92a637a4b4f943ee34c4bdc37854f1c938f262ed4807ac502cd1e23863df59799fc3048ff31a8d342c3ee1ded5b97972785d38a0123546c1dd1714b72ed9
+  metadata.gz: bba5bd633fa5e1d02037487c549d130bb43cf8b473c33544e623aea153e3a71fdc17ec8f0a395c31fe2efcd79fc4f5e3ee6bb3db29dceba3169120d23c5f2c62
+  data.tar.gz: 3ab4786f322d28b6077395eb2042a51ae079d78b88230ba5069745f0b43fe2314b49cda55208e0b58067c18cca224096201b1b05365d019c483d5f48705e8fd1

data/README.md

@@ -146,35 +146,37 @@ 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
+  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
+  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
                                                       ___________
-  On Demand Monthly                                     $6,432.48
-
-  Zones Under Reserve Pricing                           $8,720.00
+  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
+  On demand yearly                                     $77,189.76
+  Reserve prepay one time fee                          $98,600.00
+  Reserve monthly fees                                $104,640.00
                                                       ___________
   Total                                               $280,429.76
+
+YEARLY RESERVE SAVINGS:
+  Savings due to reserved pricing                     $145,522.24
+  Savings %                                                   34%
+.................................................................
 ```
 
 ## Contributing
@@ -193,4 +195,4 @@ library. Use at your own risk.
 
 ## Author
 
-Konstantin Gredeskoul, [@kig on twitter](http://twitter.com/kig), [@kigster on github](http://github.com/kigster)
+* Konstantin Gredeskoul, [@kig on twitter](http://twitter.com/kig), [@kigster on github](http://github.com/kigster)

data/lib/pricing/flavor.rb

@@ -1,14 +1,13 @@
 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)
+    def initialize(name, options = {})
       @name = name
-      @os = os
-      @cost = (cost == 'N/A') ? nil : cost.to_f
-      @cpus = cpus.to_f
-      @disk = disk.to_i
-      @ram = ram.to_f
+      @os = options[:os]
+      @cost = (options[:cost] == 'N/A') ? nil : options[:cost].to_f
+      @cpus = options[:cpus].to_f
+      @disk = options[:disk].to_i
+      @ram = options[:ram].to_f
     end
 
     def to_h

data/lib/pricing/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joyent-cloud-pricing
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Konstantin Gredeskoul