amazon-pricing 0.1.48 → 0.1.49

data/Gemfile.lock

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

data/Rakefile

@@ -62,7 +62,7 @@ task :default => [:test]
 def print_ec2_table(pricing)
   line = "Region,Instance Type,API Name,Memory (MB),Disk (GB),Compute Units,Virtual Cores,Disk Type,OD Linux PPH,OD Windows PPH,OD RHEL PPH,OD SLES PPH,OD MsWinSQL PPH,OD MsWinSQLWeb PPH,"
   [:year1, :year3].each do |term|
-    [:light, :medium, :heavy].each do |res_type|
+    [:light, :medium, :heavy, :allupfront, :partialupfront, :noupfront].each do |res_type|
       [:linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb].each do |os|
         line += "#{term} #{res_type} #{os} Prepay,#{term} #{res_type} #{os} PPH,"
       end
@@ -76,7 +76,7 @@ def print_ec2_table(pricing)
         line += "#{t.price_per_hour(os, :ondemand)},"
       end
       [:year1, :year3].each do |term|
-        [:light, :medium, :heavy].each do |res_type|
+        [:light, :medium, :heavy, :allupfront, :partialupfront, :noupfront].each do |res_type|
           [:linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb].each do |os|
             line += "#{t.prepay(os, res_type, term)},#{t.price_per_hour(os, res_type, term)},"
           end

data/lib/amazon-pricing.rb

@@ -9,3 +9,8 @@ require 'aws-price-list'
 require 'ec2-price-list'
 require 'gov-cloud-price-list'
 require 'rds-price-list'
+
+require 'logger'
+logger = Logger.new(STDERR)
+logger.level = Logger::WARN
+

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

@@ -13,8 +13,10 @@ module AwsPricing
     attr_accessor :instance_type, :name, 
       :ondemand_price_per_hour, :light_price_per_hour_1_year, :medium_price_per_hour_1_year, :heavy_price_per_hour_1_year,
       :light_price_per_hour_3_year, :medium_price_per_hour_3_year, :heavy_price_per_hour_3_year,
-      :light_prepay_1_year, :light_prepay_3_year, :medium_prepay_1_year, :medium_prepay_3_year, :heavy_prepay_1_year, :heavy_prepay_3_year
-
+      :light_prepay_1_year, :light_prepay_3_year, :medium_prepay_1_year, :medium_prepay_3_year, :heavy_prepay_1_year, :heavy_prepay_3_year,
+      :allupfront_price_per_hour_1_year, :allupfront_prepay_1_year, :allupfront_price_per_hour_3_year, :allupfront_prepay_3_year,
+      :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_prepay_1_year, :noupfront_price_per_hour_3_year, :noupfront_prepay_3_year
 
     def initialize(instance_type=nil, name=nil)
       @instance_type = instance_type
@@ -51,11 +53,29 @@ module AwsPricing
         elsif term == :year3
           @heavy_prepay_3_year
         end
+      when :allupfront
+        if term == :year1
+          @allupfront_prepay_1_year
+        elsif term == :year3
+          @allupfront_prepay_3_year
+        end
+      when :partialupfront
+        if term == :year1
+          @partialupfront_prepay_1_year
+        elsif term == :year3
+          @partialupfront_prepay_3_year
+        end
+      when :noupfront
+        if term == :year1
+          @noupfront_prepay_1_year
+        elsif term == :year3
+          @noupfront_prepay_3_year
+        end
       end
     end
 
     # type_of_instance = :ondemand, :light, :medium, :heavy
-    # term = :year_1, :year_3, nil
+    # term = :year1, :year3, nil
     def set_prepay(type_of_instance, term, price)
       case type_of_instance
       when :light
@@ -76,11 +96,31 @@ module AwsPricing
         elsif term == :year3
           @heavy_prepay_3_year = price
         end
+      when :allupfront
+        if term == :year1
+          @allupfront_prepay_1_year = price
+        elsif term == :year3
+          @allupfront_prepay_3_year = price
+        end
+      when :partialupfront
+        if term == :year1
+          @partialupfront_prepay_1_year = price
+        elsif term == :year3
+          @partialupfront_prepay_3_year = price
+        end
+      when :noupfront
+        if term == :year1
+          @noupfront_prepay_1_year = price
+        elsif term == :year3
+          @noupfront_prepay_3_year = price
+        end
+      else
+        raise "Unable to set prepay for #{type_of_instance} : #{term} to #{price}"
       end
     end
 
     # type_of_instance = :ondemand, :light, :medium, :heavy
-    # term = :year_1, :year_3, nil
+    # term = :year1, :year3, nil
     def price_per_hour(type_of_instance = :ondemand, term = nil)
       case type_of_instance
       when :ondemand
@@ -103,6 +143,24 @@ module AwsPricing
         elsif term == :year3
           @heavy_price_per_hour_3_year
         end
+      when :allupfront
+        if term == :year1
+          @allupfront_price_per_hour_1_year
+        elsif term == :year3
+          @allupfront_price_per_hour_3_year
+        end
+      when :partialupfront
+        if term == :year1
+          @partialupfront_price_per_hour_1_year
+        elsif term == :year3
+          @partialupfront_price_per_hour_3_year
+        end
+      when :noupfront
+        if term == :year1
+          @noupfront_price_per_hour_1_year
+        elsif term == :year3
+          @noupfront_price_per_hour_3_year
+        end
       end
     end
 
@@ -130,6 +188,24 @@ module AwsPricing
         elsif term == :year3
           @heavy_price_per_hour_3_year = price_per_hour
         end
+      when :allupfront
+        if term == :year1
+          @allupfront_price_per_hour_1_year = price_per_hour
+        elsif term == :year3
+          @allupfront_price_per_hour_3_year = price_per_hour
+        end
+      when :partialupfront
+        if term == :year1
+          @partialupfront_price_per_hour_1_year = price_per_hour
+        elsif term == :year3
+          @partialupfront_price_per_hour_3_year = price_per_hour
+        end
+      when :noupfront
+        if term == :year1
+          @noupfront_price_per_hour_1_year = price_per_hour
+        elsif term == :year3
+          @noupfront_price_per_hour_3_year = price_per_hour
+        end
       end
     end
 

data/lib/amazon-pricing/ec2-instance-type.rb

@@ -17,6 +17,29 @@ module AwsPricing
       os.available?(type_of_instance)
     end
 
+    # operating_system = :linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb
+    # type_of_instance = :ondemand, :light, :medium, :heavy, :allupfront, partialupfront, :noupfront
+    # term = nil (on demand), yrTerm1, yrTerm3
+    def update_pricing_new(operating_system, type_of_instance, price, term = nil, is_prepay = false)
+      os = get_category_type(operating_system)
+      if os.nil?
+        os = OperatingSystem.new(self, operating_system)
+        @category_types[operating_system] = os
+      end
+
+      if type_of_instance == :ondemand
+        os.set_price_per_hour(type_of_instance, nil, price)
+      else
+        years = :year1 if term == "yrTerm1"
+        years = :year3 if term == "yrTerm3"
+        if is_prepay
+          os.set_prepay(type_of_instance, years, price)
+        else
+          os.set_price_per_hour(type_of_instance, years, price)
+        end
+      end
+    end
+
     # operating_system = :linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb
     # type_of_instance = :ondemand, :light, :medium, :heavy
     def update_pricing(operating_system, type_of_instance, json)

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

@@ -93,24 +93,26 @@ module AwsPricing
 
     def self.populate_lookups
       # We use Linux on-demand to populate the lookup tables with the basic lookup information
-      res = AwsPricing::PriceList.fetch_url("http://aws-assets-pricing-prod.s3.amazonaws.com/pricing/ec2/linux-od.js")
-      res['config']['regions'].each do |reg|
-        reg['instanceTypes'].each do |type|
-          items = type['sizes']
-          items = [type] if items.nil?
-          items.each do |size|
-            begin
-              api_name = size["size"]
-              @@Memory_Lookup[api_name] = size["memoryGiB"].to_f * 1000
-              @@Compute_Units_Lookup[api_name] = size["ECU"].to_i 
-              @@Virtual_Cores_Lookup[api_name] = size["vCPU"].to_i 
-            rescue UnknownTypeError
-              $stderr.puts "WARNING: encountered #{$!.message}"
+      ["http://a0.awsstatic.com/pricing/1/ec2/linux-od.min.js", "http://a0.awsstatic.com/pricing/1/ec2/previous-generation/linux-od.min.js"].each do |url|
+        res = AwsPricing::PriceList.fetch_url(url)
+
+        res['config']['regions'].each do |reg|
+          reg['instanceTypes'].each do |type|
+            items = type['sizes']
+            items = [type] if items.nil?
+            items.each do |size|
+              begin
+                api_name = size["size"]
+                @@Memory_Lookup[api_name] = size["memoryGiB"].to_f * 1000
+                @@Compute_Units_Lookup[api_name] = size["ECU"].to_i 
+                @@Virtual_Cores_Lookup[api_name] = size["vCPU"].to_i 
+              rescue UnknownTypeError
+                $stderr.puts "WARNING: encountered #{$!.message}"
+              end
             end
           end
         end
       end
-
     end
 
     protected

data/lib/amazon-pricing/region.rb

@@ -15,7 +15,7 @@ module AwsPricing
   # e.g. us-east, us-west
   #
   class Region
-    attr_accessor :name, :ebs_price
+    attr_accessor :name, :ebs_price, :ec2_instance_types, :rds_instance_types
 
     def initialize(name)
       @name = name

data/lib/amazon-pricing/version.rb

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

data/lib/aws-price-list.rb

@@ -16,8 +16,27 @@ module AwsPricing
   class PriceList
     attr_accessor :regions
 
+    def initialize(is_govcloud = false)
+      @_regions = {}
+
+      # Creating regions upfront since different json files all use different naming conventions. No more ad-hoc creation.
+      if is_govcloud
+        regions = ["us-gov-west-1"]
+      else
+        # AWS added some but not all of teh data for us-gov-west-1. Not sure why they have not completed it. If they do not deprecate the screen scraping.
+        regions = ["eu-west-1", "sa-east-1", "us-east-1", "ap-northeast-1", "us-west-2", "us-west-1", "ap-southeast-1", "ap-southeast-2", "eu-central-1"]
+      end
+
+      regions.each do |name|
+        @_regions[name] = Region.new(name)
+      end
+    end
+
+    # EBS now reports regions correctly but all else still has the old format - so we need to handle both
+    # region mapping and non-mapping
     def get_region(name)
-      @_regions[@@Region_Lookup[name] || name]
+      #@_regions[@@Region_Lookup[name] || name]
+      @_regions[convert_region(name)]
     end
 
     def regions
@@ -66,34 +85,44 @@ module AwsPricing
 
     attr_accessor :_regions
 
-    def add_region(region)
-      @_regions[region.name] = region
-    end
+    #def add_region(region)
+    #  @_regions[region.name] = region
+    #end
 
-    def find_or_create_region(name)
-      region = get_region(name)
-      if region.nil?
-        region = Region.new(name)
-        add_region(region)
-      end
-      region
-    end
+    #def find_or_create_region(name)
+    #  region = get_region(name)
+    #  if region.nil?
+    #    # We must use standard names
+    #    region = Region.new(name)
+    #    add_region(region)
+    #  end
+    #  region
+    #end
 
     EC2_BASE_URL = "http://a0.awsstatic.com/pricing/1/ec2/"
     EBS_BASE_URL = "http://a0.awsstatic.com/pricing/1/ebs/"
     RDS_BASE_URL = "http://a0.awsstatic.com/pricing/1/rds/"
 
-    # Lookup allows us to map to AWS API region names
-    @@Region_Lookup = {
-      'us-east-1' => 'us-east',
-      'us-west-1' => 'us-west',
-      'us-west-2' => 'us-west-2',
-      'eu-west-1' => 'eu-ireland',
-      'ap-southeast-1' => 'apac-sin',
-      'ap-southeast-2' => 'apac-syd',
-      'ap-northeast-1' => 'apac-tokyo',
-      'sa-east-1' => 'sa-east-1'
-    }
+    def convert_region(name)
+      case name
+      when "us-east"
+        "us-east-1"
+      when "us-west"
+        "us-west-1"
+      when "eu-ireland"
+        "eu-west-1"
+      when "apac-sin"
+        "ap-southeast-1"
+      when "apac-syd"
+        "ap-southeast-2"
+      when "apac-tokyo"
+        "ap-northeast-1"
+      when "eu-frankfurt"
+        "eu-central-1"
+      else
+        name
+      end
+    end
 
   end
 

data/lib/ec2-price-list.rb

@@ -2,9 +2,10 @@ module AwsPricing
   class Ec2PriceList < PriceList
     
     def initialize
-      @_regions = {}
+      super
       InstanceType.populate_lookups
       get_ec2_on_demand_instance_pricing
+      get_ec2_legacy_reserved_instance_pricing
       get_ec2_reserved_instance_pricing
       fetch_ec2_ebs_pricing
     end
@@ -12,7 +13,7 @@ module AwsPricing
     protected
 
     @@OS_TYPES = [:linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb]
-    @@RES_TYPES = [:light, :medium, :heavy]
+    @@LEGACY_RES_TYPES = [:light, :medium, :heavy]
 
     def get_ec2_on_demand_instance_pricing
       @@OS_TYPES.each do |os|
@@ -24,9 +25,9 @@ module AwsPricing
       end
     end
 
-    def get_ec2_reserved_instance_pricing
+    def get_ec2_legacy_reserved_instance_pricing
       @@OS_TYPES.each do |os|
-        @@RES_TYPES.each do |res_type|
+        @@LEGACY_RES_TYPES.each do |res_type|
           fetch_ec2_instance_pricing(EC2_BASE_URL + "#{os}-ri-#{res_type}.min.js", res_type, os)
           # Rinse & repeat for legacy instances (note: amazon changed URLs for legacy reserved instances)
           os_rewrite = os
@@ -39,13 +40,22 @@ module AwsPricing
       end
     end
 
+    def get_ec2_reserved_instance_pricing
+      # I give up on finding a pattern so just iterating over known URLs
+      page_targets = {"linux-unix" => :linux, "red-hat-enterprise-linux" => :rhel, "suse-linux" => :sles, "windows" => :mswin, "windows-with-sql-server-standard" => :mswinSQL, "windows-with-sql-server-web" => :mswinSQLWeb}
+      page_targets.each_pair do |target, operating_system|
+        url = "#{EC2_BASE_URL}ri-v2/#{target}-shared.min.js"
+        fetch_ec2_instance_pricing_ri_v2(url, operating_system)
+      end
+    end
+
     # Retrieves the EC2 on-demand instance pricing.
     # type_of_instance = :ondemand, :light, :medium, :heavy
     def fetch_ec2_instance_pricing(url, type_of_instance, operating_system)
       res = PriceList.fetch_url(url)
       res['config']['regions'].each do |reg|
         region_name = reg['region']
-        region = find_or_create_region(region_name)
+        region = get_region(region_name)
         # e.g. type = {"type"=>"hiCPUODI", "sizes"=>[{"size"=>"med", "valueColumns"=>[{"name"=>"mswinSQL", "prices"=>{"USD"=>"N/A"}}]}, {"size"=>"xl", "valueColumns"=>[{"name"=>"mswinSQL", "prices"=>{"USD"=>"2.427"}}]}]}
         reg['instanceTypes'].each do |type|
           # e.g. size = {"size"=>"xl", "valueColumns"=>[{"name"=>"mswinSQL", "prices"=>{"USD"=>"2.427"}}]}
@@ -66,6 +76,79 @@ module AwsPricing
       end
     end
 
+    # Retrieves the EC2 on-demand instance pricing.
+    # type_of_instance = :ondemand, :light, :medium, :heavy
+    def fetch_ec2_instance_pricing(url, type_of_instance, operating_system)
+      res = PriceList.fetch_url(url)
+      res['config']['regions'].each do |reg|
+        region_name = reg['region']
+        region = get_region(region_name)
+        if region.nil?
+          $stderr.puts "WARNING: unable to find region #{region_name}"
+          next
+        end
+        # e.g. type = {"type"=>"hiCPUODI", "sizes"=>[{"size"=>"med", "valueColumns"=>[{"name"=>"mswinSQL", "prices"=>{"USD"=>"N/A"}}]}, {"size"=>"xl", "valueColumns"=>[{"name"=>"mswinSQL", "prices"=>{"USD"=>"2.427"}}]}]}
+        reg['instanceTypes'].each do |type|
+          # e.g. size = {"size"=>"xl", "valueColumns"=>[{"name"=>"mswinSQL", "prices"=>{"USD"=>"2.427"}}]}
+          # Amazon now can return array or hash here (hash = only 1 item)
+          items = type['sizes']
+          items = [type] if items.nil?
+          items.each do |size|
+            begin
+              api_name, name = Ec2InstanceType.get_name(type["type"], size["size"], type_of_instance != :ondemand)
+              instance_type = region.add_or_update_ec2_instance_type(api_name, name)
+              instance_type.update_pricing(operating_system, type_of_instance, size)
+            rescue UnknownTypeError
+              $stderr.puts "WARNING: encountered #{$!.message}"
+            end
+          end
+        end
+      end
+    end
+
+    # With v2 of RIs they have an entirely new format that needs to be parsed
+    def fetch_ec2_instance_pricing_ri_v2(url, operating_system)
+      res = PriceList.fetch_url(url)
+      res['config']['regions'].each do |reg|
+        region_name = reg['region']
+        region = get_region(region_name)
+        if region.nil?
+          $stderr.puts "WARNING: unable to find region #{region_name}"
+          next
+        end
+        reg['instanceTypes'].each do |type|
+          api_name = type["type"]
+          instance_type = region.get_instance_type(api_name)
+          if instance_type.nil?
+            $stderr.puts "WARNING: new reserved instances not found for #{api_name} in #{region_name}"
+            next
+          end
+
+          type["terms"].each do |term|
+            term["purchaseOptions"].each do |option|
+              case option["purchaseOption"]
+              when "noUpfront"
+                reservation_type = :noupfront
+              when "allUpfront"
+                reservation_type = :allupfront
+              when "partialUpfront"
+                reservation_type = :partialupfront
+              end
+
+              duration = term["term"]
+              prices = option["valueColumns"]
+              upfront = prices.select{|i| i["name"] == "upfront"}.first
+              instance_type.update_pricing_new(operating_system, reservation_type, upfront["prices"]["USD"].to_f, duration, true) unless upfront.nil?
+              hourly = prices.select{|i| i["name"] == "monthlyStar"}.first
+              instance_type.update_pricing_new(operating_system, reservation_type, hourly["prices"]["USD"].to_f, duration, false)
+            end
+          end
+
+        end
+      end
+    end
+
+
     def fetch_ec2_ebs_pricing
       res = PriceList.fetch_url(EBS_BASE_URL + "pricing-ebs.min.js")
       res["config"]["regions"].each do |ebs_types|

data/lib/gov-cloud-price-list.rb

@@ -5,8 +5,7 @@ module AwsPricing
     GOV_CLOUD_EBS_URL = "http://aws.amazon.com/govcloud-us/pricing/ebs/"
 
     def initialize
-      @_regions = {}
-      @_regions["us-gov-west-1"] = Region.new("us-gov-west-1")
+      super(true)
       InstanceType.populate_lookups
       get_ec2_instance_pricing
       fetch_ec2_ebs_pricing
@@ -24,13 +23,16 @@ module AwsPricing
       end
       
       for i in 4..9
-        create_reserved_instances(tables[i], :light)
+        # GovCloud no longer supports reservation types
+        #create_reserved_instances(tables[i], :light)
       end
       for i in 9..22
-        create_reserved_instances(tables[i], :medium)
+        # GovCloud no longer supports reservation types
+        #create_reserved_instances(tables[i], :medium)
       end
       for i in 23..33
-        create_reserved_instances(tables[i], :heavy)
+        # GovCloud no longer supports reservation types
+        #create_reserved_instances(tables[i], :heavy)
       end
 
     end
@@ -106,7 +108,7 @@ module AwsPricing
         :sles
       when "Windows"
         :mswin
-      when "Windows SQL Server Web", "Windows SQL Server Web Edition", "Windows SQL Server\n Web Edition"
+      when "Windows SQL Server Web", "Windows SQL Server Web Edition", "Windows SQL Server\n Web Edition", "Server Web"
         :mswinSQL
       when "Windows SQL Server Standard", "Windows SQL Server Standard Edition", "Windows SQL Server\n Standard Edition"
         :mswinSQLWeb

data/lib/rds-price-list.rb

@@ -2,7 +2,7 @@ module AwsPricing
   class RdsPriceList < PriceList
     
     def initialize
-      @_regions = {}
+      super
       InstanceType.populate_lookups
       get_rds_on_demand_instance_pricing
       get_rds_reserved_instance_pricing
@@ -110,7 +110,7 @@ module AwsPricing
       res = PriceList.fetch_url(url)
       res['config']['regions'].each do |reg|
         region_name = reg['region']
-        region = find_or_create_region(region_name)
+        region = get_region(region_name)
         reg['types'].each do |type|
           type['tiers'].each do |tier|
             begin
@@ -137,7 +137,7 @@ module AwsPricing
       res = PriceList.fetch_url(url)
       res['config']['regions'].each do |reg|
         region_name = reg['region']
-        region = find_or_create_region(region_name)
+        region = get_region(region_name)
         reg['instanceTypes'].each do |type|
           type['tiers'].each do |tier|
             begin

data/test/govcloud_test.rb

@@ -47,14 +47,4 @@ class TestGovCloud < Test::Unit::TestCase
     assert region.ebs_price.s3_snaps_per_gb == 0.125
   end
 
-  # Defect found in which ordering of price per hour and upfront get reversed
-  def test_ri_pricing
-    region = @@ec2_pricing.get_region('us-gov-west-1')
-    instance = region.get_ec2_instance_type('m3.large')
-    os = instance.get_operating_system(:linux)
-    assert os.ondemand_price_per_hour == 0.168
-    assert os.light_prepay_1_year == 300.0
-    assert os.light_price_per_hour_1_year == 0.167
-  end
-
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.48
+  version: 0.1.49
+  prerelease: 
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -30,6 +31,7 @@ files:
 - archive/ec2-2014-05-22.csv
 - archive/rds-2014-03-18.csv
 - archive/rds-2014-05-22.csv
+- lib/.DS_Store
 - lib/amazon-pricing.rb
 - lib/amazon-pricing/category-type.rb
 - lib/amazon-pricing/database-type.rb
@@ -55,7 +57,6 @@ files:
 homepage: http://github.com/CloudHealth/amazon-pricing
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -66,20 +67,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: -2678167569791819720
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2678167569791819720
 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
@@ -90,4 +99,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 |-
-    M2Y3Y2NjMmVjZWNkZGUxYWY2NDU4ZWQ2YWM4NGQyOWY1YzE2ZjExZQ==
-  data.tar.gz: !binary |-
-    NjExZWM5NDg0YTFmZmFlZGZlMjQyMTMxMGY0ZGMzYjI0NmY0OGIwNA==
-SHA512:
-  metadata.gz: !binary |-
-    ZDY0YzQ2OGYzZWNjN2QwZWNlNzNiODJmZmJjNzkwNjc2YTA2YmUzZDU4Nzk2
-    ZDNmMWYzZGE0MjUwMGE0MTM3NGIzNzI0ZDU5NDM1YTBmOTFkY2FjNzgyMzE1
-    ZWVjOGZmNDVkMTRjM2UxNjE5MjExY2JkNDAyYjA3NmY1YzFkOTg=
-  data.tar.gz: !binary |-
-    OTdiNTUyOGVjNDFmMDFiNjliODBjYWNlZTc0NTgzZjJkMDBhMDg4NzM3NmY1
-    ZTY5ZjdhNjk2Yjc2MGM3YzI5NjE1YjEzODg1NTIxZWRmNjI4YzE0NWFhNWM3
-    OGU4Mzk4OWM1YmFmZmQxZjdiMDE2MWQ5YjFkNWFkNmMzYmRjYmE=