fog 1.12.1 → 1.13.0

data/tests/rackspace/requests/storage/object_tests.rb

@@ -17,18 +17,18 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
       Fog::Storage[:rackspace].put_object('fogobjecttests', 'fog_object', lorem_file)
     end
 
-    tests("#get_object('fogobjectests', 'fog_object')").returns(lorem_file.read) do
+    tests("#get_object('fogobjectests', 'fog_object')").succeeds do
       pending if Fog.mocking?
-      Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_object').body
+      Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_object').body == lorem_file.read
     end
 
-    tests("#get_object('fogobjecttests', 'fog_object', &block)").returns(lorem_file.read) do
+    tests("#get_object('fogobjecttests', 'fog_object', &block)").succeeds do
       pending if Fog.mocking?
       data = ''
       Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_object') do |chunk, remaining_bytes, total_bytes|
         data << chunk
       end
-      data
+      data == lorem_file.read
     end
 
     tests("#head_object('fogobjectests', 'fog_object')").succeeds do
@@ -70,40 +70,59 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
       storage    = Fog::Storage::Rackspace.new(:rackspace_temp_url_key => "super_secret")
       storage.extend RackspaceStorageHelpers
       storage.override_path('/fake_version/fake_tenant')
-      object_url = storage.get_object_https_url('fogobjecttests', 'fog-object', expires_at)      
+      object_url = storage.get_object_https_url('fogobjecttests', 'fog-object', expires_at)
       object_url =~ /https:\/\/.*clouddrive.com\/[^\/]+\/[^\/]+\/fogobjecttests\/fog%2Dobject\?temp_url_sig=a24dd5fc955a57adce7d1b5bc4ec2c7660ab8396&temp_url_expires=1344149532/
     end
 
     tests("put_object with block") do
-      tests("#put_object('fogobjecttests', 'fog_object', &block)") do
-        pending if Fog.mocking?
+      pending if Fog.mocking?
 
+      tests("#put_object('fogobjecttests', 'fog_object', &block)").succeeds do
         begin
           file = lorem_file
-          buffer_size = file.size / 2 # chop it up into two buffers
+          buffer_size = file.stat.size / 2 # chop it up into two buffers
           Fog::Storage[:rackspace].put_object('fogobjecttests', 'fog_block_object', nil) do
-            if file.pos < file.size
-              file.sysread(buffer_size)
-            else
-              ""
-            end
+            file.read(buffer_size).to_s
           end
         ensure
           file.close
         end
       end
 
-      tests("object successfully uploaded?").returns(lorem_file.read) do
-        pending if Fog.mocking?
-        Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_block_object').body
+      tests('#get_object').succeeds do
+        Fog::Storage[:rackspace].get_object('fogobjecttests', 'fog_block_object').body == lorem_file.read
       end
 
-      tests("delete file").succeeds do
-        pending if Fog.mocking?
+      tests('#delete_object').succeeds do
         Fog::Storage[:rackspace].delete_object('fogobjecttests', 'fog_block_object')
       end
     end
 
+    tests('#delete_multiple_objects') do
+      pending if Fog.mocking?
+
+      Fog::Storage[:rackspace].put_object('fogobjecttests', 'fog_object', lorem_file)
+      Fog::Storage[:rackspace].put_object('fogobjecttests', 'fog_object2', lorem_file)
+      Fog::Storage[:rackspace].directories.create(:key => 'fogobjecttests2')
+      Fog::Storage[:rackspace].put_object('fogobjecttests2', 'fog_object', lorem_file)
+
+      expected = {
+        "Number Not Found"  => 0,
+        "Response Status"   => "200 OK",
+        "Errors"            => [],
+        "Number Deleted"    => 2,
+        "Response Body"     => ""
+      }
+
+      returns(expected, 'deletes multiple objects') do
+        Fog::Storage[:rackspace].delete_multiple_objects('fogobjecttests', ['fog_object', 'fog_object2']).body
+      end
+
+      returns(expected, 'deletes object and container') do
+        Fog::Storage[:rackspace].delete_multiple_objects(nil, ['fogobjecttests2/fog_object', 'fogobjecttests2']).body
+      end
+    end
+
   end
 
   tests('failure') do
@@ -138,6 +157,42 @@ Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
       Fog::Storage[:rackspace].delete_object('fognoncontainer', 'fog_non_object')
     end
 
+    tests('#delete_multiple_objects') do
+      pending if Fog.mocking?
+
+      expected = {
+        "Number Not Found"  => 2,
+        "Response Status"   => "200 OK",
+        "Errors"            => [],
+        "Number Deleted"    => 0,
+        "Response Body"     => ""
+      }
+
+      returns(expected, 'reports missing objects') do
+        Fog::Storage[:rackspace].delete_multiple_objects('fogobjecttests', ['fog_non_object', 'fog_non_object2']).body
+      end
+
+      returns(expected, 'reports missing container') do
+        Fog::Storage[:rackspace].delete_multiple_objects('fognoncontainer', ['fog_non_object', 'fog_non_object2']).body
+      end
+
+      tests('deleting non-empty container') do
+        Fog::Storage[:rackspace].put_object('fogobjecttests', 'fog_object', lorem_file)
+
+        expected = {
+          "Number Not Found"  => 0,
+          "Response Status"   => "400 Bad Request",
+          "Errors"            => [['fogobjecttests', '409 Conflict']],
+          "Number Deleted"    => 1,
+          "Response Body"     => ""
+        }
+
+        body = Fog::Storage[:rackspace].delete_multiple_objects(nil, ['fogobjecttests', 'fogobjecttests/fog_object']).body
+        expected['Errors'][0][0] = body['Errors'][0][0] rescue nil
+        returns(expected, 'deletes object but not container') { body }
+      end
+    end
+
   end
 
   unless Fog.mocking?

data/tests/rackspace/service_tests.rb

@@ -0,0 +1,83 @@
+Shindo.tests('Fog::Rackspace::Service', ['rackspace']) do
+
+  tests('process_response') do
+    @service = Fog::Rackspace::Service.new
+
+    tests('nil').returns(nil) do
+      @service.send(:process_response, nil)
+    end
+
+    tests('response missing body').returns(nil) do
+      response = Excon::Response.new
+      response.body = nil
+      @service.send(:process_response, response)
+    end
+
+    tests('processes body').returns({'a'=>2, 'b'=>3}) do
+      response = Excon::Response.new
+      response.headers['Content-Type'] = "application/json"
+      response.body = "{\"a\":2,\"b\":3}"
+      @service.send(:process_response, response)
+      response.body
+    end
+
+    tests('process body with hash').returns({:a=>2, :b=>3}) do
+      response = Excon::Response.new
+      response.headers['Content-Type'] = "application/json"
+      response.body = {:a=>2, :b=>3}
+      @service.send(:process_response, response)
+      response.body
+    end
+
+    tests('handles malformed json').returns({}) do
+      response = Excon::Response.new
+      response.headers['Content-Type'] = "application/json"
+      response.body = "I am totally not json"
+      @service.send(:process_response, response)
+      response.body
+    end
+
+  end
+
+  tests('headers') do
+    # adding an implementation for auth_token to service instance. Normally this would come from a subclass.
+    def @service.auth_token
+      "my_auth_token"
+    end
+
+    HEADER_HASH = {
+      'Content-Type' => 'application/json',
+      'Accept' => 'application/json',
+      'X-Auth-Token' => @service.auth_token
+    }.freeze
+
+    tests('without options').returns(HEADER_HASH) do
+       @service.send(:headers)
+    end
+
+    tests('with options not containing :header key').returns(HEADER_HASH) do
+       @service.send(:headers, {:a => 3})
+    end
+
+    tests('with options containing :header key').returns(HEADER_HASH.merge(:a => 3)) do
+       @service.send(:headers, :headers => {:a => 3})
+    end
+  end
+
+  tests('request_params') do
+    REQUEST_HASH = {
+      :path=>"/endpoint/my_service",
+      :headers=>{"Content-Type"=>"application/json", "Accept"=>"application/json", "X-Auth-Token"=>"my_auth_token"},
+      :host=>"fog.io"
+    }.freeze
+
+    uri = URI.parse("http://fog.io/endpoint")
+    @service.instance_variable_set("@uri", uri)
+    params = {:path => 'my_service'}
+
+    tests('returns request hash').returns(REQUEST_HASH) do
+      @service.send(:request_params, params)
+    end
+  end
+
+end

data/tests/rackspace/storage_tests.rb

@@ -98,6 +98,15 @@ Shindo.tests('Rackspace | Storage', ['rackspace']) do
       returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /snet-/) != nil }
     end
   end
+
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service = Fog::Storage::Rackspace.new
+    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+    @service.instance_variable_set("@auth_token", "bad-token")
+    returns(204) { @service.head_containers.status }
+  end
     
   tests('account').succeeds do
     pending if Fog.mocking?    

data/tests/xenserver/models/compute/server_tests.rb

@@ -60,7 +60,8 @@ Shindo.tests('Fog::Compute[:xenserver] | server model', ['xenserver']) do
         :pv_kernel,
         :pv_ramdisk,
         :pv_legacy_args,
-        :pv_bootloader_args
+        :pv_bootloader_args,
+        :snapshots
       ]
       tests("The server model should respond to") do
         attributes.each do |attribute|
@@ -157,6 +158,15 @@ Shindo.tests('Fog::Compute[:xenserver] | server model', ['xenserver']) do
       server.pv_bootloader == 'supergrub'
     end
     
+    tests("Creating a snapshot") do
+      snap_ref = server.snapshot('newsnapshot')
+      tests("it should create a snapshot") do
+        snap_ref = server.snapshot('newsnapshot')
+        servers.get(snap_ref).reference == snap_ref
+      end
+      test("and destroy it afterwards") { servers.get(snap_ref).destroy }
+    end
+    
     test("be able to be destroyed!") do
       server.destroy
       servers.get_by_name('fog-test-server-shindo') == nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.25.0
 - !ruby/object:Gem::Dependency
   name: formatador
   requirement: !ruby/object:Gem::Requirement
@@ -124,37 +124,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.3
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: ruby-hmac
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-hmac
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -486,6 +486,8 @@ files:
 - lib/fog/aws/models/iam/roles.rb
 - lib/fog/aws/models/iam/user.rb
 - lib/fog/aws/models/iam/users.rb
+- lib/fog/aws/models/rds/log_file.rb
+- lib/fog/aws/models/rds/log_files.rb
 - lib/fog/aws/models/rds/parameter.rb
 - lib/fog/aws/models/rds/parameter_group.rb
 - lib/fog/aws/models/rds/parameter_groups.rb
@@ -726,12 +728,14 @@ files:
 - lib/fog/aws/parsers/rds/delete_db_snapshot.rb
 - lib/fog/aws/parsers/rds/describe_db_engine_versions.rb
 - lib/fog/aws/parsers/rds/describe_db_instances.rb
+- lib/fog/aws/parsers/rds/describe_db_log_files.rb
 - lib/fog/aws/parsers/rds/describe_db_parameter_groups.rb
 - lib/fog/aws/parsers/rds/describe_db_parameters.rb
 - lib/fog/aws/parsers/rds/describe_db_reserved_instances.rb
 - lib/fog/aws/parsers/rds/describe_db_security_groups.rb
 - lib/fog/aws/parsers/rds/describe_db_snapshots.rb
 - lib/fog/aws/parsers/rds/describe_db_subnet_groups.rb
+- lib/fog/aws/parsers/rds/download_db_logfile_portion.rb
 - lib/fog/aws/parsers/rds/event_list.rb
 - lib/fog/aws/parsers/rds/modify_db_instance.rb
 - lib/fog/aws/parsers/rds/modify_db_parameter_group.rb
@@ -749,6 +753,7 @@ files:
 - lib/fog/aws/parsers/ses/list_verified_email_addresses.rb
 - lib/fog/aws/parsers/ses/send_email.rb
 - lib/fog/aws/parsers/ses/send_raw_email.rb
+- lib/fog/aws/parsers/ses/verify_domain_identity.rb
 - lib/fog/aws/parsers/ses/verify_email_address.rb
 - lib/fog/aws/parsers/simpledb/basic.rb
 - lib/fog/aws/parsers/simpledb/domain_metadata.rb
@@ -790,6 +795,7 @@ files:
 - lib/fog/aws/parsers/storage/initiate_multipart_upload.rb
 - lib/fog/aws/parsers/storage/list_multipart_uploads.rb
 - lib/fog/aws/parsers/storage/list_parts.rb
+- lib/fog/aws/parsers/sts/assume_role.rb
 - lib/fog/aws/parsers/sts/get_session_token.rb
 - lib/fog/aws/rds.rb
 - lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb
@@ -1137,6 +1143,7 @@ files:
 - lib/fog/aws/requests/rds/delete_db_snapshot.rb
 - lib/fog/aws/requests/rds/describe_db_engine_versions.rb
 - lib/fog/aws/requests/rds/describe_db_instances.rb
+- lib/fog/aws/requests/rds/describe_db_log_files.rb
 - lib/fog/aws/requests/rds/describe_db_parameter_groups.rb
 - lib/fog/aws/requests/rds/describe_db_parameters.rb
 - lib/fog/aws/requests/rds/describe_db_reserved_instances.rb
@@ -1144,6 +1151,7 @@ files:
 - lib/fog/aws/requests/rds/describe_db_snapshots.rb
 - lib/fog/aws/requests/rds/describe_db_subnet_groups.rb
 - lib/fog/aws/requests/rds/describe_events.rb
+- lib/fog/aws/requests/rds/download_db_logfile_portion.rb
 - lib/fog/aws/requests/rds/list_tags_for_resource.rb
 - lib/fog/aws/requests/rds/modify_db_instance.rb
 - lib/fog/aws/requests/rds/modify_db_parameter_group.rb
@@ -1158,6 +1166,7 @@ files:
 - lib/fog/aws/requests/ses/list_verified_email_addresses.rb
 - lib/fog/aws/requests/ses/send_email.rb
 - lib/fog/aws/requests/ses/send_raw_email.rb
+- lib/fog/aws/requests/ses/verify_domain_identity.rb
 - lib/fog/aws/requests/ses/verify_email_address.rb
 - lib/fog/aws/requests/simpledb/batch_put_attributes.rb
 - lib/fog/aws/requests/simpledb/create_domain.rb
@@ -1240,6 +1249,7 @@ files:
 - lib/fog/aws/requests/storage/put_request_payment.rb
 - lib/fog/aws/requests/storage/sync_clock.rb
 - lib/fog/aws/requests/storage/upload_part.rb
+- lib/fog/aws/requests/sts/assume_role.rb
 - lib/fog/aws/requests/sts/get_federation_token.rb
 - lib/fog/aws/requests/sts/get_session_token.rb
 - lib/fog/aws/ses.rb
@@ -1367,6 +1377,7 @@ files:
 - lib/fog/brightbox.rb
 - lib/fog/brightbox/compute.rb
 - lib/fog/brightbox/compute/image_selector.rb
+- lib/fog/brightbox/compute/shared.rb
 - lib/fog/brightbox/models/compute/account.rb
 - lib/fog/brightbox/models/compute/accounts.rb
 - lib/fog/brightbox/models/compute/api_client.rb
@@ -1375,6 +1386,8 @@ files:
 - lib/fog/brightbox/models/compute/applications.rb
 - lib/fog/brightbox/models/compute/cloud_ip.rb
 - lib/fog/brightbox/models/compute/cloud_ips.rb
+- lib/fog/brightbox/models/compute/collaboration.rb
+- lib/fog/brightbox/models/compute/collaborations.rb
 - lib/fog/brightbox/models/compute/firewall_policies.rb
 - lib/fog/brightbox/models/compute/firewall_policy.rb
 - lib/fog/brightbox/models/compute/firewall_rule.rb
@@ -1390,10 +1403,13 @@ files:
 - lib/fog/brightbox/models/compute/server_groups.rb
 - lib/fog/brightbox/models/compute/servers.rb
 - lib/fog/brightbox/models/compute/user.rb
+- lib/fog/brightbox/models/compute/user_collaboration.rb
+- lib/fog/brightbox/models/compute/user_collaborations.rb
 - lib/fog/brightbox/models/compute/users.rb
 - lib/fog/brightbox/models/compute/zone.rb
 - lib/fog/brightbox/models/compute/zones.rb
 - lib/fog/brightbox/oauth2.rb
+- lib/fog/brightbox/requests/compute/accept_user_collaboration.rb
 - lib/fog/brightbox/requests/compute/activate_console_server.rb
 - lib/fog/brightbox/requests/compute/add_listeners_load_balancer.rb
 - lib/fog/brightbox/requests/compute/add_nodes_load_balancer.rb
@@ -1402,6 +1418,7 @@ files:
 - lib/fog/brightbox/requests/compute/create_api_client.rb
 - lib/fog/brightbox/requests/compute/create_application.rb
 - lib/fog/brightbox/requests/compute/create_cloud_ip.rb
+- lib/fog/brightbox/requests/compute/create_collaboration.rb
 - lib/fog/brightbox/requests/compute/create_firewall_policy.rb
 - lib/fog/brightbox/requests/compute/create_firewall_rule.rb
 - lib/fog/brightbox/requests/compute/create_image.rb
@@ -1411,17 +1428,21 @@ files:
 - lib/fog/brightbox/requests/compute/delete_api_client.rb
 - lib/fog/brightbox/requests/compute/delete_application.rb
 - lib/fog/brightbox/requests/compute/delete_cloud_ip.rb
+- lib/fog/brightbox/requests/compute/delete_collaboration.rb
 - lib/fog/brightbox/requests/compute/delete_firewall_policy.rb
 - lib/fog/brightbox/requests/compute/delete_firewall_rule.rb
 - lib/fog/brightbox/requests/compute/delete_image.rb
 - lib/fog/brightbox/requests/compute/delete_load_balancer.rb
 - lib/fog/brightbox/requests/compute/delete_server.rb
 - lib/fog/brightbox/requests/compute/delete_server_group.rb
+- lib/fog/brightbox/requests/compute/delete_user_collaboration.rb
+- lib/fog/brightbox/requests/compute/destroy_user_collaboration.rb
 - lib/fog/brightbox/requests/compute/get_account.rb
 - lib/fog/brightbox/requests/compute/get_api_client.rb
 - lib/fog/brightbox/requests/compute/get_application.rb
 - lib/fog/brightbox/requests/compute/get_authenticated_user.rb
 - lib/fog/brightbox/requests/compute/get_cloud_ip.rb
+- lib/fog/brightbox/requests/compute/get_collaboration.rb
 - lib/fog/brightbox/requests/compute/get_firewall_policy.rb
 - lib/fog/brightbox/requests/compute/get_firewall_rule.rb
 - lib/fog/brightbox/requests/compute/get_image.rb
@@ -1432,25 +1453,30 @@ files:
 - lib/fog/brightbox/requests/compute/get_server_group.rb
 - lib/fog/brightbox/requests/compute/get_server_type.rb
 - lib/fog/brightbox/requests/compute/get_user.rb
+- lib/fog/brightbox/requests/compute/get_user_collaboration.rb
 - lib/fog/brightbox/requests/compute/get_zone.rb
 - lib/fog/brightbox/requests/compute/list_accounts.rb
 - lib/fog/brightbox/requests/compute/list_api_clients.rb
 - lib/fog/brightbox/requests/compute/list_applications.rb
 - lib/fog/brightbox/requests/compute/list_cloud_ips.rb
+- lib/fog/brightbox/requests/compute/list_collaborations.rb
 - lib/fog/brightbox/requests/compute/list_firewall_policies.rb
 - lib/fog/brightbox/requests/compute/list_images.rb
 - lib/fog/brightbox/requests/compute/list_load_balancers.rb
 - lib/fog/brightbox/requests/compute/list_server_groups.rb
 - lib/fog/brightbox/requests/compute/list_server_types.rb
 - lib/fog/brightbox/requests/compute/list_servers.rb
+- lib/fog/brightbox/requests/compute/list_user_collaborations.rb
 - lib/fog/brightbox/requests/compute/list_users.rb
 - lib/fog/brightbox/requests/compute/list_zones.rb
 - lib/fog/brightbox/requests/compute/map_cloud_ip.rb
 - lib/fog/brightbox/requests/compute/move_servers_server_group.rb
+- lib/fog/brightbox/requests/compute/reject_user_collaboration.rb
 - lib/fog/brightbox/requests/compute/remove_firewall_policy.rb
 - lib/fog/brightbox/requests/compute/remove_listeners_load_balancer.rb
 - lib/fog/brightbox/requests/compute/remove_nodes_load_balancer.rb
 - lib/fog/brightbox/requests/compute/remove_servers_server_group.rb
+- lib/fog/brightbox/requests/compute/resend_collaboration.rb
 - lib/fog/brightbox/requests/compute/reset_ftp_password_account.rb
 - lib/fog/brightbox/requests/compute/reset_ftp_password_scoped_account.rb
 - lib/fog/brightbox/requests/compute/reset_secret_api_client.rb
@@ -1498,6 +1524,7 @@ files:
 - lib/fog/cloudsigma.rb
 - lib/fog/cloudsigma/compute.rb
 - lib/fog/cloudsigma/connection.rb
+- lib/fog/cloudsigma/docs/getting_started.md
 - lib/fog/cloudsigma/error.rb
 - lib/fog/cloudsigma/mock_data.rb
 - lib/fog/cloudsigma/models/balance.rb
@@ -1688,11 +1715,11 @@ files:
 - lib/fog/core/connection.rb
 - lib/fog/core/credentials.rb
 - lib/fog/core/current_machine.rb
+- lib/fog/core/deprecated/connection.rb
 - lib/fog/core/deprecated_connection_accessors.rb
 - lib/fog/core/deprecation.rb
 - lib/fog/core/errors.rb
 - lib/fog/core/hmac.rb
-- lib/fog/core/json.rb
 - lib/fog/core/logger.rb
 - lib/fog/core/mock.rb
 - lib/fog/core/model.rb
@@ -2084,6 +2111,8 @@ files:
 - lib/fog/go_grid/requests/compute/support_password_list.rb
 - lib/fog/google.rb
 - lib/fog/google/compute.rb
+- lib/fog/google/models/compute/disk.rb
+- lib/fog/google/models/compute/disks.rb
 - lib/fog/google/models/compute/flavor.rb
 - lib/fog/google/models/compute/flavors.rb
 - lib/fog/google/models/compute/image.rb
@@ -2436,6 +2465,7 @@ files:
 - lib/fog/joyent/requests/compute/start_machine_from_snapshot.rb
 - lib/fog/joyent/requests/compute/stop_machine.rb
 - lib/fog/joyent/requests/compute/update_machine_metadata.rb
+- lib/fog/json.rb
 - lib/fog/libvirt.rb
 - lib/fog/libvirt/compute.rb
 - lib/fog/libvirt/models/compute/README.md
@@ -2536,6 +2566,7 @@ files:
 - lib/fog/local/models/storage/file.rb
 - lib/fog/local/models/storage/files.rb
 - lib/fog/local/storage.rb
+- lib/fog/metering.rb
 - lib/fog/monitoring.rb
 - lib/fog/network.rb
 - lib/fog/ninefold.rb
@@ -2597,6 +2628,7 @@ files:
 - lib/fog/openstack/examples/storage/set-account-quota.rb
 - lib/fog/openstack/identity.rb
 - lib/fog/openstack/image.rb
+- lib/fog/openstack/metering.rb
 - lib/fog/openstack/models/compute/address.rb
 - lib/fog/openstack/models/compute/addresses.rb
 - lib/fog/openstack/models/compute/flavor.rb
@@ -2632,6 +2664,10 @@ files:
 - lib/fog/openstack/models/image/image.rb
 - lib/fog/openstack/models/image/images.rb
 - lib/fog/openstack/models/meta_parent.rb
+- lib/fog/openstack/models/metering/meter.rb
+- lib/fog/openstack/models/metering/meters.rb
+- lib/fog/openstack/models/metering/resource.rb
+- lib/fog/openstack/models/metering/resources.rb
 - lib/fog/openstack/models/network/floating_ip.rb
 - lib/fog/openstack/models/network/floating_ips.rb
 - lib/fog/openstack/models/network/lb_health_monitor.rb
@@ -2789,6 +2825,11 @@ files:
 - lib/fog/openstack/requests/image/set_tenant.rb
 - lib/fog/openstack/requests/image/update_image.rb
 - lib/fog/openstack/requests/image/update_image_members.rb
+- lib/fog/openstack/requests/metering/get_resource.rb
+- lib/fog/openstack/requests/metering/get_samples.rb
+- lib/fog/openstack/requests/metering/get_statistics.rb
+- lib/fog/openstack/requests/metering/list_meters.rb
+- lib/fog/openstack/requests/metering/list_resources.rb
 - lib/fog/openstack/requests/network/add_router_interface.rb
 - lib/fog/openstack/requests/network/associate_floating_ip.rb
 - lib/fog/openstack/requests/network/associate_lb_health_monitor.rb
@@ -3205,7 +3246,9 @@ files:
 - lib/fog/rackspace/requests/load_balancers/update_node.rb
 - lib/fog/rackspace/requests/storage/copy_object.rb
 - lib/fog/rackspace/requests/storage/delete_container.rb
+- lib/fog/rackspace/requests/storage/delete_multiple_objects.rb
 - lib/fog/rackspace/requests/storage/delete_object.rb
+- lib/fog/rackspace/requests/storage/delete_static_large_object.rb
 - lib/fog/rackspace/requests/storage/get_container.rb
 - lib/fog/rackspace/requests/storage/get_containers.rb
 - lib/fog/rackspace/requests/storage/get_object.rb
@@ -3215,8 +3258,10 @@ files:
 - lib/fog/rackspace/requests/storage/head_object.rb
 - lib/fog/rackspace/requests/storage/post_set_meta_temp_url_key.rb
 - lib/fog/rackspace/requests/storage/put_container.rb
+- lib/fog/rackspace/requests/storage/put_dynamic_obj_manifest.rb
 - lib/fog/rackspace/requests/storage/put_object.rb
 - lib/fog/rackspace/requests/storage/put_object_manifest.rb
+- lib/fog/rackspace/requests/storage/put_static_obj_manifest.rb
 - lib/fog/rackspace/service.rb
 - lib/fog/rackspace/storage.rb
 - lib/fog/riakcs.rb
@@ -3742,11 +3787,15 @@ files:
 - lib/fog/xenserver/requests/compute/set_attribute.rb
 - lib/fog/xenserver/requests/compute/shutdown_host.rb
 - lib/fog/xenserver/requests/compute/shutdown_server.rb
+- lib/fog/xenserver/requests/compute/snapshot_revert.rb
+- lib/fog/xenserver/requests/compute/snapshot_server.rb
 - lib/fog/xenserver/requests/compute/start_server.rb
 - lib/fog/xenserver/requests/compute/start_vm.rb
 - lib/fog/xenserver/requests/compute/unplug_pbd.rb
 - lib/fog/xenserver/requests/compute/unplug_vbd.rb
 - lib/fog/xenserver/utilities.rb
+- lib/fog/xml.rb
+- lib/fog/xml/sax_parser_connection.rb
 - lib/fog/zerigo.rb
 - lib/fog/zerigo/dns.rb
 - lib/fog/zerigo/models/dns/record.rb
@@ -3785,6 +3834,7 @@ files:
 - tests/aws/models/auto_scaling/activities_tests.rb
 - tests/aws/models/auto_scaling/configuration_test.rb
 - tests/aws/models/auto_scaling/configurations_tests.rb
+- tests/aws/models/auto_scaling/groups_test.rb
 - tests/aws/models/auto_scaling/helper.rb
 - tests/aws/models/auto_scaling/instances_tests.rb
 - tests/aws/models/beanstalk/application_tests.rb
@@ -3924,12 +3974,14 @@ files:
 - tests/aws/requests/rds/describe_events.rb
 - tests/aws/requests/rds/helper.rb
 - tests/aws/requests/rds/instance_tests.rb
+- tests/aws/requests/rds/log_file_tests.rb
 - tests/aws/requests/rds/parameter_group_tests.rb
 - tests/aws/requests/rds/parameter_request_tests.rb
 - tests/aws/requests/rds/security_group_tests.rb
 - tests/aws/requests/rds/subnet_groups_test.rb
 - tests/aws/requests/rds/tagging_tests.rb
 - tests/aws/requests/ses/helper.rb
+- tests/aws/requests/ses/verified_domain_identity_tests.rb
 - tests/aws/requests/ses/verified_email_address_tests.rb
 - tests/aws/requests/simpledb/attributes_tests.rb
 - tests/aws/requests/simpledb/domain_tests.rb
@@ -3946,6 +3998,7 @@ files:
 - tests/aws/requests/storage/multipart_upload_tests.rb
 - tests/aws/requests/storage/object_tests.rb
 - tests/aws/requests/storage/versioning_tests.rb
+- tests/aws/requests/sts/assume_role_tests.rb
 - tests/aws/requests/sts/get_federation_token_tests.rb
 - tests/aws/requests/sts/session_token_tests.rb
 - tests/aws/signaturev4_tests.rb
@@ -3967,6 +4020,7 @@ files:
 - tests/brightbox/requests/compute/api_client_tests.rb
 - tests/brightbox/requests/compute/application_test.rb
 - tests/brightbox/requests/compute/cloud_ip_tests.rb
+- tests/brightbox/requests/compute/collaboration_tests.rb
 - tests/brightbox/requests/compute/firewall_policy_tests.rb
 - tests/brightbox/requests/compute/firewall_rule_tests.rb
 - tests/brightbox/requests/compute/helper.rb
@@ -3976,6 +4030,7 @@ files:
 - tests/brightbox/requests/compute/server_group_tests.rb
 - tests/brightbox/requests/compute/server_tests.rb
 - tests/brightbox/requests/compute/server_type_tests.rb
+- tests/brightbox/requests/compute/user_collaboration_tests.rb
 - tests/brightbox/requests/compute/user_tests.rb
 - tests/brightbox/requests/compute/zone_tests.rb
 - tests/clodo/requests/compute/image_tests.rb
@@ -4010,12 +4065,12 @@ files:
 - tests/compute/models/server_tests.rb
 - tests/compute/models/servers_tests.rb
 - tests/core/attribute_tests.rb
+- tests/core/connection_tests.rb
 - tests/core/credential_tests.rb
 - tests/core/current_machine_tests.rb
 - tests/core/mocking_tests.rb
 - tests/core/parser_tests.rb
 - tests/core/timeout_tests.rb
-- tests/core/user_agent_tests.rb
 - tests/core/wait_for_tests.rb
 - tests/digitalocean/helper.rb
 - tests/digitalocean/models/compute/flavor_tests.rb
@@ -4249,6 +4304,8 @@ files:
 - tests/openstack/requests/identity/tenant_tests.rb
 - tests/openstack/requests/identity/user_tests.rb
 - tests/openstack/requests/image/image_tests.rb
+- tests/openstack/requests/metering/meter_tests.rb
+- tests/openstack/requests/metering/resource_tests.rb
 - tests/openstack/requests/network/lb_health_monitor_tests.rb
 - tests/openstack/requests/network/lb_member_tests.rb
 - tests/openstack/requests/network/lb_pool_tests.rb
@@ -4289,6 +4346,7 @@ files:
 - tests/rackspace/databases_tests.rb
 - tests/rackspace/dns_tests.rb
 - tests/rackspace/helper.rb
+- tests/rackspace/identity_tests.rb
 - tests/rackspace/load_balancer_tests.rb
 - tests/rackspace/models/block_storage/snapshot_tests.rb
 - tests/rackspace/models/block_storage/snapshots_tests.rb
@@ -4380,6 +4438,7 @@ files:
 - tests/rackspace/requests/storage/container_tests.rb
 - tests/rackspace/requests/storage/large_object_tests.rb
 - tests/rackspace/requests/storage/object_tests.rb
+- tests/rackspace/service_tests.rb
 - tests/rackspace/storage_tests.rb
 - tests/rackspace/url_encoding_tests.rb
 - tests/riakcs/requests/provisioning/provisioning_tests.rb
@@ -4485,7 +4544,8 @@ files:
 - tests/xenserver/xenserver_tests.rb
 - tests/zerigo/requests/dns/dns_tests.rb
 homepage: http://github.com/fog/fog
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
@@ -4499,7 +4559,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1026096410422706099
+      hash: 970170911850261824
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -4519,6 +4579,7 @@ test_files:
 - tests/aws/models/auto_scaling/activities_tests.rb
 - tests/aws/models/auto_scaling/configuration_test.rb
 - tests/aws/models/auto_scaling/configurations_tests.rb
+- tests/aws/models/auto_scaling/groups_test.rb
 - tests/aws/models/auto_scaling/helper.rb
 - tests/aws/models/auto_scaling/instances_tests.rb
 - tests/aws/models/beanstalk/application_tests.rb
@@ -4658,12 +4719,14 @@ test_files:
 - tests/aws/requests/rds/describe_events.rb
 - tests/aws/requests/rds/helper.rb
 - tests/aws/requests/rds/instance_tests.rb
+- tests/aws/requests/rds/log_file_tests.rb
 - tests/aws/requests/rds/parameter_group_tests.rb
 - tests/aws/requests/rds/parameter_request_tests.rb
 - tests/aws/requests/rds/security_group_tests.rb
 - tests/aws/requests/rds/subnet_groups_test.rb
 - tests/aws/requests/rds/tagging_tests.rb
 - tests/aws/requests/ses/helper.rb
+- tests/aws/requests/ses/verified_domain_identity_tests.rb
 - tests/aws/requests/ses/verified_email_address_tests.rb
 - tests/aws/requests/simpledb/attributes_tests.rb
 - tests/aws/requests/simpledb/domain_tests.rb
@@ -4680,6 +4743,7 @@ test_files:
 - tests/aws/requests/storage/multipart_upload_tests.rb
 - tests/aws/requests/storage/object_tests.rb
 - tests/aws/requests/storage/versioning_tests.rb
+- tests/aws/requests/sts/assume_role_tests.rb
 - tests/aws/requests/sts/get_federation_token_tests.rb
 - tests/aws/requests/sts/session_token_tests.rb
 - tests/aws/signaturev4_tests.rb
@@ -4701,6 +4765,7 @@ test_files:
 - tests/brightbox/requests/compute/api_client_tests.rb
 - tests/brightbox/requests/compute/application_test.rb
 - tests/brightbox/requests/compute/cloud_ip_tests.rb
+- tests/brightbox/requests/compute/collaboration_tests.rb
 - tests/brightbox/requests/compute/firewall_policy_tests.rb
 - tests/brightbox/requests/compute/firewall_rule_tests.rb
 - tests/brightbox/requests/compute/helper.rb
@@ -4710,6 +4775,7 @@ test_files:
 - tests/brightbox/requests/compute/server_group_tests.rb
 - tests/brightbox/requests/compute/server_tests.rb
 - tests/brightbox/requests/compute/server_type_tests.rb
+- tests/brightbox/requests/compute/user_collaboration_tests.rb
 - tests/brightbox/requests/compute/user_tests.rb
 - tests/brightbox/requests/compute/zone_tests.rb
 - tests/clodo/requests/compute/image_tests.rb
@@ -4744,12 +4810,12 @@ test_files:
 - tests/compute/models/server_tests.rb
 - tests/compute/models/servers_tests.rb
 - tests/core/attribute_tests.rb
+- tests/core/connection_tests.rb
 - tests/core/credential_tests.rb
 - tests/core/current_machine_tests.rb
 - tests/core/mocking_tests.rb
 - tests/core/parser_tests.rb
 - tests/core/timeout_tests.rb
-- tests/core/user_agent_tests.rb
 - tests/core/wait_for_tests.rb
 - tests/digitalocean/helper.rb
 - tests/digitalocean/models/compute/flavor_tests.rb
@@ -4983,6 +5049,8 @@ test_files:
 - tests/openstack/requests/identity/tenant_tests.rb
 - tests/openstack/requests/identity/user_tests.rb
 - tests/openstack/requests/image/image_tests.rb
+- tests/openstack/requests/metering/meter_tests.rb
+- tests/openstack/requests/metering/resource_tests.rb
 - tests/openstack/requests/network/lb_health_monitor_tests.rb
 - tests/openstack/requests/network/lb_member_tests.rb
 - tests/openstack/requests/network/lb_pool_tests.rb
@@ -5023,6 +5091,7 @@ test_files:
 - tests/rackspace/databases_tests.rb
 - tests/rackspace/dns_tests.rb
 - tests/rackspace/helper.rb
+- tests/rackspace/identity_tests.rb
 - tests/rackspace/load_balancer_tests.rb
 - tests/rackspace/models/block_storage/snapshot_tests.rb
 - tests/rackspace/models/block_storage/snapshots_tests.rb
@@ -5114,6 +5183,7 @@ test_files:
 - tests/rackspace/requests/storage/container_tests.rb
 - tests/rackspace/requests/storage/large_object_tests.rb
 - tests/rackspace/requests/storage/object_tests.rb
+- tests/rackspace/service_tests.rb
 - tests/rackspace/storage_tests.rb
 - tests/rackspace/url_encoding_tests.rb
 - tests/riakcs/requests/provisioning/provisioning_tests.rb