amazon-pricing 0.1.36 → 0.1.37

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjNjZjUyYmZmYzgwMTU3YWZlZjkyODE1YzkyZThlN2VlMDk0N2IzZQ==
+  data.tar.gz: !binary |-
+    MTJhZmJhMDhlODI5Njg2ODBmODlmM2NjYjE4NmJkZjhkMmUyY2U2YQ==
+SHA512:
+  metadata.gz: !binary |-
+    OWFkZjI2ZTM0NTgwMzFjNmFmYzNiYzZhNTczNjQ4MDYyZWE5ZmM4MWQxZjZm
+    NzRkNzRiNzJmMDEyNjdjNjA2ZGY3NmQ4MjRkNTM2OTBmNDM4NGMxMjFhZmQ1
+    NjAzNzExMzNiOTVlNTYzNmExMzY1YmYwMzVkN2NhYmViMDFiNDQ=
+  data.tar.gz: !binary |-
+    ZWExYWRhZjI3Mjk0ODYyNjkyNjZjYzU4MTczNzcxZmNmNTFkNDlhYzMzZTJj
+    NjRlNDZjYmViZWY0YzU1MTFmZmUzOWI0OTJkYWRiYmU0Y2FjOTE3ZmMxNDE2
+    MDMyMjI2NTFhOGZhODJiZjQ0ZjAxYWFjOWI3NDc3MmIxMzY3YjY=

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

@@ -92,8 +92,7 @@ module AwsPricing
     end
 
     def self.populate_lookups
-      return unless @@Memory_Lookup.empty? && @@Compute_Units_Lookup.empty? && @@Virtual_Cores_Lookup.empty?
-
+      # 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|
@@ -175,6 +174,7 @@ 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',
       'r3.large' => 'Memory Optimized Large', 'r3.xlarge' => 'Memory Optimized Extra Large', 'r3.2xlarge' => 'Memory Optimized Double Extra Large', 'r3.4xlarge' => 'Memory Optimized Quadruple Extra Large', 'r3.8xlarge' => 'Memory Optimized Eight Extra Large',
+      't2.micro' => 'Burstable Performance Instance Micro', 't2.small' => 'Burstable Performance Instance Small', 't2.medium' => 'Burstable Performance Instance Medium',
     } 
     @@Disk_Lookup = {
       'm1.small' => 160, 'm1.medium' => 410, 'm1.large' =>850, 'm1.xlarge' => 1690,
@@ -194,6 +194,7 @@ module AwsPricing
       'c3.large' => 32, 'c3.xlarge' => 80, 'c3.2xlarge' => 160, 'c3.4xlarge' => 320, 'c3.8xlarge' => 640, 
       'i2.large' => 360, 'i2.xlarge' => 720, 'i2.2xlarge' => 1440, 'i2.4xlarge' => 2880, 'i2.8xlarge' => 5760,
       'r3.large' => 32, 'r3.xlarge' => 80, 'r3.2xlarge' => 160, 'r3.4xlarge' => 320, 'r3.8xlarge' => 640,
+      't2.micro' => 0, 't2.small' => 0, 't2.medium' => 0,
     }
     @@Platform_Lookup = {
       'm1.small' => 32, 'm1.medium' => 32, 'm1.large' => 64, 'm1.xlarge' => 64,
@@ -213,6 +214,7 @@ 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,
       'r3.large' => 64, 'r3.xlarge' => 64, 'r3.2xlarge' => 64, 'r3.4xlarge' => 64, 'r3.8xlarge' => 64,
+      't2.micro' => 64, 't2.small' => 64, 't2.medium' => 64,
     }
     @@Disk_Type_Lookup = {
       'm1.small' => :ephemeral, 'm1.medium' => :ephemeral, 'm1.large' => :ephemeral, 'm1.xlarge' => :ephemeral,
@@ -232,16 +234,23 @@ module AwsPricing
       'db.t1.micro' => :ebs,
       '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,
-      # Remove asterisk when this is released instance type
-      #'r3.large *' => :ssd, 'r3.xlarge *' => :ssd, 'r3.2xlarge *' => :ssd, 'r3.4xlarge *' => :ssd, 'r3.8xlarge *' => :ssd,
+      'r3.large' => :ssd, 'r3.xlarge' => :ssd, 'r3.2xlarge' => :ssd, 'r3.4xlarge' => :ssd, 'r3.8xlarge' => :ssd,
+      't2.micro' => :ebs, 't2.small' => :ebs, 't2.medium' => :ebs,
+    }
+    # Sigh... AWS does not always provide memory info (e.g. t2, r3)
+    @@Memory_Lookup = {
+      'r3.large' => 15250, 'r3.xlarge' => 30500, 'r3.2xlarge' => 61000, 'r3.4xlarge' => 122000, 'r3.8xlarge' => 244000,
+      't2.micro' => 1000, 't2.small' => 2000, 't2.medium' => 4000,
+    }
+    @@Virtual_Cores_Lookup = {
+      'r3.large' => 2, 'r3.xlarge' => 4, 'r3.2xlarge' => 8, 'r3.4xlarge' => 16, 'r3.8xlarge' => 32,
+      't2.micro' => 1, 't2.small' => 1, 't2.medium' => 2,
     }
 
     # 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
 

data/lib/amazon-pricing/version.rb

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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.36
-  prerelease: 
+  version: 0.1.37
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -52,6 +51,7 @@ files:
 homepage: http://github.com/CloudHealth/amazon-pricing
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -62,28 +62,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: 87748617366120623
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 87748617366120623
 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
@@ -94,3 +86,4 @@ test_files:
 - test/ec2_instance_types_test.rb
 - test/govcloud_test.rb
 - test/helper.rb
+has_rdoc: