amazon-pricing 0.1.29 → 0.1.30

data/Gemfile.lock

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

data/lib/amazon-pricing.rb

@@ -96,12 +96,14 @@ module AwsPricing
 
   class GovCloudEc2PriceList < PriceList
     GOV_CLOUD_URL = "http://aws.amazon.com/govcloud-us/pricing/ec2/"
+    GOV_CLOUD_EBS_URL = "http://aws.amazon.com/govcloud-us/pricing/ebs/"
 
     def initialize
       @_regions = {}
       @_regions["us-gov-west"] = Region.new("us-gov-west")
       InstanceType.populate_lookups
       get_ec2_instance_pricing
+      fetch_ec2_ebs_pricing
     end
 
     protected
@@ -164,6 +166,27 @@ module AwsPricing
       end
     end
 
+    def fetch_ec2_ebs_pricing
+      client = Mechanize.new
+      page = client.get(GOV_CLOUD_EBS_URL)
+      ebs_costs = page.search("//div[@class='text section']//li")
+      @_regions.values.each do |region|
+        region.ebs_price = EbsPrice.new(region)
+        region.ebs_price.standard_per_gb = get_ebs_price(ebs_costs[0])
+        region.ebs_price.standard_per_million_io = get_ebs_price(ebs_costs[1])
+        region.ebs_price.preferred_per_gb = get_ebs_price(ebs_costs[2])
+        region.ebs_price.preferred_per_iops = get_ebs_price(ebs_costs[3])
+        region.ebs_price.s3_snaps_per_gb = get_ebs_price(ebs_costs[4])
+      end
+
+    end
+
+    # e.g. $0.065 per GB-Month of provisioned storage
+    def get_ebs_price(xml_element)
+      tokens = xml_element.text.split(" ")
+      tokens[0].gsub("$", "").to_f
+    end
+
     def get_os(val)
       case val
       when "Amazon Linux"
@@ -352,7 +375,8 @@ module AwsPricing
       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.ebs_price = EbsPrice.new(region, ebs_types)
+        region.ebs_price = EbsPrice.new(region)
+        region.ebs_price.update_from_json(ebs_types)
       end
     end
 

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

@@ -10,10 +10,14 @@
 module AwsPricing
 
   class EbsPrice
-    attr_reader :standard_per_gb, :standard_per_million_io,
+    attr_accessor :region, :standard_per_gb, :standard_per_million_io,
       :preferred_per_gb, :preferred_per_iops, :s3_snaps_per_gb
 
-    def initialize(region, json)
+    def initialize(region)
+      @region = region
+    end
+
+    def update_from_json(json)
       json["types"].each do |t|
         case t["name"]
         when "ebsVols"

data/lib/amazon-pricing/version.rb

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

data/test/govcloud_test.rb

@@ -40,4 +40,13 @@ class TestGovCloud < Test::Unit::TestCase
     assert instance.virtual_cores == 2
   end
 
+  def test_ebs
+    region = @@ec2_pricing.get_region('us-gov-west')
+    assert region.ebs_price.standard_per_gb == 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.12
+    assert region.ebs_price.s3_snaps_per_gb == 0.125
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
   prerelease: 
 platform: ruby
 authors:
@@ -65,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1325936641347822274
+      hash: -4082041594937074380
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1325936641347822274
+      hash: -4082041594937074380
 requirements: []
 rubyforge_project: amazon-pricing
 rubygems_version: 1.8.25