amazon-pricing 0.1.25 → 0.1.26

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    amazon-pricing (0.1.25)
+    amazon-pricing (0.1.26)
 
 GEM
   remote: https://rubygems.org/
@@ -19,7 +19,6 @@ GEM
     test-unit (2.5.5)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES

data/lib/amazon-pricing.rb

@@ -74,8 +74,9 @@ module AwsPricing
       region
     end
 
-    EC2_BASE_URL = "http://aws-assets-pricing-prod.s3.amazonaws.com/pricing/ec2/"
-    RDS_BASE_URL = "http://aws-assets-pricing-prod.s3.amazonaws.com/pricing/rds/"
+    EC2_BASE_URL = "http://a0.awsstatic.com/pricing/1/ec2/"
+    EBS_BASE_URL = "http://a0.awsstatic.com/pricing/1/ebs/"
+    RDS_BASE_URL = "http://a0.awsstatic.com/pricing/1/rds/"
 
     # Lookup allows us to map to AWS API region names
     @@Region_Lookup = {
@@ -109,14 +110,14 @@ module AwsPricing
 
     def get_ec2_on_demand_instance_pricing
       @@OS_TYPES.each do |os|
-        fetch_ec2_instance_pricing(EC2_BASE_URL + "#{os}-od.js", :ondemand, os)
+        fetch_ec2_instance_pricing(EC2_BASE_URL + "#{os}-od.min.js", :ondemand, os)
       end
     end
 
     def get_ec2_reserved_instance_pricing
       @@OS_TYPES.each do |os|
         @@RES_TYPES.each do |res_type|
-          fetch_ec2_instance_pricing(EC2_BASE_URL + "#{os}-ri-#{res_type}.js", res_type, os)
+          fetch_ec2_instance_pricing(EC2_BASE_URL + "#{os}-ri-#{res_type}.min.js", res_type, os)
         end
       end
     end
@@ -148,7 +149,7 @@ module AwsPricing
     end
 
     def fetch_ec2_ebs_pricing
-      res = PriceList.fetch_url(EC2_BASE_URL + "pricing-ebs.js")
+      res = PriceList.fetch_url(EBS_BASE_URL + "pricing-ebs.min.js")
       res["config"]["regions"].each do |ebs_types|
         region = get_region(ebs_types["region"])
         region.ebs_price = EbsPrice.new(region, ebs_types)
@@ -204,9 +205,9 @@ module AwsPricing
             is_byol = is_byol? dp_type
 
             if [:mysql, :postgresql, :oracle].include? db
-              fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{dp_type}-deployments.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)
             elsif db == :sqlserver
-              fetch_on_demand_rds_instance_pricing(RDS_BASE_URL+"#{db}/sqlserver-#{dp_type}-ondemand.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)
             end
           end
         }
@@ -218,9 +219,9 @@ module AwsPricing
         if [:mysql, :postgresql].include? db
           @@RES_TYPES.each do |res_type|
             if db == :postgresql and res_type == :heavy
-              fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{res_type}-utilization-reserved-instances.js", res_type, db, false)
+              fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{res_type}-utilization-reserved-instances.min.js", res_type, db, false)
             elsif db == :mysql
-              fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{res_type}-utilization-reserved-instances.js", res_type, db, false)
+              fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{res_type}-utilization-reserved-instances.min.js", res_type, db, false)
             end            
           end
         else
@@ -229,9 +230,9 @@ module AwsPricing
               db_instance.each do |dp_type|
                 is_byol = is_byol? dp_type
                 if db == :oracle
-                  fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{dp_type}-#{res_type}-utilization-reserved-instances.js", res_type, db_type, is_byol) 
+                  fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/pricing-#{dp_type}-#{res_type}-utilization-reserved-instances.min.js", res_type, db_type, is_byol) 
                 elsif db == :sqlserver
-                  fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/sqlserver-#{dp_type}-#{res_type}-ri.js", res_type, db_type, is_byol)
+                  fetch_reserved_rds_instance_pricing(RDS_BASE_URL+"#{db}/sqlserver-#{dp_type}-#{res_type}-ri.min.js", res_type, db_type, is_byol)
                 end
               end    
             end            
@@ -250,7 +251,7 @@ 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.js"
+              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"]

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

@@ -171,6 +171,8 @@ module AwsPricing
       'g2.2xlarge' => 'Cluster GPU Double Extra Large',
       'c3.large' => 'High-Compute Large', 'c3.xlarge' => 'High-Compute Extra Large', 'c3.2xlarge' => 'High-Compute Double Extra Large', 'c3.4xlarge' => 'High-Compute Quadruple Extra Large', 'c3.8xlarge' => 'High-Compute Eight Extra Large',
       'i2.xlarge' => 'High I/O Extra Large', 'i2.2xlarge' => 'High I/O Double Extra Large', 'i2.4xlarge' => 'High I/O Quadruple Extra Large', 'i2.8xlarge' => 'High I/O Eight Extra Large',
+      # Remove asterisk when this is released instance type
+      #'r3.large *' => 'Memory Optimized Large', 'r3.xlarge *' => 'Memory Optimized Extra Large', 'r3.2xlarge *' => 'Memory Optimized Double Extra Large', 'r3.4xlarge *' => 'Memory Optimized Quadruple Extra Large', 'r3.8xlarge *' => 'Memory Optimized Eight Extra Large',
     } 
     @@Disk_Lookup = {
       'm1.small' => 160, 'm1.medium' => 410, 'm1.large' =>850, 'm1.xlarge' => 1690,
@@ -189,6 +191,8 @@ module AwsPricing
       'db.t1.micro' => 160,
       'c3.large' => 32, 'c3.xlarge' => 80, 'c3.2xlarge' => 160, 'c3.4xlarge' => 320, 'c3.8xlarge' => 640, 
       'i2.large' => 360, 'i2.xlarge' => 720, 'i2.2xlarge' => 1440, 'i2.4xlarge' => 2880, 'i2.8xlarge' => 5760,
+      # Remove asterisk when this is released instance type
+      #'r3.large *' => 0, 'r3.xlarge *' => 0, 'r3.2xlarge *' => 0, 'r3.4xlarge *' => 0, 'r3.8xlarge *' => 0,
     }
     @@Platform_Lookup = {
       'm1.small' => 32, 'm1.medium' => 32, 'm1.large' => 64, 'm1.xlarge' => 64,
@@ -207,6 +211,8 @@ module AwsPricing
       'db.t1.micro' => 64,
       'c3.large' => 64, 'c3.xlarge' => 64, 'c3.2xlarge' => 64, 'c3.4xlarge' => 64, 'c3.8xlarge' => 64, 
       'i2.large' => 64, 'i2.xlarge' => 64, 'i2.2xlarge' => 64, 'i2.4xlarge' => 64, 'i2.8xlarge' => 64,
+      # Remove asterisk when this is released instance type
+      #'r3.large *' => 64, 'r3.xlarge *' => 64, 'r3.2xlarge *' => 64, 'r3.4xlarge *' => 64, 'r3.8xlarge *' => 64,
     }
     @@Disk_Type_Lookup = {
       'm1.small' => :ephemeral, 'm1.medium' => :ephemeral, 'm1.large' => :ephemeral, 'm1.xlarge' => :ephemeral,
@@ -226,6 +232,8 @@ module AwsPricing
       'db.t1.micro' => :ebs,
       'c3.large' => :ssd, 'c3.xlarge' => :ssd, 'c3.2xlarge' => :ssd, 'c3.4xlarge' => :ssd, 'c3.8xlarge' => :ssd, 
       'i2.large' => :ssd, 'i2.xlarge' => :ssd, 'i2.2xlarge' => :ssd, 'i2.4xlarge' => :ssd, 'i2.8xlarge' => :ssd,
+      # Remove asterisk when this is released instance type
+      #'r3.large *' => :ssd, 'r3.xlarge *' => :ssd, 'r3.2xlarge *' => :ssd, 'r3.4xlarge *' => :ssd, 'r3.8xlarge *' => :ssd,
     }
 
     # Due to fact AWS pricing API only reports these for EC2, we will fetch from EC2 and keep around for lookup

data/lib/amazon-pricing/version.rb

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

data/test/ec2_instance_types_test.rb

@@ -70,7 +70,7 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
     region = @@ec2_pricing.get_region('us-east')
     instance = region.get_ec2_instance_type('m1.large')
     bem = instance.get_breakeven_month(:linux, :heavy, :year1)
-    assert bem == 6
+    assert bem == 8
   end
 
   def test_memory
@@ -88,8 +88,8 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
 
   def test_ebs
     region = @@ec2_pricing.get_region('us-east')
-    assert region.ebs_price.standard_per_gb == 0.10
-    assert region.ebs_price.standard_per_million_io == 0.10
+    assert region.ebs_price.standard_per_gb == 0.05
+    assert region.ebs_price.standard_per_million_io == 0.05
     assert region.ebs_price.preferred_per_gb == 0.125
     assert region.ebs_price.preferred_per_iops == 0.10
     assert region.ebs_price.s3_snaps_per_gb == 0.095

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.25
-  prerelease:
+  version: 0.1.26
+  prerelease: 
 platform: ruby
 authors:
 - Joe Kinsella
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -47,39 +47,44 @@ files:
 homepage: http://github.com/CloudHealth/amazon-pricing
 licenses:
 - MIT
-post_install_message:
+post_install_message: 
 rdoc_options:
-- "--title"
+- --title
 - amazon-pricing documentation
-- "--line-numbers"
-- "--main"
+- --line-numbers
+- --main
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      version: !binary |-
-        MA==
-      hash: 2
-  none: false
+      hash: -1099421878339302140
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      version: !binary |-
-        MA==
-      hash: 2
-  none: false
+      hash: -1099421878339302140
 requirements: []
 rubyforge_project: amazon-pricing
-rubygems_version: 1.8.24
-signing_key:
+rubygems_version: 1.8.25
+signing_key: 
 specification_version: 3
 summary: Amazon Web Services Pricing Ruby gem
-test_files: []
+test_files:
+- spec/instance_type_spec.rb
+- spec/price_list_spec.rb
+- spec/rds_pricing_spec.rb
+- spec/spec_helper.rb
+- spec/support/.gitignore
+- test/ec2_instance_types_test.rb
+- test/helper.rb