amazon-pricing 0.1.23 → 0.1.24

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTZlOTJmYmE3NDE5MGZkN2I4Yzg1N2M1MTBmZjhiZmMwNmFjOTBjNQ==
+  data.tar.gz: !binary |-
+    OThkNzhjOWRjOTQ4YjRhNDU2MmZiNzI4YjBiNzY2NDYwMWFmYTViZA==
+SHA512:
+  metadata.gz: !binary |-
+    MzBkMWI3ZjY0NWNkMmM3ZmJiNTc2NzI0ZTk1MmNmZjg0YmViMDhiNjVjYWZj
+    ZTkxMDI3MDA2Y2Q2YjVlMGE4N2QxYjZkYTVmYmFkMGY1ODBkODYwNWRmZjky
+    NDA2OTY2NDZlNTkxZGU5YmQ1ODJiNTE5MTM1MDA5ZGFjNzIxYjA=
+  data.tar.gz: !binary |-
+    NWZkYTk1MDg0NDEwMGZmNzYxNzFkODFlOWJhOWRiYjZhODE2NDA0N2ZlNWY5
+    OGU2ZTFlNGNiZTIyYTA4MTliNDg3NTAzZGM5ZmFkYmQ4YWNiODdiNTA0OWE1
+    N2Q1ZjI4MTU0NDlkZmQwYTc2ODBlMzA4ZTNkNmRmYjAwNWZmNTQ=

data/Gemfile.lock

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

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

@@ -52,7 +52,7 @@ module AwsPricing
     # Returns [api_name, name]
     def self.get_name(instance_type, api_name, is_reserved = false)
       # Let's handle new instances more gracefully
-      unless @@Memory_Lookup.has_key? api_name
+      unless @@Name_Lookup.has_key? api_name
         raise UnknownTypeError, "Unknown instance type #{instance_type} #{api_name}", caller
       end
 

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

@@ -28,12 +28,12 @@ module AwsPricing
       @name = name
       @api_name = api_name
 
-      @memory_in_mb = @@Memory_Lookup[@api_name]
-      @disk_in_gb = @@Disk_Lookup[@api_name]
-      @platform = @@Platform_Lookup[@api_name]
-      @compute_units = @@Compute_Units_Lookup[@api_name]
-      @virtual_cores = @@Virtual_Cores_Lookup[@api_name]
-      @disk_type = @@Disk_Type_Lookup[@api_name]
+      @disk_in_gb = InstanceType.get_disk(api_name)
+      @platform = InstanceType.get_platform(api_name)
+      @disk_type = InstanceType.get_disk_type(api_name)
+      @memory_in_mb = InstanceType.get_memory(api_name)
+      @compute_units = InstanceType.get_compute_units(api_name)
+      @virtual_cores = InstanceType.get_virtual_cores(api_name)
     end
 
     # Keep this in for backwards compatibility within current major version of gem
@@ -91,8 +91,55 @@ module AwsPricing
       end
     end
 
+    def self.populate_lookups
+      return unless @@Memory_Lookup.empty? && @@Compute_Units_Lookup.empty? && @@Virtual_Cores_Lookup.empty?
+
+      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}"
+            end
+          end
+        end
+      end
+
+    end
+
     protected
 
+    def self.get_disk(api_name)
+      @@Disk_Lookup[api_name]
+    end
+
+    def self.get_platform(api_name)
+      @@Platform_Lookup[api_name]
+    end
+
+    def self.get_disk_type(api_name)
+      @@Disk_Type_Lookup[api_name]
+    end
+
+    def self.get_memory(api_name)
+      @@Memory_Lookup[api_name]
+    end
+
+    def self.get_compute_units(api_name)
+      @@Compute_Units_Lookup[api_name]
+    end
+
+    def self.get_virtual_cores(api_name)
+      @@Virtual_Cores_Lookup[api_name]
+    end
+
     def coerce_price(price)
       return nil if price.nil? || price == "N/A"
       price.gsub(",","").to_f
@@ -125,24 +172,6 @@ module AwsPricing
       'c3.large' => 'High-Compute Large', 'c3.xlarge' => 'High-Compute Extra Large', 'c3.2xlarge' => 'High-Compute Double Extra Large', 'c3.4xlarge' => 'High-Compute Quadruple Extra Large', 'c3.8xlarge' => 'High-Compute Eight Extra Large',
       'i2.xlarge' => 'High I/O Extra Large', 'i2.2xlarge' => 'High I/O Double Extra Large', 'i2.4xlarge' => 'High I/O Quadruple Extra Large', 'i2.8xlarge' => 'High I/O Eight Extra Large',
     } 
-    @@Memory_Lookup = {
-      'm1.small' => 1700, 'm1.medium' => 3750, 'm1.large' => 7500, 'm1.xlarge' => 15000,
-      'm2.xlarge' => 17100, 'm2.2xlarge' => 34200, 'm2.4xlarge' => 68400,
-      'm3.medium' => 3750, 'm3.large' => 7500, 'm3.xlarge' => 15000, 'm3.2xlarge' => 30000,
-      'c1.medium' => 1700, 'c1.xlarge' => 7000,
-      'hi1.4xlarge' => 60500,
-      'cg1.4xlarge' => 22000,
-      'cc1.4xlarge' => 23000, 'cc2.8xlarge' => 60500,
-      't1.micro' => 1700,
-      'cr1.8xlarge' => 244000,
-      'hs1.8xlarge' => 117000,
-      'g2.2xlarge' => 15000,      
-      'db.m1.small' => 1700, 'db.m1.medium' => 3750, 'db.m1.large' => 7500, 'db.m1.xlarge' => 15000,
-      'db.m2.xlarge' => 17100, 'db.m2.2xlarge' => 34000, 'db.m2.4xlarge' => 68000, 'db.cr1.8xlarge' => 244000,
-      'db.t1.micro' => 613,
-      'c3.large' => 3750, 'c3.xlarge' => 7000, 'c3.2xlarge' => 15000, 'c3.4xlarge' => 30000, 'c3.8xlarge' => 60000, 
-      'i2.large' => 15000, 'i2.xlarge' => 30500, 'i2.2xlarge' => 61000, 'i2.4xlarge' => 122000, 'i2.8xlarge' => 244000,
-    }
     @@Disk_Lookup = {
       'm1.small' => 160, 'm1.medium' => 410, 'm1.large' =>850, 'm1.xlarge' => 1690,
       'm2.xlarge' => 420, 'm2.2xlarge' => 850, 'm2.4xlarge' => 1690,
@@ -179,45 +208,6 @@ module AwsPricing
       'c3.large' => 64, 'c3.xlarge' => 64, 'c3.2xlarge' => 64, 'c3.4xlarge' => 64, 'c3.8xlarge' => 64, 
       'i2.large' => 64, 'i2.xlarge' => 64, 'i2.2xlarge' => 64, 'i2.4xlarge' => 64, 'i2.8xlarge' => 64,
     }
-    @@Compute_Units_Lookup = {
-      'm1.small' => 1, 'm1.medium' => 2, 'm1.large' => 4, 'm1.xlarge' => 8,
-      'm2.xlarge' => 6.5, 'm2.2xlarge' => 13, 'm2.4xlarge' => 26,
-      'm3.medium' => 3, 'm3.large' => 6.5, 'm3.xlarge' => 13, 'm3.2xlarge' => 26,
-      'c1.medium' => 5, 'c1.xlarge' => 20,
-      'hi1.4xlarge' => 35,
-      'cg1.4xlarge' => 34,
-      'cc1.4xlarge' => 34, 'cc2.8xlarge' => 88,
-      't1.micro' => 2,
-      'cr1.8xlarge' => 88,
-      'hs1.8xlarge' => 35,
-      'g2.2xlarge' => 26,
-      'unknown' => 0,      
-      'db.m1.small' => 1, 'db.m1.medium' => 2, 'db.m1.large' => 4, 'db.m1.xlarge' => 8,
-      'db.m2.xlarge' => 6.5, 'db.m2.2xlarge' => 13, 'db.m2.4xlarge' => 26, 'db.cr1.8xlarge' => 88,
-      'db.t1.micro' => 1,
-      'c3.large' => 7, 'c3.xlarge' => 14, 'c3.2xlarge' => 28, 'c3.4xlarge' => 55, 'c3.8xlarge' => 108, 
-      # Since I2 is not released, the cpmpute units are not yet published, so this is estimate
-      'i2.large' => 6.5, 'i2.xlarge' => 13, 'i2.2xlarge' => 26, 'i2.4xlarge' => 52, 'i2.8xlarge' => 104,
-    }
-    @@Virtual_Cores_Lookup = {
-      'm1.small' => 1, 'm1.medium' => 1, 'm1.large' => 2, 'm1.xlarge' => 4,
-      'm2.xlarge' => 2, 'm2.2xlarge' => 4, 'm2.4xlarge' => 8,
-      'm3.medium' => 1, 'm3.large' => 2, 'm3.xlarge' => 4, 'm3.2xlarge' => 8,
-      'c1.medium' => 2, 'c1.xlarge' => 8,
-      'hi1.4xlarge' => 16,
-      'cg1.4xlarge' => 8,
-      'cc1.4xlarge' => 8, 'cc2.8xlarge' => 16,
-      't1.micro' => 0,
-      'cr1.8xlarge' => 16,
-      'hs1.8xlarge' => 16,
-      'g2.2xlarge' => 8,
-      'unknown' => 0,      
-      'db.m1.small' => 1, 'db.m1.medium' => 1, 'db.m1.large' => 2, 'db.m1.xlarge' => 4,
-      'db.m2.xlarge' => 2, 'db.m2.2xlarge' => 4, 'db.m2.4xlarge' => 8, 'db.cr1.8xlarge' => 16,
-      'db.t1.micro' => 0,
-      'c3.large' => 2, 'c3.xlarge' => 4, 'c3.2xlarge' => 8, 'c3.4xlarge' => 16, 'c3.8xlarge' => 32, 
-      'i2.large' => 2, 'i2.xlarge' => 4, 'i2.2xlarge' => 8, 'i2.4xlarge' => 16, 'i2.8xlarge' => 32,
-    }
     @@Disk_Type_Lookup = {
       'm1.small' => :ephemeral, 'm1.medium' => :ephemeral, 'm1.large' => :ephemeral, 'm1.xlarge' => :ephemeral,
       'm2.xlarge' => :ephemeral, 'm2.2xlarge' => :ephemeral, 'm2.4xlarge' => :ephemeral,
@@ -237,6 +227,14 @@ module AwsPricing
       'c3.large' => :ssd, 'c3.xlarge' => :ssd, 'c3.2xlarge' => :ssd, 'c3.4xlarge' => :ssd, 'c3.8xlarge' => :ssd, 
       'i2.large' => :ssd, 'i2.xlarge' => :ssd, 'i2.2xlarge' => :ssd, 'i2.4xlarge' => :ssd, 'i2.8xlarge' => :ssd,
     }
+
+    # Due to fact AWS pricing API only reports these for EC2, we will fetch from EC2 and keep around for lookup
+    # e.g. EC2 = http://aws-assets-pricing-prod.s3.amazonaws.com/pricing/ec2/linux-od.js
+    # e.g. RDS = http://aws-assets-pricing-prod.s3.amazonaws.com/pricing/rds/mysql/pricing-standard-deployments.js
+    @@Memory_Lookup = {}
+    @@Compute_Units_Lookup = {}
+    @@Virtual_Cores_Lookup = {}
+
   end
 
 end

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

@@ -12,12 +12,12 @@ module AwsPricing
       # Let's look up using the standard name but need to remove leading "db." to do so
       api_name_for_lookup = api_name.sub("db.", "")
 
-      @memory_in_mb = @@Memory_Lookup[api_name_for_lookup]
-      @disk_in_gb = @@Disk_Lookup[api_name_for_lookup]
-      @platform = @@Platform_Lookup[api_name_for_lookup]
-      @compute_units = @@Compute_Units_Lookup[api_name_for_lookup]
-      @virtual_cores = @@Virtual_Cores_Lookup[api_name_for_lookup]
-      @disk_type = @@Disk_Type_Lookup[api_name_for_lookup]
+      @disk_in_gb = InstanceType.get_disk(api_name_for_lookup)
+      @platform = InstanceType.get_platform(api_name_for_lookup)
+      @disk_type = InstanceType.get_disk_type(api_name_for_lookup)
+      @memory_in_mb = InstanceType.get_memory(api_name_for_lookup)
+      @compute_units = InstanceType.get_compute_units(api_name_for_lookup)
+      @virtual_cores = InstanceType.get_virtual_cores(api_name_for_lookup)
     end
 
 
@@ -109,6 +109,7 @@ module AwsPricing
 
       [api_name, name]
     end
+
    end
 
 end

data/lib/amazon-pricing/version.rb

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

data/lib/amazon-pricing.rb

@@ -35,7 +35,7 @@ module AwsPricing
       region.get_instance_type(api_name)
     end
 
-    def fetch_url(url)
+    def self.fetch_url(url)
       uri = URI.parse(url)
       page = Net::HTTP.get_response(uri)
       # Now that AWS switched from json to jsonp, remove first/last lines
@@ -88,6 +88,7 @@ module AwsPricing
     
     def initialize
       @_regions = {}
+      InstanceType.populate_lookups
       get_ec2_on_demand_instance_pricing
       get_ec2_reserved_instance_pricing
       fetch_ec2_ebs_pricing
@@ -115,7 +116,7 @@ module AwsPricing
     # 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 = fetch_url(url)
+      res = PriceList.fetch_url(url)
       res['config']['regions'].each do |reg|
         region_name = reg['region']
         region = find_or_create_region(region_name)
@@ -139,7 +140,7 @@ module AwsPricing
     end
 
     def fetch_ec2_ebs_pricing
-      res = fetch_url(EC2_BASE_URL + "pricing-ebs.js")
+      res = PriceList.fetch_url(EC2_BASE_URL + "pricing-ebs.js")
       res["config"]["regions"].each do |ebs_types|
         region = get_region(ebs_types["region"])
         region.ebs_price = EbsPrice.new(region, ebs_types)
@@ -152,8 +153,9 @@ module AwsPricing
     
     def initialize
       @_regions = {}
-       get_rds_on_demand_instance_pricing
-       get_rds_reserved_instance_pricing
+      InstanceType.populate_lookups
+      get_rds_on_demand_instance_pricing
+      get_rds_reserved_instance_pricing
     end
 
     protected
@@ -231,7 +233,7 @@ module AwsPricing
     end
 
     def fetch_on_demand_rds_instance_pricing(url, type_of_rds_instance, db_type, is_byol)
-      res = fetch_url(url)
+      res = PriceList.fetch_url(url)
       res['config']['regions'].each do |reg|
         region_name = reg['region']
         region = find_or_create_region(region_name)
@@ -257,7 +259,7 @@ module AwsPricing
     end
 
     def fetch_reserved_rds_instance_pricing(url, type_of_rds_instance, db_type, is_byol)
-      res = fetch_url(url)
+      res = PriceList.fetch_url(url)
       res['config']['regions'].each do |reg|
         region_name = reg['region']
         region = find_or_create_region(region_name)

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.23
-  prerelease: 
+  version: 0.1.24
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -47,6 +46,7 @@ files:
 homepage: http://github.com/CloudHealth/amazon-pricing
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -57,28 +57,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4471370739960301886
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4471370739960301886
 requirements: []
 rubyforge_project: amazon-pricing
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Amazon Web Services Pricing Ruby gem
 test_files:
 - spec/instance_type_spec.rb
@@ -88,3 +80,4 @@ test_files:
 - spec/support/.gitignore
 - test/ec2_instance_types_test.rb
 - test/helper.rb
+has_rdoc: