amazon-pricing 0.1.45 → 0.1.46

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWEyNTk2NzExMjdlZTFlZmI4NDBmODEwOWI2OGI3OTcyZWNlOTExZg==
+    OGUyODcyODBiMTVhNGUxNTY5MDgwMzdjODkxNGMwOGFmNGY0ODA4OA==
   data.tar.gz: !binary |-
-    ZmIzYjBlMGU3ODI0OGM1MmI5MDRhZjY0Y2YzMzRiYjhjYzUzZjI2Mw==
+    YjRlZjY1YWQ3YzVmZDgyN2EwZDE5N2Q3ZGRmMmFkYzJlZDA1NTA2Mg==
 SHA512:
   metadata.gz: !binary |-
-    NGYxNGI4ZGNjMmM4NDUwN2U5YzFkMTg3MDZmZjM3OTYwNGI4NzRhYWZkY2Ix
-    NWY1Yjk1NGFmODYyZmFkNDg5YzExYjc2NjZlNDkxMTE4OTY4ODEyZWMzYzU5
-    ZTlmZTZkMWY5OTIwNGI2ZmIyZTBlNWNlNjhlZjQ0OTZiN2M4NmE=
+    ZWEyYjkwYmFhNDU5Y2I0ZjI5ZGVjZWMxODI4YTllYmZmNWQ4MjRhMmNiY2Q4
+    ZTdlYzM5YzkyZGIyMWE5OGNkMTcxN2QwNGQ2NWNiZmYyNDQ0ZTAwN2RkNjYw
+    MDIyZGJkYmQ0ZjU1NWQ2NDkyNzhmOTFiZjZiZDU3ZTExNjJjMzI=
   data.tar.gz: !binary |-
-    ZjcyYmUwNDczZTIzNThkZTZjOTgxYTdmY2VlZjZhOWJjOTNjNjlhZmNiMTMy
-    NDQ0MzJmOWVlNmNkNGQxYTQ5Y2U5OTM2ZjNjODAyYzI1MDM1NWUzYTY3ODE2
-    M2EwMmE5ZWE2NzQ4OWIzYjM2MWY2NDkxYjBlNTkwYzU0ZjczYTM=
+    MmE2ZTk3NzczODU1OTJjZmIxYmQ5NTYyNWEzNjEzNmE1MGRkY2I0MzZkOTNh
+    YTUxMTk4YzU1NjM0NGUzMWU2MTE2MGI3ZDQxYzVhN2ExODU2NTdkODQwMDIz
+    NjE3ZmM3NDkwYTY4ODMyYmQ0MGVjNjRkM2IyZjFlOTk1OTcwNmU=

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

@@ -52,7 +52,7 @@ module AwsPricing
       end
     end
 
-    def update_pricing2(operating_system, type_of_instance, ondemand_pph = nil, year1_prepay = nil, year3_prepay = nil, year1_pph = nil, year3_pph = nil)
+    def update_pricing2(operating_system, res_type, ondemand_pph = nil, year1_prepay = nil, year3_prepay = nil, year1_pph = nil, year3_pph = nil)
 
       os = get_category_type(operating_system)
       if os.nil?
@@ -60,11 +60,11 @@ module AwsPricing
         @category_types[operating_system] = os
       end
 
-      os.set_price_per_hour(type_of_instance, nil, coerce_price(ondemand_pph)) unless ondemand_pph.nil?
-      os.set_prepay(type_of_instance, :year1, coerce_price(year1_prepay)) unless year1_prepay.nil?
-      os.set_prepay(type_of_instance, :year3, coerce_price(year3_prepay)) unless year3_prepay.nil?
-      os.set_price_per_hour(type_of_instance, :year1, coerce_price(year1_pph)) unless year1_pph.nil?
-      os.set_price_per_hour(type_of_instance, :year3, coerce_price(year3_pph)) unless year3_pph.nil?
+      os.set_price_per_hour(res_type, nil, coerce_price(ondemand_pph)) unless ondemand_pph.nil?
+      os.set_prepay(res_type, :year1, coerce_price(year1_prepay)) unless year1_prepay.nil?
+      os.set_prepay(res_type, :year3, coerce_price(year3_prepay)) unless year3_prepay.nil?
+      os.set_price_per_hour(res_type, :year1, coerce_price(year1_pph)) unless year1_pph.nil?
+      os.set_price_per_hour(res_type, :year3, coerce_price(year3_pph)) unless year3_pph.nil?
     end
 
     # Maintained for backward compatibility reasons
@@ -88,5 +88,5 @@ module AwsPricing
       [api_name, name]
     end
 
-   end
+  end
 end

data/lib/amazon-pricing/version.rb

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

data/lib/gov-cloud-price-list.rb

@@ -19,23 +19,25 @@ module AwsPricing
       client = Mechanize.new
       page = client.get(GOV_CLOUD_URL)
       tables = page.search("//div[@class='aws-table ']")
-      create_ondemand_instances(get_rows(tables[0]))
-      create_ondemand_instances(get_rows(tables[1]))
+      for i in 0..3
+        create_ondemand_instances(tables[i])
+      end
       
-      for i in 2..7
-        create_reserved_instances(get_rows(tables[i]), :light)
+      for i in 4..9
+        create_reserved_instances(tables[i], :light)
       end
-      for i in 8..13
-        create_reserved_instances(get_rows(tables[i]), :medium)
+      for i in 9..22
+        create_reserved_instances(tables[i], :medium)
       end
-      for i in 14..19
-        create_reserved_instances(get_rows(tables[i]), :heavy)
+      for i in 23..33
+        create_reserved_instances(tables[i], :heavy)
       end
 
     end
 
     # e.g. [["Prices / Hour", "Amazon Linux", "RHEL", "SLES"], ["m1.small", "$0.053", "$0.083", "$0.083"]]
-    def create_ondemand_instances(rows)
+    def create_ondemand_instances(table)
+      rows = get_rows(table)
       header = rows[0]
       @_regions.values.each do |region|
 
@@ -54,16 +56,17 @@ module AwsPricing
     end
 
     # e.g. [["RHEL", "1 yr Term Upfront", "1 yr TermHourly", "3 yr TermUpfront", "3 yr Term Hourly"], ["m1.small", "$68.00", "$0.099", "$105.00", "$0.098"]]
-    def create_reserved_instances(rows, res_type)
-      header = rows[0]
-      operating_system = get_os(header[0])
+    def create_reserved_instances(table, res_type)
+      rows = get_rows(table)
+      operating_system = get_os(table.search(".//td/p").last.inner_text.strip)  # Wow...
+
       @_regions.values.each do |region|
 
         rows.slice(1, rows.size).each do |row|
           api_name = row[0]
           instance_type = region.get_instance_type(api_name)
           if instance_type.nil?
-            api_name, name = Ec2InstanceType.get_name(nil, row[0], true)
+            api_name, name = Ec2InstanceType.get_name(nil, api_name, 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[3], row[2], row[4])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.45
+  version: 0.1.46
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email: