aws-pricing 0.2.0 → 0.3.0

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 gem 'httparty'
+gem 'json'
 
 group :development do
   gem "rspec", "~> 2.8.0"

data/Gemfile.lock

@@ -33,5 +33,6 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   httparty
   jeweler (~> 1.8.3)
+  json
   rdoc (~> 3.12)
   rspec (~> 2.8.0)

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/aws-pricing.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "aws-pricing"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian Morgan"]
@@ -47,12 +47,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
     else
       s.add_dependency(%q<httparty>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -60,6 +62,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<httparty>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/aws-pricing.rb

@@ -1,4 +1,5 @@
 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)

data/lib/aws-pricing/ec2.rb

@@ -3,10 +3,18 @@ module AWSPricing
     #Elastic Compute pricing data
     
   
-    #Returns Hash of server instance pricing information
+    #Returns Hash of on-demand server instance pricing information
     def self.instances
       Base.get('/ec2/pricing/pricing-on-demand-instances.json')
     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
+      callback_response.gsub!('callback(','')
+      callback_response.slice!(callback_response.length-1)
+      JSON.parse callback_response
+    end
   
     #Returns Hash of elastic block storage pricing information
     def self.ebs
@@ -32,6 +40,6 @@ module AWSPricing
     def self.elb
       Base.get('/ec2/pricing/pricing-elb.json')
     end
-  
+      
   end
 end

data/spec/aws-pricing_spec.rb

@@ -27,6 +27,10 @@ describe "AwsPricing" do
       AWSPricing::EC2.elastic_ips.class.should == Hash
     end
     
+    it "returns a hash of spot instance pricing from jsonp callback hack" do
+      AWSPricing::EC2.spot_instances.class.should == Hash
+    end
+    
     
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-pricing
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2162624860 !ruby/object:Gem::Requirement
+  requirement: &2155604820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162624860
+  version_requirements: *2155604820
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2155603780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2155603780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2162624020 !ruby/object:Gem::Requirement
+  requirement: &2155602800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2162624020
+  version_requirements: *2155602800
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2162623420 !ruby/object:Gem::Requirement
+  requirement: &2155602080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *2162623420
+  version_requirements: *2155602080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2162622680 !ruby/object:Gem::Requirement
+  requirement: &2155601180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2162622680
+  version_requirements: *2155601180
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2162621840 !ruby/object:Gem::Requirement
+  requirement: &2155600180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +76,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2162621840
+  version_requirements: *2155600180
 description: Simpler interface to AWS pricing data
 email: ian@ruby-code.com
 executables: []
@@ -107,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1537789119708931460
+      hash: 2973659971606962462
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: