amazon-pricing 0.1.52 → 0.1.53

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjhmYmJjYTBkNmVmYzk3NWUwM2FhZTk4ZTFhZGQ4MjM5NTg1YWE0Nw==
+    ZTE5NzY3ZTgxMWJiMzJlN2E5ZjEyN2U0YjZmYTQxODE5OGU0ZjY4Mw==
   data.tar.gz: !binary |-
-    NzdlMjYwNWRlMDBhZDA4ZWUxY2RmOWFhY2NhMjU4ZmRiYTA4NmMyNA==
+    NDkxOTg3NzlkMGVlNmEwNTRiNjUzZTVlYTlhYTUxMGE3NjYwMmZmYw==
 SHA512:
   metadata.gz: !binary |-
-    YTI2ZGQwZGRiZjUxNjEyNDlhZTkwMWM5MmI5NjAzM2RlMDAxZTFlZTY0OTAw
-    NTY1YTZmMWJiZmUwNWM3N2MwMjZmODlmZjNjYTIxYmJhNDllOGNkNTEzMTEx
-    Y2QxOTI3OGZlODUyOTdhZjIyZWQxZjE3MDljM2QzYTIwZTljNTQ=
+    MWRlOWM5NDk2NzFjMzUxYzRjNWM3OTIwMTNkMzJmNWQ0OTQ2NzYxY2E3MWQ4
+    MDI2N2FjOWEwZmUzOTU4YjM4NGU4MzAyZjhkOTY3YzBhZjU1Zjc5NjM0NTMz
+    ZWUwZTU2MjIzZTFiNzFmMDgyYjg0MTg4MjQ4OTNmNGNlOGE2Mjk=
   data.tar.gz: !binary |-
-    YTY1NTI5MWE5Njg1Y2VhYjA0MmJiNDcwYTM1MjMzZDdlMTEzNThmZWQ4YTU2
-    MmE1MmJjMTI2NDQ0NjFjNDM4MjhmMjg0YjQ3Y2I5YzI0NjI0MjRkYjhmN2Jj
-    NTYwZGIxNDliMGU3ZjBkOGFiNzExNDBjMGRlMzczZTIyNTVmYjI=
+    YWQyYWI5MjcyYmVhOGIxYjE2NDIyMzFhNWFiMTYwZGUzMjllNDVhNDdjYWNk
+    NDQ4OGRhNzJkYTk2ZWQyOTgzMDQyZWJiN2FmNWNjNjQ3YjNiMTVhYTU4YjQz
+    NDQ5ODJkM2NlNjU5ZmY2ZGMyOGZjNzEyM2MwZWQyYzgzMjBhYTg=

data/lib/amazon-pricing/version.rb

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

data/lib/ec2-price-list.rb

@@ -47,6 +47,14 @@ module AwsPricing
         url = "#{EC2_BASE_URL}ri-v2/#{target}-shared.min.js"
         fetch_ec2_instance_pricing_ri_v2(url, operating_system)
       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.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)
+      end
+
     end
 
     # Retrieves the EC2 on-demand instance pricing.

data/test/ec2_instance_types_test.rb

@@ -119,6 +119,22 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
     assert os.allupfront_effective_rate_3_year == 0.0388
   end
 
+  def test_new_reservation_types_for_legacy_instance
+    region = @@ec2_pricing.get_region('us-east')
+    instance = region.get_ec2_instance_type('m2.4xlarge')
+    os = instance.get_operating_system(:linux)
+    assert os.ondemand_price_per_hour == 0.980
+    assert os.partialupfront_prepay_1_year == 1894
+    assert os.allupfront_prepay_1_year == 3255
+    assert os.partialupfront_prepay_3_year == 2875
+    assert os.allupfront_prepay_3_year == 5839
+    assert os.noupfront_effective_rate_1_year == 0.444
+    assert os.partialupfront_effective_rate_1_year == 0.3792
+    assert os.allupfront_effective_rate_1_year == 0.3716
+    assert os.partialupfront_effective_rate_3_year == 0.2364
+    assert os.allupfront_effective_rate_3_year == 0.2222
+  end
+
   def test_bad_data
     # Someone at AWS is fat fingering the pricing data and putting the text "os" where there should be the actual operating system (e.g. "linux") - see http://a0.awsstatic.com/pricing/1/ec2/linux-od.min.js
     @@ec2_pricing.regions.each do |region|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.52
+  version: 0.1.53
 platform: ruby
 authors:
 - Joe Kinsella