amazon-pricing 0.1.113 → 0.1.114

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTNiNjUyMTA0ZDNkZTkyYTI1MDIwN2YyMTA3MjYxZDI2ZTE1M2Q4OQ==
+    ZWMxNzhmMDVmOTkyYmU5MDc4NWE0Y2FhZTc4OTRiYWIyOWNlODk4YQ==
   data.tar.gz: !binary |-
-    Y2MzMTI5ZjNlNDEzYzVmZGNjNGRjMGM0YWU2ZjMyMzk4YzE3YzBlMQ==
+    MmY0YWMzYjkzMTM0M2NhMzRkYzJkZGMyMDU0NTlmNzcyZTAwZjMyOA==
 SHA512:
   metadata.gz: !binary |-
-    ZTI4NjkxODdhNmQxYTJkNDcxMTBiNDU3ZGM3NGYzOGU2OGY4OGNjNDdlNzcw
-    YzEwZTE4NDhhMWIzYWEzOWQwYjg5NTk2NWQ1ZDlkODQ0ZGVjNzUxYTA3YjJm
-    ZGYxYzk3ZGFhZTk2OWMzNTZmMjZmMTlkMzQwYWEyNmM0YTUxZjI=
+    ZGJjYTQ2Y2YzM2NmNWRlNzJiZDliMjQwMWQ2ZjNhZWY3NjRhYTMzYjQwYTg1
+    MTlhMjM2OTk5ZmI4N2IxYjczM2I4YWFlN2NlZjllODZjMzM3ZDdjMDY5MmY1
+    NWYyOGU4MTEyMDgyOTkwZmRmNjNlODEwM2EyZjU3MTg1MjkyOWQ=
   data.tar.gz: !binary |-
-    YTRlOGM1NmJjNTk4MzJmYzc5OTBmYzYzZDc3ODI5YTc0NjUxNDk2NmIyMzA5
-    N2FmNjRhOTE1ZWIwODExNzc3NThiMjVmMDhmNWMwN2QwOGVkOTZkYTdlMDM5
-    MTAzYjFiNDRmNDg4Y2IzNmZjYjA3NDRkYzBkMTc1N2EyMDA5NTM=
+    N2Y1YjQ0NzRiODhlOTE2ZTRhN2QxNjhkMDBjYmYwM2M3MDQ3MGU2NzQ5MTUy
+    OTcxNTRhMTYwNWVkNDU5Y2VlYWYxZjMxNzJjZjk4MTkyN2JlM2ZlZDg3M2M0
+    YmI2NzE2MzY3MmJmMjZjMWU0MTRmMDc0MDRlYjYyNmQ5MmU4NTQ=

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

@@ -13,16 +13,21 @@ module AwsPricing
 
     protected
 
+    # the following were verified that the URL actually works:
+    # - note that mswinSQLEnterprise is not like the others (and linuxSQL* didn't work in NEW_OS_TYPES)
+    # - for new OS supported (like linuxSQL*), pay attention to #get_ec2_legacy_reserved_instance_pricing
+    #   to verify that pricing is available for previousGen instance types.
     @@OS_TYPES = [:linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb]
-    @@NEW_OS_TYPES = [:mswinSQLEnterprise, :linuxSQL, :linuxSQLWeb, :linuxSQLEnterprise]
+    @@NEW_OS_TYPES = [:mswinSQLEnterprise]
+    @@LINUXSQL_OS_TYPES = [:linuxSQL, :linuxSQLWeb, :linuxSQLEnterprise]
     @@LEGACY_RES_TYPES = [:light, :medium, :heavy]
 
     def get_ec2_on_demand_instance_pricing
-      (@@OS_TYPES + @@NEW_OS_TYPES).each do |os|
+      (@@OS_TYPES + @@NEW_OS_TYPES + @@LINUXSQL_OS_TYPES).each do |os|
         fetch_ec2_instance_pricing(EC2_BASE_URL + "#{os}-od.min.js", :ondemand, os)
       end
       # Rinse & repeat for legacy instances
-      @@OS_TYPES.each do |os|
+      (@@OS_TYPES + @@LINUXSQL_OS_TYPES).each do |os|
         fetch_ec2_instance_pricing(EC2_BASE_URL + "previous-generation/#{os}-od.min.js", :ondemand, os)
       end
     end
@@ -54,7 +59,10 @@ module AwsPricing
       end
 
       # 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, 
+        "linux-with-sql-server-standard" => :linuxSQL, "linux-with-sql-server-web" => :linuxSQLWeb, "linux-with-sql-server-enterprise" => :linuxSQLEnterprise,
+      }
       page_targets.each_pair do |target, operating_system|
         url = "#{EC2_BASE_URL}previous-generation/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.113' # [major,minor.fix]: adding m5d
+VERSION = '0.1.114' # [major,minor.fix]: adding linuxSQL* previousGen
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.113
+  version: 0.1.114
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email: