awscosts 0.0.7 → 0.0.8

data/lib/awscosts/ec2.rb

@@ -16,7 +16,7 @@ class AWSCosts::EC2
   end
 
   def on_demand(type)
-    AWSCosts::EC2OnDemand.fetch(TYPES[type], self.region.price_mapping)
+    AWSCosts::EC2OnDemand.fetch(TYPES[type], self.region.name)
   end
 
   def reserved(type, utilisation= :light)

data/lib/awscosts/s3.rb

@@ -6,20 +6,31 @@ class AWSCosts::S3
 
   attr_reader :region
 
+  REGION_MAPPING = {
+       'us-east-1' => "us-std",
+       'us-west-1' => "us-west-1",
+       'us-west-2' => "us-west-2",
+       'eu-west-1' => "eu-west-1",
+       'ap-southeast-1' => "ap-southeast-1",
+       'ap-southeast-2' =>"ap-southeast-2",
+       'ap-northeast-1' =>"ap-northeast-1",
+       'sa-east-1' => "sa-east-1"
+  }
+
   def initialize region
-    @region = region
+    @region = REGION_MAPPING[region.name]
   end
 
   def storage
-    AWSCosts::S3Storage.fetch(self.region.price_mapping)
+    AWSCosts::S3Storage.fetch(self.region)
   end
 
   def data_transfer
-    AWSCosts::S3DataTransfer.fetch(self.region.price_mapping)
+    AWSCosts::S3DataTransfer.fetch(self.region)
   end
 
   def requests
-    AWSCosts::S3Requests.fetch(self.region.price_mapping)
+    AWSCosts::S3Requests.fetch(self.region)
   end
 end
 

data/lib/awscosts/version.rb

@@ -1,3 +1,3 @@
 module AWSCosts
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/awscosts/ec2_ebs_spec.rb

@@ -3,37 +3,41 @@ require 'spec_helper'
 describe AWSCosts::EBS do
   use_vcr_cassette
 
-  subject { AWSCosts.region('ap-southeast-2').ec2.ebs}
+  AWSCosts::Region::SUPPORTED.keys.each do |region|
+    context "in the region of #{region}" do
+      subject { AWSCosts.region(region).ec2.ebs}
 
-  describe 'standard EBS volume' do
-    let(:price) { subject.price(:standard) }
+      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 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
+        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) }
+      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 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
+        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) }
+      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
+        it 'should provide a price per GB stored / month' do
+          price['perGBmoDataStored'].should > 0
+        end
+      end
     end
   end
 

data/spec/awscosts/ec2_elastic_ips_spec.rb

@@ -3,13 +3,17 @@ require 'spec_helper'
 describe AWSCosts::ElasticIPs do
   use_vcr_cassette
 
-  subject { AWSCosts.region('ap-southeast-2').ec2.elastic_ips}
+  AWSCosts::Region::SUPPORTED.keys.each do |region|
 
-  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 }
+    context "in the region of #{region}" do
+      subject { AWSCosts.region(region).ec2.elastic_ips}
 
+      it { expect(subject.price_one).to eql(0.0) }
+      it { expect(subject.price_additional_per_hour).to be > 0 }
+      it { expect(subject.price_non_attached_per_hour).to be > 0 }
+      it { expect(subject.price_remap_first_100).to eql(0.0) }
+      it { expect(subject.price_remap_over_100).to be > 0 }
+    end
+  end
 end
 

data/spec/awscosts/ec2_elb_spec.rb

@@ -5,8 +5,8 @@ describe AWSCosts::ELB do
 
   subject { AWSCosts.region('ap-southeast-2').ec2.elb}
 
-  its(:price_per_hour) { should > 0 }
-  its(:price_per_gb) { should > 0 }
+  it { expect(subject.price_per_hour).to be > 0 }
+  it { expect(subject.price_per_gb).to be > 0 }
 
 end
 

data/spec/awscosts/ec2_on_demand_spec.rb

@@ -6,9 +6,12 @@ describe AWSCosts::EC2OnDemand do
     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') }
+      AWSCosts::Region::SUPPORTED.keys.each do |region|
+        context "in the region of #{region}" do
+          subject { AWSCosts.region(region).ec2.on_demand(type)}
+          it {expect(subject.price).not_to be_empty }
+        end
+      end
     end
   end
 end

data/spec/awscosts/ec2_reserved_instances_spec.rb

@@ -14,19 +14,19 @@ describe AWSCosts::EC2ReservedInstances do
             subject { AWSCosts.region(r).ec2.reserved(type)}
 
             it 'upfront price for 1 year term' do
-              subject.upfront(:one_year).should have_key('m1.small')
+              subject.upfront(:one_year).should have_key('t2.small')
             end
 
             it 'upfront price for 3 year term' do
-              subject.upfront(:three_year).should have_key('m1.small')
+              subject.upfront(:three_year).should have_key('t2.small')
             end
 
             it 'hourly price for 1 year term' do
-              subject.hourly(:one_year).should have_key('m1.small')
+              subject.hourly(:one_year).should have_key('t2.small')
             end
 
             it 'hourly price for 3 year term' do
-              subject.hourly(:three_year).should have_key('m1.small')
+              subject.hourly(:three_year).should have_key('t2.small')
             end
           end
         end

data/spec/awscosts/ec2_spec.rb

@@ -2,9 +2,13 @@ require 'spec_helper'
 
 describe AWSCosts::EC2 do
 
-  subject { AWSCosts::EC2.new('us-east-1') }
+  AWSCosts::Region::SUPPORTED.keys.each do |region|
+    context "in the region of #{region}" do
+    subject { AWSCosts::EC2.new(region) }
 
-  it { should respond_to(:region) }
+    it { should respond_to(:region) }
+    end
+  end
 
 
 end

data/spec/awscosts/s3_data_transfer_spec.rb

@@ -3,9 +3,13 @@ require 'spec_helper'
 describe AWSCosts::S3DataTransfer do
   use_vcr_cassette
 
-  subject { AWSCosts.region('ap-northeast-1').s3.data_transfer}
+  AWSCosts::Region::SUPPORTED.keys.each do |region|
+    context "in the region of #{region}" do
+      subject { AWSCosts.region(region).s3.data_transfer}
 
-  its(:price) { should have_key('dataXferInS3') }
+      it { expect(subject.price).to have_key('dataXferInS3') }
+    end
+  end
 end
 
 

data/spec/awscosts/s3_requests_spec.rb

@@ -3,8 +3,11 @@ require 'spec_helper'
 describe AWSCosts::S3Requests do
   use_vcr_cassette
 
-  subject { AWSCosts.region('ap-northeast-1').s3.requests}
-
-  its(:price) { should have_key('putcopypost') }
+  AWSCosts::Region::SUPPORTED.keys.each do |region|
+    context "in the region of #{region}" do
+      subject { AWSCosts.region(region).s3.requests}
+      it { expect(subject.price).to have_key('putcopypost') }
+    end
+  end
 end
 

data/spec/awscosts/s3_storage_spec.rb

@@ -3,10 +3,15 @@ require 'spec_helper'
 describe AWSCosts::S3Storage do
   use_vcr_cassette
 
-  subject { AWSCosts.region('ap-northeast-1').s3.storage}
+  AWSCosts::Region::SUPPORTED.keys.each do |region|
+    context "in the region of #{region}" do
+      subject { AWSCosts.region(region).s3.storage}
 
-  its(:price) { should have_key('firstTBstorage') }
-  its(:price) { should have_key('next49TBstorage') }
+      it { expect(subject.price).to have_key('firstTBstorage') }
+      it { expect(subject.price).to have_key('next49TBstorage') }
+    end
+  end
 end
 
 
+

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: awscosts
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.0.8
 platform: ruby
 authors:
 - Stephen Bartlett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: rspec
   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: 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
@@ -115,7 +102,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -170,33 +157,26 @@ files:
 homepage: https://github.com/srbartlett/awscosts
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -374550561017871658
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -374550561017871658
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Programmatic access to AWS pricing
 test_files:
 - spec/awscosts/ec2_ebs_spec.rb