amazon-pricing 0.1.49 → 0.1.50

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWYyNTc2ZDU0NDkyY2UzZDdkM2E2YzhiODljNTNmNTdlZTE3MGQyMw==
+  data.tar.gz: !binary |-
+    ZWU3YjdlYTY1MGJiMDI2ZWNmMDEyMWI2ZmVjNjgyZmIzYWY2NDgyZQ==
+SHA512:
+  metadata.gz: !binary |-
+    ZGJiMDBhNDliZGMzZWQ1OTE0Mzk2NDM2MmYxMTkxYThkMzBiOTk3YzViYmE1
+    ZWY3ZmYzNGE5OGNkOTg1NzU0N2RjMmM0ODk3OTc1Yjg0ZWQxOTViMjg4OThm
+    ZmY1YjVhMDI5ZDhmZjg5MDZjZjhiMmIxOGZhNDQyN2IzMDYxNjc=
+  data.tar.gz: !binary |-
+    ZTA1Mjk4MjNmODc2OGJkMzMxOWI3NDFkOTVkNDlkNzRkOWM3YWZhN2NiM2E0
+    ZjdjOTNmYTIzMGMxYzhhOGJmZjhkNjRmMTk1YmYzYjM4YWJkMjc0YWFiZDFl
+    NDc1YzZlNWU3MDFlYWRjMDM5NTIxYjAzN2ZiMGFlNjJhZGE1N2M=

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

@@ -14,9 +14,9 @@ module AwsPricing
       :ondemand_price_per_hour, :light_price_per_hour_1_year, :medium_price_per_hour_1_year, :heavy_price_per_hour_1_year,
       :light_price_per_hour_3_year, :medium_price_per_hour_3_year, :heavy_price_per_hour_3_year,
       :light_prepay_1_year, :light_prepay_3_year, :medium_prepay_1_year, :medium_prepay_3_year, :heavy_prepay_1_year, :heavy_prepay_3_year,
-      :allupfront_price_per_hour_1_year, :allupfront_prepay_1_year, :allupfront_price_per_hour_3_year, :allupfront_prepay_3_year,
+      :allupfront_prepay_1_year, :allupfront_prepay_3_year,
       :partialupfront_price_per_hour_1_year, :partialupfront_prepay_1_year, :partialupfront_price_per_hour_3_year, :partialupfront_prepay_3_year,
-      :noupfront_price_per_hour_1_year, :noupfront_prepay_1_year, :noupfront_price_per_hour_3_year, :noupfront_prepay_3_year
+      :noupfront_price_per_hour_1_year, :noupfront_price_per_hour_3_year
 
     def initialize(instance_type=nil, name=nil)
       @instance_type = instance_type
@@ -65,12 +65,6 @@ module AwsPricing
         elsif term == :year3
           @partialupfront_prepay_3_year
         end
-      when :noupfront
-        if term == :year1
-          @noupfront_prepay_1_year
-        elsif term == :year3
-          @noupfront_prepay_3_year
-        end
       end
     end
 
@@ -108,14 +102,8 @@ module AwsPricing
         elsif term == :year3
           @partialupfront_prepay_3_year = price
         end
-      when :noupfront
-        if term == :year1
-          @noupfront_prepay_1_year = price
-        elsif term == :year3
-          @noupfront_prepay_3_year = price
-        end
       else
-        raise "Unable to set prepay for #{type_of_instance} : #{term} to #{price}"
+        raise "Unable to set prepay for #{instance_type.api_name} : #{name} : #{type_of_instance} : #{term} to #{price}"
       end
     end
 
@@ -143,12 +131,6 @@ module AwsPricing
         elsif term == :year3
           @heavy_price_per_hour_3_year
         end
-      when :allupfront
-        if term == :year1
-          @allupfront_price_per_hour_1_year
-        elsif term == :year3
-          @allupfront_price_per_hour_3_year
-        end
       when :partialupfront
         if term == :year1
           @partialupfront_price_per_hour_1_year
@@ -188,12 +170,6 @@ module AwsPricing
         elsif term == :year3
           @heavy_price_per_hour_3_year = price_per_hour
         end
-      when :allupfront
-        if term == :year1
-          @allupfront_price_per_hour_1_year = price_per_hour
-        elsif term == :year3
-          @allupfront_price_per_hour_3_year = price_per_hour
-        end
       when :partialupfront
         if term == :year1
           @partialupfront_price_per_hour_1_year = price_per_hour

data/lib/amazon-pricing/version.rb

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

data/lib/ec2-price-list.rb

@@ -138,9 +138,11 @@ module AwsPricing
               duration = term["term"]
               prices = option["valueColumns"]
               upfront = prices.select{|i| i["name"] == "upfront"}.first
-              instance_type.update_pricing_new(operating_system, reservation_type, upfront["prices"]["USD"].to_f, duration, true) unless upfront.nil?
+              price = upfront["prices"]["USD"]
+              instance_type.update_pricing_new(operating_system, reservation_type, price.to_f, duration, true) unless reservation_type == :noupfront || price == "N/A"
               hourly = prices.select{|i| i["name"] == "monthlyStar"}.first
-              instance_type.update_pricing_new(operating_system, reservation_type, hourly["prices"]["USD"].to_f, duration, false)
+              price = hourly["prices"]["USD"]
+              instance_type.update_pricing_new(operating_system, reservation_type, price.to_f * 12 / 365 / 24, duration, false) unless reservation_type == :allupfront || price == "N/A"
             end
           end
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.49
-  prerelease: 
+  version: 0.1.50
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -57,6 +56,7 @@ files:
 homepage: http://github.com/CloudHealth/amazon-pricing
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -67,28 +67,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2678167569791819720
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2678167569791819720
 requirements: []
 rubyforge_project: amazon-pricing
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Amazon Web Services Pricing Ruby gem
 test_files:
 - spec/instance_type_spec.rb
@@ -99,3 +91,4 @@ test_files:
 - test/ec2_instance_types_test.rb
 - test/govcloud_test.rb
 - test/helper.rb
+has_rdoc: