amazon-pricing 0.1.69 → 0.1.70

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjM4OTQ2NjUzYzQ4N2RhN2I1YTk0Y2JmN2M2NDFhMWI0YzJjM2Y3MQ==
+    OWUyYTMwNDM1MGU5ZGM4MzM2MTYzZjZiZmI3ZjA2ZTYwZjkzMTU0Mg==
   data.tar.gz: !binary |-
-    Yzc3MWZhZTU5NTAxYTVmNWM3MjMwYjQ5ODlhNGEzNmYxN2RhZGMyNA==
+    NGE3OTFmYmMzNDU0MmRiNDA2ZTIxYjJiMGFhNzRjODRkZmRjYzNlYw==
 SHA512:
   metadata.gz: !binary |-
-    MmI2ZTY2NWJhZGIzNDI4Yjg4YWVhYWZjNDI4MWI2Mzc0ZWNmN2UxMWE0ZGZm
-    NjA2OWI0Njk5ZDAwMDAyZTRlMjBlMjZjZDc1ODBlYzlhNWUyMTcxNWEzOTQx
-    YjVmNmVlODI0MzllY2I1YTA3YjlmYmQ4MTBhZTNlZGQ0Njk2OTQ=
+    M2ZiMTM1NTZjNGNhZWNkNGE4MWVmZGYxN2IzYTg4ZmU4NDVhYzM4ODVjMDQw
+    ZWU2OGI1ZTRmNDY1YWRmNzRkZDMzY2Q3MDE0MTJjZGE4YWE3NjYwZWZlNTlh
+    YTAwOWQzMDQ0NDM1NTgyY2NjMDIzYzI0NzIwNWEwNDgwZmE5MWI=
   data.tar.gz: !binary |-
-    ODdkMjI1MmVlY2JkM2Y3YWEyZWM5ZTRlM2ZjODJjNzllYjI3M2QxZDFlM2Ew
-    NDAwNDlhNzg0ODY5MmFlZTU3MDc4MmIxNWYzMTA1MzNlNWM1MGE1Yjc1OTQ4
-    OGU0NmU1Y2YzNmZkMTA1ZWNkZDU5YmJjYjI5YzY0YjNiYzNkZTM=
+    NWUxZTRlNDczNTVmMTE1NWEyNjIyNjU0ODhiY2JjMzIwN2E2ZTcyNWFjOGRk
+    YTJmZGY0ZjU4ZWQ1MzI2OTZkMDYwOTIwOTlhYzdmOGU1ZTBiMzMwYzRlNmY4
+    Njg5ZjNlZDA1ZTU2ODZiZWM1MzNmNTllNDE3NTJkYzUxZjQ3ZmY=

data/Gemfile.lock

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

data/lib/amazon-pricing/common/ec2_common.rb

@@ -63,10 +63,10 @@ module AwsPricing
               prices = option["valueColumns"]
               upfront = prices.select{|i| i["name"] == "upfront"}.first
               price = upfront["prices"]["USD"]
-              instance_type.update_pricing_new(operating_system, reservation_type, price.to_f, duration, true) unless reservation_type == :noupfront || price == "N/A"
+              instance_type.update_pricing_new(operating_system, reservation_type, price, duration, true) unless reservation_type == :noupfront || price == "N/A"
               hourly = prices.select{|i| i["name"] == "monthlyStar"}.first
               price = hourly["prices"]["USD"]
-              instance_type.update_pricing_new(operating_system, reservation_type, price.to_f * 12 / 365 / 24, duration, false) unless reservation_type == :allupfront || price == "N/A"
+              instance_type.update_pricing_new(operating_system, reservation_type, price, duration, false) unless reservation_type == :allupfront || price == "N/A"
             end
           end
 

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

@@ -28,15 +28,17 @@ module AwsPricing
         @category_types[operating_system] = os
       end
 
+      p = coerce_price(price)
+
       if type_of_instance == :ondemand
-        os.set_price_per_hour(type_of_instance, nil, price)
+        os.set_price_per_hour(type_of_instance, nil, p)
       else
         years = :year1 if term == "yrTerm1"
         years = :year3 if term == "yrTerm3"
         if is_prepay
-          os.set_prepay(type_of_instance, years, price)
+          os.set_prepay(type_of_instance, years, p)
         else
-          os.set_price_per_hour(type_of_instance, years, price)
+          os.set_price_per_hour(type_of_instance, years, p * 12 / 365 / 24)
         end
       end
     end

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

@@ -110,7 +110,7 @@ module AwsPricing
       }
       years = terms_to_years[term]
       prices.each do |price|
-        p = price['prices']['USD']
+        p = coerce_price(price['prices']['USD'])
         case price['name']
           when 'upfront'
             db.set_prepay(type_of_instance, years, p.to_f) unless type_of_instance == :noupfront || p == "N/A"

data/lib/amazon-pricing/ec2-price-list.rb

@@ -14,10 +14,11 @@ module AwsPricing
     protected
 
     @@OS_TYPES = [:linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb]
+    @@NEW_OS_TYPES = [:mswinSQLEnterprise]
     @@LEGACY_RES_TYPES = [:light, :medium, :heavy]
 
     def get_ec2_on_demand_instance_pricing
-      @@OS_TYPES.each do |os|
+      (@@OS_TYPES + @@NEW_OS_TYPES).each do |os|
         fetch_ec2_instance_pricing(EC2_BASE_URL + "#{os}-od.min.js", :ondemand, os)
       end
       # Rinse & repeat for legacy instances
@@ -43,7 +44,7 @@ module AwsPricing
 
     def get_ec2_reserved_instance_pricing
       # I give up on finding a pattern so just iterating over known URLs
-      page_targets = {"linux-unix" => :linux, "red-hat-enterprise-linux" => :rhel, "suse-linux" => :sles, "windows" => :mswin, "windows-with-sql-server-standard" => :mswinSQL, "windows-with-sql-server-web" => :mswinSQLWeb}
+      page_targets = {"linux-unix" => :linux, "red-hat-enterprise-linux" => :rhel, "suse-linux" => :sles, "windows" => :mswin, "windows-with-sql-server-standard" => :mswinSQL, "windows-with-sql-server-web" => :mswinSQLWeb, "windows-with-sql-server-enterprise" => :mswinSQLEnterprise}
       page_targets.each_pair do |target, operating_system|
         url = "#{EC2_BASE_URL}ri-v2/#{target}-shared.min.js"
         fetch_ec2_instance_pricing_ri_v2(url, operating_system)

data/lib/amazon-pricing/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.69
+  version: 0.1.70
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email: