amazon-pricing 0.1.35 → 0.1.36

data/Gemfile.lock

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

data/lib/amazon-pricing.rb

@@ -1,3 +1,4 @@
+
 require 'json'
 require 'net/http'
 require 'mechanize'
@@ -181,11 +182,12 @@ module AwsPricing
       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])
+        region.ebs_price.standard_per_gb = get_ebs_price(ebs_costs[4])
+        region.ebs_price.standard_per_million_io = get_ebs_price(ebs_costs[5])
+        region.ebs_price.ssd_per_gb = nil
+        region.ebs_price.s3_snaps_per_gb = get_ebs_price(ebs_costs[6])
       end
 
     end

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

@@ -10,22 +10,26 @@
 module AwsPricing
 
   class EbsPrice
-    attr_accessor :standard_per_gb, :standard_per_million_io,
-      :preferred_per_gb, :preferred_per_iops, :s3_snaps_per_gb
+    attr_accessor :standard_per_gb, :standard_per_million_io, :s3_snaps_per_gb,
+      :preferred_per_gb, :preferred_per_iops,
+      :ssd_per_gb
 
     def initialize(region)
       #@region = region
     end
 
+    # e.g http://a0.awsstatic.com/pricing/1/ebs/pricing-ebs.min.js
     def update_from_json(json)
       json["types"].each do |t|
         case t["name"]
-        when "ebsVols"
+        when "Amazon EBS Magnetic volumes"
           @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 "ebsPIOPSVols"
+        when "Amazon EBS Provisioned IOPS (SSD) 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"
+          @ssd_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/version.rb

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

data/test/ec2_instance_types_test.rb

@@ -12,14 +12,12 @@
 
 $: << File.expand_path(File.dirname(__FILE__))
 require 'helper'
-require 'test/unit'
+require 'test-unit'
 
 class TestEc2InstanceTypes < Test::Unit::TestCase
-  class << self
-    def startup
-      #This is expensive, so only do once.
-      @@ec2_pricing = AwsPricing::Ec2PriceList.new
-    end
+  def setup
+    #This is expensive, so only do once.
+    @@ec2_pricing ||= AwsPricing::Ec2PriceList.new
   end
 
   def test_name_lookup
@@ -110,7 +108,6 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
     @@ec2_pricing.regions.each do |region|
       region.ec2_instance_types.each do |instance|
         instance.operating_systems.each do |os|
-          puts os.class.name
           #assert os.ondemand_price_per_hour.nil? && (!os.light_price_per_hour_1_year.nil? || !os.medium_price_per_hour_1_year.nil? || !os.heavy_price_per_hour_1_year.nil?)
         end
       end

data/test/govcloud_test.rb

@@ -15,11 +15,9 @@ require 'helper'
 require 'test/unit'
 
 class TestGovCloud < Test::Unit::TestCase
-  class << self
-    def startup
-      #This is expensive, so only do once.
+  def setup
+    #This is expensive, so only do once.
       @@ec2_pricing = AwsPricing::GovCloudEc2PriceList.new
-    end
   end
 
   def test_cc8xlarge_issue

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.36
+  prerelease: 
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -51,7 +52,6 @@ files:
 homepage: http://github.com/CloudHealth/amazon-pricing
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -62,20 +62,28 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 87748617366120623
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 87748617366120623
 requirements: []
 rubyforge_project: amazon-pricing
-rubygems_version: 2.2.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Amazon Web Services Pricing Ruby gem
 test_files:
 - spec/instance_type_spec.rb
@@ -86,4 +94,3 @@ test_files:
 - test/ec2_instance_types_test.rb
 - test/govcloud_test.rb
 - test/helper.rb
-has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWEyYWY0MGUxMjVkOGQ2MzM4MjNiZTljY2M4MjRkMzlmMDU5MTRmNw==
-  data.tar.gz: !binary |-
-    MDM1YmNmNmQzNTA0ZDhhOWRmNzBlZWZlODM2MDNlYzdiNDMxMDMyNA==
-SHA512:
-  metadata.gz: !binary |-
-    Mzc1MjBiM2FlOGQ2Y2QyZjViM2IwYmQzMTM4ZDM4ZmIxMzRkMmNmMzExZTdj
-    ZThmMWQ0NWE5OWE3NDljZTJjNDJkMGQ4Y2E0N2JhODIxOWI0YWQ0OTdmMGEx
-    ZmVmNDE0NjBlMjdjOWQ1ZTBhY2UwNDRmODVmY2EyNTQ4NmZiOGY=
-  data.tar.gz: !binary |-
-    NWJlODk4YmJjMTk0NzBhMDQ0MzFkNTc3NjRlMTdlZjk2MTVmMDcwNTUyMzQ4
-    ODY5ZWMyYmZhZDQwODU4ZWMyZmQ3ZDViYTcwZTliMzBmOTFjMTYxYWIxNmFm
-    NTc5ZmNkZWRiMWM0YmM0OTQ1NGRhMWVkNWQ0Y2M5YTYyZWE5M2Q=