amazon-pricing 0.1.7 → 0.1.8

data/CHANGELOG

@@ -1,3 +1,7 @@
+= Version 0.1.7
+  * Refactored model to simplify access (one instance type for all usages), 
+  introduced operating system pricing to suppport RHEL, SLES, etc...
+
 = Version 0.0.6
   * Another missing instance type, cc2.8xlarge
 

data/Rakefile

@@ -31,7 +31,7 @@ task :test do
   ruby "test/test-ec2-instance-types.rb"
 end
 
-desc "Prints current EC2 pricing to console"
+desc "Prints current EC2 pricing in CSV format"
 task :print_price_list do
   require 'lib/amazon-pricing'
   pricing = AwsPricing::PriceList.new

data/amazon-pricing.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/sonian/amazon-pricing"
   s.summary     = "Amazon Web Services Pricing Ruby gem"
   s.description = "A Ruby library for retrieving pricing for Amazon Web Services"
+  s.license     = 'MIT'
 
   s.rubyforge_project = "amazon-pricing"
 

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

@@ -46,6 +46,15 @@ module AwsPricing
       @operating_systems[name]
     end
 
+    # Returns whether an instance_type is available. 
+    # operating_system = :linux, :mswin, :rhel, :sles, :mswinSQL, :mswinSQLWeb
+    # type_of_instance = :ondemand, :light, :medium, :heavy
+    def available?(type_of_instance = :ondemand, operating_system = :linux)
+      os = get_operating_system(operating_system)
+      return false if os.nil?
+      os.available?(type_of_instance)
+    end
+
     # type_of_instance = :ondemand, :light, :medium, :heavy
     # term = :year_1, :year_3, nil
     def price_per_hour(operating_system, type_of_instance, term = nil)
@@ -190,7 +199,7 @@ module AwsPricing
     @@Memory_Lookup = {
       'm1.small' => 1700, 'm1.medium' => 3750, 'm1.large' => 7500, 'm1.xlarge' => 15000,
       'm2.xlarge' => 17100, 'm2.2xlarge' => 34200, 'm2.4xlarge' => 68400,
-      #'m3.xlarge' => 15, 'm3.2xlarge' => 30,
+      'm3.xlarge' => 15000, 'm3.2xlarge' => 30000,
       'c1.medium' => 1700, 'c1.xlarge' => 7000,
       'hi1.4xlarge' => 60500,
       'cg1.4xlarge' => 22000,
@@ -203,7 +212,7 @@ module AwsPricing
     @@Disk_Lookup = {
       'm1.small' => 160, 'm1.medium' => 410, 'm1.large' =>850, 'm1.xlarge' => 1690,
       'm2.xlarge' => 420, 'm2.2xlarge' => 850, 'm2.4xlarge' => 1690,
-      #'m3.xlarge' => 0, 'm3.2xlarge' => 0,
+      'm3.xlarge' => 0, 'm3.2xlarge' => 0,
       'c1.medium' => 350, 'c1.xlarge' => 1690,
       'hi1.4xlarge' => 2048,
       'cg1.4xlarge' => 1690,
@@ -216,7 +225,7 @@ module AwsPricing
     @@Platform_Lookup = {
       'm1.small' => 32, 'm1.medium' => 32, 'm1.large' => 64, 'm1.xlarge' => 64,
       'm2.xlarge' => 64, 'm2.2xlarge' => 64, 'm2.4xlarge' => 64,
-      #'m3.xlarge' => 64, 'm3.2xlarge' => 64,
+      'm3.xlarge' => 64, 'm3.2xlarge' => 64,
       'c1.medium' => 32, 'c1.xlarge' => 64,
       'hi1.4xlarge' => 64,
       'cg1.4xlarge' => 64,
@@ -229,7 +238,7 @@ module AwsPricing
     @@Compute_Units_Lookup = {
       'm1.small' => 1, 'm1.medium' => 2, 'm1.large' => 4, 'm1.xlarge' => 8,
       'm2.xlarge' => 6, 'm2.2xlarge' => 13, 'm2.4xlarge' => 26,
-      #'m3.xlarge' => 13, 'm3.2xlarge' => 26,
+      'm3.xlarge' => 13, 'm3.2xlarge' => 26,
       'c1.medium' => 5, 'c1.xlarge' => 20,
       'hi1.4xlarge' => 35,
       'cg1.4xlarge' => 34,
@@ -242,7 +251,7 @@ module AwsPricing
     @@Virtual_Cores_Lookup = {
       'm1.small' => 1, 'm1.medium' => 1, 'm1.large' => 2, 'm1.xlarge' => 4,
       'm2.xlarge' => 2, 'm2.2xlarge' => 4, 'm2.4xlarge' => 8,
-      #'m3.xlarge' => 4, 'm3.2xlarge' => 8,
+      'm3.xlarge' => 4, 'm3.2xlarge' => 8,
       'c1.medium' => 2, 'c1.xlarge' => 8,
       'hi1.4xlarge' => 16,
       'cg1.4xlarge' => 8,

data/lib/amazon-pricing/operating-system.rb

@@ -21,6 +21,12 @@ module AwsPricing
       @name = name
     end
 
+    # Returns whether an instance_type is available. 
+    # type_of_instance = :ondemand, :light, :medium, :heavy
+    def available?(type_of_instance = :ondemand)
+      not price_per_hour(type_of_instance).nil?
+    end
+
     # type_of_instance = :ondemand, :light, :medium, :heavy
     # term = :year_1, :year_3, nil
     def prepay(type_of_instance = :ondemand, term = nil)

data/lib/amazon-pricing/region.rb

@@ -32,10 +32,7 @@ module AwsPricing
     def instance_type_available?(api_name, type_of_instance = :ondemand, operating_system = :linux)
       instance = @instance_types[api_name]
       return false if instance.nil?
-      os = instance.get_operating_system(operating_system)
-      return false if os.nil?
-      pph = os.price_per_hour(type_of_instance)
-      not pph.nil?
+      instance.available?(type_of_instance, operating_system)
     end
 
     # type_of_instance = :ondemand, :light, :medium, :heavy

data/lib/amazon-pricing/version.rb

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

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

@@ -48,6 +48,21 @@ class TestEc2InstanceTypes < Test::Unit::TestCase
     assert region.instance_type_available?('m1.large')
   end
 
+  def test_fetch_all_breakeven_months
+    pricing = AwsPricing::PriceList.new
+    pricing.regions.each do |region|
+      region.instance_types.each do |instance|
+        instance.operating_systems.each do |os|
+          [:light, :medium, :heavy].each do |res_type|
+            next if not instance.available?(res_type)
+            assert_not_nil(os.get_breakeven_month(res_type, :year1))
+            assert_not_nil(os.get_breakeven_month(res_type, :year3))
+          end
+        end
+      end
+    end
+  end
+
   def test_breakeven_month
     pricing = AwsPricing::PriceList.new
     region = pricing.get_region('us-east')

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.1.7
+  version: 0.1.8
+  prerelease: 
 platform: ruby
 authors:
 - Joe Kinsella
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library for retrieving pricing for Amazon Web Services
 email:
@@ -37,34 +37,33 @@ files:
 - test/helper.rb
 - test/test-ec2-instance-types.rb
 homepage: http://github.com/sonian/amazon-pricing
-licenses: []
-post_install_message:
+licenses:
+- MIT
+post_install_message: 
 rdoc_options:
-- "--title"
+- --title
 - amazon-pricing documentation
-- "--line-numbers"
-- "--main"
+- --line-numbers
+- --main
 - README
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 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:
@@ -72,3 +71,4 @@ test_files:
 - spec/price_list_spec.rb
 - test/helper.rb
 - test/test-ec2-instance-types.rb
+has_rdoc: