amazon-pricing 0.1.30 → 0.1.32

data/Gemfile.lock

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

data/lib/amazon-pricing.rb

@@ -30,6 +30,16 @@ module AwsPricing
       @_regions.values
     end
 
+    def get_instance_types
+      instance_types = []
+      @_regions.each do |region|
+        region.ec2_instance_types.each do |instance_type|
+          instance_types << instance_type
+        end
+      end
+      instance_types
+    end
+
     def get_instance_type(region_name, api_name)
       region = get_region(region_name)
       raise "Region #{region_name} not found" if region.nil?
@@ -100,7 +110,7 @@ module AwsPricing
 
     def initialize
       @_regions = {}
-      @_regions["us-gov-west"] = Region.new("us-gov-west")
+      @_regions["us-gov-west-1"] = Region.new("us-gov-west-1")
       InstanceType.populate_lookups
       get_ec2_instance_pricing
       fetch_ec2_ebs_pricing
@@ -113,7 +123,6 @@ module AwsPricing
       client = Mechanize.new
       page = client.get(GOV_CLOUD_URL)
       tables = page.search("//div[@class='aws-table section']")
-
       create_ondemand_instances(get_rows(tables[0]))
       create_ondemand_instances(get_rows(tables[1]))
       
@@ -161,7 +170,7 @@ module AwsPricing
             api_name, name = Ec2InstanceType.get_name(nil, row[0], true)
             instance_type = region.add_or_update_ec2_instance_type(api_name, name)
           end
-         instance_type.update_pricing2(operating_system, res_type, nil, row[1], row[2], row[3], row[4])
+         instance_type.update_pricing2(operating_system, res_type, nil, row[1], row[3], row[2], row[4])
         end
       end
     end
@@ -226,7 +235,7 @@ module AwsPricing
 
     def initialize
       @_regions = {}
-      @_regions["us-gov-west"] = Region.new("us-gov-west")
+      @_regions["us-gov-west-1"] = Region.new("us-gov-west-1")
       InstanceType.populate_lookups
       get_rds_instance_pricing
     end

data/lib/amazon-pricing/ebs-price.rb

@@ -10,11 +10,11 @@
 module AwsPricing
 
   class EbsPrice
-    attr_accessor :region, :standard_per_gb, :standard_per_million_io,
+    attr_accessor :standard_per_gb, :standard_per_million_io,
       :preferred_per_gb, :preferred_per_iops, :s3_snaps_per_gb
 
     def initialize(region)
-      @region = region
+      #@region = region
     end
 
     def update_from_json(json)

data/lib/amazon-pricing/version.rb

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

data/test/ec2_instance_types_test.rb

@@ -22,11 +22,6 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
     end
   end
 
-  def test_cc8xlarge_issue
-    obj = @@ec2_pricing.get_instance_type('us-east', 'cc2.8xlarge')
-    assert obj.api_name == 'cc2.8xlarge'
-  end
-
   def test_name_lookup
     @@ec2_pricing.regions.each do |region|
       assert_not_nil region.name
@@ -49,7 +44,7 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
   def test_available
     # Validate instance types in specific regions are available
     region = @@ec2_pricing.get_region('us-east')
-    assert region.instance_type_available?('m1.large')
+    assert region.instance_type_available?('m3.large')
   end
 
   def test_fetch_all_breakeven_months
@@ -68,7 +63,7 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
 
   def test_breakeven_month
     region = @@ec2_pricing.get_region('us-east')
-    instance = region.get_ec2_instance_type('m1.large')
+    instance = region.get_ec2_instance_type('m3.large')
     bem = instance.get_breakeven_month(:linux, :heavy, :year1)
     assert bem == 6
   end
@@ -76,13 +71,13 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
   def test_memory
     # Validate instance types in specific regions are available
     region = @@ec2_pricing.get_region('us-east')
-    instance = region.get_ec2_instance_type('m1.large')
+    instance = region.get_ec2_instance_type('m3.large')
     assert instance.memory_in_mb == 7500
   end
 
   def test_non_standard_region_name
     region = @@ec2_pricing.get_region('eu-west-1')
-    instance = region.get_ec2_instance_type('m1.large')
+    instance = region.get_ec2_instance_type('m3.large')
     assert instance.memory_in_mb == 7500
   end
 
@@ -106,7 +101,7 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
 
   def test_virtual_cores
     region = @@ec2_pricing.get_region('us-east')
-    instance = region.get_ec2_instance_type('m1.large')
+    instance = region.get_ec2_instance_type('m3.large')
     assert instance.virtual_cores == 2
   end
 

data/test/govcloud_test.rb

@@ -23,25 +23,25 @@ class TestGovCloud < Test::Unit::TestCase
   end
 
   def test_cc8xlarge_issue
-    obj = @@ec2_pricing.get_instance_type('us-gov-west', 'cc2.8xlarge')
+    obj = @@ec2_pricing.get_instance_type('us-gov-west-1', 'cc2.8xlarge')
     assert obj.api_name == 'cc2.8xlarge'
   end
 
   def test_memory
     # Validate instance types in specific regions are available
-    region = @@ec2_pricing.get_region('us-gov-west')
+    region = @@ec2_pricing.get_region('us-gov-west-1')
     instance = region.get_ec2_instance_type('m1.large')
     assert instance.memory_in_mb == 7500
   end
 
   def test_virtual_cores
-    region = @@ec2_pricing.get_region('us-gov-west')
+    region = @@ec2_pricing.get_region('us-gov-west-1')
     instance = region.get_ec2_instance_type('m1.large')
     assert instance.virtual_cores == 2
   end
 
   def test_ebs
-    region = @@ec2_pricing.get_region('us-gov-west')
+    region = @@ec2_pricing.get_region('us-gov-west-1')
     assert region.ebs_price.standard_per_gb == 0.065
     assert region.ebs_price.standard_per_million_io == 0.065
     assert region.ebs_price.preferred_per_gb == 0.15

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.32
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -65,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4082041594937074380
+      hash: -865750944682742325
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4082041594937074380
+      hash: -865750944682742325
 requirements: []
 rubyforge_project: amazon-pricing
 rubygems_version: 1.8.25