amazon-pricing 0.1.72 → 0.1.73

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGY4MTgzNzUyZDMyYmZjYjViNDU4MGRjMWIwNzVkOTVmMjlmNjMwYQ==
+    YzhlODhkYmE1OGQ1MmU5ZmJiNDMwMTdmNGY0NTRiMmQ0OTY5NDY5Mw==
   data.tar.gz: !binary |-
-    MDhkNjQxZGEyZTkzMWIwNDU0ZTU1ZjdlZTBlYzAwYzE1ZmQ0NTMxZg==
+    NjA5NGE1MjgwOGIwZjVjNTA4YzA4NWQ0N2JiZTY3OTFjMTQxZWFkYw==
 SHA512:
   metadata.gz: !binary |-
-    MWUxOWUyOGYzMzY5YzIyZmE4NWIwZTRkYzdmZjI3MTI1ZWU5ZGMzYTljNmQx
-    MzY5ZDVkODkwNjJhYmViZTBmZGU4MTY0MjFkZWNjNTdhYjlhMGJkOTNmODIx
-    OWVkZTcxOWU3ODlkN2Q4ODQyOGM3YzFiYmQ2ZTFiZmUyMWFlNzk=
+    ODczMjkyN2RjMzc1NzI3ZTQ4MDliOGE2NWEzZDVkYWZhMTJiZTFiMDZiNjg1
+    MTM5YTVhMDRlZmMwMzc4MWUyYzA4MjZkODBhODlkY2I4YWMyMWMzMjcwMzhl
+    MmQzNTI1NjBlY2YzZDdkYjQ3YmRkNThjY2RiMjkzYTE3ZjM3YjA=
   data.tar.gz: !binary |-
-    MGQ4YWE4NWY4YmI0NWIyYWVjMWFlMTQ5NTgzMGNmZmU1NzgxYTEyODdlYmJm
-    ZjI2ZTEzYzMwZWM0Y2U0Y2I1MDc4ZjRjZWZmNzM1NGI0ZDNlMThmNDdjYTIw
-    OGE5ZTQwNmExMmJlZTY1NzcxOGQ3NjFhNjlmZDU1MmJhM2Q3MDU=
+    MjczMThkZWM0ZWU1ZjY3YjhjY2E3OWNlM2M1NmUyZmVmMjBiOWU0NWZmYTJh
+    NjQwZGY4ZTUxMTViNTZjMTllN2M5ZWYzZTI0MjIwYzgzZThlNTNkZjI0Nzhh
+    OGRjZGQ1MDRlNThkOTJjMDc5YmQ5ODhmZDZhZGE1YzQzNWEzOTQ=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    amazon-pricing (0.1.72)
+    amazon-pricing (0.1.73)
 
 GEM
   remote: https://rubygems.org/

data/lib/amazon-pricing/ec2-price-list.rb

@@ -61,7 +61,12 @@ module AwsPricing
     def fetch_ec2_ebs_pricing
       res = PriceList.fetch_url(EBS_BASE_URL + "pricing-ebs.min.js")
       res["config"]["regions"].each do |ebs_types|
-        region = get_region(ebs_types["region"])
+        region_name = ebs_types["region"]
+        region = get_region(region_name)
+        if region.nil?
+          $stderr.puts "[fetch_ec2_ebs_pricing] WARNING: unable to find region #{region_name}"
+          next
+        end
         region.ebs_price = EbsPrice.new(region)
         region.ebs_price.update_from_json(ebs_types)
       end

data/lib/amazon-pricing/rds-price-list.rb

@@ -215,6 +215,10 @@ module AwsPricing
       res['config']['regions'].each do |reg|
         region_name = reg['region']
         region = get_region(region_name)
+        if region.nil?
+          $stderr.puts "[fetch_on_demand_rds_instance_pricing] WARNING: unable to find region #{region_name}"
+          next
+        end
         reg['types'].each do |type|
           type['tiers'].each do |tier|
             begin

data/lib/amazon-pricing/version.rb

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

data/test/ec2_instance_types_test.rb

@@ -177,18 +177,15 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
     region = @@ec2_pricing.get_region('us-gov-west-1')
     instance = region.get_ec2_instance_type('r3.large')
     os = instance.get_operating_system(:linux)
-    assert os.ondemand_price_per_hour == 0.210
-    assert os.partialupfront_prepay_1_year == 649
-    assert os.allupfront_prepay_1_year == 976
-    assert os.partialupfront_prepay_3_year == 1239
-    assert os.allupfront_prepay_3_year == 1935
-    assert os.noupfront_effective_rate_1_year == 0.1320
-    assert os.partialupfront_effective_rate_1_year == 0.1131
-    assert os.allupfront_effective_rate_1_year == 0.1114
-    assert os.partialupfront_effective_rate_3_year == 0.0781
-    assert os.allupfront_effective_rate_3_year == 0.0736
+    assert os.ondemand_price_per_hour == 0.2
+    assert os.partialupfront_prepay_1_year == 617
+    assert os.allupfront_prepay_1_year == 927
+    assert os.partialupfront_prepay_3_year == 1177
+    assert os.allupfront_prepay_3_year == 1838
+    assert os.noupfront_effective_rate_1_year == 0.125
+    assert os.partialupfront_effective_rate_1_year == 0.1074
+    assert os.allupfront_effective_rate_1_year == 0.1058
+    assert os.partialupfront_effective_rate_3_year == 0.0738
+    assert os.allupfront_effective_rate_3_year == 0.0699
   end
-
-
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.72
+  version: 0.1.73
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -96,3 +96,4 @@ test_files:
 - spec/support/.gitignore
 - test/ec2_instance_types_test.rb
 - test/helper.rb
+has_rdoc: