amazon-pricing 0.1.50 → 0.1.51

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWYyNTc2ZDU0NDkyY2UzZDdkM2E2YzhiODljNTNmNTdlZTE3MGQyMw==
+    ZWEzNTE0ZTc2NmY3ZGVmMGUzZTJmZTAwYWVjN2QwMWJjYzY2NDA0Nw==
   data.tar.gz: !binary |-
-    ZWU3YjdlYTY1MGJiMDI2ZWNmMDEyMWI2ZmVjNjgyZmIzYWY2NDgyZQ==
+    YjYzZDRiODEyNWFjNjM3MTcwNzY4NWU5Mjc0ZDI2YTc2NmRiNjM5OA==
 SHA512:
   metadata.gz: !binary |-
-    ZGJiMDBhNDliZGMzZWQ1OTE0Mzk2NDM2MmYxMTkxYThkMzBiOTk3YzViYmE1
-    ZWY3ZmYzNGE5OGNkOTg1NzU0N2RjMmM0ODk3OTc1Yjg0ZWQxOTViMjg4OThm
-    ZmY1YjVhMDI5ZDhmZjg5MDZjZjhiMmIxOGZhNDQyN2IzMDYxNjc=
+    MDliMjdiNWVjMzUxYzM3YWJjZDIwZDQxNzYzZTA0NmEwYTRiNjcyZTgyZWYy
+    MTcwMDBhYmRkYTAxMzk3OWExMzJlNTE1ZWIyMjllNWRiYWQ2ZjM4ZjFkNTdl
+    ZTU4OTUyNjYzZGUyN2I3MTRjYzgxNjYyODU0ZDUyNjhiOTM2MjY=
   data.tar.gz: !binary |-
-    ZTA1Mjk4MjNmODc2OGJkMzMxOWI3NDFkOTVkNDlkNzRkOWM3YWZhN2NiM2E0
-    ZjdjOTNmYTIzMGMxYzhhOGJmZjhkNjRmMTk1YmYzYjM4YWJkMjc0YWFiZDFl
-    NDc1YzZlNWU3MDFlYWRjMDM5NTIxYjAzN2ZiMGFlNjJhZGE1N2M=
+    YTU2NjZmYWQ0YjM0NTg1N2FjNzk5YmFmYzBkNjkwN2M1MzQ4MmY3NDZhNzQy
+    N2E2NDdlOWU3MDk1NTYwMzYzMWI4MWFkOTQ4M2U4NTI4YTI1OWRiMzVjMjYz
+    MDE0NGZkMTZkZWU2ZmRhZGM1YjZjY2IxZGJiZmJjNDk5ZWJiNDU=

data/Gemfile.lock

@@ -1,32 +1,12 @@
 PATH
   remote: .
   specs:
-    amazon-pricing (0.1.49)
+    amazon-pricing (0.1.22)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    domain_name (0.5.18)
-      unf (>= 0.0.5, < 1.0.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    mechanize (2.7.3)
-      domain_name (~> 0.5, >= 0.5.1)
-      http-cookie (~> 1.0)
-      mime-types (~> 2.0)
-      net-http-digest_auth (~> 1.1, >= 1.1.1)
-      net-http-persistent (~> 2.5, >= 2.5.2)
-      nokogiri (~> 1.4)
-      ntlm-http (~> 0.1, >= 0.1.1)
-      webrobots (>= 0.0.9, < 0.2)
-    mime-types (2.2)
-    mini_portile (0.5.3)
-    net-http-digest_auth (1.4)
-    net-http-persistent (2.9.4)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    ntlm-http (0.1.1)
     rake (10.1.0)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
@@ -37,17 +17,12 @@ GEM
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.3)
     test-unit (2.5.5)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.6)
-    webrobots (0.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   amazon-pricing!
-  mechanize (~> 2.7.3)
   rake
   rspec (~> 2.11.0)
   test-unit

data/lib/amazon-pricing/category-type.rb

@@ -18,6 +18,26 @@ module AwsPricing
       :partialupfront_price_per_hour_1_year, :partialupfront_prepay_1_year, :partialupfront_price_per_hour_3_year, :partialupfront_prepay_3_year,
       :noupfront_price_per_hour_1_year, :noupfront_price_per_hour_3_year
 
+    def allupfront_effective_rate_1_year
+      allupfront_prepay_1_year / 365 / 24
+    end
+
+    def allupfront_effective_rate_3_year
+      allupfront_prepay_3_year / 3 / 365 / 24
+    end
+
+    def partialupfront_effective_rate_1_year
+      partialupfront_prepay_1_year / 365 / 24 + partialupfront_price_per_hour_1_year
+    end
+
+    def partialupfront_effective_rate_3_year
+      partialupfront_prepay_3_year / 3 / 365 / 24 + partialupfront_price_per_hour_3_year
+    end
+
+    def noupfront_effective_rate_1_year
+      noupfront_price_per_hour_1_year
+    end
+
     def initialize(instance_type=nil, name=nil)
       @instance_type = instance_type
       @name = name

data/lib/amazon-pricing/version.rb

@@ -8,5 +8,5 @@
 # Home::      http://github.com/CloudHealth/amazon-pricing
 #++
 module AwsPricing
-  VERSION = '0.1.50'
+  VERSION = '0.1.51'
 end

data/test/ec2_instance_types_test.rb

@@ -103,6 +103,22 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
     assert instance.virtual_cores == 2
   end
 
+  def test_new_reservation_types
+    region = @@ec2_pricing.get_region('us-east')
+    instance = region.get_ec2_instance_type('c3.large')
+    os = instance.get_operating_system(:linux)
+    assert os.ondemand_price_per_hour == 0.105
+    assert os.partialupfront_prepay_1_year == 326
+    assert os.allupfront_prepay_1_year == 542
+    assert os.partialupfront_prepay_3_year == 508
+    assert os.allupfront_prepay_3_year == 1020
+    assert os.noupfront_effective_rate_1_year.round(4) == 0.0730
+    assert os.partialupfront_effective_rate_1_year.round(4) == 0.0632
+    assert os.allupfront_effective_rate_1_year.round(4) == 0.0619
+    assert os.partialupfront_effective_rate_3_year.round(4) == 0.0413
+    assert os.allupfront_effective_rate_3_year.round(4) == 0.0388
+  end
+
   def test_bad_data
     # Someone at AWS is fat fingering the pricing data and putting the text "os" where there should be the actual operating system (e.g. "linux") - see http://a0.awsstatic.com/pricing/1/ec2/linux-od.min.js
     @@ec2_pricing.regions.each do |region|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.50
+  version: 0.1.51
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email: