aws-pricing 0.4.0 → 0.5.0

data/.travis.yml

@@ -0,0 +1 @@
+language: ruby

data/Gemfile

@@ -4,8 +4,8 @@ gem 'httparty'
 gem 'json'
 
 group :development do
-  gem "rspec", "~> 2.8.0"
+  gem "rspec", "~> 2.11.0"
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", "~> 1.1.3"
   gem "jeweler", "~> 1.8.3"
 end

data/Gemfile.lock

@@ -17,22 +17,22 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.0)
+    rspec-expectations (2.11.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler (~> 1.1.3)
   httparty
   jeweler (~> 1.8.3)
   json
   rdoc (~> 3.12)
-  rspec (~> 2.8.0)
+  rspec (~> 2.11.0)

data/README.rdoc

@@ -1,5 +1,9 @@
 = 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]
+
+
 Simpler interface to AWS pricing data. Uses Amazon's unofficial json price URLs.
 
 == Scope of data available

data/Rakefile

@@ -29,6 +29,7 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
+  spec.rspec_opts = %w[-fs --color --backtrace]
 end
 
 RSpec::Core::RakeTask.new(:rcov) do |spec|

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/aws-pricing.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "aws-pricing"
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian Morgan"]
-  s.date = "2012-04-20"
+  s.date = "2012-07-15"
   s.description = "Simpler interface to AWS pricing data"
   s.email = "ian@ruby-code.com"
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -39,7 +40,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/seeingidog/aws-pricing"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "Simpler interface to AWS pricing data"
 
   if s.respond_to? :specification_version then
@@ -48,24 +49,24 @@ 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<rspec>, ["~> 2.11.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
       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<rspec>, ["~> 2.11.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.1.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     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<rspec>, ["~> 2.11.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.1.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
   end
 end

data/lib/aws-pricing/base.rb

@@ -4,9 +4,9 @@ module AWSPricing
     format :json
     base_uri 'http://aws.amazon.com/'
     
-  
+    private
     def self.get(url)
-      super(url).parsed_response['config']
+      super(url+'.json').parsed_response['config']
     end
     
   end

data/lib/aws-pricing/cloudfront.rb

@@ -5,12 +5,12 @@ module AWSPricing
   
     #Returns Hash of request pricing information
     def self.requests
-      Base.get('/cloudfront/pricing/pricing-cloudfront-requests.json')
+      Base.get('/cloudfront/pricing/pricing-cloudfront-requests')
     end
     
     #Returns Hash of data transfer pricing information
     def self.data_transfer
-      Base.get('/cloudfront/pricing/pricing-cloudfront-on-demand.json')
+      Base.get('/cloudfront/pricing/pricing-cloudfront-on-demand')
     end
   
   end

data/lib/aws-pricing/ec2.rb

@@ -5,7 +5,7 @@ module AWSPricing
   
     #Returns Hash of on-demand server instance pricing information
     def self.instances
-      Base.get('/ec2/pricing/pricing-on-demand-instances.json')
+      Base.get('/ec2/pricing/pricing-on-demand-instances')
     end
     
     #Returns Hash of current spot instance pricing information (5m)
@@ -18,27 +18,27 @@ module AWSPricing
   
     #Returns Hash of elastic block storage pricing information
     def self.ebs
-      Base.get('/ec2/pricing/pricing-ebs.json')
+      Base.get('/ec2/pricing/pricing-ebs')
     end
   
     #Returns Hash of data transfer pricing information
     def self.data_transfer
-      Base.get('/ec2/pricing/pricing-data-transfer.json')
+      Base.get('/ec2/pricing/pricing-data-transfer')
     end
     
     #Returns Hash of elastic IP pricing information
     def self.elastic_ips
-      Base.get('/ec2/pricing/pricing-elastic-ips.json')
+      Base.get('/ec2/pricing/pricing-elastic-ips')
     end
     
     #Returns Hash of Cloudwatch monitoring pricing information
     def self.cloud_watch
-      Base.get('/ec2/pricing/pricing-cloudwatch.json')
+      Base.get('/ec2/pricing/pricing-cloudwatch')
     end
     
     #Returns Hash of elastic loadbalancer pricing information
     def self.elb
-      Base.get('/ec2/pricing/pricing-elb.json')
+      Base.get('/ec2/pricing/pricing-elb')
     end
       
   end

data/lib/aws-pricing/emr.rb

@@ -5,7 +5,7 @@ module AWSPricing
   
     #Returns Hash of pricing information
     def self.pricing
-      Base.get('/elasticmapreduce/pricing/pricing-emr.json')
+      Base.get('/elasticmapreduce/pricing/pricing-emr')
     end
     
   end

data/lib/aws-pricing/rds.rb

@@ -5,12 +5,12 @@ module AWSPricing
   
     #Returns Hash of standard deployment pricing information
     def self.standard
-      Base.get('/rds/pricing/mysql/pricing-standard-deployments.json')
+      Base.get('/rds/pricing/mysql/pricing-standard-deployments')
     end
     
     #Returns Hash of multi-availability zone deployment pricing information
     def self.multi_az
-      Base.get('/rds/pricing/mysql/pricing-multiAZ-deployments.json')
+      Base.get('/rds/pricing/mysql/pricing-multiAZ-deployments')
     end
   
   end

data/lib/aws-pricing/s3.rb

@@ -4,17 +4,17 @@ module AWSPricing
     
     #Returns Hash of storage pricing information   
     def self.storage
-      Base.get('/s3/pricing/pricing-storage.json')
+      Base.get('/s3/pricing/pricing-storage')
     end
     
     #Returns Hash of data transfer pricing information   
     def self.data_transfer
-      Base.get('/s3/pricing/pricing-data-transfer.json')
+      Base.get('/s3/pricing/pricing-data-transfer')
     end
     
     #Returns Hash of request pricing information
     def self.requests
-      Base.get('/s3/pricing/pricing-requests.json')
+      Base.get('/s3/pricing/pricing-requests')
     end
   end
   

data/spec/aws-pricing_spec.rb

@@ -1,73 +1,74 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+include AWSPricing
+
 describe "AwsPricing" do
   
   describe "EC2 pricing" do
     it "returns a hash of instance pricing" do
-      AWSPricing::EC2.instances.class.should == Hash
+      EC2.instances.class.should == Hash
     end
   
     it "returns a hash of ebs pricing" do
-      AWSPricing::EC2.ebs.class.should == Hash
+      EC2.ebs.class.should == Hash
     end
   
     it "returns a hash of data transfer pricing" do
-      AWSPricing::EC2.data_transfer.class.should == Hash
+      EC2.data_transfer.class.should == Hash
     end
     
     it "returns a hash of elb pricing" do
-      AWSPricing::EC2.elb.class.should == Hash
+      EC2.elb.class.should == Hash
     end
     
     it "returns a hash of cloudwatch pricing" do
-      AWSPricing::EC2.cloud_watch.class.should == Hash
+      EC2.cloud_watch.class.should == Hash
     end
     
     it "returns a hash of elastic ip pricing" do
-      AWSPricing::EC2.elastic_ips.class.should == Hash
+      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
+      EC2.spot_instances.class.should == Hash
     end
     
-    
   end
   
   describe "S3 Pricing" do
     it "returns a hash of storage pricing" do
-      AWSPricing::S3.storage.class.should == Hash
+      S3.storage.class.should == Hash
     end
     it "returns a hash of data transfer pricing" do
-      AWSPricing::S3.data_transfer.class.should == Hash
+      S3.data_transfer.class.should == Hash
     end
     it "returns a hash of requests pricing" do
-      AWSPricing::S3.requests.class.should == Hash
+      S3.requests.class.should == Hash
     end
   end
   
   describe "Cloudfront pricing" do
     it "returns a hash of requests pricing" do
-      AWSPricing::CloudFront.data_transfer.class.should == Hash
+      CloudFront.data_transfer.class.should == Hash
     end
     it "returns a hash of requests pricing" do
-      AWSPricing::CloudFront.requests.class.should == Hash
+      CloudFront.requests.class.should == Hash
     end
   end
   
   describe "Elastic Mapreduce pricing" do
     it "returns a hash of pricing" do
-      AWSPricing::EMR.pricing.class.should == Hash
+      EMR.pricing.class.should == Hash
     end
   end
   
   describe "RDS pricing" do
     it "returns a hash of standard deployment pricing" do
-      AWSPricing::RDS.standard.class.should == Hash
+      RDS.standard.class.should == Hash
     end
     
     it "returns a hash of multi-az deployment pricing" do
-      AWSPricing::RDS.multi_az.class.should == Hash
+      RDS.multi_az.class.should == Hash
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-pricing
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2153300040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153300040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153299340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153299340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153298680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *2153298680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2153298140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,21 +69,31 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *2153298140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153297500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *2153297500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153296740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +101,12 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2153296740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 description: Simpler interface to AWS pricing data
 email: ian@ruby-code.com
 executables: []
@@ -87,6 +117,7 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -118,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2911167471319597973
+      hash: 3576624189235302444
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simpler interface to AWS pricing data