RubyGems - amazon-pricing - Versions diffs - 0.1.43 → 0.1.44 - Mend

amazon-pricing 0.1.43 → 0.1.44

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +8 -8
data/lib/amazon-pricing/version.rb +1 -1
data/lib/aws-price-list.rb +0 -126
data/lib/gov-cloud-price-list.rb +129 -1
data/lib/rds-price-list.rb +10 -9
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWRkNGE0ZDA5YzQzNWFiNjRjMTVmZWZlYTE2MTg0YWIwNTk4MTNiNQ==
+    ZmVmZGI2MDkyMzAzZDUwMmYzMzc0NmE2ZjkxY2JmNjdjNTlkYzg5Yw==
   data.tar.gz: !binary |-
-    MWI3OTJkNzY3MDE1NTIzNTZhZjM3NGI2MzUxNjY1ZTg5YWYxOGFkYg==
+    YzZiZDJhNDc3ZWIxZWU4ZWQyYjAyM2RmMWQ3OGFmYTAyNTA1NDIyNQ==
 SHA512:
   metadata.gz: !binary |-
-    NTU2MzA2NWJlNGQxNjEzMmYwODU2YzlmNjQ3YzA4ODIwYzkwZDE0MTQyNGVh
-    NTAyZmM3MDllYzQxMzYyMjBhN2ZkMzI1ZjNlOGYxNTgxMDk5ZDUzNjkzY2Yy
-    Y2MyNjhjN2IyNDkwNWZlNzZiNTQxZTA0ZTVkODBhODg4YmI5NmM=
+    MzQ4YWM0NWM1MjRlMGFjNjFkNTc0ZjFjZWExMjJjYjgzYTJlMDMwM2Y0ZDkw
+    MTU1MGQ3MDMyNjI3NDk5YzM3ZjNkOWJjNzdhYTJkY2I3YTk5ODZjODRiMjIz
+    YzI1ZDYwMDk2M2M3ZDQ4ODg2NjdjN2VlZTZmNjQ1MzIxYTlmMTQ=
   data.tar.gz: !binary |-
-    MzQ3YjZhNWE3ZWU3MjVmZTdiYmI4ODA2Y2VmZjllNWQwOWJjODc0YjRjOGEy
-    N2Y5N2MwMDYzM2M3MDIzODg1ZGE4OGY1MzUzYjhiMDcyZDFiM2JhYmMzNDlm
-    NjA4YWQ1YTM5ZjdkMTc1MmVjNmRjYjJmODRlMTA1MWM4YTQ4M2Y=
+    ZGJlZGM0NzdiMDY5Yjg1MjllN2M5NmY3OTQzZjE2ZTE3NWEyNjBiNDUyY2M5
+    OGJhOTcxOWM4MzcwMzc2MzA4Mzc5ZWQ1ZjE3OGIyOTRiM2UyNDQ2MjkzMjky
+    MDJkMDY4MTA0NzFhOGFmYzViNjJiZTFmOTEzZjNmNmE5MzllOGM=

data/lib/amazon-pricing/version.rb CHANGED Viewed

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

data/lib/aws-price-list.rb CHANGED Viewed

@@ -98,130 +98,4 @@ module AwsPricing
   end
-  class GovCloudEc2PriceList < PriceList
-    GOV_CLOUD_URL = "http://aws.amazon.com/govcloud-us/pricing/ec2/"
-    GOV_CLOUD_EBS_URL = "http://aws.amazon.com/govcloud-us/pricing/ebs/"
-    def initialize
-      @_regions = {}
-      @_regions["us-gov-west-1"] = Region.new("us-gov-west-1")
-      InstanceType.populate_lookups
-      get_ec2_instance_pricing
-      fetch_ec2_ebs_pricing
-    end
-    protected
-    def get_ec2_instance_pricing
-      client = Mechanize.new
-      page = client.get(GOV_CLOUD_URL)
-      tables = page.search("//div[@class='aws-table section']")
-      create_ondemand_instances(get_rows(tables[0]))
-      create_ondemand_instances(get_rows(tables[1]))
-      for i in 2..7
-        create_reserved_instances(get_rows(tables[i]), :light)
-      end
-      for i in 8..13
-        create_reserved_instances(get_rows(tables[i]), :medium)
-      end
-      for i in 14..19
-        create_reserved_instances(get_rows(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)
-      header = rows[0]
-      @_regions.values.each do |region|
-        rows.slice(1, rows.size).each do |row|
-          api_name = row[0]
-          instance_type = region.get_ec2_instance_type(api_name)
-          if instance_type.nil?
-            api_name, name = Ec2InstanceType.get_name(nil, row[0], false)
-            instance_type = region.add_or_update_ec2_instance_type(api_name, name)
-          end
-          instance_type.update_pricing2(get_os(header[1]), :ondemand, row[1])
-          instance_type.update_pricing2(get_os(header[2]), :ondemand, row[2])
-          instance_type.update_pricing2(get_os(header[3]), :ondemand, row[3])
-        end
-      end
-    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])
-      @_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)
-            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])
-        end
-      end
-    end
-    def fetch_ec2_ebs_pricing
-      client = Mechanize.new
-      page = client.get(GOV_CLOUD_EBS_URL)
-      ebs_costs = page.search("//div[@class='text section']//li")
-      @_regions.values.each do |region|
-        region.ebs_price = EbsPrice.new(region)
-        region.ebs_price.preferred_per_gb = get_ebs_price(ebs_costs[1])
-        region.ebs_price.preferred_per_iops = get_ebs_price(ebs_costs[2])
-        region.ebs_price.standard_per_gb = get_ebs_price(ebs_costs[3])
-        region.ebs_price.standard_per_million_io = get_ebs_price(ebs_costs[4])
-        region.ebs_price.ssd_per_gb = nil
-        region.ebs_price.s3_snaps_per_gb = get_ebs_price(ebs_costs[5])
-      end
-    end
-    # e.g. $0.065 per GB-Month of provisioned storage
-    def get_ebs_price(xml_element)
-      tokens = xml_element.text.split(" ")
-      tokens[0].gsub("$", "").to_f
-    end
-    def get_os(val)
-      case val
-      when "Amazon Linux"
-        :linux
-      when "RHEL"
-        :rhel
-      when "SLES"
-        :sles
-      when "Windows"
-        :mswin
-      when "Windows SQL Server Web", "Windows SQL Server Web Edition"
-        :mswinSQL
-      when "Windows SQL Server Standard", "Windows SQL Server Standard Edition"
-        :mswinSQLWeb
-      else
-        raise "Unable to identify operating system '#{val}'"
-      end
-    end
-    def get_rows(html_table)
-      rows = []
-      html_table.search(".//tr").each do |tr|
-        row = []
-        tr.search(".//td").each do |td|
-         row << td.inner_text.strip.sub("\n", " ").sub("  ", " ")
-        end
-        next if row.size == 1
-        rows << row unless row.empty?
-      end
-      rows
-    end
-  end
 end

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

@@ -1,4 +1,132 @@
 module AwsPricing
+  class GovCloudEc2PriceList < PriceList
+    GOV_CLOUD_URL = "http://aws.amazon.com/govcloud-us/pricing/ec2/"
+    GOV_CLOUD_EBS_URL = "http://aws.amazon.com/govcloud-us/pricing/ebs/"
+    def initialize
+      @_regions = {}
+      @_regions["us-gov-west-1"] = Region.new("us-gov-west-1")
+      InstanceType.populate_lookups
+      get_ec2_instance_pricing
+      fetch_ec2_ebs_pricing
+    end
+    protected
+    def get_ec2_instance_pricing
+      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 2..7
+        create_reserved_instances(get_rows(tables[i]), :light)
+      end
+      for i in 8..13
+        create_reserved_instances(get_rows(tables[i]), :medium)
+      end
+      for i in 14..19
+        create_reserved_instances(get_rows(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)
+      header = rows[0]
+      @_regions.values.each do |region|
+        rows.slice(1, rows.size).each do |row|
+          api_name = row[0]
+          instance_type = region.get_ec2_instance_type(api_name)
+          if instance_type.nil?
+            api_name, name = Ec2InstanceType.get_name(nil, row[0], false)
+            instance_type = region.add_or_update_ec2_instance_type(api_name, name)
+          end
+          instance_type.update_pricing2(get_os(header[1]), :ondemand, row[1])
+          instance_type.update_pricing2(get_os(header[2]), :ondemand, row[2])
+          instance_type.update_pricing2(get_os(header[3]), :ondemand, row[3])
+        end
+      end
+    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])
+      @_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)
+            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])
+        end
+      end
+    end
+    def fetch_ec2_ebs_pricing
+      client = Mechanize.new
+      page = client.get(GOV_CLOUD_EBS_URL)
+      ebs_costs = page.search("//div[@class='text-box section']//li")
+      @_regions.values.each do |region|
+        region.ebs_price = EbsPrice.new(region)
+        region.ebs_price.preferred_per_gb = get_ebs_price(ebs_costs[1])
+        region.ebs_price.preferred_per_iops = get_ebs_price(ebs_costs[2])
+        region.ebs_price.standard_per_gb = get_ebs_price(ebs_costs[3])
+        region.ebs_price.standard_per_million_io = get_ebs_price(ebs_costs[4])
+        region.ebs_price.ssd_per_gb = nil
+        region.ebs_price.s3_snaps_per_gb = get_ebs_price(ebs_costs[5])
+      end
+    end
+    # e.g. $0.065 per GB-Month of provisioned storage
+    def get_ebs_price(xml_element)
+      tokens = xml_element.text.split(" ")
+      tokens[0].gsub("$", "").to_f
+    end
+    def get_os(val)
+      case val
+      when "Amazon Linux"
+        :linux
+      when "RHEL"
+        :rhel
+      when "SLES"
+        :sles
+      when "Windows"
+        :mswin
+      when "Windows SQL Server Web", "Windows SQL Server Web Edition"
+        :mswinSQL
+      when "Windows SQL Server Standard", "Windows SQL Server Standard Edition"
+        :mswinSQLWeb
+      else
+        raise "Unable to identify operating system '#{val}'"
+      end
+    end
+    def get_rows(html_table)
+      rows = []
+      html_table.search(".//tr").each do |tr|
+        row = []
+        tr.search(".//td").each do |td|
+         row << td.inner_text.strip.sub("\n", " ").sub("  ", " ")
+        end
+        next if row.size == 1
+        rows << row unless row.empty?
+      end
+      rows
+    end
+  end
   class GovCloudRdsPriceList < PriceList
     GOV_CLOUD_URL = "http://aws.amazon.com/govcloud-us/pricing/rds/"
@@ -17,7 +145,7 @@ module AwsPricing
       client = Mechanize.new
       page = client.get(GOV_CLOUD_URL)
-      tables = page.search("//div[@class='aws-table section']")
+      tables = page.search("//div[@class='aws-table ']")
       # Mysql
       create_ondemand_instances(:mysql, :ondemand, false, false, get_rows(tables[0]))

data/lib/rds-price-list.rb CHANGED Viewed

@@ -28,7 +28,7 @@ module AwsPricing
     def is_multi_az?(type)
-      return true if type.match("multiAZ")
+      return true if type.upcase.match("MULTI-AZ")
       false
     end
@@ -44,11 +44,12 @@ module AwsPricing
             #
             # to find out the byol type
             is_byol = is_byol? dp_type
+            is_multi_az = dp_type.upcase.include?("MULTIAZ")
             if [:mysql, :postgresql, :oracle].include? db
-              fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{dp_type}-deployments.min.js",:ondemand, db_type, is_byol)
+              fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{dp_type}-deployments.min.js",:ondemand, db_type, is_byol, is_multi_az)
             elsif db == :sqlserver
-              fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/sqlserver-#{dp_type}-ondemand.min.js",:ondemand, db_type, is_byol)
+              fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/sqlserver-#{dp_type}-ondemand.min.js",:ondemand, db_type, is_byol, is_multi_az)
             end
           end
         }
@@ -82,7 +83,7 @@ module AwsPricing
       end
     end
-    def fetch_on_demand_rds_instance_pricing(url, type_of_rds_instance, db_type, is_byol)
+    def fetch_on_demand_rds_instance_pricing(url, type_of_rds_instance, db_type, is_byol, is_multi_az = false)
       res = PriceList.fetch_url(url)
       res['config']['regions'].each do |reg|
         region_name = reg['region']
@@ -92,11 +93,11 @@ module AwsPricing
             begin
               #
               # this is special case URL, it is oracle - multiAZ type of deployment but it doesn't have mutliAZ attributes in json.
-              if url == "http://aws.amazon.com/rds/pricing/oracle/pricing-li-multiAZ-deployments.min.js"
-                is_multi_az = true
-              else
-                is_multi_az = is_multi_az? type["name"]
-              end
+              #if url == "http://aws.amazon.com/rds/pricing/oracle/pricing-li-multiAZ-deployments.min.js"
+              #  is_multi_az = true
+              #else
+              #  is_multi_az = is_multi_az? type["name"]
+              #end
               api_name, name = RdsInstanceType.get_name(type["name"], tier["name"], type_of_rds_instance != :ondemand)
               instance_type = region.add_or_update_rds_instance_type(api_name, name)

metadata CHANGED Viewed

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