amazon-pricing 0.1.5 → 0.1.6

data/Rakefile

@@ -35,13 +35,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,Prepay 1 Year,Prepay 3 Year"
+  puts "Region,Instance Type,Prepay 1 Year,Prepay 3 Year,Linux PPH,Windows PPH,RHEL PPH,SLES PPH,MSWinSQL PPH,MsWinSQLWeb PPH,3 Year Linux PPH,3 Year Windows PPH,3 Year RHEL PPH,3 Year SLES PPH,3 Year MSWinSQL PPH,3 Year MsWinSQLWeb PPH"
   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},0,0,#{t.linux_price_per_hour},#{t.windows_price_per_hour},#{t.rhel_price_per_hour},#{t.sles_price_per_hour},#{t.mswinSQL_price_per_hour},#{t.mswinSQLWeb_price_per_hour},N/A,N/A,N/A,N/A,N/A,N/A"
     end
     region.ec2_reserved_instance_types.each do |t|
-      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}"
+      puts "#{region.name},#{t.usage_type},#{t.api_name},#{t.prepay_1_year},#{t.prepay_3_year},#{t.linux_price_per_hour},#{t.windows_price_per_hour},#{t.rhel_price_per_hour},#{t.sles_price_per_hour},#{t.mswinSQL_price_per_hour},#{t.mswinSQLWeb_price_per_hour},#{t.linux_price_per_hour_3_year},#{t.windows_price_per_hour_3_year},#{t.rhel_price_per_hour_3_year},#{t.sles_price_per_hour_3_year},#{t.mswinSQL_price_per_hour_3_year},#{t.mswinSQLWeb_price_per_hour_3_year}"
     end
   end
 end

data/lib/amazon-pricing.rb

@@ -64,9 +64,26 @@ module AwsPricing
 
     protected
 
-    # Retrieves the EC2 on-demand instance pricing.
+    @@OS_TYPES = [:linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb]
+    @@RES_TYPES = [:light, :medium, :heavy]
+
     def get_ec2_on_demand_instance_pricing
-      res = fetch_url(EC2_BASE_URL + "pricing-on-demand-instances.json")
+      @@OS_TYPES.each do |os|
+        fetch_ec2_on_demand_instance_pricing(EC2_BASE_URL + "json/#{os}-od.json", os)
+      end
+    end
+
+    def get_ec2_reserved_instance_pricing
+      @@OS_TYPES.each do |os|
+        @@RES_TYPES.each do |res_type|
+          fetch_ec2_reserved_instance_pricing(EC2_BASE_URL + "json/#{os}-ri-#{res_type}.json", res_type, os)
+        end
+      end
+    end
+
+    # Retrieves the EC2 on-demand instance pricing.
+    def fetch_ec2_on_demand_instance_pricing(url, platform)
+      res = fetch_url(url)
       @version_ec2_on_demand_instance = res['vers']
       res['config']['regions'].each do |reg|
         region_name = reg['region']
@@ -74,7 +91,7 @@ module AwsPricing
         reg['instanceTypes'].each do |type|
           type['sizes'].each do |size|
             begin
-              region.add_or_update_instance_type(:on_demand, InstanceType.new(region, type['type'], size))
+              region.add_or_update_instance_type(:on_demand, InstanceType.new(region, type['type'], size, platform))
             rescue UnknownTypeError
               $stderr.puts "WARNING: encountered #{$!.message}"
             end
@@ -82,16 +99,6 @@ module AwsPricing
         end
       end
     end
-
-    def get_ec2_reserved_instance_pricing
-      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, platform)

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

@@ -20,19 +20,37 @@ module AwsPricing
   #
   class InstanceType
     attr_accessor :name, :api_name, :linux_price_per_hour, :windows_price_per_hour,
-      :memory_in_mb, :disk_in_mb, :platform, :compute_units, :virtual_cores
+      :memory_in_mb, :disk_in_mb, :platform, :compute_units, :virtual_cores,
+      :rhel_price_per_hour, :sles_price_per_hour, :mswinSQL_price_per_hour, :mswinSQLWeb_price_per_hour
 
     # 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, platform)
+      # e.g. json = {"size"=>"sm", "valueColumns"=>[{"name"=>"linux", "prices"=>{"USD"=>"0.060"}}]}
+
+      # e.g. {"linux"=>"0.060"}
       values = InstanceType::get_values(json)
 
       @size = json['size']
-      @linux_price_per_hour = values['linux'].to_f
-      @linux_price_per_hour = nil if @linux_price_per_hour == 0
-      @windows_price_per_hour = values['mswin'].to_f
-      @windows_price_per_hour = nil if @windows_price_per_hour == 0
+
+      pph = values[platform.to_s]
+      pph = nil if pph == "N/A"
+
+      if platform == :mswin
+        @windows_price_per_hour = pph
+      elsif platform == :linux
+        @linux_price_per_hour = pph
+      elsif platform == :rhel
+        @rhel_price_per_hour = pph
+      elsif platform == :sles
+        @sles_price_per_hour = pph
+      elsif platform == :mswinSQL
+        @mswinSQL_price_per_hour = pph
+      elsif platform == :mswinSQLWeb
+        @mswinSQLWeb_price_per_hour = pph
+      end
+
       @instance_type = instance_type
 
       @api_name = self.class.get_api_name(@instance_type, @size)
@@ -50,7 +68,12 @@ module AwsPricing
     def available?(platform = nil)
       return @linux_price_per_hour != nil if platform == :linux
       return @windows_price_per_hour != nil if platform == :windows
-      return @linux_price_per_hour != nil || @windows_price_per_hour != nil
+      return @rhel_price_per_hour != nil if platform == :rhel
+      return @sles_price_per_hour != nil if platform == :sles
+      return @mswinSQL_price_per_hour != nil if platform == :mswinSQL
+      return @mswinSQLWeb_price_per_hour != nil if platform == :mswinSQLWeb
+      return @linux_price_per_hour != nil || @windows_price_per_hour != nil || @rhel_price_per_hour ||
+        @sles_price_per_hour != nil || @mswinSQL_price_per_hour != nil || @mswinSQLWeb_price_per_hour
     end
 
     def is_reserved?
@@ -59,8 +82,12 @@ module AwsPricing
 
     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?
+      @windows_price_per_hour ||= instance_type.windows_price_per_hour
+      @linux_price_per_hour ||= instance_type.linux_price_per_hour
+      @rhel_price_per_hour ||= instance_type.rhel_price_per_hour
+      @sles_price_per_hour ||= instance_type.sles_price_per_hour 
+      @mswinSQL_price_per_hour ||= instance_type.mswinSQL_price_per_hour
+      @mswinSQLWeb_price_per_hour ||= instance_type.mswinSQLWeb_price_per_hour 
     end
 
     protected

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

@@ -15,46 +15,58 @@ 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, :linux_price_per_hour_3_year, :windows_price_per_hour_3_year
+    attr_accessor :prepay_1_year, :prepay_3_year, :usage_type, 
+      :linux_price_per_hour_3_year, :windows_price_per_hour_3_year, :rhel_price_per_hour_3_year, :sles_price_per_hour_3_year, :mswinSQL_price_per_hour_3_year, :mswinSQLWeb_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, platform)
-      super(region, instance_type, json)
+      super(region, instance_type, json, platform)
 
       # Fixme: calling twice, fix later
       json['valueColumns'].each do |val|
+        price = val['prices']['USD']
+        price = nil if price == "N/A"
+
         case val["name"]
         when "yrTerm1"
-          @prepay_1_year = val['prices']['USD'].to_f unless val['prices']['USD'].to_f == 0
+          @prepay_1_year ||= price
         when "yrTerm1Hourly"
-          if platform == :windows
-            @windows_price_per_hour = val['prices']['USD']
+          if platform == :mswin
+            @windows_price_per_hour = price
           elsif platform == :linux
-            @linux_price_per_hour = val['prices']['USD']
+            @linux_price_per_hour = price
+          elsif platform == :rhel
+            @rhel_price_per_hour = price
+          elsif platform == :sles
+            @sles_price_per_hour = price
+          elsif platform == :mswinSQL
+            @mswinSQL_price_per_hour = price
+          elsif platform == :mswinSQLWeb
+            @mswinSQLWeb_price_per_hour = price
           end
         when "yrTerm3"
-          @prepay_3_year = val['prices']['USD'].to_f unless val['prices']['USD'].to_f == 0
+          @prepay_3_year ||= price
         when "yrTerm3Hourly"
-          if platform == :windows
-            @windows_price_per_hour_3_year = val['prices']['USD']
+          if platform == :mswin
+            @windows_price_per_hour_3_year = price
           elsif platform == :linux
-            @linux_price_per_hour_3_year = val['prices']['USD']
+            @linux_price_per_hour_3_year = price
+          elsif platform == :rhel
+            @rhel_price_per_hour_3_year = price
+          elsif platform == :sles
+            @sles_price_per_hour_3_year = price
+          elsif platform == :mswinSQL
+            @mswinSQL_price_per_hour_3_year = price
+          elsif platform == :mswinSQLWeb
+            @mswinSQLWeb_price_per_hour_3_year = price
           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
@@ -66,8 +78,12 @@ module AwsPricing
     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?
+      @linux_price_per_hour_3_year ||= instance_type.linux_price_per_hour_3_year
+      @windows_price_per_hour_3_year ||= instance_type.windows_price_per_hour_3_year
+      @rhel_price_per_hour_3_year ||= instance_type.rhel_price_per_hour_3_year
+      @sles_price_per_hour_3_year ||= instance_type.sles_price_per_hour_3_year
+      @mswinSQL_price_per_hour_3_year ||= instance_type.mswinSQL_price_per_hour_3_year
+      @mswinSQLWeb_price_per_hour_3_year ||= instance_type.mswinSQLWeb_price_per_hour_3_year
     end
 
     protected

data/lib/amazon-pricing/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: amazon-pricing
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Amazon Web Services Pricing Ruby gem
@@ -70,3 +70,4 @@ test_files:
 - spec/price_list_spec.rb
 - test/helper.rb
 - test/test-ec2-instance-types.rb
+has_rdoc: