awsum 0.5 → 0.5.1

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

@@ -7,11 +7,25 @@ module Awsum
     let(:ec2) { subject }
 
     describe "creating a snapshot" do
+      before do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=CreateSnapshot.*Description=Test%20snapshot.*VolumeId=vol-44d6322d|, :body => fixture('ec2/create_snapshot'), :status => 200)
+      end
+
+      let(:result) { ec2.create_snapshot 'vol-44d6322d', :description => 'Test snapshot' }
+
+      it "should return a snapshot" do
+        result.should be_a(Awsum::Ec2::Snapshot)
+      end
+    end
+
+    describe "creating a snapshot with tags" do
       before do
         FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=CreateSnapshot.*VolumeId=vol-44d6322d|, :body => fixture('ec2/create_snapshot'), :status => 200)
+
+        ec2.should_receive(:create_tags).with('snap-747c911d', :name => 'Test')
       end
 
-      let(:result) { ec2.create_snapshot 'vol-44d6322d' }
+      let(:result) { ec2.create_snapshot 'vol-44d6322d', :tags => {:name => 'Test'} }
 
       it "should return a snapshot" do
         result.should be_a(Awsum::Ec2::Snapshot)
@@ -42,6 +56,18 @@ module Awsum
       end
     end
 
+    describe "retrieving a list of snapshots with a filter" do
+      before do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeSnapshots.*Filter.1.Name=Name.*Filter.1.Value.1=Test|, :body => fixture('ec2/snapshots'), :status => 200)
+      end
+
+      let(:result) { ec2.snapshots(:filter => {'Name' => 'Test'}) }
+
+      it "should return a snapshot" do
+        result.first.should be_a(Awsum::Ec2::Snapshot)
+      end
+    end
+
     describe "deleting a snapshot" do
       before do
         FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DeleteSnapshot.*SnapshotId=snap-747c911d|, :body => fixture('ec2/delete_snapshot'), :status => 200)

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

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+module Awsum
+  describe Ec2::State do
+    let(:state) { Ec2::State.new(0, 'pending') }
+
+    it "should be comparable to a number" do
+      state.should == 0
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+module Awsum
+  describe Ec2 do
+
+    subject { Ec2.new('abc', 'xyz') }
+    let(:ec2) { subject }
+
+    describe "creating a tag" do
+      before do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=CreateTags.*ResourceId.1=ari-f9c22690.*Tag.1.Key=name.*Tag.1.Value=Test|, :status => 200)
+      end
+
+      let(:result) { ec2.create_tags 'ari-f9c22690', :name => 'Test' }
+
+      it "should return true" do
+        result.should be_true
+      end
+    end
+
+    describe "retrieving a list of tags" do
+      before do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeTags|, :body => fixture('ec2/tags'), :status => 200)
+      end
+
+      let(:result) { ec2.tags }
+
+      it "should return an array of tags" do
+        result.first.should be_a(Awsum::Ec2::Tag)
+      end
+    end
+
+    describe "retrieving a list of tags with a filter" do
+      before do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeTags.*Filter.1.Name=key.*Filter.1.Value.1=name|, :body => fixture('ec2/tags'), :status => 200)
+      end
+
+      let(:result) { ec2.tags(:key => :name) }
+
+      it "should return an array of tags" do
+        result.first.should be_a(Awsum::Ec2::Tag)
+      end
+    end
+  end
+end

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

@@ -18,6 +18,20 @@ module Awsum
       end
     end
 
+    describe "creating a volume with a tag" do
+      before do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=CreateVolume.*AvailabilityZone=us-east-1b.*Size=10|, :body => fixture('ec2/create_volume'), :status => 200)
+
+        ec2.should_receive(:create_tags).with('vol-44d6322d', :name => 'Test')
+      end
+
+      let(:result) { ec2.create_volume 'us-east-1b', :size => 10, :tags => {:name => 'Test'} }
+
+      it "should return a volume" do
+        result.should be_a(Awsum::Ec2::Volume)
+      end
+    end
+
     describe "retrieving a list of volumes" do
       before do
         FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeVolumes|, :body => fixture('ec2/volumes'), :status => 200)
@@ -30,6 +44,30 @@ module Awsum
       end
     end
 
+    describe "retrieving a list of volumes with a filter" do
+      before do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeVolumes.*Filter.1.Name=attachment.status.*Filter.1.Value.1=attached|, :body => fixture('ec2/volumes'), :status => 200)
+      end
+
+      let(:result) { ec2.volumes(:filter => {'attachment.status' => 'attached'}) }
+
+      it "should return an array of volumes" do
+        result.first.should be_a(Awsum::Ec2::Volume)
+      end
+    end
+
+    describe "retrieving a list of volumes by tag" do
+      before do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeVolumes.*Filter.1.Name=tag%3Aname.*Filter.1.Value.1=Test|, :body => fixture('ec2/volumes'), :status => 200)
+      end
+
+      let(:result) { ec2.volumes(:tags => {:name=> 'Test'}) }
+
+      it "should return an array of volumes" do
+        result.first.should be_a(Awsum::Ec2::Volume)
+      end
+    end
+
     describe "retrieving a volume by id" do
       before do
         FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DescribeVolumes.*VolumeId.1=vol-44d6322d|, :body => fixture('ec2/volumes'), :status => 200)
@@ -91,6 +129,15 @@ module Awsum
         volume.delete.should be_true
       end
 
+      it "should be able to force delete itself" do
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DetachVolume.*Force=true.*VolumeId=vol-44d6322d|, :body => fixture('ec2/detach_volume'), :status => 200)
+        FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=DeleteVolume.*VolumeId=vol-44d6322d|, :body => fixture('ec2/delete_volume'), :status => 200)
+
+        volume.should_receive(:status).and_return('available')
+
+        volume.delete!.should be_true
+      end
+
       it "should be able to create a snapshot of itself" do
         FakeWeb.register_uri(:get, %r|https://ec2\.amazonaws\.com/?.*Action=CreateSnapshot.*VolumeId=vol-44d6322d|, :body => fixture('ec2/create_snapshot'), :status => 200)
 

data/spec/lib/awsum/requestable_spec.rb

@@ -20,7 +20,7 @@ module Awsum
 
       describe "#send_query_request" do
         it "should generate the correct request uri" do
-          FakeWeb.register_uri(:get, 'https://test.amazonaws.com/?AWSAccessKeyId=ABCDEF&Action=DescribeImages&ImageId.1=ami-1234567&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2009-01-23T03%3A34%3A38.000Z&Version=2010-06-15&Signature=ZkjqlJRngvT4sITa50ZODqeYn%2FMBBDNtFhFf6ucz7QI%3D', :body => '', :status => 200)
+          FakeWeb.register_uri(:get, 'https://test.amazonaws.com/?AWSAccessKeyId=ABCDEF&Action=DescribeImages&ImageId.1=ami-1234567&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2009-01-23T03%3A34%3A38.000Z&Version=2010-08-31&Signature=y5cfq8sS%2FinWuP5q2%2B8fs%2BDxfQx4dA%2F54fyNnL3LIkU%3D', :body => '', :status => 200)
 
           subject.send(:send_query_request, {'Action' => 'DescribeImages', 'ImageId.1' => 'ami-1234567', 'Timestamp' => '2009-01-23T03:34:38.000Z'})
         end

data/tools/dump.rb

@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+
+ROOT = File.join(File.dirname(__FILE__), '..')
+
+$LOAD_PATH << File.join(ROOT, 'lib')
+require 'awsum/ec2'
+require 'awsum/s3'
+
+#Dumps the raw result of a call to the Awsum library
+# Usage ruby dump.rb -a <access key> -s <secret key> -c <command to call>
+#
+# Awsum::Ec2 is available as ec2
+# Awsum::S3 is available as s3
+#
+# Exampe
+# ruby dump.rb -a ABC -s XYZ -c "ec2.images"
+
+#Parse command line
+access_key = nil
+secret_key = nil
+command = nil
+ARGV.each_with_index do |arg, i|
+  case arg
+    when '-a'
+      access_key = ARGV[i+1]
+    when '-s'
+      secret_key = ARGV[i+1]
+    when '-c'
+      command = ARGV[i+1]
+  end
+end
+
+ENV['DEBUG'] = 'true'
+
+ec2 = Awsum::Ec2.new(access_key, secret_key)
+s3 = Awsum::S3.new(access_key, secret_key)
+
+
+module Awsum
+  module Requestable
+    alias_method :old_handle_response, :handle_response
+    def handle_response(response, &block)
+      puts "block given" if block_given?
+      puts response.body
+      old_handle_response(response, &block)
+    end
+  end
+end
+
+begin
+  eval(command)
+rescue Awsum::Error => e
+  puts "ERROR: #{e.inspect}"
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awsum
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  version: "0.5"
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Andrew Timberlake
@@ -14,11 +15,144 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-19 00:00:00 +02:00
+date: 2011-02-01 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
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  name: bundler
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: jeweler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: rspec
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: fakeweb
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        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
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: rcov
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: timecop
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: rspec
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,10 +165,7 @@ dependencies:
         - beta
         - 22
         version: 2.0.0.beta.22
-  requirement: *id001
-  prerelease: false
-  type: :development
-  name: rspec
+  requirement: *id010
 description: 
 email: andrew@andrewtimberlake.com
 executables: []
@@ -46,7 +177,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .autotest
-- .gitignore
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -54,6 +184,8 @@ files:
 - README.rdoc
 - Rakefile
 - awsum.gemspec
+- functional/ec2/instances_spec.rb
+- functional/spec_helper.rb
 - lib/awsum.rb
 - lib/awsum/ec2.rb
 - lib/awsum/ec2/address.rb
@@ -73,12 +205,15 @@ files:
 - lib/awsum/ec2/parsers/reserved_instances_offering_parser.rb
 - lib/awsum/ec2/parsers/security_group_parser.rb
 - lib/awsum/ec2/parsers/snapshot_parser.rb
+- lib/awsum/ec2/parsers/tag_parser.rb
 - lib/awsum/ec2/parsers/volume_parser.rb
 - lib/awsum/ec2/region.rb
 - lib/awsum/ec2/reserved_instance.rb
 - lib/awsum/ec2/reserved_instances_offering.rb
 - lib/awsum/ec2/security_group.rb
 - lib/awsum/ec2/snapshot.rb
+- lib/awsum/ec2/state.rb
+- lib/awsum/ec2/tag.rb
 - lib/awsum/ec2/volume.rb
 - lib/awsum/error.rb
 - lib/awsum/net_fix.rb
@@ -94,6 +229,7 @@ files:
 - spec/fixtures/ec2/allocate_address.xml
 - spec/fixtures/ec2/associate_address.xml
 - spec/fixtures/ec2/attach_volume.xml
+- spec/fixtures/ec2/authorize_group_access.xml
 - spec/fixtures/ec2/authorize_ip_access.xml
 - spec/fixtures/ec2/authorize_owner_group_access.xml
 - spec/fixtures/ec2/authorize_owner_group_access_error.xml
@@ -119,7 +255,7 @@ files:
 - spec/fixtures/ec2/invalid_request_error.xml
 - spec/fixtures/ec2/key_pairs.xml
 - spec/fixtures/ec2/purchase_reserved_instances_offering.xml
-- spec/fixtures/ec2/purchase_reserved_instances_offerings.xml
+- spec/fixtures/ec2/purchase_reserved_instances_offering2.xml
 - spec/fixtures/ec2/regions.xml
 - spec/fixtures/ec2/register_image.xml
 - spec/fixtures/ec2/release_address.xml
@@ -131,6 +267,7 @@ files:
 - spec/fixtures/ec2/run_instances.xml
 - spec/fixtures/ec2/security_groups.xml
 - spec/fixtures/ec2/snapshots.xml
+- spec/fixtures/ec2/tags.xml
 - spec/fixtures/ec2/terminate_instances.xml
 - spec/fixtures/ec2/unassociated_address.xml
 - spec/fixtures/ec2/volumes.xml
@@ -156,12 +293,15 @@ files:
 - spec/lib/awsum/ec2/parsers/reserved_instances_offering_parser_spec.rb
 - spec/lib/awsum/ec2/parsers/security_group_parser_spec.rb
 - spec/lib/awsum/ec2/parsers/snapshot_parser_spec.rb
+- spec/lib/awsum/ec2/parsers/tag_parser_spec.rb
 - spec/lib/awsum/ec2/parsers/volume_parser_spec.rb
 - spec/lib/awsum/ec2/region_spec.rb
 - spec/lib/awsum/ec2/reserved_instance_spec.rb
 - spec/lib/awsum/ec2/reserved_instances_offering_spec.rb
 - spec/lib/awsum/ec2/security_group_spec.rb
 - spec/lib/awsum/ec2/snapshots_spec.rb
+- spec/lib/awsum/ec2/state_spec.rb
+- spec/lib/awsum/ec2/tag_spec.rb
 - spec/lib/awsum/ec2/volume_spec.rb
 - spec/lib/awsum/ec2_spec.rb
 - spec/lib/awsum/error_spec.rb
@@ -171,13 +311,14 @@ files:
 - spec/lib/awsum/s3/parsers/bucket_parser_spec.rb
 - spec/lib/awsum/s3/parsers/object_parser_spec.rb
 - spec/spec_helper.rb
+- tools/dump.rb
 has_rdoc: true
 homepage: http://andrewtimberlake.com/projects/awsum
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -206,35 +347,38 @@ signing_key:
 specification_version: 3
 summary: A library for working with Amazon Web Services in the most natural rubyish way
 test_files: 
-- spec/lib/awsum/s3/parsers/object_parser_spec.rb
-- spec/lib/awsum/s3/parsers/bucket_parser_spec.rb
-- spec/lib/awsum/s3/object_spec.rb
-- spec/lib/awsum/s3/bucket_spec.rb
-- spec/lib/awsum/ec2/reserved_instance_spec.rb
-- spec/lib/awsum/ec2/region_spec.rb
+- spec/lib/awsum/ec2/address_spec.rb
 - spec/lib/awsum/ec2/availability_zones_spec.rb
-- spec/lib/awsum/ec2/parsers/register_image_parser_spec.rb
-- spec/lib/awsum/ec2/parsers/security_group_parser_spec.rb
+- spec/lib/awsum/ec2/image_spec.rb
+- spec/lib/awsum/ec2/instance_spec.rb
+- spec/lib/awsum/ec2/keypair_spec.rb
+- spec/lib/awsum/ec2/parsers/address_parser_spec.rb
+- spec/lib/awsum/ec2/parsers/availability_zone_parser_spec.rb
 - spec/lib/awsum/ec2/parsers/image_parser_spec.rb
-- spec/lib/awsum/ec2/parsers/snapshot_parser_spec.rb
+- spec/lib/awsum/ec2/parsers/instance_parser_spec.rb
+- spec/lib/awsum/ec2/parsers/keypair_parser_spec.rb
+- spec/lib/awsum/ec2/parsers/purchase_reserved_instances_offering_parser_spec.rb
 - spec/lib/awsum/ec2/parsers/region_parser_spec.rb
-- spec/lib/awsum/ec2/parsers/availability_zone_parser_spec.rb
+- spec/lib/awsum/ec2/parsers/register_image_parser_spec.rb
 - spec/lib/awsum/ec2/parsers/reserved_instance_parser_spec.rb
-- spec/lib/awsum/ec2/parsers/address_parser_spec.rb
-- spec/lib/awsum/ec2/parsers/purchase_reserved_instances_offering_parser_spec.rb
-- spec/lib/awsum/ec2/parsers/volume_parser_spec.rb
 - spec/lib/awsum/ec2/parsers/reserved_instances_offering_parser_spec.rb
-- spec/lib/awsum/ec2/parsers/keypair_parser_spec.rb
-- spec/lib/awsum/ec2/parsers/instance_parser_spec.rb
-- spec/lib/awsum/ec2/image_spec.rb
-- spec/lib/awsum/ec2/address_spec.rb
-- spec/lib/awsum/ec2/keypair_spec.rb
+- spec/lib/awsum/ec2/parsers/security_group_parser_spec.rb
+- spec/lib/awsum/ec2/parsers/snapshot_parser_spec.rb
+- spec/lib/awsum/ec2/parsers/tag_parser_spec.rb
+- spec/lib/awsum/ec2/parsers/volume_parser_spec.rb
+- spec/lib/awsum/ec2/region_spec.rb
+- spec/lib/awsum/ec2/reserved_instance_spec.rb
+- spec/lib/awsum/ec2/reserved_instances_offering_spec.rb
+- spec/lib/awsum/ec2/security_group_spec.rb
 - spec/lib/awsum/ec2/snapshots_spec.rb
+- spec/lib/awsum/ec2/state_spec.rb
+- spec/lib/awsum/ec2/tag_spec.rb
 - spec/lib/awsum/ec2/volume_spec.rb
-- spec/lib/awsum/ec2/instance_spec.rb
-- spec/lib/awsum/ec2/security_group_spec.rb
-- spec/lib/awsum/ec2/reserved_instances_offering_spec.rb
 - spec/lib/awsum/ec2_spec.rb
 - spec/lib/awsum/error_spec.rb
 - spec/lib/awsum/requestable_spec.rb
+- spec/lib/awsum/s3/bucket_spec.rb
+- spec/lib/awsum/s3/object_spec.rb
+- spec/lib/awsum/s3/parsers/bucket_parser_spec.rb
+- spec/lib/awsum/s3/parsers/object_parser_spec.rb
 - spec/spec_helper.rb