amazon-pricing 0.1.32 → 0.1.33

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    amazon-pricing (0.1.32)
+    amazon-pricing (0.1.33)
 
 GEM
   remote: https://rubygems.org/
@@ -27,7 +27,7 @@ GEM
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     ntlm-http (0.1.1)
-    rake (10.2.2)
+    rake (10.1.0)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)

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

@@ -1,6 +1,12 @@
 require 'amazon-pricing/instance-type'
 module AwsPricing
   class Ec2InstanceType < InstanceType
+
+    # Returns OperatingSystem pricing
+    # e.g. :linux
+    def get_operating_system(type)
+      get_category_type(type)
+    end
     
     # Returns whether an instance_type is available. 
     # operating_system = :linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb
@@ -23,7 +29,10 @@ module AwsPricing
       if type_of_instance == :ondemand
         # e.g. {"size"=>"sm", "valueColumns"=>[{"name"=>"linux", "prices"=>{"USD"=>"0.060"}}]}
         values = Ec2InstanceType::get_values(json, operating_system)
-        price = coerce_price(values[operating_system.to_s])
+        category = operating_system.to_s
+        # Someone at AWS is fat fingering the pricing data and putting the text "os" where there should be the actual operating system (e.g. "linux") - see http://a0.awsstatic.com/pricing/1/ec2/linux-od.min.js
+        category = "os" if values.has_key?("os")
+        price = coerce_price(values[category])
         os.set_price_per_hour(type_of_instance, nil, price)
       else
         json['valueColumns'].each do |val|

data/lib/amazon-pricing/version.rb

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

data/test/govcloud_test.rb

@@ -23,20 +23,20 @@ class TestGovCloud < Test::Unit::TestCase
   end
 
   def test_cc8xlarge_issue
-    obj = @@ec2_pricing.get_instance_type('us-gov-west-1', 'cc2.8xlarge')
-    assert obj.api_name == 'cc2.8xlarge'
+    obj = @@ec2_pricing.get_instance_type('us-gov-west-1', 'm3.large')
+    assert obj.api_name == 'm3.large'
   end
 
   def test_memory
     # Validate instance types in specific regions are available
     region = @@ec2_pricing.get_region('us-gov-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
 
   def test_virtual_cores
     region = @@ec2_pricing.get_region('us-gov-west-1')
-    instance = region.get_ec2_instance_type('m1.large')
+    instance = region.get_ec2_instance_type('m3.large')
     assert instance.virtual_cores == 2
   end
 
@@ -49,4 +49,14 @@ class TestGovCloud < Test::Unit::TestCase
     assert region.ebs_price.s3_snaps_per_gb == 0.125
   end
 
+  # Defect found in which ordering of price per hour and upfront get reversed
+  def test_ri_pricing
+    region = @@ec2_pricing.get_region('us-gov-west-1')
+    instance = region.get_ec2_instance_type('m3.large')
+    os = instance.get_operating_system(:linux)
+    assert os.ondemand_price_per_hour == 0.168
+    assert os.light_prepay_1_year == 300.0
+    assert os.light_price_per_hour_1_year == 0.167
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.33
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-16 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: -865750944682742325
+      hash: -1176722608496314632
 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: -865750944682742325
+      hash: -1176722608496314632
 requirements: []
 rubyforge_project: amazon-pricing
 rubygems_version: 1.8.25