fog 0.5.3 → 0.6.0

data/tests/dns/requests/dnsimple/dns_tests.rb

@@ -0,0 +1,130 @@
+Shindo.tests('DNSimple::dns | DNS requests', ['dnsimple', 'dns']) do
+
+  @domain = ''
+  @domain_count = 0
+
+  def generate_unique_domain( with_trailing_dot = false)
+    #get time (with 1/100th of sec accuracy)
+    #want unique domain name and if provider is fast, this can be called more than once per second
+    time= (Time.now.to_f * 100).to_i
+    domain = 'test-' + time.to_s + '.com'
+    if with_trailing_dot
+      domain+= '.'
+    end
+
+    domain
+  end
+
+  tests("success") do
+
+    test("get current domain count") do
+      pending if Fog.mocking?
+
+      response = DNSimple[:dns].list_domains()
+      if response.status == 200
+        @domain_count = response.body.size
+      end
+
+      response.status == 200
+    end
+
+    test("create domain") do
+      pending if Fog.mocking?
+
+      domain = generate_unique_domain
+      response = DNSimple[:dns].create_domain(domain)
+      if response.status == 201
+        @domain = response.body["domain"]
+      end
+
+      response.status == 201
+    end
+
+    test("get domain by id") do
+      pending if Fog.mocking?
+
+      response = DNSimple[:dns].get_domain(@domain["id"])
+      response.status == 200
+    end
+
+    test("create an A resource record") do
+      pending if Fog.mocking?
+
+      domain = @domain["name"]
+      name = "www"
+      type = "A"
+      content = "1.2.3.4"
+      response = DNSimple[:dns].create_record(domain, name, type, content)
+
+      if response.status == 201
+        @record = response.body["record"]
+      end
+
+      response.status == 201
+
+    end
+
+    test("create a MX record") do
+      pending if Fog.mocking?
+
+      domain = @domain["name"]
+      name = ""
+      type = "MX"
+      content = "mail.#{domain}"
+      options = { :ttl => 60, :prio => 10 }
+      response = DNSimple[:dns].create_record(domain, name, type, content, options)
+
+      response.status == 201
+    end
+
+    test("update a record") do
+      pending if Fog.mocking?
+
+      domain = @domain["name"]
+      record_id = @record["id"]
+      options = { :content => "2.3.4.5", :ttl => 600 }
+      response = DNSimple[:dns].update_record(domain, record_id, options)
+      response.status == 200
+    end
+
+    test("list records") do
+      pending if Fog.mocking?
+
+      response = DNSimple[:dns].list_records(@domain["name"])
+
+      if response.status == 200
+        @records = response.body
+      end
+
+      (response.status == 200) and (response.body.size == 2)
+    end
+
+    test("delete records") do
+      pending if Fog.mocking?
+      domain = @domain["name"]
+
+      result = true
+      @records.each do |record|
+        response = DNSimple[:dns].delete_record(domain, record["record"]["id"])
+        if(response.status != 200)
+          result = false
+          break
+        end
+      end
+
+      result
+    end
+
+    test("delete domain") do
+      pending if Fog.mocking?
+
+      response = DNSimple[:dns].delete_domain(@domain["name"])
+      response.status == 200
+    end
+
+  end
+
+  tests( 'failure') do
+  end
+
+end

data/tests/helper.rb

@@ -8,7 +8,7 @@ def lorem_file
 end
 
 # check to see which credentials are available and add others to the skipped tags list
-all_providers = ['aws', 'bluebox', 'brightbox', 'gogrid', 'google', 'linode', 'local', 'newservers', 'rackspace', 'slicehost', 'terremarkecloud', 'zerigo']
+all_providers = ['aws', 'bluebox', 'brightbox', 'dnsimple', 'ecloud', 'gogrid', 'google', 'linode', 'local', 'newservers', 'rackspace', 'slicehost', 'zerigo']
 available_providers = Fog.providers.map {|provider| provider.downcase}
 for provider in (all_providers - available_providers)
   Formatador.display_line("[yellow]Skipping tests for [bold]#{provider}[/] [yellow]due to lacking credentials (add some to '~/.fog' to run them)[/]")

data/tests/helpers/mock_helper.rb

@@ -28,6 +28,8 @@ if Fog.mock?
     :rackspace_api_key                => 'rackspace_api_key',
     :rackspace_username               => 'rackspace_username',
     :slicehost_password               => 'slicehost_password',
+    :voxel_api_key                    => 'voxel_api_key',
+    :voxel_api_secret                 => 'voxel_api_secret',
     :zerigo_email                     => 'zerigo_email',
     :zerigo_token                     => 'zerigo_token'
   })

data/tests/storage/models/directory_test.rb

@@ -13,7 +13,8 @@ for provider, config in storage_providers
         @instance.public=(true)
       end
 
-      if !Fog.mocking? || config[:mocked]
+      tests('responds_to(:public_url)') do
+        pending if Fog.mocking? && !config[:mocked]
         @instance.responds_to(:public_url)
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 3
-  version: 0.5.3
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 -08:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,12 +38,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 1
         segments: 
         - 0
         - 5
-        - 2
-        version: 0.5.2
+        - 5
+        version: 0.5.5
   name: excon
   prerelease: false
   version_requirements: *id002
@@ -203,6 +203,7 @@ files:
 - benchs/params.rb
 - benchs/parse_vs_push.rb
 - bin/fog
+- changelog.txt
 - examples/dns_tests.rb
 - examples/storage_tests.rb
 - fog.gemspec
@@ -221,13 +222,17 @@ files:
 - lib/fog/aws/parsers/iam/create_access_key.rb
 - lib/fog/aws/parsers/iam/create_group.rb
 - lib/fog/aws/parsers/iam/create_user.rb
+- lib/fog/aws/parsers/iam/get_group.rb
 - lib/fog/aws/parsers/iam/get_user.rb
+- lib/fog/aws/parsers/iam/get_user_policy.rb
 - lib/fog/aws/parsers/iam/list_access_keys.rb
 - lib/fog/aws/parsers/iam/list_groups.rb
 - lib/fog/aws/parsers/iam/list_groups_for_user.rb
 - lib/fog/aws/parsers/iam/list_policies.rb
 - lib/fog/aws/parsers/iam/list_signing_certificates.rb
 - lib/fog/aws/parsers/iam/list_users.rb
+- lib/fog/aws/parsers/iam/update_group.rb
+- lib/fog/aws/parsers/iam/update_user.rb
 - lib/fog/aws/parsers/iam/upload_signing_certificate.rb
 - lib/fog/aws/parsers/ses/delete_verified_email_address.rb
 - lib/fog/aws/parsers/ses/get_send_quota.rb
@@ -259,7 +264,9 @@ files:
 - lib/fog/aws/requests/iam/delete_signing_certificate.rb
 - lib/fog/aws/requests/iam/delete_user.rb
 - lib/fog/aws/requests/iam/delete_user_policy.rb
+- lib/fog/aws/requests/iam/get_group.rb
 - lib/fog/aws/requests/iam/get_user.rb
+- lib/fog/aws/requests/iam/get_user_policy.rb
 - lib/fog/aws/requests/iam/list_access_keys.rb
 - lib/fog/aws/requests/iam/list_group_policies.rb
 - lib/fog/aws/requests/iam/list_groups.rb
@@ -271,6 +278,9 @@ files:
 - lib/fog/aws/requests/iam/put_user_policy.rb
 - lib/fog/aws/requests/iam/remove_user_from_group.rb
 - lib/fog/aws/requests/iam/update_access_key.rb
+- lib/fog/aws/requests/iam/update_group.rb
+- lib/fog/aws/requests/iam/update_signing_certificate.rb
+- lib/fog/aws/requests/iam/update_user.rb
 - lib/fog/aws/requests/iam/upload_signing_certificate.rb
 - lib/fog/aws/requests/ses/delete_verified_email_address.rb
 - lib/fog/aws/requests/ses/get_send_quota.rb
@@ -294,6 +304,8 @@ files:
 - lib/fog/bin/aws.rb
 - lib/fog/bin/bluebox.rb
 - lib/fog/bin/brightbox.rb
+- lib/fog/bin/dnsimple.rb
+- lib/fog/bin/ecloud.rb
 - lib/fog/bin/go_grid.rb
 - lib/fog/bin/google.rb
 - lib/fog/bin/linode.rb
@@ -302,8 +314,7 @@ files:
 - lib/fog/bin/rackspace.rb
 - lib/fog/bin/slicehost.rb
 - lib/fog/bin/terremark.rb
-- lib/fog/bin/terremark_ecloud.rb
-- lib/fog/bin/vcloud.rb
+- lib/fog/bin/voxel.rb
 - lib/fog/bin/zerigo.rb
 - lib/fog/cdn.rb
 - lib/fog/cdn/aws.rb
@@ -324,6 +335,7 @@ files:
 - lib/fog/compute/aws.rb
 - lib/fog/compute/bluebox.rb
 - lib/fog/compute/brightbox.rb
+- lib/fog/compute/ecloud.rb
 - lib/fog/compute/go_grid.rb
 - lib/fog/compute/linode.rb
 - lib/fog/compute/models/aws/address.rb
@@ -365,6 +377,28 @@ files:
 - lib/fog/compute/models/brightbox/users.rb
 - lib/fog/compute/models/brightbox/zone.rb
 - lib/fog/compute/models/brightbox/zones.rb
+- lib/fog/compute/models/ecloud/backup_internet_service.rb
+- lib/fog/compute/models/ecloud/backup_internet_services.rb
+- lib/fog/compute/models/ecloud/catalog.rb
+- lib/fog/compute/models/ecloud/catalog_item.rb
+- lib/fog/compute/models/ecloud/firewall_acl.rb
+- lib/fog/compute/models/ecloud/firewall_acls.rb
+- lib/fog/compute/models/ecloud/internet_service.rb
+- lib/fog/compute/models/ecloud/internet_services.rb
+- lib/fog/compute/models/ecloud/ip.rb
+- lib/fog/compute/models/ecloud/ips.rb
+- lib/fog/compute/models/ecloud/network.rb
+- lib/fog/compute/models/ecloud/networks.rb
+- lib/fog/compute/models/ecloud/node.rb
+- lib/fog/compute/models/ecloud/nodes.rb
+- lib/fog/compute/models/ecloud/public_ip.rb
+- lib/fog/compute/models/ecloud/public_ips.rb
+- lib/fog/compute/models/ecloud/server.rb
+- lib/fog/compute/models/ecloud/servers.rb
+- lib/fog/compute/models/ecloud/task.rb
+- lib/fog/compute/models/ecloud/tasks.rb
+- lib/fog/compute/models/ecloud/vdc.rb
+- lib/fog/compute/models/ecloud/vdcs.rb
 - lib/fog/compute/models/go_grid/image.rb
 - lib/fog/compute/models/go_grid/images.rb
 - lib/fog/compute/models/go_grid/password.rb
@@ -383,6 +417,10 @@ files:
 - lib/fog/compute/models/slicehost/images.rb
 - lib/fog/compute/models/slicehost/server.rb
 - lib/fog/compute/models/slicehost/servers.rb
+- lib/fog/compute/models/voxel/image.rb
+- lib/fog/compute/models/voxel/images.rb
+- lib/fog/compute/models/voxel/server.rb
+- lib/fog/compute/models/voxel/servers.rb
 - lib/fog/compute/new_servers.rb
 - lib/fog/compute/parsers/aws/allocate_address.rb
 - lib/fog/compute/parsers/aws/attach_volume.rb
@@ -419,17 +457,12 @@ files:
 - lib/fog/compute/parsers/slicehost/get_images.rb
 - lib/fog/compute/parsers/slicehost/get_slice.rb
 - lib/fog/compute/parsers/slicehost/get_slices.rb
-- lib/fog/compute/parsers/terremark_ecloud/get_catalog.rb
-- lib/fog/compute/parsers/terremark_ecloud/get_catalog_item.rb
-- lib/fog/compute/parsers/terremark_ecloud/get_ip_address.rb
-- lib/fog/compute/parsers/terremark_ecloud/get_ip_addresses.rb
-- lib/fog/compute/parsers/terremark_ecloud/get_network.rb
-- lib/fog/compute/parsers/terremark_ecloud/get_organization.rb
-- lib/fog/compute/parsers/terremark_ecloud/get_task.rb
-- lib/fog/compute/parsers/terremark_ecloud/get_task_list.rb
-- lib/fog/compute/parsers/terremark_ecloud/get_vdc.rb
-- lib/fog/compute/parsers/terremark_ecloud/get_versions.rb
-- lib/fog/compute/parsers/terremark_ecloud/login.rb
+- lib/fog/compute/parsers/voxel/basic.rb
+- lib/fog/compute/parsers/voxel/devices_list.rb
+- lib/fog/compute/parsers/voxel/images_list.rb
+- lib/fog/compute/parsers/voxel/voxcloud_create.rb
+- lib/fog/compute/parsers/voxel/voxcloud_delete.rb
+- lib/fog/compute/parsers/voxel/voxcloud_status.rb
 - lib/fog/compute/rackspace.rb
 - lib/fog/compute/requests/aws/allocate_address.rb
 - lib/fog/compute/requests/aws/associate_address.rb
@@ -526,6 +559,45 @@ files:
 - lib/fog/compute/requests/brightbox/update_load_balancer.rb
 - lib/fog/compute/requests/brightbox/update_server.rb
 - lib/fog/compute/requests/brightbox/update_user.rb
+- lib/fog/compute/requests/ecloud/add_backup_internet_service.rb
+- lib/fog/compute/requests/ecloud/add_internet_service.rb
+- lib/fog/compute/requests/ecloud/add_node.rb
+- lib/fog/compute/requests/ecloud/clone_vapp.rb
+- lib/fog/compute/requests/ecloud/configure_internet_service.rb
+- lib/fog/compute/requests/ecloud/configure_network.rb
+- lib/fog/compute/requests/ecloud/configure_network_ip.rb
+- lib/fog/compute/requests/ecloud/configure_node.rb
+- lib/fog/compute/requests/ecloud/configure_vapp.rb
+- lib/fog/compute/requests/ecloud/delete_internet_service.rb
+- lib/fog/compute/requests/ecloud/delete_node.rb
+- lib/fog/compute/requests/ecloud/delete_vapp.rb
+- lib/fog/compute/requests/ecloud/get_catalog.rb
+- lib/fog/compute/requests/ecloud/get_catalog_item.rb
+- lib/fog/compute/requests/ecloud/get_customization_options.rb
+- lib/fog/compute/requests/ecloud/get_firewall_acl.rb
+- lib/fog/compute/requests/ecloud/get_firewall_acls.rb
+- lib/fog/compute/requests/ecloud/get_internet_services.rb
+- lib/fog/compute/requests/ecloud/get_network.rb
+- lib/fog/compute/requests/ecloud/get_network_extensions.rb
+- lib/fog/compute/requests/ecloud/get_network_ip.rb
+- lib/fog/compute/requests/ecloud/get_network_ips.rb
+- lib/fog/compute/requests/ecloud/get_node.rb
+- lib/fog/compute/requests/ecloud/get_nodes.rb
+- lib/fog/compute/requests/ecloud/get_organization.rb
+- lib/fog/compute/requests/ecloud/get_public_ip.rb
+- lib/fog/compute/requests/ecloud/get_public_ips.rb
+- lib/fog/compute/requests/ecloud/get_task.rb
+- lib/fog/compute/requests/ecloud/get_task_list.rb
+- lib/fog/compute/requests/ecloud/get_vapp.rb
+- lib/fog/compute/requests/ecloud/get_vapp_template.rb
+- lib/fog/compute/requests/ecloud/get_vdc.rb
+- lib/fog/compute/requests/ecloud/get_versions.rb
+- lib/fog/compute/requests/ecloud/instantiate_vapp_template.rb
+- lib/fog/compute/requests/ecloud/login.rb
+- lib/fog/compute/requests/ecloud/power_off.rb
+- lib/fog/compute/requests/ecloud/power_on.rb
+- lib/fog/compute/requests/ecloud/power_reset.rb
+- lib/fog/compute/requests/ecloud/power_shutdown.rb
 - lib/fog/compute/requests/go_grid/common_lookup_list.rb
 - lib/fog/compute/requests/go_grid/grid_image_get.rb
 - lib/fog/compute/requests/go_grid/grid_image_list.rb
@@ -586,19 +658,14 @@ files:
 - lib/fog/compute/requests/slicehost/get_slice.rb
 - lib/fog/compute/requests/slicehost/get_slices.rb
 - lib/fog/compute/requests/slicehost/reboot_slice.rb
-- lib/fog/compute/requests/terremark_ecloud/get_catalog.rb
-- lib/fog/compute/requests/terremark_ecloud/get_catalog_item.rb
-- lib/fog/compute/requests/terremark_ecloud/get_ip_address.rb
-- lib/fog/compute/requests/terremark_ecloud/get_ip_addresses.rb
-- lib/fog/compute/requests/terremark_ecloud/get_network.rb
-- lib/fog/compute/requests/terremark_ecloud/get_organization.rb
-- lib/fog/compute/requests/terremark_ecloud/get_task.rb
-- lib/fog/compute/requests/terremark_ecloud/get_task_list.rb
-- lib/fog/compute/requests/terremark_ecloud/get_vdc.rb
-- lib/fog/compute/requests/terremark_ecloud/get_versions.rb
-- lib/fog/compute/requests/terremark_ecloud/login.rb
+- lib/fog/compute/requests/voxel/devices_list.rb
+- lib/fog/compute/requests/voxel/devices_power.rb
+- lib/fog/compute/requests/voxel/images_list.rb
+- lib/fog/compute/requests/voxel/voxcloud_create.rb
+- lib/fog/compute/requests/voxel/voxcloud_delete.rb
+- lib/fog/compute/requests/voxel/voxcloud_status.rb
 - lib/fog/compute/slicehost.rb
-- lib/fog/compute/terremark_ecloud.rb
+- lib/fog/compute/voxel.rb
 - lib/fog/core.rb
 - lib/fog/core/attributes.rb
 - lib/fog/core/collection.rb
@@ -611,17 +678,28 @@ files:
 - lib/fog/core/model.rb
 - lib/fog/core/parser.rb
 - lib/fog/core/provider.rb
+- lib/fog/core/scp.rb
 - lib/fog/core/service.rb
 - lib/fog/core/ssh.rb
 - lib/fog/core/time.rb
 - lib/fog/core/wait_for.rb
 - lib/fog/dns.rb
 - lib/fog/dns/aws.rb
+- lib/fog/dns/bluebox.rb
+- lib/fog/dns/dnsimple.rb
 - lib/fog/dns/linode.rb
 - lib/fog/dns/models/aws/record.rb
 - lib/fog/dns/models/aws/records.rb
 - lib/fog/dns/models/aws/zone.rb
 - lib/fog/dns/models/aws/zones.rb
+- lib/fog/dns/models/bluebox/record.rb
+- lib/fog/dns/models/bluebox/records.rb
+- lib/fog/dns/models/bluebox/zone.rb
+- lib/fog/dns/models/bluebox/zones.rb
+- lib/fog/dns/models/dnsimple/record.rb
+- lib/fog/dns/models/dnsimple/records.rb
+- lib/fog/dns/models/dnsimple/zone.rb
+- lib/fog/dns/models/dnsimple/zones.rb
 - lib/fog/dns/models/linode/record.rb
 - lib/fog/dns/models/linode/records.rb
 - lib/fog/dns/models/linode/zone.rb
@@ -641,6 +719,12 @@ files:
 - lib/fog/dns/parsers/aws/get_hosted_zone.rb
 - lib/fog/dns/parsers/aws/list_hosted_zones.rb
 - lib/fog/dns/parsers/aws/list_resource_record_sets.rb
+- lib/fog/dns/parsers/bluebox/create_record.rb
+- lib/fog/dns/parsers/bluebox/create_zone.rb
+- lib/fog/dns/parsers/bluebox/get_record.rb
+- lib/fog/dns/parsers/bluebox/get_records.rb
+- lib/fog/dns/parsers/bluebox/get_zone.rb
+- lib/fog/dns/parsers/bluebox/get_zones.rb
 - lib/fog/dns/parsers/slicehost/create_record.rb
 - lib/fog/dns/parsers/slicehost/create_zone.rb
 - lib/fog/dns/parsers/slicehost/get_record.rb
@@ -664,6 +748,24 @@ files:
 - lib/fog/dns/requests/aws/get_hosted_zone.rb
 - lib/fog/dns/requests/aws/list_hosted_zones.rb
 - lib/fog/dns/requests/aws/list_resource_record_sets.rb
+- lib/fog/dns/requests/bluebox/create_record.rb
+- lib/fog/dns/requests/bluebox/create_zone.rb
+- lib/fog/dns/requests/bluebox/delete_record.rb
+- lib/fog/dns/requests/bluebox/delete_zone.rb
+- lib/fog/dns/requests/bluebox/get_record.rb
+- lib/fog/dns/requests/bluebox/get_records.rb
+- lib/fog/dns/requests/bluebox/get_zone.rb
+- lib/fog/dns/requests/bluebox/get_zones.rb
+- lib/fog/dns/requests/bluebox/update_record.rb
+- lib/fog/dns/requests/bluebox/update_zone.rb
+- lib/fog/dns/requests/dnsimple/create_domain.rb
+- lib/fog/dns/requests/dnsimple/create_record.rb
+- lib/fog/dns/requests/dnsimple/delete_domain.rb
+- lib/fog/dns/requests/dnsimple/delete_record.rb
+- lib/fog/dns/requests/dnsimple/get_domain.rb
+- lib/fog/dns/requests/dnsimple/list_domains.rb
+- lib/fog/dns/requests/dnsimple/list_records.rb
+- lib/fog/dns/requests/dnsimple/update_record.rb
 - lib/fog/dns/requests/linode/domain_create.rb
 - lib/fog/dns/requests/linode/domain_delete.rb
 - lib/fog/dns/requests/linode/domain_list.rb
@@ -700,6 +802,8 @@ files:
 - lib/fog/providers/aws.rb
 - lib/fog/providers/bluebox.rb
 - lib/fog/providers/brightbox.rb
+- lib/fog/providers/dnsimple.rb
+- lib/fog/providers/ecloud.rb
 - lib/fog/providers/go_grid.rb
 - lib/fog/providers/google.rb
 - lib/fog/providers/linode.rb
@@ -707,7 +811,7 @@ files:
 - lib/fog/providers/new_servers.rb
 - lib/fog/providers/rackspace.rb
 - lib/fog/providers/slicehost.rb
-- lib/fog/providers/terremark_ecloud.rb
+- lib/fog/providers/voxel.rb
 - lib/fog/providers/zerigo.rb
 - lib/fog/storage.rb
 - lib/fog/storage/aws.rb
@@ -737,6 +841,7 @@ files:
 - lib/fog/storage/parsers/aws/get_bucket_logging.rb
 - lib/fog/storage/parsers/aws/get_bucket_object_versions.rb
 - lib/fog/storage/parsers/aws/get_bucket_versioning.rb
+- lib/fog/storage/parsers/aws/get_bucket_website.rb
 - lib/fog/storage/parsers/aws/get_request_payment.rb
 - lib/fog/storage/parsers/aws/get_service.rb
 - lib/fog/storage/parsers/aws/initiate_multipart_upload.rb
@@ -755,6 +860,7 @@ files:
 - lib/fog/storage/requests/aws/complete_multipart_upload.rb
 - lib/fog/storage/requests/aws/copy_object.rb
 - lib/fog/storage/requests/aws/delete_bucket.rb
+- lib/fog/storage/requests/aws/delete_bucket_website.rb
 - lib/fog/storage/requests/aws/delete_object.rb
 - lib/fog/storage/requests/aws/get_bucket.rb
 - lib/fog/storage/requests/aws/get_bucket_acl.rb
@@ -762,6 +868,7 @@ files:
 - lib/fog/storage/requests/aws/get_bucket_logging.rb
 - lib/fog/storage/requests/aws/get_bucket_object_versions.rb
 - lib/fog/storage/requests/aws/get_bucket_versioning.rb
+- lib/fog/storage/requests/aws/get_bucket_website.rb
 - lib/fog/storage/requests/aws/get_object.rb
 - lib/fog/storage/requests/aws/get_object_acl.rb
 - lib/fog/storage/requests/aws/get_object_torrent.rb
@@ -777,6 +884,7 @@ files:
 - lib/fog/storage/requests/aws/put_bucket_acl.rb
 - lib/fog/storage/requests/aws/put_bucket_logging.rb
 - lib/fog/storage/requests/aws/put_bucket_versioning.rb
+- lib/fog/storage/requests/aws/put_bucket_website.rb
 - lib/fog/storage/requests/aws/put_object.rb
 - lib/fog/storage/requests/aws/put_object_acl.rb
 - lib/fog/storage/requests/aws/put_object_url.rb
@@ -809,7 +917,6 @@ files:
 - lib/fog/storage/requests/rackspace/put_container.rb
 - lib/fog/storage/requests/rackspace/put_object.rb
 - lib/fog/terremark.rb
-- lib/fog/terremark/ecloud.rb
 - lib/fog/terremark/models/shared/address.rb
 - lib/fog/terremark/models/shared/addresses.rb
 - lib/fog/terremark/models/shared/network.rb
@@ -869,79 +976,6 @@ files:
 - lib/fog/terremark/requests/shared/power_shutdown.rb
 - lib/fog/terremark/shared.rb
 - lib/fog/terremark/vcloud.rb
-- lib/fog/vcloud.rb
-- lib/fog/vcloud/collection.rb
-- lib/fog/vcloud/generators.rb
-- lib/fog/vcloud/mock_data_classes.rb
-- lib/fog/vcloud/model.rb
-- lib/fog/vcloud/models/vdc.rb
-- lib/fog/vcloud/models/vdcs.rb
-- lib/fog/vcloud/requests/get_network.rb
-- lib/fog/vcloud/requests/get_organization.rb
-- lib/fog/vcloud/requests/get_vdc.rb
-- lib/fog/vcloud/requests/get_versions.rb
-- lib/fog/vcloud/requests/login.rb
-- lib/fog/vcloud/terremark/ecloud.rb
-- lib/fog/vcloud/terremark/ecloud/models/backup_internet_service.rb
-- lib/fog/vcloud/terremark/ecloud/models/backup_internet_services.rb
-- lib/fog/vcloud/terremark/ecloud/models/catalog.rb
-- lib/fog/vcloud/terremark/ecloud/models/catalog_item.rb
-- lib/fog/vcloud/terremark/ecloud/models/firewall_acl.rb
-- lib/fog/vcloud/terremark/ecloud/models/firewall_acls.rb
-- lib/fog/vcloud/terremark/ecloud/models/internet_service.rb
-- lib/fog/vcloud/terremark/ecloud/models/internet_services.rb
-- lib/fog/vcloud/terremark/ecloud/models/ip.rb
-- lib/fog/vcloud/terremark/ecloud/models/ips.rb
-- lib/fog/vcloud/terremark/ecloud/models/network.rb
-- lib/fog/vcloud/terremark/ecloud/models/networks.rb
-- lib/fog/vcloud/terremark/ecloud/models/node.rb
-- lib/fog/vcloud/terremark/ecloud/models/nodes.rb
-- lib/fog/vcloud/terremark/ecloud/models/public_ip.rb
-- lib/fog/vcloud/terremark/ecloud/models/public_ips.rb
-- lib/fog/vcloud/terremark/ecloud/models/server.rb
-- lib/fog/vcloud/terremark/ecloud/models/servers.rb
-- lib/fog/vcloud/terremark/ecloud/models/task.rb
-- lib/fog/vcloud/terremark/ecloud/models/tasks.rb
-- lib/fog/vcloud/terremark/ecloud/models/vdc.rb
-- lib/fog/vcloud/terremark/ecloud/models/vdcs.rb
-- lib/fog/vcloud/terremark/ecloud/requests/add_backup_internet_service.rb
-- lib/fog/vcloud/terremark/ecloud/requests/add_internet_service.rb
-- lib/fog/vcloud/terremark/ecloud/requests/add_node.rb
-- lib/fog/vcloud/terremark/ecloud/requests/clone_vapp.rb
-- lib/fog/vcloud/terremark/ecloud/requests/configure_internet_service.rb
-- lib/fog/vcloud/terremark/ecloud/requests/configure_network.rb
-- lib/fog/vcloud/terremark/ecloud/requests/configure_network_ip.rb
-- lib/fog/vcloud/terremark/ecloud/requests/configure_node.rb
-- lib/fog/vcloud/terremark/ecloud/requests/configure_vapp.rb
-- lib/fog/vcloud/terremark/ecloud/requests/delete_internet_service.rb
-- lib/fog/vcloud/terremark/ecloud/requests/delete_node.rb
-- lib/fog/vcloud/terremark/ecloud/requests/delete_vapp.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_catalog.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_catalog_item.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_customization_options.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acl.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acls.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_internet_services.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_network.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_network_extensions.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_network_ip.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_network_ips.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_node.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_nodes.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_public_ip.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_public_ips.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_task.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_task_list.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_vapp.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_vapp_template.rb
-- lib/fog/vcloud/terremark/ecloud/requests/get_vdc.rb
-- lib/fog/vcloud/terremark/ecloud/requests/instantiate_vapp_template.rb
-- lib/fog/vcloud/terremark/ecloud/requests/power_off.rb
-- lib/fog/vcloud/terremark/ecloud/requests/power_on.rb
-- lib/fog/vcloud/terremark/ecloud/requests/power_reset.rb
-- lib/fog/vcloud/terremark/ecloud/requests/power_shutdown.rb
-- lib/fog/vcloud/terremark/vcloud.rb
-- lib/fog/vcloud/terremark/vcloud/requests/get_vdc.rb
 - spec/aws/models/compute/address_spec.rb
 - spec/aws/models/compute/addresses_spec.rb
 - spec/aws/models/compute/key_pair_spec.rb
@@ -953,59 +987,54 @@ files:
 - spec/aws/models/compute/snapshots_spec.rb
 - spec/aws/models/compute/volume_spec.rb
 - spec/aws/models/compute/volumes_spec.rb
+- spec/ecloud/bin_spec.rb
+- spec/ecloud/models/backup_internet_service_spec.rb
+- spec/ecloud/models/backup_internet_services_spec.rb
+- spec/ecloud/models/internet_service_spec.rb
+- spec/ecloud/models/internet_services_spec.rb
+- spec/ecloud/models/ip_spec.rb
+- spec/ecloud/models/ips_spec.rb
+- spec/ecloud/models/network_spec.rb
+- spec/ecloud/models/networks_spec.rb
+- spec/ecloud/models/node_spec.rb
+- spec/ecloud/models/nodes_spec.rb
+- spec/ecloud/models/public_ip_spec.rb
+- spec/ecloud/models/public_ips_spec.rb
+- spec/ecloud/models/server_spec.rb
+- spec/ecloud/models/vdc_spec.rb
+- spec/ecloud/models/vdcs_spec.rb
+- spec/ecloud/requests/add_backup_internet_service_spec.rb
+- spec/ecloud/requests/add_internet_service_spec.rb
+- spec/ecloud/requests/add_node_spec.rb
+- spec/ecloud/requests/configure_internet_service_spec.rb
+- spec/ecloud/requests/configure_network_ip_spec.rb
+- spec/ecloud/requests/configure_node_spec.rb
+- spec/ecloud/requests/configure_vapp_spec.rb
+- spec/ecloud/requests/delete_internet_service_spec.rb
+- spec/ecloud/requests/delete_node_spec.rb
+- spec/ecloud/requests/delete_vapp_spec.rb
+- spec/ecloud/requests/get_catalog_item_spec.rb
+- spec/ecloud/requests/get_catalog_spec.rb
+- spec/ecloud/requests/get_customization_options_spec.rb
+- spec/ecloud/requests/get_internet_services_spec.rb
+- spec/ecloud/requests/get_network_ip_spec.rb
+- spec/ecloud/requests/get_network_ips_spec.rb
+- spec/ecloud/requests/get_network_spec.rb
+- spec/ecloud/requests/get_node_spec.rb
+- spec/ecloud/requests/get_nodes_spec.rb
+- spec/ecloud/requests/get_organization_spec.rb
+- spec/ecloud/requests/get_public_ip_spec.rb
+- spec/ecloud/requests/get_public_ips_spec.rb
+- spec/ecloud/requests/get_vapp_spec.rb
+- spec/ecloud/requests/get_vdc_spec.rb
+- spec/ecloud/requests/get_versions_spec.rb
+- spec/ecloud/requests/instantiate_vapp_template_spec.rb
+- spec/ecloud/requests/login_spec.rb
+- spec/ecloud/requests/power_off_spec.rb
+- spec/ecloud/requests/power_on_spec.rb
+- spec/ecloud/spec_helper.rb
+- spec/ecloud/vcloud_spec.rb
 - spec/spec_helper.rb
-- spec/vcloud/bin_spec.rb
-- spec/vcloud/models/vdc_spec.rb
-- spec/vcloud/models/vdcs_spec.rb
-- spec/vcloud/requests/get_network_spec.rb
-- spec/vcloud/requests/get_organization_spec.rb
-- spec/vcloud/requests/get_vdc_spec.rb
-- spec/vcloud/requests/get_versions_spec.rb
-- spec/vcloud/requests/login_spec.rb
-- spec/vcloud/spec_helper.rb
-- spec/vcloud/terremark/ecloud/models/backup_internet_service_spec.rb
-- spec/vcloud/terremark/ecloud/models/backup_internet_services_spec.rb
-- spec/vcloud/terremark/ecloud/models/internet_service_spec.rb
-- spec/vcloud/terremark/ecloud/models/internet_services_spec.rb
-- spec/vcloud/terremark/ecloud/models/ip_spec.rb
-- spec/vcloud/terremark/ecloud/models/ips_spec.rb
-- spec/vcloud/terremark/ecloud/models/network_spec.rb
-- spec/vcloud/terremark/ecloud/models/networks_spec.rb
-- spec/vcloud/terremark/ecloud/models/node_spec.rb
-- spec/vcloud/terremark/ecloud/models/nodes_spec.rb
-- spec/vcloud/terremark/ecloud/models/public_ip_spec.rb
-- spec/vcloud/terremark/ecloud/models/public_ips_spec.rb
-- spec/vcloud/terremark/ecloud/models/server_spec.rb
-- spec/vcloud/terremark/ecloud/models/vdc_spec.rb
-- spec/vcloud/terremark/ecloud/models/vdcs_spec.rb
-- spec/vcloud/terremark/ecloud/requests/add_backup_internet_service_spec.rb
-- spec/vcloud/terremark/ecloud/requests/add_internet_service_spec.rb
-- spec/vcloud/terremark/ecloud/requests/add_node_spec.rb
-- spec/vcloud/terremark/ecloud/requests/configure_internet_service_spec.rb
-- spec/vcloud/terremark/ecloud/requests/configure_network_ip_spec.rb
-- spec/vcloud/terremark/ecloud/requests/configure_node_spec.rb
-- spec/vcloud/terremark/ecloud/requests/configure_vapp_spec.rb
-- spec/vcloud/terremark/ecloud/requests/delete_internet_service_spec.rb
-- spec/vcloud/terremark/ecloud/requests/delete_node_spec.rb
-- spec/vcloud/terremark/ecloud/requests/delete_vapp_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_catalog_item_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_catalog_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_customization_options_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_internet_services_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_network_ip_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_network_ips_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_network_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_node_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_nodes_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_public_ip_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_public_ips_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_vapp_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_vdc_spec.rb
-- spec/vcloud/terremark/ecloud/requests/instantiate_vapp_template_spec.rb
-- spec/vcloud/terremark/ecloud/requests/login_spec.rb
-- spec/vcloud/terremark/ecloud/requests/power_off_spec.rb
-- spec/vcloud/terremark/ecloud/requests/power_on_spec.rb
-- spec/vcloud/vcloud_spec.rb
 - tests/aws/requests/iam/access_key_tests.rb
 - tests/aws/requests/iam/group_policy_tests.rb
 - tests/aws/requests/iam/group_tests.rb
@@ -1063,12 +1092,8 @@ files:
 - tests/compute/requests/slicehost/flavor_tests.rb
 - tests/compute/requests/slicehost/image_tests.rb
 - tests/compute/requests/slicehost/slice_tests.rb
-- tests/compute/requests/terremark_ecloud/catalog_tests.rb
-- tests/compute/requests/terremark_ecloud/helper.rb
-- tests/compute/requests/terremark_ecloud/network_tests.rb
-- tests/compute/requests/terremark_ecloud/organization_tests.rb
-- tests/compute/requests/terremark_ecloud/task_tests.rb
-- tests/compute/requests/terremark_ecloud/vdc_tests.rb
+- tests/compute/requests/voxel/image_tests.rb
+- tests/compute/requests/voxel/server_tests.rb
 - tests/core/attribute_tests.rb
 - tests/dns/helper.rb
 - tests/dns/models/record_tests.rb
@@ -1076,6 +1101,8 @@ files:
 - tests/dns/models/zone_tests.rb
 - tests/dns/models/zones_tests.rb
 - tests/dns/requests/aws/dns_tests.rb
+- tests/dns/requests/bluebox/dns_tests.rb
+- tests/dns/requests/dnsimple/dns_tests.rb
 - tests/dns/requests/linode/dns_tests.rb
 - tests/dns/requests/slicehost/dns_tests.rb
 - tests/dns/requests/zerigo/dns_tests.rb
@@ -1149,59 +1176,54 @@ test_files:
 - spec/aws/models/compute/snapshots_spec.rb
 - spec/aws/models/compute/volume_spec.rb
 - spec/aws/models/compute/volumes_spec.rb
+- spec/ecloud/bin_spec.rb
+- spec/ecloud/models/backup_internet_service_spec.rb
+- spec/ecloud/models/backup_internet_services_spec.rb
+- spec/ecloud/models/internet_service_spec.rb
+- spec/ecloud/models/internet_services_spec.rb
+- spec/ecloud/models/ip_spec.rb
+- spec/ecloud/models/ips_spec.rb
+- spec/ecloud/models/network_spec.rb
+- spec/ecloud/models/networks_spec.rb
+- spec/ecloud/models/node_spec.rb
+- spec/ecloud/models/nodes_spec.rb
+- spec/ecloud/models/public_ip_spec.rb
+- spec/ecloud/models/public_ips_spec.rb
+- spec/ecloud/models/server_spec.rb
+- spec/ecloud/models/vdc_spec.rb
+- spec/ecloud/models/vdcs_spec.rb
+- spec/ecloud/requests/add_backup_internet_service_spec.rb
+- spec/ecloud/requests/add_internet_service_spec.rb
+- spec/ecloud/requests/add_node_spec.rb
+- spec/ecloud/requests/configure_internet_service_spec.rb
+- spec/ecloud/requests/configure_network_ip_spec.rb
+- spec/ecloud/requests/configure_node_spec.rb
+- spec/ecloud/requests/configure_vapp_spec.rb
+- spec/ecloud/requests/delete_internet_service_spec.rb
+- spec/ecloud/requests/delete_node_spec.rb
+- spec/ecloud/requests/delete_vapp_spec.rb
+- spec/ecloud/requests/get_catalog_item_spec.rb
+- spec/ecloud/requests/get_catalog_spec.rb
+- spec/ecloud/requests/get_customization_options_spec.rb
+- spec/ecloud/requests/get_internet_services_spec.rb
+- spec/ecloud/requests/get_network_ip_spec.rb
+- spec/ecloud/requests/get_network_ips_spec.rb
+- spec/ecloud/requests/get_network_spec.rb
+- spec/ecloud/requests/get_node_spec.rb
+- spec/ecloud/requests/get_nodes_spec.rb
+- spec/ecloud/requests/get_organization_spec.rb
+- spec/ecloud/requests/get_public_ip_spec.rb
+- spec/ecloud/requests/get_public_ips_spec.rb
+- spec/ecloud/requests/get_vapp_spec.rb
+- spec/ecloud/requests/get_vdc_spec.rb
+- spec/ecloud/requests/get_versions_spec.rb
+- spec/ecloud/requests/instantiate_vapp_template_spec.rb
+- spec/ecloud/requests/login_spec.rb
+- spec/ecloud/requests/power_off_spec.rb
+- spec/ecloud/requests/power_on_spec.rb
+- spec/ecloud/spec_helper.rb
+- spec/ecloud/vcloud_spec.rb
 - spec/spec_helper.rb
-- spec/vcloud/bin_spec.rb
-- spec/vcloud/models/vdc_spec.rb
-- spec/vcloud/models/vdcs_spec.rb
-- spec/vcloud/requests/get_network_spec.rb
-- spec/vcloud/requests/get_organization_spec.rb
-- spec/vcloud/requests/get_vdc_spec.rb
-- spec/vcloud/requests/get_versions_spec.rb
-- spec/vcloud/requests/login_spec.rb
-- spec/vcloud/spec_helper.rb
-- spec/vcloud/terremark/ecloud/models/backup_internet_service_spec.rb
-- spec/vcloud/terremark/ecloud/models/backup_internet_services_spec.rb
-- spec/vcloud/terremark/ecloud/models/internet_service_spec.rb
-- spec/vcloud/terremark/ecloud/models/internet_services_spec.rb
-- spec/vcloud/terremark/ecloud/models/ip_spec.rb
-- spec/vcloud/terremark/ecloud/models/ips_spec.rb
-- spec/vcloud/terremark/ecloud/models/network_spec.rb
-- spec/vcloud/terremark/ecloud/models/networks_spec.rb
-- spec/vcloud/terremark/ecloud/models/node_spec.rb
-- spec/vcloud/terremark/ecloud/models/nodes_spec.rb
-- spec/vcloud/terremark/ecloud/models/public_ip_spec.rb
-- spec/vcloud/terremark/ecloud/models/public_ips_spec.rb
-- spec/vcloud/terremark/ecloud/models/server_spec.rb
-- spec/vcloud/terremark/ecloud/models/vdc_spec.rb
-- spec/vcloud/terremark/ecloud/models/vdcs_spec.rb
-- spec/vcloud/terremark/ecloud/requests/add_backup_internet_service_spec.rb
-- spec/vcloud/terremark/ecloud/requests/add_internet_service_spec.rb
-- spec/vcloud/terremark/ecloud/requests/add_node_spec.rb
-- spec/vcloud/terremark/ecloud/requests/configure_internet_service_spec.rb
-- spec/vcloud/terremark/ecloud/requests/configure_network_ip_spec.rb
-- spec/vcloud/terremark/ecloud/requests/configure_node_spec.rb
-- spec/vcloud/terremark/ecloud/requests/configure_vapp_spec.rb
-- spec/vcloud/terremark/ecloud/requests/delete_internet_service_spec.rb
-- spec/vcloud/terremark/ecloud/requests/delete_node_spec.rb
-- spec/vcloud/terremark/ecloud/requests/delete_vapp_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_catalog_item_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_catalog_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_customization_options_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_internet_services_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_network_ip_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_network_ips_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_network_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_node_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_nodes_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_public_ip_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_public_ips_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_vapp_spec.rb
-- spec/vcloud/terremark/ecloud/requests/get_vdc_spec.rb
-- spec/vcloud/terremark/ecloud/requests/instantiate_vapp_template_spec.rb
-- spec/vcloud/terremark/ecloud/requests/login_spec.rb
-- spec/vcloud/terremark/ecloud/requests/power_off_spec.rb
-- spec/vcloud/terremark/ecloud/requests/power_on_spec.rb
-- spec/vcloud/vcloud_spec.rb
 - tests/aws/requests/iam/access_key_tests.rb
 - tests/aws/requests/iam/group_policy_tests.rb
 - tests/aws/requests/iam/group_tests.rb
@@ -1259,12 +1281,8 @@ test_files:
 - tests/compute/requests/slicehost/flavor_tests.rb
 - tests/compute/requests/slicehost/image_tests.rb
 - tests/compute/requests/slicehost/slice_tests.rb
-- tests/compute/requests/terremark_ecloud/catalog_tests.rb
-- tests/compute/requests/terremark_ecloud/helper.rb
-- tests/compute/requests/terremark_ecloud/network_tests.rb
-- tests/compute/requests/terremark_ecloud/organization_tests.rb
-- tests/compute/requests/terremark_ecloud/task_tests.rb
-- tests/compute/requests/terremark_ecloud/vdc_tests.rb
+- tests/compute/requests/voxel/image_tests.rb
+- tests/compute/requests/voxel/server_tests.rb
 - tests/core/attribute_tests.rb
 - tests/dns/helper.rb
 - tests/dns/models/record_tests.rb
@@ -1272,6 +1290,8 @@ test_files:
 - tests/dns/models/zone_tests.rb
 - tests/dns/models/zones_tests.rb
 - tests/dns/requests/aws/dns_tests.rb
+- tests/dns/requests/bluebox/dns_tests.rb
+- tests/dns/requests/dnsimple/dns_tests.rb
 - tests/dns/requests/linode/dns_tests.rb
 - tests/dns/requests/slicehost/dns_tests.rb
 - tests/dns/requests/zerigo/dns_tests.rb