amazon-pricing 0.1.1 → 0.1.2

data/Gemfile

@@ -0,0 +1,9 @@
+# A sample Gemfile
+source "https://rubygems.org"
+gemspec
+
+group :test do
+  gem 'rspec', '~> 2.11.0'
+end
+
+# gem "rails"

data/Rakefile

@@ -1,6 +1,9 @@
 require 'bundler'
 require 'rake/testtask'
-require File.expand_path('lib/amazon-pricing/version')
+
+$: << File.expand_path(File.dirname(__FILE__), 'lib')
+
+require 'amazon-pricing/version'
 
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'

data/lib/amazon-pricing.rb

@@ -73,7 +73,11 @@ module AwsPricing
         region = find_or_create_region(region_name)
         reg['instanceTypes'].each do |type|
           type['sizes'].each do |size|
-            region.add_or_update_instance_type(:on_demand, InstanceType.new(region, type['type'], size))
+            begin
+              region.add_or_update_instance_type(:on_demand, InstanceType.new(region, type['type'], size))
+            rescue UnknownTypeError
+              $stderr.puts "WARNING: encountered #{$!.message}"
+            end
           end
         end
       end
@@ -98,7 +102,11 @@ module AwsPricing
         region = find_or_create_region(region_name)
         reg['instanceTypes'].each do |type|
           type['sizes'].each do |size|
-            region.add_or_update_instance_type(:reserved, ReservedInstanceType.new(region, type['type'], size, reserved_usage_type, platform), reserved_usage_type)
+            begin
+              region.add_or_update_instance_type(:reserved, ReservedInstanceType.new(region, type['type'], size, reserved_usage_type, platform), reserved_usage_type)
+            rescue UnknownTypeError
+              $stderr.puts "WARNING: encountered #{$!.message}"
+            end
           end
         end
       end

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

@@ -9,6 +9,9 @@
 #++
 module AwsPricing
 
+  class UnknownTypeError < NameError
+  end
+
   # InstanceType is a specific type of instance in a region with a defined
   # price per hour. The price will vary by platform (Linux, Windows).
   #
@@ -23,7 +26,7 @@ module AwsPricing
     # type (e.g. stdODI) and the json for the specific instance. The json is
     # based on the current undocumented AWS pricing API.
     def initialize(region, instance_type, json)
-      values = get_values(json)
+      values = InstanceType::get_values(json)
 
       @size = json['size']
       @linux_price_per_hour = values['linux'].to_f
@@ -32,8 +35,8 @@ module AwsPricing
       @windows_price_per_hour = nil if @windows_price_per_hour == 0
       @instance_type = instance_type
 
-      @api_name = get_api_name(@instance_type, @size)
-      @name = get_name(@instance_type, @size)
+      @api_name = self.class.get_api_name(@instance_type, @size)
+      @name = self.class.get_name(@instance_type, @size)
 
       @memory_in_mb = @@Memory_Lookup[@api_name]
       @disk_in_mb = @@Disk_Lookup[@api_name]
@@ -63,23 +66,21 @@ module AwsPricing
 
     attr_accessor :size, :instance_type
 
-    def get_api_name(instance_type, size)
+    def self.get_api_name(instance_type, size)
       # Let's handle new instances more gracefully
-      unless @@Api_Name_Lookup.has_key?(instance_type)
-        raise "The instance type #{instance_type} is not found"
-      end
-      if @@Api_Name_Lookup[instance_type][size].nil?
-        raise "The instance type #{instance_type} of size #{size} is not found"
+      unless @@Api_Name_Lookup.has_key? instance_type
+        raise UnknownTypeError, "Unknown instance type #{instance_type}", caller
+      else
+        @@Api_Name_Lookup[instance_type][size]
       end
-      @@Api_Name_Lookup[instance_type][size]
     end
 
-    def get_name(instance_type, size)
+    def self.get_name(instance_type, size)
       @@Name_Lookup[instance_type][size]
     end
 
     # Turn json into hash table for parsing
-    def get_values(json)
+    def self.get_values(json)
       values = {}
       json['valueColumns'].each do |val|
         values[val['name']] = val['prices']['USD']

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

@@ -73,18 +73,16 @@ module AwsPricing
     protected
       attr_accessor :size, :instance_type
 
-      def get_api_name(instance_type, size)
+      def self.get_api_name(instance_type, size)
         # Let's handle new instances more gracefully
-        unless @@Api_Name_Lookup_Reserved.has_key?(instance_type)
-          raise "The instance type #{instance_type} is not found"
+        unless @@Api_Name_Lookup_Reserved.has_key? instance_type
+          raise UnknownTypeError, "Unknown instance type #{instance_type}", caller
+        else
+          @@Api_Name_Lookup_Reserved[instance_type][size]
         end
-        if @@Api_Name_Lookup_Reserved[instance_type][size].nil?
-          raise "The instance type #{instance_type} of size #{size} is not found"
-        end
-        @@Api_Name_Lookup_Reserved[instance_type][size]
       end
 
-      def get_name(instance_type, size)
+      def self.get_name(instance_type, size)
         @@Name_Lookup_Reserved[instance_type][size]
       end
 

data/lib/amazon-pricing/version.rb

@@ -8,5 +8,5 @@
 # Home::      http://github.com/sonian/amazon-pricing
 #++
 module AwsPricing
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/instance_type_spec.rb

@@ -0,0 +1,11 @@
+require 'amazon-pricing/instance-type'
+
+describe AwsPricing::InstanceType do
+  describe '::get_api_name' do
+    it "raises an UnknownTypeError on an unexpected instance type" do
+      expect {
+        AwsPricing::InstanceType::get_api_name 'QuantumODI', 'huge'
+      }.to raise_error(AwsPricing::UnknownTypeError)
+    end
+  end
+end

data/spec/price_list_spec.rb

@@ -0,0 +1,39 @@
+require 'amazon-pricing'
+
+describe AwsPricing::PriceList do
+  describe "#get_ec2_on_demand_instance_pricing" do
+    let(:price_list) {
+      {
+        'config' => {
+          'regions' => [{
+            'region' => 'us-east',
+            'instanceTypes' => [{
+              'type' => 'stdODI',
+              'sizes' => [{
+                'size' => 'sm',
+                'valueColumns' => [
+                  {'name' => 'linux', 'prices' => { 'USD' => '0.065' }},
+                  {'name' => 'mswin', 'prices' => { 'USD' => '0.265' }}
+                                  ]}]}]}]
+        }
+      }
+    }
+
+    before do
+      AwsPricing::PriceList.any_instance.tap do |it|
+        it.stub :get_ec2_reserved_instance_pricing
+        it.stub :fetch_ec2_ebs_pricing
+        it.stub :fetch_url => price_list
+      end
+    end
+    
+    it "doesn't break when amazon adds instance types" do
+      newType = {'type' => 'quantumODI', 'sizes' => [{'size' => 'sm', 'valueColumns' => []}]}
+      price_list['config']['regions'][0]['instanceTypes'] << newType
+
+      expect {
+        AwsPricing::PriceList.new
+      }.to_not raise_error
+    end
+  end
+end

data/test/helper.rb

@@ -1,5 +1,5 @@
 #--
-# IBM SmartCloud Ruby library
+# Amazon Web Services Pricing Ruby library
 #
 # Ruby Gem Name::  amazon-pricing
 # Author::    Joe Kinsella (mailto:joe.kinsella@gmail.com)

data/test/test-ec2-instance-types.rb

@@ -10,8 +10,8 @@
 # Home::      http://github.com/sonian/amazon-pricing
 #++
 
-puts Dir.pwd
-require File.join(Dir.pwd, 'test', 'helper')
+$: << File.expand_path(File.dirname(__FILE__))
+require 'helper'
 require 'test/unit'
 
 class TestEc2InstanceTypes < Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-11-03 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -21,6 +21,7 @@ extra_rdoc_files:
 - README
 files:
 - CHANGELOG
+- Gemfile
 - LICENSE
 - README
 - Rakefile
@@ -31,6 +32,8 @@ files:
 - lib/amazon-pricing/region.rb
 - lib/amazon-pricing/reserved-instance-type.rb
 - lib/amazon-pricing/version.rb
+- spec/instance_type_spec.rb
+- spec/price_list_spec.rb
 - test/helper.rb
 - test/test-ec2-instance-types.rb
 homepage: http://github.com/sonian/amazon-pricing
@@ -63,5 +66,7 @@ signing_key:
 specification_version: 3
 summary: Amazon Web Services Pricing Ruby gem
 test_files:
+- spec/instance_type_spec.rb
+- spec/price_list_spec.rb
 - test/helper.rb
 - test/test-ec2-instance-types.rb