amazon-pricing 0.1.101 → 0.1.102

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTU2NDFjMzQyMmJiYWM1ODQ4ZDUyMTY3ODg2MTJiZWNhNmI4ZmM3ZA==
+    NDk2YzFkNTk1M2Y3MDMwNTI5NzIzYmIxMTBhYmU1YjliMTA5Y2IzNg==
   data.tar.gz: !binary |-
-    OWNjODFmZGViN2Q5NjMwYjk3OGE3MWZmZDA4NDk3ZDJlZTJmODZjZA==
+    MDkyYWZlOWQ1NDVhOTE4ZWY3ZTdjNWI2NDA5OTc4NDQ3MmZhZDZmYg==
 SHA512:
   metadata.gz: !binary |-
-    YTc2ODc0OTgyY2UyYjlkYjg1OWYyNDZmOTZmYjRjMmEzOGQwOWVmNjRmYWU4
-    NWQ0M2U5NWY5NmZmZTRiNDY0ODYzMWE1OGVhMzJhMDdjY2U1YmY0ZGMwNGYx
-    Mjk1NmE5MGI3YTg4ODZlNjQ4N2FjZTI4ODgxZTVjMzI1NTdlOWU=
+    MjNlMTI3ZWI1YzgzMDk4OTIyOTQyMGMyOWNkN2YxNjY3MGNlM2MxODg3ZTVi
+    MWRlNWIxODM4NDM2NmQyMmJiMDJhMzA2OGVhMzlkYTBlMzU2YWExM2VlYWE4
+    MGY4ZmY3MTE2OTRkMmFiMjcxMzI2MTM2ZDg5ODNlMGJjNGZiMDQ=
   data.tar.gz: !binary |-
-    MWFjZTE0ZTY4Mzk5NGY3YmY5MDJiODYwZDNjMjM2NjA0ODllZDA4YmZjZWVj
-    ZjY1N2EyOTRkN2MyY2NjNjhhZTQ5YTlmN2MzM2JkZDFmODE4Yjg0NGRiYWQ4
-    NjkzYzk5NjliZTBhOTI2NGFjNWY3YWI3YzE0MTEzYzgyOGQzNDE=
+    MDRiZTZiN2M2MWEyNTdjMzIzMzlmZGI0YzE4NTc3MWM4ZmQxMGQ5MmFmMjcz
+    NTM2ODdkNmY2N2NjNjIxNTllYTQ4N2M4OWY1ZjkzYjVlYzMyYzY2NjczNjMx
+    ZDg4Mjk2MmNjNjAxZDhiNjQ2ZDhhYjlmODVjZWMyODdjNDI3OWU=

data/lib/amazon-pricing/definitions/category-type.rb

@@ -16,9 +16,13 @@ module AwsPricing
       :light_prepay_1_year, :light_prepay_3_year, :medium_prepay_1_year, :medium_prepay_3_year, :heavy_prepay_1_year, :heavy_prepay_3_year,
       :allupfront_prepay_1_year, :allupfront_prepay_3_year,
       :partialupfront_price_per_hour_1_year, :partialupfront_prepay_1_year, :partialupfront_price_per_hour_3_year, :partialupfront_prepay_3_year,
-      :noupfront_price_per_hour_1_year, :noupfront_price_per_hour_3_year, :convertible_allupfront_prepay_3_year,
-      :convertible_partialupfront_price_per_hour_3_year, :convertible_partialupfront_prepay_3_year,
-      :convertible_noupfront_price_per_hour_3_year
+      :noupfront_price_per_hour_1_year, :noupfront_price_per_hour_3_year,
+      :convertible_allupfront_prepay_3_year,
+        :convertible_partialupfront_price_per_hour_3_year, :convertible_partialupfront_prepay_3_year,
+        :convertible_noupfront_price_per_hour_3_year,
+      :convertible_allupfront_prepay_1_year,
+        :convertible_partialupfront_price_per_hour_1_year, :convertible_partialupfront_prepay_1_year,
+        :convertible_noupfront_price_per_hour_1_year
 
     def allupfront_effective_rate_1_year
       (allupfront_prepay_1_year / 365 / 24).round(4)
@@ -78,6 +82,8 @@ module AwsPricing
       when :allupfront
         if term == :year1
           @allupfront_prepay_1_year
+        elsif term == :year1_convertible
+          @convertible_allupfront_prepay_1_year
         elsif term == :year3
           @allupfront_prepay_3_year
         elsif term == :year3_convertible
@@ -86,6 +92,8 @@ module AwsPricing
       when :partialupfront
         if term == :year1
           @partialupfront_prepay_1_year
+        elsif term == :year1_convertible
+          @convertible_partialupfront_prepay_1_year
         elsif term == :year3
           @partialupfront_prepay_3_year
         elsif term == :year3_convertible
@@ -119,6 +127,8 @@ module AwsPricing
       when :allupfront
         if term == :year1
           @allupfront_prepay_1_year = price
+        elsif term == :year1_convertible
+          @convertible_allupfront_prepay_1_year = price
         elsif term == :year3
           @allupfront_prepay_3_year = price
         elsif term == :year3_convertible
@@ -127,6 +137,8 @@ module AwsPricing
       when :partialupfront
         if term == :year1
           @partialupfront_prepay_1_year = price
+        elsif term == :year1_convertible
+          @convertible_partialupfront_prepay_1_year = price
         elsif term == :year3
           @partialupfront_prepay_3_year = price
         elsif term == :year3_convertible
@@ -164,6 +176,8 @@ module AwsPricing
       when :partialupfront
         if term == :year1
           @partialupfront_price_per_hour_1_year
+        elsif term == :year1_convertible
+          @convertible_partialupfront_price_per_hour_1_year
         elsif term == :year3
           @partialupfront_price_per_hour_3_year
         elsif term == :year3_convertible
@@ -172,6 +186,8 @@ module AwsPricing
       when :noupfront
         if term == :year1
           @noupfront_price_per_hour_1_year
+        elsif term == :year1_convertible
+          @convertible_noupfront_price_per_hour_1_year
         elsif term == :year3
           @noupfront_price_per_hour_3_year
         elsif term == :year3_convertible
@@ -209,6 +225,8 @@ module AwsPricing
       when :partialupfront
         if term == :year1
           @partialupfront_price_per_hour_1_year = price_per_hour
+        elsif term == :year1_convertible
+          @convertible_partialupfront_price_per_hour_1_year = price_per_hour
         elsif term == :year3
           @partialupfront_price_per_hour_3_year = price_per_hour
         elsif term == :year3_convertible
@@ -217,6 +235,8 @@ module AwsPricing
       when :noupfront
         if term == :year1
           @noupfront_price_per_hour_1_year = price_per_hour
+        elsif term == :year1_convertible
+          @convertible_noupfront_price_per_hour_1_year = price_per_hour
         elsif term == :year3
           @noupfront_price_per_hour_3_year = price_per_hour
         elsif term == :year3_convertible

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

@@ -36,6 +36,8 @@ module AwsPricing
         case term
           when "yrTerm1", "yrTerm1Standard"
             years = :year1
+          when "yrTerm1Convertible"
+            years = :year1_convertible
           when "yrTerm3", "yrTerm3Standard"
             years = :year3
           when "yrTerm3Convertible"

data/lib/amazon-pricing/version.rb

@@ -8,5 +8,5 @@
 # Home::      http://github.com/CloudHealth/amazon-pricing
 #++
 module AwsPricing
-VERSION = '0.1.101' # [major,minor.fix]: c5 instance type returned
+VERSION = '0.1.102' # [major,minor.fix]: adding convertible 1year prices
 end

metadata

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