amazon-pricing 0.1.75 → 0.1.76

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWU5NmE4N2NiY2I0MDAyMzNkZGIwOGRiNDU4YmIyMzI5NzRkNTRkMg==
-  data.tar.gz: !binary |-
-    NmEzYzg0ZGI2Mzk5NDhjYmFiMWVmNTYzYTQ0MjM2NDQ3MzNmM2E0ZQ==
+SHA1:
+  metadata.gz: d472ba3a48cd3e5079c816df71dbe2249607e02a
+  data.tar.gz: 53d480512cdc7347d27ed0e5bc07b0791b8a91db
 SHA512:
-  metadata.gz: !binary |-
-    ZWVjOWQwYzIzZjdkYTY2ZWNmNGZjZGIzMTg0MGUyYjQ4OTgxMjNkOTk1ZDgz
-    NWUzOTBjYWRjYzI1MWU5NjA1YjZmNWNkMjU4NzIwY2Q3MDYzMTc5OWU0ZDUw
-    MmZmMWNkYzQzNzEzZjUxMzcwNDUzN2M0ZjU4ZmEwZTdiMTgxYjY=
-  data.tar.gz: !binary |-
-    YzI4N2E1NWNhNGEyZmY1ODgzZjVhYzI5ZjAzMzU1N2M3YjUxNzgzM2JiZTZm
-    MGMxMDYzYmI2ZjhlNTdmODE2NWU2NmQ0MGY0Y2YyYjZmNzFmNWZlM2EzNGU5
-    OWQzNWQ5MjllODQzNjI2Zjc1YzIyZmVmOTk0Njg4NzM1Y2E4NDQ=
+  metadata.gz: f37dfa9dc471b49204323ea8d631ab5ef1b5364e6fb692223ef56594afe5d43386b49cae7bcd43ba34274308ed56e259cf8ef4122d5b67d7c57d3305da008d92
+  data.tar.gz: a09e9a05ca0f7a82f4a5e665bc8f77b946226890d073e60c88ab9feff1bb491f9dc808779546aefedc9b5cc1f99b3c3c2721403cbd522de905ef6f7a72adbe1d

data/Gemfile.lock

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

data/lib/amazon-pricing/definitions/ebs-price.rb

@@ -12,7 +12,8 @@ module AwsPricing
   class EbsPrice
     attr_accessor :standard_per_gb, :standard_per_million_io, :s3_snaps_per_gb,
       :preferred_per_gb, :preferred_per_iops,
-      :ssd_per_gb
+      :ssd_per_gb,
+      :ebs_cold_hdd_per_gb, :ebs_optimized_hdd_per_gb
 
     def initialize(region)
       #@region = region
@@ -22,14 +23,18 @@ module AwsPricing
     def update_from_json(json)
       json["types"].each do |t|
         case t["name"]
-        when "Amazon EBS Magnetic volumes"
+        when "Amazon EBS Magnetic volumes"  # not supported by aws anymore, replaced by st1 and sc1
           @standard_per_gb = t["values"].select{|v| v["rate"] == "perGBmoProvStorage" }.first["prices"].values.first.to_f
           @standard_per_million_io = t["values"].select{|v| v["rate"] == "perMMIOreq" }.first["prices"].values.first.to_f
-        when "Amazon EBS Provisioned IOPS (SSD) volumes"
+        when "Amazon EBS Provisioned IOPS SSD (io1) volumes"
           @preferred_per_gb = t["values"].select{|v| v["rate"] == "perGBmoProvStorage" }.first["prices"].values.first.to_f
           @preferred_per_iops = t["values"].select{|v| v["rate"] == "perPIOPSreq" }.first["prices"].values.first.to_f
-        when "Amazon EBS General Purpose (SSD) volumes"
+        when "Amazon EBS General Purpose SSD (gp2) volumes"
           @ssd_per_gb = t["values"].select{|v| v["rate"] == "perGBmoProvStorage" }.first["prices"].values.first.to_f
+        when "Amazon EBS Cold HDD (sc1) volumes"
+          @ebs_cold_hdd_per_gb = t["values"].select{|v| v["rate"] == "perGBmoProvStorage" }.first["prices"].values.first.to_f
+        when "Amazon EBS Throughput Optimized HDD (st1) volumes"
+          @ebs_optimized_hdd_per_gb = t["values"].select{|v| v["rate"] == "perGBmoProvStorage" }.first["prices"].values.first.to_f
         when "ebsSnapsToS3"
           @s3_snaps_per_gb = t["values"].select{|v| v["rate"] == "perGBmoDataStored" }.first["prices"].values.first.to_f
         end

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

@@ -59,16 +59,20 @@ module AwsPricing
     end
 
     def fetch_ec2_ebs_pricing
-      res = PriceList.fetch_url(EBS_BASE_URL + "pricing-ebs.min.js")
-      res["config"]["regions"].each do |ebs_types|
-        region_name = ebs_types["region"]
+      res_current = PriceList.fetch_url(EBS_BASE_URL + "pricing-ebs.min.js")
+      res_previous = PriceList.fetch_url(EBS_BASE_URL + "pricing-ebs-previous-generation.min.js")
+      res_current["config"]["regions"].each do |region_types_current|
+        region_name = region_types_current["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_previous = res_previous["config"]["regions"]
+        region_types_previous = region_previous.select{|rp| region_name == rp["region"]}.first
         region.ebs_price = EbsPrice.new(region)
-        region.ebs_price.update_from_json(ebs_types)
+        region.ebs_price.update_from_json(region_types_current)
+        region.ebs_price.update_from_json(region_types_previous)
       end
     end
 

data/lib/amazon-pricing/version.rb

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

data/test/ec2_instance_types_test.rb

@@ -80,19 +80,29 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
   end
 
   def test_ebs
-    region = @@ec2_pricing.get_region('us-east')
+    region = @@ec2_pricing.get_region('us-east-1')
+    # next two prices are no longer provided by aws (May 09, 2016)
     assert region.ebs_price.standard_per_gb == 0.05
     assert region.ebs_price.standard_per_million_io == 0.05
     assert region.ebs_price.preferred_per_gb == 0.125
     assert region.ebs_price.preferred_per_iops == 0.065
     assert region.ebs_price.s3_snaps_per_gb == 0.095
+    # next two prices were added by aws (May 09, 2016)
+    assert region.ebs_price.ebs_optimized_hdd_per_gb == 0.045
+    assert region.ebs_price.ebs_cold_hdd_per_gb == 0.025
+
   end
 
   def test_ebs_not_null
     @@ec2_pricing.regions.each do |region|
       # Everyone should have standard pricing
+      # next two prices are no longer provided by aws (May 09, 2016) 
       assert_not_nil region.ebs_price.standard_per_gb
       assert_not_nil region.ebs_price.standard_per_million_io
+      assert_not_nil region.ebs_price.preferred_per_gb
+      assert_not_nil region.ebs_price.preferred_per_iops
+      assert_not_nil region.ebs_price.ebs_optimized_hdd_per_gb
+      assert_not_nil region.ebs_price.ebs_cold_hdd_per_gb
       assert_not_nil region.ebs_price.s3_snaps_per_gb
     end
   end
@@ -166,11 +176,16 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
 
   def test_govcloud_ebs
     region = @@ec2_pricing.get_region('us-gov-west-1')
+    # next two prices are no longer provided by aws (May 09, 2016)
     assert region.ebs_price.standard_per_gb == 0.065
-    assert region.ebs_price.standard_per_million_io == 0.065
+	assert region.ebs_price.standard_per_million_io == 0.065
     assert region.ebs_price.preferred_per_gb == 0.15
     assert region.ebs_price.preferred_per_iops == 0.078
     assert region.ebs_price.s3_snaps_per_gb == 0.125
+    # next two prices were added by aws (May 09, 2016)
+    assert region.ebs_price.ebs_optimized_hdd_per_gb == 0.054
+    assert region.ebs_price.ebs_cold_hdd_per_gb == 0.03
+
   end
 
   def test_govcloud_new_reservation_types

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.75
+  version: 0.1.76
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -19,7 +19,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -65,21 +65,21 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - amazon-pricing documentation
-- --line-numbers
-- --main
+- "--line-numbers"
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -88,12 +88,4 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Amazon Web Services Pricing Ruby gem
-test_files:
-- spec/lib/amazon-pricing/definitions/database-type_spec.rb
-- spec/lib/amazon-pricing/elasticache_pricing_spec.rb
-- spec/lib/amazon-pricing/rds_pricing_spec.rb
-- spec/spec_helper.rb
-- spec/support/.gitignore
-- test/ec2_instance_types_test.rb
-- test/helper.rb
-has_rdoc: 
+test_files: []