amazon-pricing 0.0.9 → 0.1.0

data/Rakefile

@@ -32,13 +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"
+  puts "Region,Instance Type,Linux PPH,Windows PPH,Prepay 1 Year,Prepay 3 Year"
   pricing.regions.each do |region|
     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}"
+      puts "#{region.name},on-demand,#{t.api_name},#{t.linux_price_per_hour},#{t.windows_price_per_hour},,,,"
     end
     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}"
+      puts "#{region.name},#{t.usage_type},#{t.api_name},#{t.linux_price_per_hour_1_year},#{t.windows_price_per_hour_1_year},#{t.linux_price_per_hour_3_year},#{t.windows_price_per_hour_3_year}#{t.prepay_1_year},#{t.prepay_3_year}"
     end
   end
 end

data/lib/amazon-pricing.rb

@@ -66,28 +66,31 @@ module AwsPricing
 
     # Retrieves the EC2 on-demand instance pricing.
     def get_ec2_on_demand_instance_pricing
-      res = fetch_url(EC2_BASE_URL + "on-demand-instances.json")
+      res = fetch_url(EC2_BASE_URL + "pricing-on-demand-instances.json")
       @version_ec2_on_demand_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(:on_demand, InstanceType.new(region, type['type'], size))
+            region.add_or_update_instance_type(:on_demand, InstanceType.new(region, type['type'], size))
           end
         end
       end
     end
 
     def get_ec2_reserved_instance_pricing
-      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)
+      fetch_ec2_reserved_instance_pricing(EC2_BASE_URL + "ri-light-linux.json", :light, :linux)
+      fetch_ec2_reserved_instance_pricing(EC2_BASE_URL + "ri-light-mswin.json", :light, :windows)
+      fetch_ec2_reserved_instance_pricing(EC2_BASE_URL + "ri-medium-linux.json", :medium, :linux)
+      fetch_ec2_reserved_instance_pricing(EC2_BASE_URL + "ri-medium-mswin.json", :medium, :windows)
+      fetch_ec2_reserved_instance_pricing(EC2_BASE_URL + "ri-heavy-linux.json", :heavy, :linux)
+      fetch_ec2_reserved_instance_pricing(EC2_BASE_URL + "ri-heavy-mswin.json", :heavy, :windows)
     end
 
     # Retrieves the EC2 on-demand instance pricing.
     # reserved_usage_type = :light, :medium, :heavy
-    def fetch_ec2_reserved_instance_pricing(url, reserved_usage_type)
+    def fetch_ec2_reserved_instance_pricing(url, reserved_usage_type, platform)
       res = fetch_url(url)
       @version_ec2_reserved_instance = res['vers']
       res['config']['regions'].each do |reg|
@@ -95,14 +98,14 @@ module AwsPricing
         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), reserved_usage_type)
+            region.add_or_update_instance_type(:reserved, ReservedInstanceType.new(region, type['type'], size, reserved_usage_type, platform), reserved_usage_type)
           end
         end
       end
     end
 
     def fetch_ec2_ebs_pricing
-      res = fetch_url(EC2_BASE_URL + "ebs.json")
+      res = fetch_url(EC2_BASE_URL + "pricing-ebs.json")
       res["config"]["regions"].each do |ebs_types|
         region = get_region(ebs_types["region"])
         region.ebs_price = EbsPrice.new(region, ebs_types)
@@ -115,7 +118,7 @@ module AwsPricing
       JSON.parse(page.body)
     end
 
-    EC2_BASE_URL = "http://aws.amazon.com/ec2/pricing/pricing-"
+    EC2_BASE_URL = "http://aws.amazon.com/ec2/pricing/"
 
     # Lookup allows us to map to AWS API region names
     @@Region_Lookup = {

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

@@ -49,6 +49,16 @@ module AwsPricing
       return @linux_price_per_hour != nil || @windows_price_per_hour != nil
     end
 
+    def is_reserved?
+      false
+    end
+
+    def update(instance_type)
+      # Due to new AWS json we have to make two passes through to populate an instance
+      @windows_price_per_hour = instance_type.windows_price_per_hour if @windows_price_per_hour.nil?
+      @linux_price_per_hour = instance_type.linux_price_per_hour if @linux_price_per_hour.nil?
+    end
+
     protected
 
     attr_accessor :size, :instance_type

data/lib/amazon-pricing/region.rb

@@ -52,19 +52,23 @@ module AwsPricing
 
     # instance_type = :on_demand or :reserved
     # reserved_usage_type = :light, :medium, :heavy
-    def add_instance_type(type, instance_type, reserved_usage_type = :medium)
-      raise "Instance type #{instance_type.api_name} in region #{@name} already exists" if get_instance_type(type, instance_type.api_name, reserved_usage_type)
-      if type == :on_demand
-        @_ec2_on_demand_instance_types[instance_type.api_name] = instance_type
-      elsif type == :reserved
-        case reserved_usage_type
-        when :light
-          @_ec2_reserved_instance_types_light[instance_type.api_name] = instance_type
-        when :medium
-          @_ec2_reserved_instance_types_medium[instance_type.api_name] = instance_type
-        when :heavy
-          @_ec2_reserved_instance_types_heavy[instance_type.api_name] = instance_type
+    def add_or_update_instance_type(type, instance_type, reserved_usage_type = :medium)
+      current = get_instance_type(type, instance_type.api_name, reserved_usage_type)
+      if current.nil?
+        if type == :on_demand
+          @_ec2_on_demand_instance_types[instance_type.api_name] = instance_type
+        elsif type == :reserved
+          case reserved_usage_type
+          when :light
+            @_ec2_reserved_instance_types_light[instance_type.api_name] = instance_type
+          when :medium
+            @_ec2_reserved_instance_types_medium[instance_type.api_name] = instance_type
+          when :heavy
+            @_ec2_reserved_instance_types_heavy[instance_type.api_name] = instance_type
+          end
         end
+      else
+        current.update(instance_type)
       end
     end
 

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

@@ -15,26 +15,61 @@ module AwsPricing
   # reserved instances have three usage types: light, medium and heavy.
   #
   class ReservedInstanceType < InstanceType
-    attr_accessor :prepay_1_year, :prepay_3_year, :usage_type
+    attr_accessor :prepay_1_year, :prepay_3_year, :usage_type, :linux_price_per_hour_3_year, :windows_price_per_hour_3_year
 
     # 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, usage_type)
+    def initialize(region, instance_type, json, usage_type, platform)
       super(region, instance_type, json)
 
       # Fixme: calling twice, fix later
-      values = get_values(json)
-
-      @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
+      json['valueColumns'].each do |val|
+        case val["name"]
+        when "yrTerm1"
+          @prepay_1_year = val['prices']['USD'].to_f unless val['prices']['USD'].to_f == 0
+        when "yrTerm1Hourly"
+          if platform == :windows
+            @windows_price_per_hour = val['prices']['USD']
+          elsif platform == :linux
+            @linux_price_per_hour = val['prices']['USD']
+          end
+        when "yrTerm3"
+          @prepay_3_year = val['prices']['USD'].to_f unless val['prices']['USD'].to_f == 0
+        when "yrTerm3Hourly"
+          if platform == :windows
+            @windows_price_per_hour_3_year = val['prices']['USD']
+          elsif platform == :linux
+            @linux_price_per_hour_3_year = val['prices']['USD']
+          end
+        end
+      end
       @usage_type = usage_type
     end
 
+    def linux_price_per_hour_1_year
+      self.linux_price_per_hour
+    end
+
+    def windows_price_per_hour_1_year
+      self.windows_price_per_hour
+    end
+
     def to_s
       "Reserved Instance Type: #{@region.name} #{@api_name}, 1 Year Prepay=#{@prepay_1_year}, 3 Year Prepay=#{@prepay_3_year}, Linux=$#{@linux_price_per_hour}/hour, Windows=$#{@windows_price_per_hour}/hour"
     end
 
+    def is_reserved?
+      true
+    end
+
+    def update(instance_type)
+      super
+      # Due to new AWS json we have to make two passes through to populate an instance
+      @linux_price_per_hour_3_year = instance_type.linux_price_per_hour_3_year if @linux_price_per_hour_3_year.nil?
+      @windows_price_per_hour_3_year = instance_type.windows_price_per_hour_3_year if @windows_price_per_hour_3_year.nil?
+    end
+
     protected
       attr_accessor :size, :instance_type
 
@@ -47,20 +82,22 @@ module AwsPricing
       end
 
       @@Api_Name_Lookup_Reserved = {
-        'stdResI' => {'sm' => 'm1.small', 'lg' => 'm1.large', 'xl' => 'm1.xlarge'},
+        'stdResI' => {'sm' => 'm1.small', 'med' => 'm1.medium', 'lg' => 'm1.large', 'xl' => 'm1.xlarge'},
         'hiMemResI' => {'xl' => 'm2.xlarge', 'xxl' => 'm2.2xlarge', 'xxxxl' => 'm2.4xlarge'},
         'hiCPUResI' => {'med' => 'c1.medium', 'xl' => 'c1.xlarge'},
         'clusterGPUResI' => {'xxxxl' => 'cg1.4xlarge'},
         'clusterCompResI' => {'xxxxl' => 'cc1.4xlarge', 'xxxxxxxxl' => 'cc2.8xlarge'},
         'uResI' => {'u' => 't1.micro'},
+        'hiIoResI' => {'xxxxl' => 'hi1.4xlarge'},
       }
       @@Name_Lookup_Reserved = {
-        'stdResI' => {'sm' => 'Standard Small', 'lg' => 'Standard Large', 'xl' => 'Standard Extra Large'},
+        'stdResI' => {'sm' => 'Standard Small', 'med' => 'Standard Medium', 'lg' => 'Standard Large', 'xl' => 'Standard Extra Large'},
         'hiMemResI' => {'xl' => 'Hi-Memory Extra Large', 'xxl' => 'Hi-Memory Double Extra Large', 'xxxxl' => 'Hi-Memory Quadruple Extra Large'},
         'hiCPUResI' => {'med' => 'High-CPU Medium', 'xl' => 'High-CPU Extra Large'},
         'clusterGPUResI' => {'xxxxl' => 'Cluster GPU Quadruple Extra Large'},
         'clusterCompResI' => {'xxxxl' => 'Cluster Compute Quadruple Extra Large', 'xxxxxxxxl' => 'Cluster Compute Eight Extra Large'},
         'uResI' => {'u' => 'Micro'},
+        'hiIoResI' => {'xxxxl' => 'High I/O Quadruple Extra Large Instance'},
       }
   end
 

data/lib/amazon-pricing/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amazon-pricing
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Joe Kinsella
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-13 00:00:00 -04:00
+date: 2012-10-21 00:00:00 -04:00
 default_executable: 
 dependencies: []