amazon-pricing 0.0.8 → 0.0.9

data/Rakefile

@@ -32,15 +32,13 @@ desc "Prints current EC2 pricing to console"
 task :print_price_list do
   require 'lib/amazon-pricing'
   pricing = AwsPricing::PriceList.new
+  puts "Region,Instance Type,Linux PPH,Windows PPH"
   pricing.regions.each do |region|
-    puts "Region: #{region.name}"
-    puts "   On-demand instances"
-    region.ec2_on_demand_instance_types.each do |instance_type|
-      puts "      #{instance_type.to_s}"
+    region.ec2_on_demand_instance_types.each do |t|
+      puts "#{region.name},on-demand,#{t.api_name},#{t.linux_price_per_hour},#{t.windows_price_per_hour}"
     end
-    puts "   Reserved instances"
-    region.ec2_reserved_instance_types.each do |instance_type|
-      puts "      #{instance_type.to_s}"
+    region.ec2_reserved_instance_types.each do |t|
+      puts "#{region.name},#{t.usage_type},#{t.api_name},#{t.linux_price_per_hour},#{t.windows_price_per_hour}"
     end
   end
 end

data/lib/amazon-pricing.rb

@@ -26,6 +26,7 @@ module AwsPricing
       @_regions = {}
       get_ec2_on_demand_instance_pricing
       get_ec2_reserved_instance_pricing
+      fetch_ec2_ebs_pricing
     end
 
     def get_region(name)
@@ -38,10 +39,9 @@ module AwsPricing
 
     # Type = :on_demand or :reserved
     # reserved_usage_type = :light, :medium, :heavy
-    def get_instance_type(availability_zone, type, api_name, reserved_usage_type = :medium)
-      region_name = @@Availability_Zone_Lookup[availability_zone]
-      raise "Region not found for availability zone #{availability_zone}" if region_name.nil?
+    def get_instance_type(region_name, type, api_name, reserved_usage_type = :medium)
       region = get_region(region_name)
+      raise "Region #{region_name} not found" if region.nil?
       region.get_instance_type(type, api_name, reserved_usage_type)
     end
 
@@ -66,9 +66,7 @@ module AwsPricing
 
     # Retrieves the EC2 on-demand instance pricing.
     def get_ec2_on_demand_instance_pricing
-      uri = URI.parse(EC2_STANDARD_INSTANCE_PRICING_URL)
-      page = Net::HTTP.get_response(uri)
-      res = JSON.parse(page.body)
+      res = fetch_url(EC2_BASE_URL + "on-demand-instances.json")
       @version_ec2_on_demand_instance = res['vers']
       res['config']['regions'].each do |reg|
         region_name = reg['region']
@@ -82,51 +80,51 @@ module AwsPricing
     end
 
     def get_ec2_reserved_instance_pricing
-      fetch_ec2_reserved_instance_pricing(EC2_RESERVED_INSTANCE_LIGHT_PRICING_URL, :light)
-      fetch_ec2_reserved_instance_pricing(EC2_RESERVED_INSTANCE_MEDIUM_PRICING_URL, :medium)
-      fetch_ec2_reserved_instance_pricing(EC2_RESERVED_INSTANCE_HEAVY_PRICING_URL, :heavy)
+      fetch_ec2_reserved_instance_pricing(EC2_BASE_URL + "reserved-instances-low-utilization.json", :light)
+      fetch_ec2_reserved_instance_pricing(EC2_BASE_URL + "reserved-instances.json", :medium)
+      fetch_ec2_reserved_instance_pricing(EC2_BASE_URL + "reserved-instances-high-utilization.json", :heavy)
     end
 
     # Retrieves the EC2 on-demand instance pricing.
     # reserved_usage_type = :light, :medium, :heavy
     def fetch_ec2_reserved_instance_pricing(url, reserved_usage_type)
-      uri = URI.parse(url)
-      page = Net::HTTP.get_response(uri)
-      res = JSON.parse(page.body)
+      res = fetch_url(url)
       @version_ec2_reserved_instance = res['vers']
       res['config']['regions'].each do |reg|
         region_name = reg['region']
         region = find_or_create_region(region_name)
         reg['instanceTypes'].each do |type|
           type['sizes'].each do |size|
-            region.add_instance_type(:reserved, ReservedInstanceType.new(region, type['type'], size), reserved_usage_type)
+            region.add_instance_type(:reserved, ReservedInstanceType.new(region, type['type'], size, reserved_usage_type), reserved_usage_type)
           end
         end
       end
     end
 
-    EC2_STANDARD_INSTANCE_PRICING_URL = 'http://aws.amazon.com/ec2/pricing/pricing-on-demand-instances.json'
-    EC2_RESERVED_INSTANCE_LIGHT_PRICING_URL = 'http://aws.amazon.com/ec2/pricing/pricing-reserved-instances-low-utilization.json'
-    EC2_RESERVED_INSTANCE_MEDIUM_PRICING_URL = 'http://aws.amazon.com/ec2/pricing/pricing-reserved-instances.json'
-    EC2_RESERVED_INSTANCE_HEAVY_PRICING_URL = 'http://aws.amazon.com/ec2/pricing/pricing-reserved-instances-high-utilization.json'
-
-    @@Availability_Zone_Lookup = {
-      'us-east-1a' => 'us-east', 'us-east-1b' => 'us-east', 'us-east-1c' => 'us-east',
-      'us-east-1d' => 'us-east', 'us-east-1e' => 'us-east', 'us-west-1a' => 'us-west',
-      'us-west-1b' => 'us-west', 'us-west-1c' => 'us-west', 'us-west-2a' => 'us-west-2',
-      'us-west-2b' => 'us-west-2', 'eu-west-1a' => 'eu-ireland', 'eu-west-1b' => 'eu-ireland',
-      'eu-west-1c' => 'eu-ireland', 'ap-southeast-1a' => 'apac-sin', 'ap-southeast-1b' => 'apac-sin',
-      'ap-northeast-1a' => 'apac-tokyo', 'ap-northeast-1b' => 'apac-tokyo', 'sa-east-1a' => 'sa-east-1',
-      'sa-east-1b' => 'sa-east-1'
-    }
-    
+    def fetch_ec2_ebs_pricing
+      res = fetch_url(EC2_BASE_URL + "ebs.json")
+      res["config"]["regions"].each do |ebs_types|
+        region = get_region(ebs_types["region"])
+        region.ebs_price = EbsPrice.new(region, ebs_types)
+      end
+    end
+
+    def fetch_url(url)
+      uri = URI.parse(url)
+      page = Net::HTTP.get_response(uri)
+      JSON.parse(page.body)
+    end
+
+    EC2_BASE_URL = "http://aws.amazon.com/ec2/pricing/pricing-"
+
+    # 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-northeast-1' => 'apac-tokyo', 
+      'ap-southeast-1' => 'apac-sin',
+      'ap-northeast-1' => 'apac-tokyo',
       'sa-east-1' => 'sa-east-1'
     }
   end

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

@@ -0,0 +1,32 @@
+#--
+# Amazon Web Services Pricing Ruby library
+#
+# Ruby Gem Name::  amazon-pricing
+# Author::    Joe Kinsella (mailto:joe.kinsella@gmail.com)
+# Copyright:: Copyright (c) 2011-2012 Sonian
+# License::   Distributes under the same terms as Ruby
+# Home::      http://github.com/sonian/amazon-pricing
+#++
+module AwsPricing
+
+  class EbsPrice
+    attr_reader :standard_per_gb, :standard_per_million_io,
+      :preferred_per_gb, :preferred_per_iops, :s3_snaps_per_gb
+
+    def initialize(region, json)
+      json["types"].each do |t|
+        case t["name"]
+        when "ebsVols"
+          @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"
+          @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 "ebsSnapsToS3"
+          @s3_snaps_per_gb = t["values"].select{|v| v["rate"] == "perGBmoDataStored" }.first["prices"].values.first.to_f
+        end
+      end
+    end
+
+  end
+end

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

@@ -16,7 +16,7 @@ module AwsPricing
   # $0.48/hour for Windows.
   #
   class InstanceType
-    attr_accessor :region, :name, :api_name, :linux_price_per_hour, :windows_price_per_hour,
+    attr_accessor :name, :api_name, :linux_price_per_hour, :windows_price_per_hour,
       :memory_in_mb, :disk_in_mb, :platform, :compute_units
 
     # Initializes and InstanceType object given a region, the internal
@@ -25,7 +25,6 @@ module AwsPricing
     def initialize(region, instance_type, json)
       values = get_values(json)
 
-      @region = region
       @size = json['size']
       @linux_price_per_hour = values['linux'].to_f
       @linux_price_per_hour = nil if @linux_price_per_hour == 0
@@ -50,10 +49,6 @@ module AwsPricing
       return @linux_price_per_hour != nil || @windows_price_per_hour != nil
     end
 
-    def to_s
-      "Instance Type: #{@region.name} #{@api_name}, Linux=$#{@linux_price_per_hour}/hour, Windows=$#{@windows_price_per_hour}/hour"
-    end
-
     protected
 
     attr_accessor :size, :instance_type

data/lib/amazon-pricing/region.rb

@@ -15,7 +15,7 @@ module AwsPricing
   # e.g. us-east, us-west
   #
   class Region
-    attr_accessor :name
+    attr_accessor :name, :ebs_price
 
     def initialize(name)
       @name = name
@@ -39,7 +39,7 @@ module AwsPricing
       when :heavy
         @_ec2_reserved_instance_types_heavy.values
       else
-        @_ec2_reserved_instance_types_light.values << @_ec2_reserved_instance_types_medium.values << @_ec2_reserved_instance_types_heavy.values
+        @_ec2_reserved_instance_types_light.values + @_ec2_reserved_instance_types_medium.values + @_ec2_reserved_instance_types_heavy.values
       end
     end
 

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

@@ -15,12 +15,12 @@ module AwsPricing
   # reserved instances have three usage types: light, medium and heavy.
   #
   class ReservedInstanceType < InstanceType
-    attr_accessor :prepay_1_year, :prepay_3_year
+    attr_accessor :prepay_1_year, :prepay_3_year, :usage_type
 
     # Initializes and InstanceType object given a region, the internal
     # type (e.g. stdODI) and the json for the specific instance. The json is
     # based on the current undocumented AWS pricing API.
-    def initialize(region, instance_type, json)
+    def initialize(region, instance_type, json, usage_type)
       super(region, instance_type, json)
 
       # Fixme: calling twice, fix later
@@ -28,6 +28,7 @@ module AwsPricing
 
       @prepay_1_year = values['yrTerm1'].to_f unless values['yrTerm1'].to_f == 0
       @prepay_3_year = values['yrTerm3'].to_f unless values['yrTerm3'].to_f == 0
+      @usage_type = usage_type
     end
 
     def to_s

data/lib/amazon-pricing/version.rb

@@ -8,5 +8,5 @@
 # Home::      http://github.com/sonian/amazon-pricing
 #++
 module AwsPricing
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/test/test-ec2-instance-types.rb

@@ -16,8 +16,7 @@ require 'test/unit'
 class TestEc2InstanceTypes < Test::Unit::TestCase
   def test_cc8xlarge_issue
     pricing = AwsPricing::PriceList.new
-    obj = pricing.get_instance_type('us-east-1d', :reserved, 'cc2.8xlarge', :medium)
-    puts obj.inspect
+    obj = pricing.get_instance_type('us-east', :reserved, 'cc2.8xlarge', :medium)
     assert obj.api_name == 'cc2.8xlarge'
   end
 
@@ -69,4 +68,21 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
     instance = region.get_instance_type(:on_demand, 'm1.large')
     assert instance.memory_in_mb == 7500
   end
+
+  def test_non_standard_region_name
+    pricing = AwsPricing::PriceList.new
+    region = pricing.get_region('eu-west-1')
+    instance = region.get_instance_type(:on_demand, 'm1.large')
+    assert instance.memory_in_mb == 7500
+  end
+
+  def test_ebs
+    pricing = AwsPricing::PriceList.new
+    region = pricing.get_region('us-east')
+    assert region.ebs_price.standard_per_gb == 0.10
+    assert region.ebs_price.standard_per_million_io == 0.10
+    assert region.ebs_price.preferred_per_gb == 0.125
+    assert region.ebs_price.preferred_per_iops == 0.10
+    assert region.ebs_price.s3_snaps_per_gb == 0.125
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amazon-pricing
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Joe Kinsella
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-04 00:00:00 -04:00
+date: 2012-08-13 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - Rakefile
 - amazon-pricing.gemspec
 - lib/amazon-pricing.rb
+- lib/amazon-pricing/ebs-price.rb
 - lib/amazon-pricing/instance-type.rb
 - lib/amazon-pricing/region.rb
 - lib/amazon-pricing/reserved-instance-type.rb