awsum 0.5.2 → 0.5.3

data/.rspec

@@ -1 +1,2 @@
+--tty
 --colour

data/Gemfile

@@ -6,10 +6,8 @@ gem "bundler", "~> 1.0.0"
 group :development do
   gem "jeweler"
   gem "rspec", ">= 2.0.0"
-  gem "fakeweb"
 
-  gem "shoulda"
-  gem "mocha"
+  gem "fakeweb"
   gem "rcov"
   gem "timecop"
 end

data/Gemfile.lock

@@ -8,8 +8,6 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    mocha (0.9.10)
-      rake
     rake (0.8.7)
     rcov (0.9.9)
     rspec (2.4.0)
@@ -20,7 +18,6 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
-    shoulda (2.11.3)
     timecop (0.3.5)
 
 PLATFORMS
@@ -30,9 +27,7 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   fakeweb
   jeweler
-  mocha
   rake
   rcov
   rspec (>= 2.0.0)
-  shoulda
   timecop

data/lib/awsum.rb

@@ -11,7 +11,7 @@ require 'awsum/requestable'
 require 'awsum/support'
 
 module Awsum
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 
   API_VERSION = '2010-08-31'
   SIGNATURE_VERSION = 2

data/lib/awsum/ec2.rb

@@ -203,7 +203,13 @@ module Awsum
       require 'open-uri'
       begin
         instance_id = open('http://169.254.169.254/latest/meta-data/instance-id').read
-        instance instance_id
+        availability_zone = open('http://169.254.169.254/latest/meta-data/placement/availability-zone').read
+        #NOTE: This relies on the assumption that the region code is
+        #      always one less character than the availability zone
+        region_code = availability_zone.chop
+        region(region_code) do
+          instance instance_id
+        end
       rescue OpenURI::HTTPError => e
         nil
       end

data/lib/awsum/ec2/region.rb

@@ -52,6 +52,10 @@ module Awsum
           @ec2.send(method_name, *args, &block)
         end
       end
+
+      def respond_to?(method_name, include_private = false)
+        @ec2.respond_to?(method_name, include_private) || super
+      end
     end
   end
 end

data/lib/awsum/requestable.rb

@@ -42,6 +42,7 @@ module Awsum
       params_string << "&Signature=#{CGI::escape(signature)}"
 
       url = "https://#{host}/?#{params_string}"
+      puts "url: #{url}" if ENV['DEBUG']
       response = process_request('GET', url)
       if response.is_a?(Net::HTTPSuccess)
         response

data/spec/lib/awsum/ec2/image_spec.rb

@@ -56,7 +56,9 @@ module Awsum
 
     describe "retrieving a filtered list of images with a complicated filter" do
       before do
+        #Registering 2 different uri's to handle the difference between Ruby 1.8.7 and 1.9.2
         FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeImages.*Filter.1.Name=tag%3AName.*Filter.1.Value.1=Test.*Filter.2.Name=image-type.*Filter.2.Value.1=machine.*Filter.2.Value.2=kernel.*Filter.2.Value.3=ramdisk.*Filter.3.Name=architecture.*Filter.3.Value.1=i386|, :body => fixture('ec2/images'), :status => 200)
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeImages.*Filter.1.Name=architecture.*Filter.1.Value.1=i386.*Filter.2.Name=tag%3AName.*Filter.2.Value.1=Test.*Filter.3.Name=image-type.*Filter.3.Value.1=machine.*Filter.3.Value.2=kernel.*Filter.3.Value.3=ramdisk|, :body => fixture('ec2/images'), :status => 200)
       end
 
       let(:result) { ec2.images(:filter => {:architecture => 'i386', 'tag:Name' => 'Test', 'image-type' => ['machine', 'kernel', 'ramdisk']}) }

data/spec/lib/awsum/ec2/instance_spec.rb

@@ -135,8 +135,10 @@ module Awsum
     describe "on a running instance" do
       it "should be able to retrieve an instance of itself" do
         FakeWeb.register_uri(:get, 'http://169.254.169.254/latest/meta-data/instance-id', :body => 'i-3f1cc856', :status => 200)
+        FakeWeb.register_uri(:get, 'http://169.254.169.254/latest/meta-data/placement/availability-zone', :body => 'eu-west-1a', :status => 200)
 
-        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeInstances.*InstanceId.1=i-3f1cc856|, :body => fixture('ec2/instance'), :status => 200)
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeRegions.*RegionName.1=eu-west-1|, :body => fixture('ec2/regions'), :status => 200)
+        FakeWeb.register_uri(:get, %r|https://eu-west-1.ec2\.amazonaws\.com/?.*Action=DescribeInstances.*InstanceId.1=i-3f1cc856|, :body => fixture('ec2/instance'), :status => 200)
 
         ec2.me.should be_a(Awsum::Ec2::Instance)
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awsum
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 13
+  prerelease: 
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Andrew Timberlake
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +02:00
+date: 2011-02-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   name: rake
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -31,10 +29,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   name: bundler
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,10 +45,10 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  prerelease: false
+  type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
   name: jeweler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,10 +59,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   name: rspec
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,10 +75,10 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   name: fakeweb
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -91,40 +89,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  name: shoulda
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: mocha
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
   name: rcov
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -133,12 +103,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   name: timecop
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -147,12 +117,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -163,7 +133,9 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  requirement: *id010
+  prerelease: false
+  type: :development
+  requirement: *id008
 description: 
 email: andrew@andrewtimberlake.com
 executables: []
@@ -340,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A library for working with Amazon Web Services in the most natural rubyish way