aws-pricing 0.5.0 → 0.6.0

data/.travis.yml

@@ -1 +1,10 @@
 language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode
+script: bundle exec rspec spec

data/README.rdoc

@@ -2,7 +2,7 @@
 
 {<img src="https://secure.travis-ci.org/seeingidog/aws-pricing.png?branch=master" alt="Build Status" />}[http://travis-ci.org/seeingidog/aws-pricing]
 {<img src="https://gemnasium.com/seeingidog/aws-pricing.png" alt="Dependency Status" />}[https://gemnasium.com/seeingidog/aws-pricing]
-
+{<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/seeingidog/aws-pricing]
 
 Simpler interface to AWS pricing data. Uses Amazon's unofficial json price URLs.
 

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/aws-pricing.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "aws-pricing"
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian Morgan"]
-  s.date = "2012-07-15"
+  s.date = "2012-08-09"
   s.description = "Simpler interface to AWS pricing data"
   s.email = "ian@ruby-code.com"
   s.extra_rdoc_files = [

data/lib/aws-pricing/cloudfront.rb

@@ -1,16 +1,16 @@
 module AWSPricing
   class CloudFront
     #Cloudfront pricing data
-  
+    CLOUDFRONT_BASE_URL = '/cloudfront/pricing/pricing-cloudfront-'
   
     #Returns Hash of request pricing information
     def self.requests
-      Base.get('/cloudfront/pricing/pricing-cloudfront-requests')
+      Base.get(CLOUDFRONT_BASE_URL + 'requests')
     end
     
     #Returns Hash of data transfer pricing information
     def self.data_transfer
-      Base.get('/cloudfront/pricing/pricing-cloudfront-on-demand')
+      Base.get(CLOUDFRONT_BASE_URL + 'on-demand')
     end
   
   end

data/lib/aws-pricing/ec2.rb

@@ -2,12 +2,27 @@ module AWSPricing
   class EC2
     #Elastic Compute pricing data
     
+    
   
+    EC2_BASE_URL          = '/ec2/pricing/pricing-'
+    EC2_RESERVED_BASE_URL = '/ec2/pricing/'
+
     #Returns Hash of on-demand server instance pricing information
     def self.instances
-      Base.get('/ec2/pricing/pricing-on-demand-instances')
+      Base.get(EC2_BASE_URL + 'on-demand-instances')
     end
-    
+
+    #Returns Hash of reserved server instance pricing information
+    def self.reserved_instances(options = {})
+      os          = options[:os].to_s          || 'linux'
+      utilization = options[:utilization].to_s || 'heavy'
+
+      raise "AWSPricing: Invalid OS" unless /^linux|mswin+$/ =~ os
+      raise "AWSPricing: Invalid Utilization" unless /^light|medium|heavy$/ =~ utilization
+  
+      Base.get(EC2_RESERVED_BASE_URL + "ri-#{utilization}-#{os}")
+    end
+  
     #Returns Hash of current spot instance pricing information (5m)
     def self.spot_instances
       callback_response = Net::HTTP.get_response(URI.parse 'http://spot-price.s3.amazonaws.com/spot.js').body
@@ -18,27 +33,27 @@ module AWSPricing
   
     #Returns Hash of elastic block storage pricing information
     def self.ebs
-      Base.get('/ec2/pricing/pricing-ebs')
+      Base.get(EC2_BASE_URL + 'ebs')
     end
   
     #Returns Hash of data transfer pricing information
     def self.data_transfer
-      Base.get('/ec2/pricing/pricing-data-transfer')
+      Base.get(EC2_BASE_URL + 'data-transfer')
     end
     
     #Returns Hash of elastic IP pricing information
     def self.elastic_ips
-      Base.get('/ec2/pricing/pricing-elastic-ips')
+      Base.get(EC2_BASE_URL + 'elastic-ips')
     end
     
     #Returns Hash of Cloudwatch monitoring pricing information
     def self.cloud_watch
-      Base.get('/ec2/pricing/pricing-cloudwatch')
+      Base.get(EC2_BASE_URL + 'cloudwatch')
     end
     
     #Returns Hash of elastic loadbalancer pricing information
     def self.elb
-      Base.get('/ec2/pricing/pricing-elb')
+      Base.get(EC2_BASE_URL + 'elb')
     end
       
   end

data/lib/aws-pricing/rds.rb

@@ -2,15 +2,16 @@ module AWSPricing
   class RDS
     #Relation Database Service pricing data
     
-  
+    RDS_BASE_URL = '/rds/pricing/mysql/pricing-'
+    
     #Returns Hash of standard deployment pricing information
     def self.standard
-      Base.get('/rds/pricing/mysql/pricing-standard-deployments')
+      Base.get(RDS_BASE_URL + 'standard-deployments')
     end
     
     #Returns Hash of multi-availability zone deployment pricing information
     def self.multi_az
-      Base.get('/rds/pricing/mysql/pricing-multiAZ-deployments')
+      Base.get(RDS_BASE_URL + 'multiAZ-deployments')
     end
   
   end

data/lib/aws-pricing/s3.rb

@@ -2,19 +2,21 @@ module AWSPricing
   class S3
     #Simple Storage Service pricing data
     
+    S3_BASE_URL = '/s3/pricing/pricing-'
+    
     #Returns Hash of storage pricing information   
     def self.storage
-      Base.get('/s3/pricing/pricing-storage')
+      Base.get(S3_BASE_URL + 'storage')
     end
     
     #Returns Hash of data transfer pricing information   
     def self.data_transfer
-      Base.get('/s3/pricing/pricing-data-transfer')
+      Base.get(S3_BASE_URL + 'data-transfer')
     end
     
     #Returns Hash of request pricing information
     def self.requests
-      Base.get('/s3/pricing/pricing-requests')
+      Base.get(S3_BASE_URL + 'requests')
     end
   end
   

data/spec/aws-pricing_spec.rb

@@ -8,7 +8,45 @@ describe "AwsPricing" do
     it "returns a hash of instance pricing" do
       EC2.instances.class.should == Hash
     end
+
+    describe "reserved instances" do
+      it "returns a hash of reserved linux heavy utilization instance pricing by default" do
+        EC2.reserved_instances.class.should == Hash
+      end
+      it "returns a hash of reserved linux light utilization instance pricing" do
+        EC2.reserved_instances(:os => :linux, :utilization => :light).class.should == Hash
+      end
   
+      it "returns a hash of reserved linux medium utilization instance pricing" do
+        EC2.reserved_instances(:os => :linux, :utilization => :medium).class.should == Hash
+      end
+
+      it "returns a hash of reserved linux heavy utlization instance pricing" do
+        EC2.reserved_instances(:os => :linux, :utilization => :heavy).class.should == Hash
+      end
+
+
+      it "returns a hash of reserved mswin light utilization instance pricing" do
+        EC2.reserved_instances(:os => :mswin, :utilization => :light).class.should == Hash
+      end
+
+      it "returns a hash of reserved mswin medium utilization instance pricing" do
+        EC2.reserved_instances(:os => :mswin, :utilization => :medium).class.should == Hash
+      end
+
+      it "returns a hash of reserved mswin heavy utlization instance pricing" do
+        EC2.reserved_instances(:os => :mswin, :utilization => :heavy).class.should == Hash
+      end
+
+      it "raises an error if invalid os is provided" do
+        lambda { EC2.reserved_instances(:os => :macosx) }.should raise_error
+      end
+
+      it "raises an error if invalid utilization is provided" do
+        lambda { EC2.reserved_instances(:utilization => :none) }.should raise_error
+      end
+    end
+
     it "returns a hash of ebs pricing" do
       EC2.ebs.class.should == Hash
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-pricing
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -149,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3576624189235302444
+      hash: 4553429241909489593
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: