amazon-pricing 0.1.21 → 0.1.22

data/Gemfile.lock

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

data/lib/amazon-pricing.rb

@@ -40,6 +40,10 @@ module AwsPricing
       page = Net::HTTP.get_response(uri)
       # Now that AWS switched from json to jsonp, remove first/last lines
       body = page.body.gsub("callback(", "").reverse.sub(")", "").reverse
+      if body.split("\n").last == ";"
+        # Now remove one more line (rds is returning ";", ec2 empty line)
+        body = body.reverse.sub(";", "").reverse
+      end
 
       #body = page.body.split("\n")[1..-2].join("\n")
       JSON.parse(body)

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

@@ -61,21 +61,5 @@ module AwsPricing
       [api_name, name]
     end
 
-
-    @@Name_Lookup = {
-      'm1.small' => 'Standard Small', 'm1.medium' => 'Standard Medium', 'm1.large' => 'Standard Large', 'm1.xlarge' => 'Standard Extra Large',
-      'm2.xlarge' => 'Hi-Memory Extra Large', 'm2.2xlarge' => 'Hi-Memory Double Extra Large', 'm2.4xlarge' => 'Hi-Memory Quadruple Extra Large',
-      'm3.medium' => 'M3 Medium Instance', 'm3.large'=>'M3 Large Instance', 'm3.xlarge' => 'M3 Extra Large Instance', 'm3.2xlarge' => 'M3 Double Extra Large Instance',
-      'c1.medium' => 'High-CPU Medium', 'c1.xlarge' => 'High-CPU Extra Large',
-      'hi1.4xlarge' => 'High I/O Quadruple Extra Large',
-      'cg1.4xlarge' => 'Cluster GPU Quadruple Extra Large',
-      'cc1.4xlarge' => 'Cluster Compute Quadruple Extra Large', 'cc2.8xlarge' => 'Cluster Compute Eight Extra Large',
-      't1.micro' => 'Micro',
-      'cr1.8xlarge' => 'High-Memory Cluster Eight Extra Large',
-      'hs1.8xlarge' => 'High-Storage Eight Extra Large',
-      'g2.2xlarge' => 'Cluster GPU Double Extra Large',
-      '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'
-    }    
    end
 end

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

@@ -110,6 +110,21 @@ module AwsPricing
       values
     end
 
+    @@Name_Lookup = {
+      'm1.small' => 'Standard Small', 'm1.medium' => 'Standard Medium', 'm1.large' => 'Standard Large', 'm1.xlarge' => 'Standard Extra Large',
+      'm2.xlarge' => 'Hi-Memory Extra Large', 'm2.2xlarge' => 'Hi-Memory Double Extra Large', 'm2.4xlarge' => 'Hi-Memory Quadruple Extra Large',
+      'm3.medium' => 'M3 Medium Instance', 'm3.large'=>'M3 Large Instance', 'm3.xlarge' => 'M3 Extra Large Instance', 'm3.2xlarge' => 'M3 Double Extra Large Instance',
+      'c1.medium' => 'High-CPU Medium', 'c1.xlarge' => 'High-CPU Extra Large',
+      'hi1.4xlarge' => 'High I/O Quadruple Extra Large',
+      'cg1.4xlarge' => 'Cluster GPU Quadruple Extra Large',
+      'cc1.4xlarge' => 'Cluster Compute Quadruple Extra Large', 'cc2.8xlarge' => 'Cluster Compute Eight Extra Large',
+      't1.micro' => 'Micro',
+      'cr1.8xlarge' => 'High-Memory Cluster Eight Extra Large', 
+      'hs1.8xlarge' => 'High-Storage Eight Extra Large',
+      'g2.2xlarge' => 'Cluster GPU Double Extra Large',
+      '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,

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

@@ -1,6 +1,26 @@
 require 'amazon-pricing/instance-type'
 module AwsPricing
   class RdsInstanceType < InstanceType
+
+    def initialize(region, api_name, name, json)
+      @category_types = {}
+
+      @region = region
+      @name = name
+      @api_name = api_name
+
+      # 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]
+    end
+
+
     # database_type = :mysql, :oracle, :sqlserver
     # type_of_instance = :ondemand, :light, :medium, :heavy
 
@@ -56,47 +76,39 @@ module AwsPricing
     protected 
 
     # Returns [api_name, name]
-    def self.get_name(instance_type, size, is_reserved = false)
-      lookup = @@Api_Name_Lookup
-      lookup = @@Api_Name_Lookup_Reserved if is_reserved
+    # e.g. memDBCurrentGen, db.m3.medium
+    def self.get_name(instance_type, api_name, is_reserved = false)
+
+      # Note: These api names are specific to RDS, not sure why Amazon has given them different API names (note: they have leading "db.")
+      #'cr1.8xl' => 'High-Memory Cluster Eight Extra Large',
+      #'micro' => 'Micro',
+      #'sm' => 'Standard Small',
+      #'xxlHiMem' => 'Hi-Memory Double Extra Large'
+      if ["db.cr1.8xl", "db.micro", "db.sm", "db.xxlHiMem", "sm", "micro", "xxlHiMem"].include? api_name
+        case api_name
+        when "db.cr1.8xl"
+          api_name = "db.cr1.8xlarge"
+        when "db.xxlHiMem", "xxlHiMem"
+          api_name = "db.m2.2xlarge"
+        when "db.micro", "micro"
+          api_name = "db.t1.micro"
+        when "db.sm", "sm"
+          api_name = "db.m1.small"
+        end
+      end
+
+      # 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.", "")
 
       # Let's handle new instances more gracefully
-      unless lookup.has_key? instance_type
-        raise UnknownTypeError, "Unknown instance type #{instance_type}", caller
-      else
-        api_name = lookup[instance_type][size]
+      unless @@Name_Lookup.has_key? api_name_for_lookup
+        raise UnknownTypeError, "Unknown instance type #{instance_type} #{api_name}", caller
       end
 
-      lookup = @@Name_Lookup
-      lookup = @@Name_Lookup_Reserved if is_reserved
-      name = lookup[instance_type][size]
+      name = @@Name_Lookup[api_name_for_lookup]
 
       [api_name, name]
     end
-
-    @@Api_Name_Lookup = {
-      'udbInstClass' => {'uDBInst'=>'db.t1.micro'},
-      'dbInstClass'=> {'uDBInst' => 'db.t1.micro', 'smDBInst' => 'db.m1.small', 'medDBInst' => 'db.m1.medium', 'lgDBInst' => 'db.m1.large', 'xlDBInst' => 'db.m1.xlarge'},
-      'hiMemDBInstClass'=> {'xlDBInst' => 'db.m2.xlarge', 'xxlDBInst' => 'db.m2.2xlarge', 'xxxxDBInst' => 'db.m2.4xlarge'},
-      'clusterHiMemDB' => {'xxxxxxxxl' => 'db.cr1.8xlarge'},
-      'multiAZDBInstClass'=> {'uDBInst' => 'db.t1.micro', 'smDBInst' => 'db.m1.small', 'medDBInst' => 'db.m1.medium', 'lgDBInst' => 'db.m1.large', 'xlDBInst' => 'db.m1.xlarge'},
-      'multiAZHiMemInstClass'=> {'xlDBInst' => 'db.m2.xlarge', 'xxlDBInst' => 'db.m2.2xlarge', 'xxxxDBInst' => 'db.m2.4xlarge'},
-    }
-    @@Name_Lookup = {
-      'udbInstClass' => {'uDBInst'=>'Standard Micro'},
-      'dbInstClass'=> {'uDBInst' => 'Standard Micro', 'smDBInst' => 'Standard Small', 'medDBInst' => 'Standard Medium', 'lgDBInst' => 'Standard Large', 'xlDBInst' => 'Standard Extra Large'},
-      'hiMemDBInstClass'=> {'xlDBInst' => 'Standard High-Memory Extra Large', 'xxlDBInst' => 'Standard High-Memory Double Extra Large', 'xxxxDBInst' => 'Standard High-Memory Quadruple Extra Large'},
-      'clusterHiMemDB' => {'xxxxxxxxl' => 'Standard High-Memory Cluster Eight Extra Large'},
-      'multiAZDBInstClass'=> {'uDBInst' => 'Multi-AZ Micro', 'smDBInst' => 'Multi-AZ Small', 'medDBInst' => 'Multi-AZ Medium', 'lgDBInst' => 'Multi-AZ Large', 'xlDBInst' => 'Multi-AZ Extra Large'},
-      'multiAZHiMemInstClass'=> {'xlDBInst' => 'Multi-AZ High-Memory Extra Large', 'xxlDBInst' => 'Multi-AZ High-Memory Double Extra Large', 'xxxxDBInst' => 'Multi-AZ High-Memory Quadruple Extra Large'},
-    }
-    @@Api_Name_Lookup_Reserved = {
-      'stdDeployRes' => {'u' => 'db.t1.micro', 'micro' => 'db.t1.micro', 'sm' => 'db.m1.small', 'med' => 'db.m1.medium', 'lg' => 'db.m1.large', 'xl' => 'db.m1.xlarge', 'xlHiMem' => 'db.m2.xlarge', 'xxlHiMem' => 'db.m2.2xlarge', 'xxxxlHiMem' => 'db.m2.4xlarge', 'xxxxxxxxl' => 'db.cr1.8xlarge'},
-      'multiAZdeployRes' => {'u' => 'db.t1.micro', 'micro' => 'db.t1.micro', 'sm' => 'db.m1.small', 'med' => 'db.m1.medium', 'lg' => 'db.m1.large', 'xl' => 'db.m1.xlarge', 'xlHiMem' => 'db.m2.xlarge', 'xxlHiMem' => 'db.m2.2xlarge', 'xxxxlHiMem' => 'db.m2.4xlarge', 'xxxxxxxxl' => 'db.cr1.8xlarge'},
-    }
-    @@Name_Lookup_Reserved = {
-      'stdDeployRes' => {'u' => 'Standard Micro', 'micro' => 'Standard Micro', 'sm' => 'Standard Small', 'med' => 'Standard Medium', 'lg' => 'Standard Large', 'xl' => 'Standard Extra Large', 'xlHiMem' => 'Standard Extra Large High-Memory', 'xxlHiMem' => 'Standard Double Extra Large High-Memory', 'xxxxlHiMem' => 'Standard Quadruple Extra Large High-Memory', 'xxxxxxxxl' => 'Standard Eight Extra Large'}  ,
-      'multiAZdeployRes' => {'u' => 'Multi-AZ Micro', 'micro' => 'Multi-AZ Micro', 'sm' => 'Multi-AZ Small', 'med' => 'Multi-AZ Medium', 'lg' => 'Multi-AZ Large', 'xl' => 'Multi-AZ Extra Large', 'xlHiMem' => 'Multi-AZ Extra Large High-Memory', 'xxlHiMem' => 'Multi-AZ Double Extra Large High-Memory', 'xxxxlHiMem' => 'Multi-AZ Quadruple Extra Large High-Memory', 'xxxxxxxxl' => 'Multi-AZ Eight Extra Large'},
-    }
    end
+
 end

data/lib/amazon-pricing/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -62,16 +62,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1817073564314149900
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1817073564314149900
 requirements: []
 rubyforge_project: amazon-pricing
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Amazon Web Services Pricing Ruby gem
-test_files: []
+test_files:
+- spec/instance_type_spec.rb
+- spec/price_list_spec.rb
+- spec/rds_pricing_spec.rb
+- spec/spec_helper.rb
+- spec/support/.gitignore
+- test/ec2_instance_types_test.rb
+- test/helper.rb