amazon-pricing 0.1.3 → 0.1.4

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

@@ -20,7 +20,7 @@ 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
+      :memory_in_mb, :disk_in_mb, :platform, :compute_units, :virtual_cores
 
     # Initializes and InstanceType object given a region, the internal
     # type (e.g. stdODI) and the json for the specific instance. The json is
@@ -42,6 +42,7 @@ module AwsPricing
       @disk_in_mb = @@Disk_Lookup[@api_name]
       @platform = @@Platform_Lookup[@api_name]
       @compute_units = @@Compute_Units_Lookup[@api_name]
+      @virtual_cores = @@Virtual_Cores_Lookup[@api_name]
     end
 
     # Returns whether an instance_type is available. 
@@ -112,6 +113,7 @@ module AwsPricing
     @@Memory_Lookup = {
       'm1.small' => 1700, 'm1.medium' => 3750, 'm1.large' => 7500, 'm1.xlarge' => 15000,
       'm2.xlarge' => 17100, 'm2.2xlarge' => 34200, 'm2.4xlarge' => 68400,
+      #'m3.xlarge' => 15, 'm3.2xlarge' => 30,
       'c1.medium' => 1700, 'c1.xlarge' => 7000,
       'hi1.4xlarge' => 60500,
       'cg1.4xlarge' => 22000,
@@ -122,6 +124,7 @@ module AwsPricing
     @@Disk_Lookup = {
       'm1.small' => 160, 'm1.medium' => 410, 'm1.large' =>850, 'm1.xlarge' => 1690,
       'm2.xlarge' => 420, 'm2.2xlarge' => 850, 'm2.4xlarge' => 1690,
+      #'m3.xlarge' => 0, 'm3.2xlarge' => 0,
       'c1.medium' => 350, 'c1.xlarge' => 1690,
       'hi1.4xlarge' => 2048,
       'cg1.4xlarge' => 1690,
@@ -132,6 +135,7 @@ module AwsPricing
     @@Platform_Lookup = {
       'm1.small' => 32, 'm1.medium' => 32, 'm1.large' => 64, 'm1.xlarge' => 64,
       'm2.xlarge' => 64, 'm2.2xlarge' => 64, 'm2.4xlarge' => 64,
+      #'m3.xlarge' => 64, 'm3.2xlarge' => 64,
       'c1.medium' => 32, 'c1.xlarge' => 64,
       'hi1.4xlarge' => 64,
       'cg1.4xlarge' => 64,
@@ -142,6 +146,7 @@ module AwsPricing
     @@Compute_Units_Lookup = {
       'm1.small' => 1, 'm1.medium' => 2, 'm1.large' => 4, 'm1.xlarge' => 8,
       'm2.xlarge' => 6, 'm2.2xlarge' => 13, 'm2.4xlarge' => 26,
+      #'m3.xlarge' => 13, 'm3.2xlarge' => 26,
       'c1.medium' => 5, 'c1.xlarge' => 20,
       'hi1.4xlarge' => 35,
       'cg1.4xlarge' => 34,
@@ -149,6 +154,17 @@ module AwsPricing
       't1.micro' => 2,
       'unknown' => 0,
     }
+    @@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.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,
+      'unknown' => 0,
+    }
   end
 
 end

data/lib/amazon-pricing/version.rb

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

data/test/test-ec2-instance-types.rb

@@ -97,4 +97,12 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
       assert_not_nil region.ebs_price.s3_snaps_per_gb
     end
   end
+
+  def test_virtual_cores
+    pricing = AwsPricing::PriceList.new
+    region = pricing.get_region('us-east')
+    instance = region.get_instance_type(:on_demand, 'm1.large')
+    assert instance.virtual_cores == 2
+  end
+
 end

metadata

@@ -1,35 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: amazon-pricing
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.1.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-15 00:00:00 -05:00
-default_executable: 
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies: []
-
 description: A Ruby library for retrieving pricing for Amazon Web Services
-email: 
+email:
 - joe.kinsella@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README
-files: 
+files:
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -46,45 +36,36 @@ files:
 - spec/price_list_spec.rb
 - test/helper.rb
 - test/test-ec2-instance-types.rb
-has_rdoc: true
 homepage: http://github.com/sonian/amazon-pricing
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - amazon-pricing documentation
 - --line-numbers
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: amazon-pricing
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 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
 - test/helper.rb