fog 0.0.91 → 0.0.92

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://gemcutter.org'
 
 gem 'rake'
-gem 'excon', '>= 0.0.21'
+gem 'excon', '>= 0.0.22'
 gem 'formatador', ">= 0.0.10"
 gem 'json', ">= 0"
 gem 'mime-types', ">= 0"

data/Gemfile.lock

@@ -1,69 +1,69 @@
 --- 
-specs: 
-- rake: 
-    version: 0.8.7
-- excon: 
-    version: 0.0.21
-- formatador: 
-    version: 0.0.14
-- gestalt: 
-    version: 0.0.6
-- json: 
-    version: 1.4.2
-- mime-types: 
-    version: "1.16"
-- net-ssh: 
-    version: 2.0.22
-- nokogiri: 
-    version: 1.4.1
-- rspec: 
-    version: 1.3.0
-- ruby-hmac: 
-    version: 0.4.0
-- shindo: 
-    version: 0.0.18
-hash: e443f12a9a7794f2ff4fc8e8d201b12b1e8b30bb
-sources: 
-- Rubygems: 
-    uri: http://gemcutter.org
 dependencies: 
   formatador: 
-    version: ">= 0.0.10"
-    group: 
-    - :default
-  nokogiri: 
-    version: ">= 0"
     group: 
     - :default
+    version: ">= 0.0.10"
   rake: 
-    version: ">= 0"
     group: 
     - :default
-  rspec: 
     version: ">= 0"
+  ruby-hmac: 
     group: 
     - :default
-  ruby-hmac: 
     version: ">= 0"
+  mime-types: 
     group: 
     - :default
-  mime-types: 
     version: ">= 0"
+  rspec: 
     group: 
     - :default
-  net-ssh: 
     version: ">= 0"
+  net-ssh: 
     group: 
     - :default
-  json: 
     version: ">= 0"
+  json: 
     group: 
     - :default
+    version: ">= 0"
   excon: 
-    version: ">= 0.0.21"
     group: 
     - :default
+    version: ">= 0.0.22"
   shindo: 
+    group: 
+    - :default
     version: ">= 0"
+  nokogiri: 
     group: 
     - :default
+    version: ">= 0"
+specs: 
+- rake: 
+    version: 0.8.7
+- excon: 
+    version: 0.0.22
+- formatador: 
+    version: 0.0.14
+- gestalt: 
+    version: 0.0.6
+- json: 
+    version: 1.4.3
+- mime-types: 
+    version: "1.16"
+- net-ssh: 
+    version: 2.0.22
+- nokogiri: 
+    version: 1.4.1
+- rspec: 
+    version: 1.3.0
+- ruby-hmac: 
+    version: 0.4.0
+- shindo: 
+    version: 0.0.18
+hash: a39d842433b002231eebfd269d32fe72b489b62f
+sources: 
+- Rubygems: 
+    uri: http://gemcutter.org

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.0.91'
-  s.date              = '2010-05-05'
+  s.version           = '0.0.92'
+  s.date              = '2010-05-10'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency('excon', '>=0.0.21')
+  s.add_dependency('excon', '>=0.0.23')
   s.add_dependency('formatador', '>=0.0.10')
   s.add_dependency('json')
   s.add_dependency('mime-types')
@@ -114,12 +114,15 @@ Gem::Specification.new do |s|
     lib/fog/aws/parsers/ec2/get_console_output.rb
     lib/fog/aws/parsers/ec2/run_instances.rb
     lib/fog/aws/parsers/ec2/terminate_instances.rb
+    lib/fog/aws/parsers/elb/create_load_balancer.rb
+    lib/fog/aws/parsers/elb/delete_load_balancer.rb
     lib/fog/aws/parsers/elb/deregister_instances_from_load_balancer.rb
     lib/fog/aws/parsers/elb/describe_instance_health.rb
     lib/fog/aws/parsers/elb/describe_load_balancers.rb
     lib/fog/aws/parsers/elb/disable_availability_zones_for_load_balancer.rb
     lib/fog/aws/parsers/elb/enable_availability_zones_for_load_balancer.rb
     lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb
+    lib/fog/aws/parsers/s3/access_control_list.rb
     lib/fog/aws/parsers/s3/copy_object.rb
     lib/fog/aws/parsers/s3/get_bucket.rb
     lib/fog/aws/parsers/s3/get_bucket_location.rb
@@ -161,6 +164,8 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb
     lib/fog/aws/requests/ec2/run_instances.rb
     lib/fog/aws/requests/ec2/terminate_instances.rb
+    lib/fog/aws/requests/elb/create_load_balancer.rb
+    lib/fog/aws/requests/elb/delete_load_balancer.rb
     lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb
     lib/fog/aws/requests/elb/describe_instance_health.rb
     lib/fog/aws/requests/elb/describe_load_balancers.rb
@@ -171,12 +176,17 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/s3/delete_bucket.rb
     lib/fog/aws/requests/s3/delete_object.rb
     lib/fog/aws/requests/s3/get_bucket.rb
+    lib/fog/aws/requests/s3/get_bucket_acl.rb
     lib/fog/aws/requests/s3/get_bucket_location.rb
     lib/fog/aws/requests/s3/get_object.rb
+    lib/fog/aws/requests/s3/get_object_acl.rb
+    lib/fog/aws/requests/s3/get_object_torrent.rb
+    lib/fog/aws/requests/s3/get_object_url.rb
     lib/fog/aws/requests/s3/get_request_payment.rb
     lib/fog/aws/requests/s3/get_service.rb
     lib/fog/aws/requests/s3/head_object.rb
     lib/fog/aws/requests/s3/put_bucket.rb
+    lib/fog/aws/requests/s3/put_bucket_acl.rb
     lib/fog/aws/requests/s3/put_object.rb
     lib/fog/aws/requests/s3/put_request_payment.rb
     lib/fog/aws/requests/simpledb/batch_put_attributes.rb
@@ -351,32 +361,19 @@ Gem::Specification.new do |s|
     spec/aws/models/s3/directory_spec.rb
     spec/aws/models/s3/file_spec.rb
     spec/aws/models/s3/files_spec.rb
-    spec/aws/requests/ec2/allocate_address_spec.rb
-    spec/aws/requests/ec2/associate_address_spec.rb
-    spec/aws/requests/ec2/attach_volume_spec.rb
     spec/aws/requests/ec2/authorize_security_group_ingress_spec.rb
     spec/aws/requests/ec2/create_key_pair_spec.rb
     spec/aws/requests/ec2/create_security_group_spec.rb
-    spec/aws/requests/ec2/create_snapshot_spec.rb
-    spec/aws/requests/ec2/create_volume_spec.rb
     spec/aws/requests/ec2/delete_key_pair_spec.rb
     spec/aws/requests/ec2/delete_security_group_spec.rb
-    spec/aws/requests/ec2/delete_snapshot_spec.rb
-    spec/aws/requests/ec2/delete_volume_spec.rb
-    spec/aws/requests/ec2/describe_addresses_spec.rb
     spec/aws/requests/ec2/describe_availability_zones_spec.rb
     spec/aws/requests/ec2/describe_images_spec.rb
     spec/aws/requests/ec2/describe_instances_spec.rb
     spec/aws/requests/ec2/describe_key_pairs_spec.rb
     spec/aws/requests/ec2/describe_regions_spec.rb
     spec/aws/requests/ec2/describe_security_groups_spec.rb
-    spec/aws/requests/ec2/describe_snapshots_spec.rb
-    spec/aws/requests/ec2/describe_volumes_spec.rb
-    spec/aws/requests/ec2/detach_volume_spec.rb
-    spec/aws/requests/ec2/disassociate_address_spec.rb
     spec/aws/requests/ec2/get_console_output_spec.rb
     spec/aws/requests/ec2/reboot_instances_spec.rb
-    spec/aws/requests/ec2/release_address_spec.rb
     spec/aws/requests/ec2/revoke_security_group_ingress_spec.rb
     spec/aws/requests/ec2/run_instances_spec.rb
     spec/aws/requests/ec2/terminate_instances_spec.rb
@@ -423,6 +420,10 @@ Gem::Specification.new do |s|
     spec/slicehost/models/server_spec.rb
     spec/slicehost/models/servers_spec.rb
     spec/spec_helper.rb
+    tests/aws/helper.rb
+    tests/aws/requests/ec2/address_tests.rb
+    tests/aws/requests/ec2/snapshot_tests.rb
+    tests/aws/requests/ec2/volume_tests.rb
     tests/helper.rb
     tests/helper_tests.rb
     tests/rackspace/helper.rb

data/lib/fog.rb

@@ -34,7 +34,7 @@ require 'fog/terremark'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.0.91'
+    VERSION = '0.0.92'
   end
 
   module Mock

data/lib/fog/aws/elb.rb

@@ -5,12 +5,16 @@ module Fog
       def self.new(options={})
 
         unless @required
+          require 'fog/aws/parsers/elb/create_load_balancer'
+          require 'fog/aws/parsers/elb/delete_load_balancer'
           require 'fog/aws/parsers/elb/deregister_instances_from_load_balancer'
           require 'fog/aws/parsers/elb/describe_instance_health'
           require 'fog/aws/parsers/elb/describe_load_balancers'
           require 'fog/aws/parsers/elb/disable_availability_zones_for_load_balancer'
           require 'fog/aws/parsers/elb/enable_availability_zones_for_load_balancer'
           require 'fog/aws/parsers/elb/register_instances_with_load_balancer'
+          require 'fog/aws/requests/elb/create_load_balancer'
+          require 'fog/aws/requests/elb/delete_load_balancer'
           require 'fog/aws/requests/elb/deregister_instances_from_load_balancer'
           require 'fog/aws/requests/elb/describe_instance_health'
           require 'fog/aws/requests/elb/describe_load_balancers'

data/lib/fog/aws/models/ec2/snapshot.rb

@@ -10,10 +10,13 @@ module Fog
 
         identity  :id, 'snapshotId'
 
+        attribute :description
         attribute :progress
         attribute :created_at,  'startTime'
+        attribute :owner_id,    'ownerId'
         attribute :state,       'status'
         attribute :volume_id,   'volumeId'
+        attribute :volume_size, 'volumeSize'
 
         def destroy
           requires :id

data/lib/fog/aws/parsers/ec2/create_snapshot.rb

@@ -7,10 +7,14 @@ module Fog
 
           def end_element(name)
             case name
-            when 'progress', 'snapshotId', 'status', 'volumeId'
+            when 'description', 'ownerId', 'progress', 'snapshotId', 'status', 'volumeId'
+              @response[name] = @value
+            when 'requestId'
               @response[name] = @value
             when 'startTime'
               @response[name] = Time.parse(@value)
+            when 'volumeSize'
+              @response[name] = @value.to_i
             end
           end
 

data/lib/fog/aws/parsers/ec2/describe_snapshots.rb

@@ -15,10 +15,14 @@ module Fog
             when 'item'
               @response['snapshotSet'] << @snapshot
               @snapshot = {}
-            when 'progress', 'snapshotId', 'status', 'volumeId'
+            when 'description', 'ownerId', 'progress', 'snapshotId', 'status', 'volumeId'
               @snapshot[name] = @value
+            when 'requestId'
+              @response[name] = @value
             when 'startTime'
               @snapshot[name] = Time.parse(@value)
+            when 'volumeSize'
+              @snapshot[name] = @value.to_i
             end
           end
 

data/lib/fog/aws/parsers/elb/create_load_balancer.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELB
+
+        class CreateLoadBalancer < Fog::Parsers::Base
+
+          def reset
+            @response = { 'CreateLoadBalancerResult' => {}, 'ResponseMetadata' => {} }
+          end
+
+          def end_element(name)
+            case name
+            when 'DNSName'
+              @response['CreateLoadBalancerResult'][name] = @value
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/elb/delete_load_balancer.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELB
+
+        class DeleteLoadBalancer < Fog::Parsers::Base
+
+          def reset
+            @response = { 'DeleteLoadBalancerResult' => nil, 'ResponseMetadata' => {} }
+          end
+
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/s3/access_control_list.rb

@@ -0,0 +1,46 @@
+module Fog
+  module Parsers
+    module AWS
+      module S3
+
+        class AccessControlList < Fog::Parsers::Base
+
+          def reset
+            @in_access_control_list = false
+            @grant = { 'Grantee' => {} }
+            @response = { 'Owner' => {}, 'AccessControlList' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            if name == 'AccessControlList'
+              @in_access_control_list = true
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'AccessControlList'
+              @in_access_control_list = false
+            when 'Grant'
+              @response['AccessControlList'] << @grant
+              @grant = { 'Grantee' => {} }
+            when 'DisplayName', 'ID'
+              if @in_access_control_list
+                @grant['Grantee'][name] = @value
+              else
+                @response['Owner'][name] = @value
+              end
+            when 'Permission'
+              @grant[name] = @value
+            when 'URI'
+              @grant['Grantee'][name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/ec2/create_snapshot.rb

@@ -17,11 +17,12 @@ module Fog
         #     * 'startTime'<~Time> - timestamp when snapshot was initiated
         #     * 'status'<~String> - state of snapshot
         #     * 'volumeId'<~String> - id of volume snapshot targets
-        def create_snapshot(volume_id)
+        def create_snapshot(volume_id, description = nil)
           request(
-            'Action'    => 'CreateSnapshot',
-            'VolumeId'  => volume_id,
-            :parser     => Fog::Parsers::AWS::EC2::CreateSnapshot.new
+            'Action'      => 'CreateSnapshot',
+            'Description' => description,
+            'VolumeId'    => volume_id,
+            :parser       => Fog::Parsers::AWS::EC2::CreateSnapshot.new
           )
         end
 
@@ -29,17 +30,20 @@ module Fog
 
       class Mock
 
-        def create_snapshot(volume_id)
+        def create_snapshot(volume_id, description = nil)
           response = Excon::Response.new
-          if @data[:volumes][volume_id]
+          if volume = @data[:volumes][volume_id]
             response.status = 200
             snapshot_id = Fog::AWS::Mock.snapshot_id
             data = {
+              'description' => description,
+              'ownerId'     => @owner_id,
               'progress'    => nil,
               'snapshotId'  => snapshot_id,
               'startTime'   => Time.now,
               'status'      => 'pending',
-              'volumeId'    => volume_id
+              'volumeId'    => volume_id,
+              'volumeSize'  => volume['size']
             }
             @data[:snapshots][snapshot_id] = data
             response.body = {

data/lib/fog/aws/requests/ec2/describe_snapshots.rb

@@ -53,6 +53,9 @@ module Fog
                 elsif Time.now - snapshot['startTime'] > Fog::Mock.delay
                   snapshot['progress']  = '50%'
                   snapshot['status']    = 'in progress'
+                else
+                  snapshot['progress']  = '0%'
+                  snapshot['status']    = 'in progress'
                 end
               end
             end