awscosts 0.0.3 → 0.0.4

data/lib/awscosts/cache.rb

@@ -0,0 +1,22 @@
+require 'httparty'
+require 'json'
+
+module AWSCosts::Cache
+  extend self
+
+  BASE_URI = "http://aws.amazon.com"
+
+  def get uri, &block
+    cache[uri] ||= begin
+      yield JSON.parse(HTTParty.get("#{BASE_URI}#{uri}").body)
+     end
+  end
+
+  private
+  def cache
+    @cache ||= {}
+  end
+
+end
+
+

data/lib/awscosts/ec2.rb

@@ -1,6 +1,7 @@
 require 'awscosts/ec2_on_demand'
 require 'awscosts/ec2_reserved_instances'
 require 'awscosts/ec2_elb'
+require 'awscosts/ec2_ebs'
 
 class AWSCosts::EC2
 
@@ -14,16 +15,20 @@ class AWSCosts::EC2
   end
 
   def on_demand(type)
-    AWSCosts::EC2OnDemand.fetch(type, self.region.price_mapping)
+    AWSCosts::EC2OnDemand.fetch(TYPES[type], self.region.price_mapping)
   end
 
   def reserved(type, utilisation= :light)
-    AWSCosts::EC2ReservedInstances.fetch(type, utilisation, self.region.price_mapping)
+    AWSCosts::EC2ReservedInstances.fetch(TYPES[type], utilisation, self.region.name)
   end
 
   def elb
     AWSCosts::ELB.fetch(self.region.price_mapping)
   end
+
+  def ebs
+    AWSCosts::EBS.fetch(self.region.price_mapping)
+  end
 end
 
 

data/lib/awscosts/ec2_ebs.rb

@@ -0,0 +1,36 @@
+require 'httparty'
+require 'json'
+
+class AWSCosts::EBS
+
+  TYPES = { 'ebsVols' => :standard, 'ebsPIOPSVols' => :provisioned_iops,
+            'ebsSnapsToS3' => :snapshots_to_s3 }
+
+  def initialize data
+    @data= data
+  end
+
+  def price type = nil
+    type.nil? ? @data : @data[type]
+  end
+
+  def self.fetch region
+    transformed= AWSCosts::Cache.get('/ec2/pricing/pricing-ebs.json') do |data|
+      result = {}
+      data['config']['regions'].each do |region|
+        container = {}
+        region['types'].each do |type|
+          container[TYPES[type['name']]] = {}
+          type['values'].each do |value|
+            container[TYPES[type['name']]][value['rate']] = value['prices']['USD'].to_f
+          end
+        end
+        result[region['region']] = container
+      end
+      result
+    end
+    self.new(transformed[region])
+  end
+
+end
+

data/lib/awscosts/ec2_elb.rb

@@ -1,6 +1,3 @@
-require 'httparty'
-require 'json'
-
 class AWSCosts::ELB
 
   def initialize data
@@ -16,9 +13,8 @@ class AWSCosts::ELB
   end
 
   def self.fetch region
-    @fetch ||= begin
+    transformed= AWSCosts::Cache.get('/ec2/pricing/pricing-elb.json') do |data|
       result = {}
-      data= JSON.parse(HTTParty.get('http://aws.amazon.com/ec2/pricing/pricing-elb.json').body)
       data['config']['regions'].each do |region|
         container = {}
         region['types'].each do |type|
@@ -30,7 +26,7 @@ class AWSCosts::ELB
       end
       result
     end
-    self.new(@fetch[region])
+    self.new(transformed[region])
   end
 
 end

data/lib/awscosts/ec2_on_demand.rb

@@ -1,5 +1,4 @@
-require 'httparty'
-require 'json'
+require 'awscosts/ec2'
 
 class AWSCosts::EC2OnDemand
 
@@ -22,23 +21,20 @@ class AWSCosts::EC2OnDemand
                      'hiStoreODI.xxxxxxxxl' => 'hs1.8xlarge',
                      'hiIoODI.xxxxl' => 'hi1.4xlarge' }
 
-  def initialize type, data
-    @type = type
+  def initialize data
     @data= data
   end
 
   def price size=nil
-    size ? @data[TYPE_MAPPING[@type]][size] : @data[TYPE_MAPPING[@type]]
+    size ? @data[size] : @data
   end
 
   def self.fetch type, region
-    raw_data= cache[type] ||= begin
+    transformed= AWSCosts::Cache.get("/ec2/pricing/json/#{type}-od.json") do |data|
       result = {}
-      data= JSON.parse(HTTParty.get("http://aws.amazon.com/ec2/pricing/json/#{AWSCosts::EC2::TYPE_MAPPING[type]}-od.json").body)
       data['config']['regions'].each do |region|
         platforms = {}
         region['instanceTypes'].each do |instance_type|
-          type = instance_type['type']
           instance_type['sizes'].each do |instance_size|
             size = instance_size['size']
             platform_cost = Hash.new({})
@@ -48,7 +44,7 @@ class AWSCosts::EC2OnDemand
 
             platform_cost.each_pair do |p,v|
               platforms[p] = {} unless platforms.key?(p)
-              platforms[p][TYPE_TRANSLATION["#{type}.#{size}"]] = v
+              platforms[p][TYPE_TRANSLATION["#{instance_type['type']}.#{size}"]] = v
             end
           end
         end
@@ -56,12 +52,8 @@ class AWSCosts::EC2OnDemand
       end
       result
     end
-    self.new(type, raw_data[region])
+    type == 'sles' ? self.new(transformed[region]['linux']) :self.new(transformed[region][type])
   end
 
-  private
-  def self.cache
-    @@cache ||= {}
-  end
 end
 

data/lib/awscosts/ec2_reserved_instances.rb

@@ -38,19 +38,17 @@ class AWSCosts::EC2ReservedInstances
     if size
       @data["#{TERMS[term]}Hourly"][size]
     else
-      @data["#{TERMS[term]}Hourly"][size]
+      @data["#{TERMS[term]}Hourly"]
     end
   end
 
 
   def self.fetch type, utilisation, region
-    raw_data= cache[type] ||= begin
+    transformed= AWSCosts::Cache.get("/ec2/pricing/json/#{type}-ri-#{utilisation}.json") do |data|
       result = {}
-      data= JSON.parse(HTTParty.get("http://aws.amazon.com/ec2/pricing/json/#{AWSCosts::EC2::TYPES[type]}-ri-#{utilisation}.json").body)
       data['config']['regions'].each do |region|
         platforms = {}
         region['instanceTypes'].each do |instance_type|
-          type = instance_type['type']
           instance_type['sizes'].each do |instance_size|
             size = instance_size['size']
             platform_cost = Hash.new({})
@@ -61,7 +59,7 @@ class AWSCosts::EC2ReservedInstances
 
             platform_cost.each_pair do |p,v|
               platforms[p] = {} unless platforms.key?(p)
-              platforms[p][TYPE_TRANSLATION["#{type}.#{size}"]] = v
+              platforms[p][TYPE_TRANSLATION["#{instance_type['type']}.#{size}"]] = v
             end
           end
         end
@@ -69,13 +67,8 @@ class AWSCosts::EC2ReservedInstances
       end
       result
     end
-    self.new(raw_data[region])
+    self.new(transformed[region])
   end
 
-
-  private
-  def self.cache
-    @@cache ||= {}
-  end
 end
 

data/lib/awscosts/emr.rb

@@ -31,9 +31,8 @@ class AWSCosts::EMR
   end
 
   def self.fetch region
-    @cache ||= begin
+    transformed= AWSCosts::Cache.get("/elasticmapreduce/pricing/pricing-emr.json") do |data|
       result = {}
-      data= JSON.parse(HTTParty.get("http://aws.amazon.com/elasticmapreduce/pricing/pricing-emr.json").body)
       data['config']['regions'].each do |region|
         platforms = {}
         region['instanceTypes'].each do |instance_type|
@@ -54,12 +53,8 @@ class AWSCosts::EMR
       end
       result
     end
-    self.new(@cache[region])
+    self.new(transformed[region])
   end
 
-  private
-  def self.cache
-    @@cache ||= {}
-  end
 end
 

data/lib/awscosts/s3_data_transfer.rb

@@ -14,9 +14,8 @@ class AWSCosts::S3DataTransfer
   end
 
   def self.fetch region
-    @cache ||= begin
+    transformed= AWSCosts::Cache.get("/s3/pricing/pricing-data-transfer.json") do |data|
       result = {}
-      data= JSON.parse(HTTParty.get("http://aws.amazon.com/s3/pricing/pricing-data-transfer.json").body)
       data['config']['regions'].each do |region|
         types = {}
         region['types'].each do |type|
@@ -29,7 +28,7 @@ class AWSCosts::S3DataTransfer
       end
       result
     end
-    self.new(@cache[region])
+    self.new(transformed[region])
   end
 
 end

data/lib/awscosts/s3_requests.rb

@@ -3,8 +3,6 @@ require 'json'
 
 class AWSCosts::S3Requests
 
-  TIERS = %w{putcopypost, glacierRequests, deleteRequests, getEtc, glacierDataRestore}
-
   def initialize data
     @data= data
   end
@@ -14,9 +12,8 @@ class AWSCosts::S3Requests
   end
 
   def self.fetch region
-    @cache ||= begin
+    transformed= AWSCosts::Cache.get("/s3/pricing/pricing-requests.json") do |data|
       result = {}
-      data= JSON.parse(HTTParty.get("http://aws.amazon.com/s3/pricing/pricing-requests.json").body)
       data['config']['regions'].each do |region|
         tiers = {}
         region['tiers'].each do |tier|
@@ -26,7 +23,7 @@ class AWSCosts::S3Requests
       end
       result
     end
-    self.new(@cache[region])
+    self.new(transformed[region])
   end
 
 end

data/lib/awscosts/s3_storage.rb

@@ -3,8 +3,6 @@ require 'json'
 
 class AWSCosts::S3Storage
 
-  TIERS = %w{firstTBstorage, next49TBstorage, next49TBstorage, next501TBstorage}
-
   def initialize data
     @data= data
   end
@@ -14,9 +12,8 @@ class AWSCosts::S3Storage
   end
 
   def self.fetch region
-    @cache ||= begin
+    transformed= AWSCosts::Cache.get("/s3/pricing/pricing-storage.json") do |data|
       result = {}
-      data= JSON.parse(HTTParty.get("http://aws.amazon.com/s3/pricing/pricing-storage.json").body)
       data['config']['regions'].each do |region|
         tiers = {}
         region['tiers'].each do |tier|
@@ -30,9 +27,8 @@ class AWSCosts::S3Storage
       end
       result
     end
-    self.new(@cache[region])
+    self.new(transformed[region])
   end
 
 end
 
-

data/lib/awscosts/version.rb

@@ -1,3 +1,3 @@
 module AWSCosts
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/awscosts.rb

@@ -3,6 +3,7 @@ require "awscosts/region"
 require "awscosts/ec2"
 require "awscosts/emr"
 require "awscosts/s3"
+require "awscosts/cache"
 
 module AWSCosts
 

data/spec/awscosts/ec2_ebs_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe AWSCosts::EBS do
+  use_vcr_cassette
+
+  subject { AWSCosts.region('ap-southeast-2').ec2.ebs}
+
+  describe 'standard EBS volume' do
+    let(:price) { subject.price(:standard) }
+
+    it 'should provide price per GB / month for provisioned storage' do
+      price['perGBmoProvStorage'].should > 0
+    end
+
+    it 'should provide price per Million requests per month' do
+      price['perMMIOreq'].should > 0
+    end
+  end
+
+  describe 'provisioned IOPS price' do
+    let(:price) { subject.price(:provisioned_iops) }
+
+    it 'should provide price per GB / month for provisioned storage' do
+      price['perGBmoProvStorage'].should > 0
+    end
+
+    it 'should provide a price per PIOPS' do
+      price['perPIOPSreq'].should > 0
+    end
+  end
+
+  describe 'Snapshots to S3' do
+    let(:price) { subject.price(:snapshots_to_s3) }
+
+    it 'should provide a price per GB stored / month' do
+      price['perGBmoDataStored'].should > 0
+    end
+  end
+
+end
+
+

data/spec/awscosts/ec2_elb_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe AWSCosts::ELB do
+  use_vcr_cassette
+
+  subject { AWSCosts.region('ap-southeast-2').ec2.elb}
+
+  its(:price_per_hour) { should > 0 }
+  its(:price_per_gb) { should > 0 }
+
+end
+

data/spec/awscosts/ec2_on_demand_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe AWSCosts::EC2OnDemand do
+
+  [:windows, :linux, :windows_with_sql, :windows_with_sql_web, :rhel, :sles].each do |type|
+    context "EC2 type of #{type}" do
+      use_vcr_cassette
+
+      subject { AWSCosts.region('ap-southeast-2').ec2.on_demand(type)}
+
+      its(:price) { should have_key('m1.small') }
+    end
+  end
+end

data/spec/awscosts/ec2_reserved_instances_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe AWSCosts::EC2ReservedInstances do
+
+  [:windows, :linux, :windows_with_sql, :windows_with_sql_web, :rhel, :sles].each do |type|
+    context "EC2 type of #{type}" do
+      use_vcr_cassette
+
+      subject { AWSCosts.region('ap-southeast-1').ec2.reserved(type)}
+
+      it 'upfront price for 1 year term' do
+        subject.upfront(:one_year).should have_key('m1.small')
+      end
+
+      it 'upfront price for 3 year term' do
+        subject.upfront(:three_year).should have_key('m1.small')
+      end
+
+      it 'hourly price for 1 year term' do
+        subject.hourly(:one_year).should have_key('m1.small')
+      end
+
+      it 'hourly price for 3 year term' do
+        subject.hourly(:three_year).should have_key('m1.small')
+      end
+    end
+  end
+end

data/spec/awscosts/emr_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe AWSCosts::EMR do
+  use_vcr_cassette
+
+  subject { AWSCosts.region('eu-west-1').emr}
+
+  it 'should provide an EMR price' do
+    subject.emr_price('m1.xlarge') { should > 0 }
+  end
+
+  it 'should provide an EMR EC2 price' do
+    subject.ec2_price('m1.xlarge') { should > 0 }
+  end
+end

data/spec/awscosts/s3_data_transfer_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe AWSCosts::S3DataTransfer do
+  use_vcr_cassette
+
+  subject { AWSCosts.region('ap-northeast-1').s3.data_transfer}
+
+  its(:price) { should have_key('dataXferInS3') }
+end
+
+

data/spec/awscosts/s3_requests_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe AWSCosts::S3Requests do
+  use_vcr_cassette
+
+  subject { AWSCosts.region('ap-northeast-1').s3.requests}
+
+  its(:price) { should have_key('putcopypost') }
+end
+

data/spec/awscosts/s3_storage_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe AWSCosts::S3Storage do
+  use_vcr_cassette
+
+  subject { AWSCosts.region('ap-northeast-1').s3.storage}
+
+  its(:price) { should have_key('firstTBstorage') }
+  its(:price) { should have_key('next49TBstorage') }
+end
+
+

data/spec/spec_helper.rb

@@ -1,5 +1,14 @@
 require 'awscosts'
+require 'vcr'
 
+RSpec.configure do |config|
+  config.extend VCR::RSpec::Macros
+end
+
+VCR.configure do |c|
+  c.cassette_library_dir = 'fixtures/vcr_cassettes'
+  c.hook_into :fakeweb
+end
 
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awscosts
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -75,6 +75,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: AWSCosts provides an easier way to calculate the costs of running your
   project in AWS
 email:
@@ -89,8 +121,28 @@ files:
 - README.md
 - Rakefile
 - awscosts.gemspec
+- fixtures/vcr_cassettes/AWSCosts_EBS.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2OnDemand/EC2_type_of_linux.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2OnDemand/EC2_type_of_rhel.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2OnDemand/EC2_type_of_sles.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2OnDemand/EC2_type_of_windows.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2OnDemand/EC2_type_of_windows_with_sql.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2OnDemand/EC2_type_of_windows_with_sql_web.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2ReservedInstances/EC2_type_of_linux.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2ReservedInstances/EC2_type_of_rhel.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2ReservedInstances/EC2_type_of_sles.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2ReservedInstances/EC2_type_of_windows.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2ReservedInstances/EC2_type_of_windows_with_sql.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2ReservedInstances/EC2_type_of_windows_with_sql_web.yml
+- fixtures/vcr_cassettes/AWSCosts_ELB.yml
+- fixtures/vcr_cassettes/AWSCosts_EMR.yml
+- fixtures/vcr_cassettes/AWSCosts_S3DataTransfer.yml
+- fixtures/vcr_cassettes/AWSCosts_S3Requests.yml
+- fixtures/vcr_cassettes/AWSCosts_S3Storage.yml
 - lib/awscosts.rb
+- lib/awscosts/cache.rb
 - lib/awscosts/ec2.rb
+- lib/awscosts/ec2_ebs.rb
 - lib/awscosts/ec2_elb.rb
 - lib/awscosts/ec2_on_demand.rb
 - lib/awscosts/ec2_reserved_instances.rb
@@ -101,8 +153,16 @@ files:
 - lib/awscosts/s3_requests.rb
 - lib/awscosts/s3_storage.rb
 - lib/awscosts/version.rb
+- spec/awscosts/ec2_ebs_spec.rb
+- spec/awscosts/ec2_elb_spec.rb
+- spec/awscosts/ec2_on_demand_spec.rb
+- spec/awscosts/ec2_reserved_instances_spec.rb
 - spec/awscosts/ec2_spec.rb
+- spec/awscosts/emr_spec.rb
 - spec/awscosts/region_spec.rb
+- spec/awscosts/s3_data_transfer_spec.rb
+- spec/awscosts/s3_requests_spec.rb
+- spec/awscosts/s3_storage_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/srbartlett/awscosts
 licenses:
@@ -119,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1983521738208440787
+      hash: -1851467363620844181
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1983521738208440787
+      hash: -1851467363620844181
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -136,6 +196,14 @@ signing_key:
 specification_version: 3
 summary: Programmatic access to AWS pricing
 test_files:
+- spec/awscosts/ec2_ebs_spec.rb
+- spec/awscosts/ec2_elb_spec.rb
+- spec/awscosts/ec2_on_demand_spec.rb
+- spec/awscosts/ec2_reserved_instances_spec.rb
 - spec/awscosts/ec2_spec.rb
+- spec/awscosts/emr_spec.rb
 - spec/awscosts/region_spec.rb
+- spec/awscosts/s3_data_transfer_spec.rb
+- spec/awscosts/s3_requests_spec.rb
+- spec/awscosts/s3_storage_spec.rb
 - spec/spec_helper.rb