awscosts 0.0.4 → 0.0.6

data/lib/awscosts/ec2.rb

@@ -2,6 +2,7 @@ require 'awscosts/ec2_on_demand'
 require 'awscosts/ec2_reserved_instances'
 require 'awscosts/ec2_elb'
 require 'awscosts/ec2_ebs'
+require 'awscosts/ec2_elastic_ips'
 
 class AWSCosts::EC2
 
@@ -29,6 +30,10 @@ class AWSCosts::EC2
   def ebs
     AWSCosts::EBS.fetch(self.region.price_mapping)
   end
+
+  def elastic_ips
+    AWSCosts::ElasticIPs.fetch(self.region.price_mapping)
+  end
 end
 
 

data/lib/awscosts/ec2_elastic_ips.rb

@@ -0,0 +1,44 @@
+class AWSCosts::ElasticIPs
+
+  def initialize data
+    @data= data
+  end
+
+  def price_one
+    @data['oneEIP']
+  end
+
+  def price_additional_per_hour
+    @data['perAdditionalEIPPerHour']
+  end
+
+  def price_non_attached_per_hour
+    @data['perNonAttachedPerHour']
+  end
+
+  def price_remap_first_100
+    @data['perRemapFirst100']
+  end
+
+  def price_remap_over_100
+    @data['perRemapOver100']
+  end
+
+  def self.fetch region
+    transformed= AWSCosts::Cache.get('/ec2/pricing/pricing-elastic-ips.json') do |data|
+      result = {}
+      data['config']['regions'].each do |region|
+        container = {}
+        region['types'].each do |type|
+          type['values'].each do |value|
+            container[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_reserved_instances.rb

@@ -67,7 +67,7 @@ class AWSCosts::EC2ReservedInstances
       end
       result
     end
-    self.new(transformed[region])
+    region == 'us-east-1' ? self.new(transformed['us-east']) : self.new(transformed[region])
   end
 
 end

data/lib/awscosts/version.rb

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

data/spec/awscosts/ec2_elastic_ips_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe AWSCosts::ElasticIPs do
+  use_vcr_cassette
+
+  subject { AWSCosts.region('ap-southeast-2').ec2.elastic_ips}
+
+  its(:price_one) { should == 0 }
+  its(:price_additional_per_hour) { should > 0 }
+  its(:price_non_attached_per_hour) { should > 0 }
+  its(:price_remap_first_100) { should == 0 }
+  its(:price_remap_over_100) { should > 0 }
+
+end
+

data/spec/awscosts/ec2_reserved_instances_spec.rb

@@ -2,26 +2,34 @@ 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
+  describe 'Reserved instances' do
 
-      subject { AWSCosts.region('ap-southeast-1').ec2.reserved(type)}
+    AWSCosts::Region::SUPPORTED.keys.each do |r|
 
-      it 'upfront price for 1 year term' do
-        subject.upfront(:one_year).should have_key('m1.small')
-      end
+      context "in the #{r} region" do
+        [:windows, :linux, :windows_with_sql, :windows_with_sql_web, :rhel, :sles].each do |type|
+          context "EC2 type of #{type}" do
+            use_vcr_cassette
 
-      it 'upfront price for 3 year term' do
-        subject.upfront(:three_year).should have_key('m1.small')
-      end
+            subject { AWSCosts.region(r).ec2.reserved(type)}
 
-      it 'hourly price for 1 year term' do
-        subject.hourly(:one_year).should have_key('m1.small')
-      end
+            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')
+            it 'hourly price for 3 year term' do
+              subject.hourly(:three_year).should have_key('m1.small')
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awscosts
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -134,6 +134,12 @@ files:
 - 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_EC2ReservedInstances/Reserved_instances/in_the_us-east-1_region/EC2_type_of_linux.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2ReservedInstances/Reserved_instances/in_the_us-east-1_region/EC2_type_of_rhel.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2ReservedInstances/Reserved_instances/in_the_us-east-1_region/EC2_type_of_sles.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2ReservedInstances/Reserved_instances/in_the_us-east-1_region/EC2_type_of_windows.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2ReservedInstances/Reserved_instances/in_the_us-east-1_region/EC2_type_of_windows_with_sql.yml
+- fixtures/vcr_cassettes/AWSCosts_EC2ReservedInstances/Reserved_instances/in_the_us-east-1_region/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
@@ -143,6 +149,7 @@ files:
 - lib/awscosts/cache.rb
 - lib/awscosts/ec2.rb
 - lib/awscosts/ec2_ebs.rb
+- lib/awscosts/ec2_elastic_ips.rb
 - lib/awscosts/ec2_elb.rb
 - lib/awscosts/ec2_on_demand.rb
 - lib/awscosts/ec2_reserved_instances.rb
@@ -154,6 +161,7 @@ files:
 - lib/awscosts/s3_storage.rb
 - lib/awscosts/version.rb
 - spec/awscosts/ec2_ebs_spec.rb
+- spec/awscosts/ec2_elastic_ips_spec.rb
 - spec/awscosts/ec2_elb_spec.rb
 - spec/awscosts/ec2_on_demand_spec.rb
 - spec/awscosts/ec2_reserved_instances_spec.rb
@@ -177,18 +185,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1851467363620844181
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1851467363620844181
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -197,6 +199,7 @@ specification_version: 3
 summary: Programmatic access to AWS pricing
 test_files:
 - spec/awscosts/ec2_ebs_spec.rb
+- spec/awscosts/ec2_elastic_ips_spec.rb
 - spec/awscosts/ec2_elb_spec.rb
 - spec/awscosts/ec2_on_demand_spec.rb
 - spec/awscosts/ec2_reserved_instances_spec.rb