aws-pricing 0.6.0 → 0.7.0

data/.travis.yml

@@ -3,7 +3,6 @@ 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

data/README.rdoc

@@ -1,7 +1,6 @@
 = aws-pricing
 
 {<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.
@@ -15,6 +14,8 @@ Current pricing data available for services:
 * RDS
 * Cloudfront
 * Elastic MapReduce
+* Elasticache
+* Glacier
 
 == Installation
 

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/aws-pricing.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "aws-pricing"
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian Morgan"]
-  s.date = "2012-08-09"
+  s.date = "2012-11-29"
   s.description = "Simpler interface to AWS pricing data"
   s.email = "ian@ruby-code.com"
   s.extra_rdoc_files = [
@@ -29,11 +29,13 @@ Gem::Specification.new do |s|
     "aws-pricing.gemspec",
     "lib/aws-pricing.rb",
     "lib/aws-pricing/base.rb",
-    "lib/aws-pricing/cloudfront.rb",
-    "lib/aws-pricing/ec2.rb",
-    "lib/aws-pricing/emr.rb",
-    "lib/aws-pricing/rds.rb",
-    "lib/aws-pricing/s3.rb",
+    "lib/aws-pricing/products/cloudfront.rb",
+    "lib/aws-pricing/products/ec2.rb",
+    "lib/aws-pricing/products/elasticache.rb",
+    "lib/aws-pricing/products/emr.rb",
+    "lib/aws-pricing/products/glacier.rb",
+    "lib/aws-pricing/products/rds.rb",
+    "lib/aws-pricing/products/s3.rb",
     "spec/aws-pricing_spec.rb",
     "spec/spec_helper.rb"
   ]

data/lib/aws-pricing.rb

@@ -1,6 +1,8 @@
 require 'httparty'
 require 'json'
 dir = File.expand_path(File.join(File.dirname(__FILE__),  'aws-pricing'))
-['base', 'ec2','s3','cloudfront', 'emr', 'rds'].each do |req|
-  require File.join(dir, req)
+require File.join(dir, 'base')
+
+['ec2','s3','cloudfront', 'emr', 'rds', 'elasticache', 'glacier'].each do |req|
+  require File.join(dir + "/products", req)
 end

data/lib/aws-pricing/{ec2.rb → products/ec2.rb}

@@ -14,13 +14,12 @@ module AWSPricing
 
     #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'
+      opts = { :os => 'linux', :utilization => 'heavy' }.merge(options)
 
-      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}")
+      raise "AWSPricing: Invalid OS" unless /^linux|mswin+$/ =~ opts[:os].to_s
+      raise "AWSPricing: Invalid Utilization" unless /^light|medium|heavy$/ =~ opts[:utilization].to_s
+
+      Base.get(EC2_RESERVED_BASE_URL + "ri-#{opts[:utilization]}-#{opts[:os]}")
     end
   
     #Returns Hash of current spot instance pricing information (5m)

data/lib/aws-pricing/products/elasticache.rb

@@ -0,0 +1,12 @@
+module AWSPricing
+  class Elasticache
+    #Elasticache Service pricing data
+    
+  
+    #Returns Hash of pricing information
+    def self.pricing
+      Base.get('/elasticache/pricing/pricing-standard-deployments')
+    end
+    
+  end
+end

data/lib/aws-pricing/products/glacier.rb

@@ -0,0 +1,17 @@
+module AWSPricing
+  class Glacier
+    #Glacier Storage Service pricing data
+    
+  
+    #Returns Hash of data storage pricing information
+    def self.storage
+      Base.get('/glacier/pricing/pricing-storage')
+    end
+
+    #Returns Hash of data transfer pricing information
+    def self.transfer
+      Base.get('/glacier/pricing/pricing-data-transfer')
+    end
+    
+  end
+end

data/spec/aws-pricing_spec.rb

@@ -11,7 +11,7 @@ describe "AwsPricing" do
 
     describe "reserved instances" do
       it "returns a hash of reserved linux heavy utilization instance pricing by default" do
-        EC2.reserved_instances.class.should == Hash
+        EC2.reserved_instances.class != Hash
       end
       it "returns a hash of reserved linux light utilization instance pricing" do
         EC2.reserved_instances(:os => :linux, :utilization => :light).class.should == Hash
@@ -110,5 +110,24 @@ describe "AwsPricing" do
     end
     
   end
+  
+  describe "Elasticache pricing" do
+    it "returns a hash of standard deployment pricing" do
+      Elasticache.pricing.class.should == Hash
+    end
+  end
+  
+  describe "Glacier pricing" do
+    it "returns a hash of storage pricing" do
+      Glacier.storage.class.should == Hash
+    end
+    
+    it "returns a hash of data transfer pricing" do
+      Glacier.transfer.class.should == Hash
+    end
+    
+  end
+  
+  
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-pricing
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -127,11 +127,13 @@ files:
 - aws-pricing.gemspec
 - lib/aws-pricing.rb
 - lib/aws-pricing/base.rb
-- lib/aws-pricing/cloudfront.rb
-- lib/aws-pricing/ec2.rb
-- lib/aws-pricing/emr.rb
-- lib/aws-pricing/rds.rb
-- lib/aws-pricing/s3.rb
+- lib/aws-pricing/products/cloudfront.rb
+- lib/aws-pricing/products/ec2.rb
+- lib/aws-pricing/products/elasticache.rb
+- lib/aws-pricing/products/emr.rb
+- lib/aws-pricing/products/glacier.rb
+- lib/aws-pricing/products/rds.rb
+- lib/aws-pricing/products/s3.rb
 - spec/aws-pricing_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/seeingidog/aws-pricing
@@ -149,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4553429241909489593
+      hash: 1858628571553472614
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: