From 27d6831c34e865ac63cff95a73771a20bde9af0e Mon Sep 17 00:00:00 2001 From: Paul Thornthwaite Date: Thu, 18 Aug 2011 09:54:28 +0100 Subject: [PATCH 01/29] [compute|brightbox] Updated test for new behaviour --- tests/compute/requests/brightbox/interface_tests.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/compute/requests/brightbox/interface_tests.rb b/tests/compute/requests/brightbox/interface_tests.rb index 70e448605..bd05a3dd4 100644 --- a/tests/compute/requests/brightbox/interface_tests.rb +++ b/tests/compute/requests/brightbox/interface_tests.rb @@ -16,7 +16,7 @@ Shindo.tests('Fog::Compute[:brightbox] | interface requests', ['brightbox']) do tests('failure') do - tests("#get_interface('int-00000')").raises(Excon::Errors::Forbidden) do + tests("#get_interface('int-00000')").raises(Excon::Errors::NotFound) do pending if Fog.mocking? Fog::Compute[:brightbox].get_interface('int-00000') end From 3d5ed0c4996db44229238ef9839bce0b8f80ec7c Mon Sep 17 00:00:00 2001 From: Paul Thornthwaite Date: Thu, 18 Aug 2011 13:13:25 +0100 Subject: [PATCH 02/29] [compute|brightbox] Picking up more attributes from Account --- lib/fog/compute/models/brightbox/account.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/fog/compute/models/brightbox/account.rb b/lib/fog/compute/models/brightbox/account.rb index 6666cad9e..d91aff526 100644 --- a/lib/fog/compute/models/brightbox/account.rb +++ b/lib/fog/compute/models/brightbox/account.rb @@ -21,17 +21,22 @@ module Fog attribute :vat_registration_number attribute :telephone_number attribute :telephone_verified + attribute :verified_telephone + attribute :verified_at, :type => :time + attribute :verified_ip + attribute :valid_credit_card, :type => :boolean attribute :ram_limit attribute :ram_used attribute :cloud_ips_limit + attribute :cloud_ips_used + attribute :load_balancers_limit + attribute :load_balancers_used attribute :library_ftp_host attribute :library_ftp_user # This is always returned as null/nil unless performing a reset_ftp_password request attribute :library_ftp_password attribute :created_at, :type => :time - - attribute :owner_id, :aliases => "owner", :squash => "id" attribute :clients attribute :images From 0f4e340f15c0b2feb6f0824a8c9fcaf85ab90cc8 Mon Sep 17 00:00:00 2001 From: Glenn Tweedie Date: Mon, 22 Aug 2011 13:14:54 +0800 Subject: [PATCH 03/29] fix indenting to get markdown to recognise the code block properly --- docs/storage/index.markdown | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/storage/index.markdown b/docs/storage/index.markdown index 2cfdebc59..cecbaebe7 100644 --- a/docs/storage/index.markdown +++ b/docs/storage/index.markdown @@ -85,29 +85,29 @@ Now you've got a bunch of files in S3: your resume, some code samples, and maybe some pictures of your cat doing funny stuff. Since this is all of vital importance, you need to back it up. - # copy each file to local disk - directory.files.each do |s3_file| - File.open(s3_file.key, 'w') do |local_file| - local_file.write(s3_file.body) - end - end + # copy each file to local disk + directory.files.each do |s3_file| + File.open(s3_file.key, 'w') do |local_file| + local_file.write(s3_file.body) + end + end One caveat: it's way more efficient to do this: - # do two things per file - directory.files.each do |file| - do_one_thing(file) - do_another_thing(file) - end + # do two things per file + directory.files.each do |file| + do_one_thing(file) + do_another_thing(file) + end than it is to do this: - # do two things per file - directory.files.each do |file| - do_one_thing(file) - end.each do |file| - do_another_thing(file) - end + # do two things per file + directory.files.each do |file| + do_one_thing(file) + end.each do |file| + do_another_thing(file) + end The reason is that the list of files might be large. Really large. Eat-all-your-RAM-and-ask-for-more large. Therefore, every time From 386ee9f13806fca38656bd429a4241bb3d5513d3 Mon Sep 17 00:00:00 2001 From: Paul Thornthwaite Date: Mon, 22 Aug 2011 17:41:18 +0100 Subject: [PATCH 04/29] [compute|brightbox] Updated and reordered model attributes --- lib/fog/compute/models/brightbox/account.rb | 17 ++++++++++----- lib/fog/compute/models/brightbox/cloud_ip.rb | 6 ++++-- lib/fog/compute/models/brightbox/flavor.rb | 7 +++---- lib/fog/compute/models/brightbox/image.rb | 21 ++++++++++++------- .../compute/models/brightbox/load_balancer.rb | 16 ++++++++++---- lib/fog/compute/models/brightbox/server.rb | 17 +++++++++------ lib/fog/compute/models/brightbox/user.rb | 10 ++++++--- lib/fog/compute/models/brightbox/zone.rb | 7 ++++--- 8 files changed, 66 insertions(+), 35 deletions(-) diff --git a/lib/fog/compute/models/brightbox/account.rb b/lib/fog/compute/models/brightbox/account.rb index d91aff526..d4b79878a 100644 --- a/lib/fog/compute/models/brightbox/account.rb +++ b/lib/fog/compute/models/brightbox/account.rb @@ -7,10 +7,12 @@ module Fog class Account < Fog::Model identity :id - attribute :resource_type attribute :url + attribute :resource_type + attribute :name attribute :status + attribute :address_1 attribute :address_2 attribute :city @@ -20,11 +22,8 @@ module Fog attribute :country_name attribute :vat_registration_number attribute :telephone_number - attribute :telephone_verified attribute :verified_telephone - attribute :verified_at, :type => :time attribute :verified_ip - attribute :valid_credit_card, :type => :boolean attribute :ram_limit attribute :ram_used attribute :cloud_ips_limit @@ -35,8 +34,16 @@ module Fog attribute :library_ftp_user # This is always returned as null/nil unless performing a reset_ftp_password request attribute :library_ftp_password - attribute :created_at, :type => :time + # Boolean flags + attribute :valid_credit_card + attribute :telephone_verified + + # Times + attribute :created_at + attribute :verified_at + + # Links - to be replaced attribute :owner_id, :aliases => "owner", :squash => "id" attribute :clients attribute :images diff --git a/lib/fog/compute/models/brightbox/cloud_ip.rb b/lib/fog/compute/models/brightbox/cloud_ip.rb index ce678cad2..0636f1e19 100644 --- a/lib/fog/compute/models/brightbox/cloud_ip.rb +++ b/lib/fog/compute/models/brightbox/cloud_ip.rb @@ -7,19 +7,21 @@ module Fog class CloudIp < Fog::Model identity :id - attribute :url + attribute :resource_type + attribute :name attribute :status - attribute :resource_type attribute :description attribute :reverse_dns attribute :public_ip + # Links - to be replaced attribute :account_id, :aliases => "account", :squash => "id" attribute :interface_id, :aliases => "interface", :squash => "id" attribute :server_id, :aliases => "server", :squash => "id" + attribute :load_balancer, :alias => "load_balancer", :squash => "id" def map(interface_to_map) requires :identity diff --git a/lib/fog/compute/models/brightbox/flavor.rb b/lib/fog/compute/models/brightbox/flavor.rb index 8d1ecefa1..1613b29fe 100644 --- a/lib/fog/compute/models/brightbox/flavor.rb +++ b/lib/fog/compute/models/brightbox/flavor.rb @@ -7,10 +7,12 @@ module Fog class Flavor < Fog::Model identity :id - attribute :url + attribute :resource_type + attribute :name attribute :status + attribute :description attribute :handle @@ -19,9 +21,6 @@ module Fog attribute :disk, :aliases => "disk_size" attribute :ram - attribute :resource_type - attribute :description - def bits 0 # This is actually based on the Image type used. 32bit or 64bit Images are supported end diff --git a/lib/fog/compute/models/brightbox/image.rb b/lib/fog/compute/models/brightbox/image.rb index c72269ecb..3fd28d5e5 100644 --- a/lib/fog/compute/models/brightbox/image.rb +++ b/lib/fog/compute/models/brightbox/image.rb @@ -7,26 +7,31 @@ module Fog class Image < Fog::Model identity :id - attribute :url + attribute :resource_type + attribute :name attribute :status + attribute :description + attribute :source attribute :source_type - - attribute :ancestor_id, :aliases => "ancestor", :squash => "id" - attribute :owner_id, :aliases => "owner", :squash => "id" attribute :arch + attribute :virtual_size + attribute :disk_size - attribute :resource_type - attribute :description + # Boolean flags attribute :public attribute :official attribute :compatibility_mode - attribute :virtual_size - attribute :disk_size + + # Times attribute :created_at + # Links - to be replaced + attribute :ancestor_id, :aliases => "ancestor", :squash => "id" + attribute :owner_id, :aliases => "owner", :squash => "id" + def ready? status == "available" end diff --git a/lib/fog/compute/models/brightbox/load_balancer.rb b/lib/fog/compute/models/brightbox/load_balancer.rb index 54bff7727..706e73da6 100644 --- a/lib/fog/compute/models/brightbox/load_balancer.rb +++ b/lib/fog/compute/models/brightbox/load_balancer.rb @@ -7,17 +7,25 @@ module Fog class LoadBalancer < Fog::Model identity :id - attribute :url - attribute :name - attribute :status attribute :resource_type - attribute :nodes + attribute :name + attribute :status + attribute :policy + attribute :nodes attribute :healthcheck attribute :listeners + + # Times + attribute :created_at + attribute :deleted_at + + # Links - to be replaced attribute :account + attribute :server + attribute :cloud_ip def ready? status == 'active' diff --git a/lib/fog/compute/models/brightbox/server.rb b/lib/fog/compute/models/brightbox/server.rb index cefa2a7aa..6fcfaa16d 100644 --- a/lib/fog/compute/models/brightbox/server.rb +++ b/lib/fog/compute/models/brightbox/server.rb @@ -7,23 +7,28 @@ module Fog class Server < Fog::Compute::Server identity :id - + attribute :resource_type attribute :url + attribute :name attribute :state, :aliases => 'status' + attribute :hostname - attribute :created_at, :type => :time - attribute :deleted_at, :type => :time - attribute :started_at, :type => :time attribute :user_data + attribute :console_url + attribute :console_token - attribute :resource_type + # Times + attribute :created_at + attribute :started_at + attribute :console_token_expires + attribute :deleted_at + # Links - to be replaced attribute :account_id, :aliases => "account", :squash => "id" attribute :image_id, :aliases => "image", :squash => "id" attribute :flavor_id, :aliases => "server_type", :squash => "id" attribute :zone_id, :aliases => "zone", :squash => "id" - attribute :snapshots attribute :cloud_ips attribute :interfaces diff --git a/lib/fog/compute/models/brightbox/user.rb b/lib/fog/compute/models/brightbox/user.rb index 39b62cd15..5b4c86de2 100644 --- a/lib/fog/compute/models/brightbox/user.rb +++ b/lib/fog/compute/models/brightbox/user.rb @@ -7,14 +7,18 @@ module Fog class User < Fog::Model identity :id - - attribute :url attribute :resource_type + attribute :url + attribute :name attribute :email_address - attribute :email_verified attribute :ssh_key + # Boolean flags + attribute :email_verified + attribute :messaging_pref + + # Links - to be replaced attribute :account_id, :aliases => "default_account", :squash => "id" attribute :accounts diff --git a/lib/fog/compute/models/brightbox/zone.rb b/lib/fog/compute/models/brightbox/zone.rb index 04eb0e4c4..4e0b6b17c 100644 --- a/lib/fog/compute/models/brightbox/zone.rb +++ b/lib/fog/compute/models/brightbox/zone.rb @@ -7,11 +7,12 @@ module Fog class Zone < Fog::Model identity :id - attribute :url - attribute :handle - attribute :status attribute :resource_type + + attribute :status + attribute :handle + attribute :description end From f2b2fc23239755f56d5ac0074a0c5530889a3f77 Mon Sep 17 00:00:00 2001 From: Dan Peterson Date: Sun, 14 Aug 2011 22:22:03 -0700 Subject: [PATCH 05/29] [compute|aws] Include ids of things we're modifying in requests. --- lib/fog/compute/requests/aws/modify_image_attribute.rb | 1 + lib/fog/compute/requests/aws/modify_instance_attribute.rb | 5 +++-- lib/fog/compute/requests/aws/modify_snapshot_attribute.rb | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/fog/compute/requests/aws/modify_image_attribute.rb b/lib/fog/compute/requests/aws/modify_image_attribute.rb index 5fc0c774e..57409a5e4 100644 --- a/lib/fog/compute/requests/aws/modify_image_attribute.rb +++ b/lib/fog/compute/requests/aws/modify_image_attribute.rb @@ -28,6 +28,7 @@ module Fog params.merge!(Fog::AWS.indexed_param('ProductCode', attributes['ProductCode'] || [])) request({ 'Action' => 'ModifyImageAttribute', + 'ImageId' => image_id, :idempotent => true, :parser => Fog::Parsers::Compute::AWS::Basic.new }.merge!(params)) diff --git a/lib/fog/compute/requests/aws/modify_instance_attribute.rb b/lib/fog/compute/requests/aws/modify_instance_attribute.rb index 929bdb137..e0ca5b8c5 100644 --- a/lib/fog/compute/requests/aws/modify_instance_attribute.rb +++ b/lib/fog/compute/requests/aws/modify_instance_attribute.rb @@ -8,7 +8,7 @@ module Fog # Modify instance attributes # # ==== Parameters - # * image_id<~String> - Id of machine image to modify + # * instance_id<~String> - Id of instance to modify # * attributes<~Hash>: # 'InstanceType.Value'<~String> - New instance type # 'Kernel.Value'<~String> - New kernel value @@ -21,11 +21,12 @@ module Fog # # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ModifyInstanceAttribute.html] # - def modify_instance_attributes(image_id, attributes) + def modify_instance_attributes(instance_id, attributes) params = {} params.merge!(Fog::AWS.indexed_param('GroupId', attributes['GroupId'] || [])) request({ 'Action' => 'ModifyInstanceAttribute', + 'InstanceId' => instance_id, :idempotent => true, :parser => Fog::Parsers::Compute::AWS::Basic.new }.merge!(params)) diff --git a/lib/fog/compute/requests/aws/modify_snapshot_attribute.rb b/lib/fog/compute/requests/aws/modify_snapshot_attribute.rb index 9f3dcda94..2edbdf932 100644 --- a/lib/fog/compute/requests/aws/modify_snapshot_attribute.rb +++ b/lib/fog/compute/requests/aws/modify_snapshot_attribute.rb @@ -25,6 +25,7 @@ module Fog params.merge!(Fog::AWS.indexed_param('CreateVolumePermission.Remove.%d.UserId', attributes['Remove.UserId'] || [])) request({ 'Action' => 'ModifySnapshotAttribute', + 'SnapshotId' => snapshot_id, :idempotent => true, :parser => Fog::Parsers::Compute::AWS::Basic.new }.merge!(params)) From c8e23007603e9a3175fc2f3de4c8c67b80f71c51 Mon Sep 17 00:00:00 2001 From: Dan Peterson Date: Sun, 14 Aug 2011 22:22:37 -0700 Subject: [PATCH 06/29] [compute|aws] Fix create_volume mock when creating from a snapshot. --- lib/fog/compute/requests/aws/create_volume.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/fog/compute/requests/aws/create_volume.rb b/lib/fog/compute/requests/aws/create_volume.rb index 7d4194303..c2ae702c7 100644 --- a/lib/fog/compute/requests/aws/create_volume.rb +++ b/lib/fog/compute/requests/aws/create_volume.rb @@ -45,8 +45,8 @@ module Fog raise Fog::Compute::AWS::NotFound.new("The snapshot '#{snapshot_id}' does not exist.") end - if snapshot && size && size != snapshot['volumeSize'] - raise Fog::Compute::AWS::NotFound.new("The snapshot '#{snapshot_id}' with the specified size of '#{size}' does not exist.") + if snapshot && size && size < snapshot['volumeSize'] + raise Fog::Compute::AWS::NotFound.new("The snapshot '#{snapshot_id}' has size #{snapshot['volumeSize']} which is greater than #{size}.") elsif snapshot && !size size = snapshot['volumeSize'] end From 927267d0c0016c5c2cb0a7dd74d8c0ab31783d55 Mon Sep 17 00:00:00 2001 From: Dan Peterson Date: Mon, 15 Aug 2011 14:10:02 -0700 Subject: [PATCH 07/29] [compute|aws] Make get_bucket_location mock return LocationConstraint as API doc describes. --- lib/fog/storage/requests/aws/get_bucket_location.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/fog/storage/requests/aws/get_bucket_location.rb b/lib/fog/storage/requests/aws/get_bucket_location.rb index f25af086a..7b495ba9f 100644 --- a/lib/fog/storage/requests/aws/get_bucket_location.rb +++ b/lib/fog/storage/requests/aws/get_bucket_location.rb @@ -37,8 +37,17 @@ module Fog def get_bucket_location(bucket_name) response = Excon::Response.new if bucket = self.data[:buckets][bucket_name] + location_constraint = case bucket['LocationConstraint'] + when 'us-east-1' + nil + when 'eu-east-1' + 'EU' + else + bucket['LocationConstraint'] + end + response.status = 200 - response.body = {'LocationConstraint' => bucket['LocationConstraint'] } + response.body = {'LocationConstraint' => location_constraint } else response.status = 404 raise(Excon::Errors.status_error({:expects => 200}, response)) From 84ae5b72939b8fbabf9a2446f5ffb77be61ba736 Mon Sep 17 00:00:00 2001 From: Dan Peterson Date: Tue, 16 Aug 2011 16:13:56 -0700 Subject: [PATCH 08/29] [compute|aws] Fix associate_address mock to detach/revert previous addresses properly. --- lib/fog/compute/requests/aws/associate_address.rb | 8 +++++--- lib/fog/compute/requests/aws/describe_instances.rb | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/fog/compute/requests/aws/associate_address.rb b/lib/fog/compute/requests/aws/associate_address.rb index aea6e64a6..5e241ce61 100644 --- a/lib/fog/compute/requests/aws/associate_address.rb +++ b/lib/fog/compute/requests/aws/associate_address.rb @@ -38,11 +38,13 @@ module Fog instance = self.data[:instances][instance_id] address = self.data[:addresses][public_ip] if instance && address + if current_instance = self.data[:instances][address['instanceId']] + current_instance['ipAddress'] = current_instance['originalIpAddress'] + end address['instanceId'] = instance_id - instance['originalIpAddress'] = instance['ipAddress'] # detach other address (if any) - if self.data[:addresses][instance['originalIpAddress']] - self.data[:addresses][instance['originalIpAddress']]['instanceId'] = nil + if self.data[:addresses][instance['ipAddress']] + self.data[:addresses][instance['ipAddress']]['instanceId'] = nil end instance['ipAddress'] = public_ip instance['dnsName'] = Fog::AWS::Mock.dns_name_for(public_ip) diff --git a/lib/fog/compute/requests/aws/describe_instances.rb b/lib/fog/compute/requests/aws/describe_instances.rb index 48adfe8db..5fab4fb62 100644 --- a/lib/fog/compute/requests/aws/describe_instances.rb +++ b/lib/fog/compute/requests/aws/describe_instances.rb @@ -85,7 +85,7 @@ module Fog instance_set = self.data[:instances].values instance_set = apply_tag_filters(instance_set, filters) - + aliases = { 'architecture' => 'architecture', 'availability-zone' => 'availabilityZone', @@ -158,6 +158,7 @@ module Fog when 'pending' if Time.now - instance['launchTime'] >= Fog::Mock.delay instance['ipAddress'] = Fog::AWS::Mock.ip_address + instance['originalIpAddress'] = instance['ipAddress'] instance['dnsName'] = Fog::AWS::Mock.dns_name_for(instance['ipAddress']) instance['privateIpAddress'] = Fog::AWS::Mock.ip_address instance['privateDnsName'] = Fog::AWS::Mock.private_dns_name_for(instance['privateIpAddress']) From 1a499cc60141adc799f37ce602335e05af32b0d9 Mon Sep 17 00:00:00 2001 From: Paul Thornthwaite Date: Tue, 23 Aug 2011 12:05:05 +0100 Subject: [PATCH 09/29] [compute|brightbox] Updates to tests * Added some missing requests to tests * Stop reverting name changes from updates - not sure best way to limit tests to people who realise details will change * General reorganisation --- tests/compute/requests/brightbox/account_tests.rb | 14 +++----------- .../compute/requests/brightbox/api_client_tests.rb | 8 ++++++-- tests/compute/requests/brightbox/helper.rb | 5 ++++- .../requests/brightbox/load_balancer_tests.rb | 12 ++++++------ tests/compute/requests/brightbox/server_tests.rb | 2 +- tests/compute/requests/brightbox/user_tests.rb | 2 +- 6 files changed, 21 insertions(+), 22 deletions(-) diff --git a/tests/compute/requests/brightbox/account_tests.rb b/tests/compute/requests/brightbox/account_tests.rb index d1aee1ad8..83cdd7d83 100644 --- a/tests/compute/requests/brightbox/account_tests.rb +++ b/tests/compute/requests/brightbox/account_tests.rb @@ -7,18 +7,10 @@ Shindo.tests('Fog::Compute[:brightbox] | account requests', ['brightbox']) do Fog::Compute[:brightbox].get_account end - unless Fog.mocking? - original_name = Fog::Compute[:brightbox].get_account["name"] - update_args = {:name => "New name from Fog test"} - end - - tests("#update_account(#{update_args.inspect})").formats(Brightbox::Compute::Formats::Full::ACCOUNT) do + update_options = {:name => "Fog@#{Time.now.iso8601}"} + tests("#update_account(#{update_options.inspect})").formats(Brightbox::Compute::Formats::Full::ACCOUNT) do pending if Fog.mocking? - Fog::Compute[:brightbox].update_account(update_args) - end - - unless Fog.mocking? - Fog::Compute[:brightbox].update_account(:name => original_name) + Fog::Compute[:brightbox].update_account(update_options) end tests("#reset_ftp_password_account").formats(Brightbox::Compute::Formats::Full::ACCOUNT) do diff --git a/tests/compute/requests/brightbox/api_client_tests.rb b/tests/compute/requests/brightbox/api_client_tests.rb index b1208d13a..039a5aea4 100644 --- a/tests/compute/requests/brightbox/api_client_tests.rb +++ b/tests/compute/requests/brightbox/api_client_tests.rb @@ -2,7 +2,10 @@ Shindo.tests('Fog::Compute[:brightbox] | api client requests', ['brightbox']) do tests('success') do - create_options = {:name => "Name from Fog test (#{Time.now.to_i})", :description => "Description from Fog test"} + create_options = { + :name => "Fog@#{Time.now.iso8601}", + :description => "Description from Fog test" + } tests("#create_api_client(#{create_options.inspect})").formats(Brightbox::Compute::Formats::Full::API_CLIENT) do pending if Fog.mocking? @@ -21,9 +24,10 @@ Shindo.tests('Fog::Compute[:brightbox] | api client requests', ['brightbox']) do Fog::Compute[:brightbox].get_api_client(@api_client_id) end + update_options = {:name => "Fog@#{Time.now.iso8601}"} tests("#update_api_client('#{@api_client_id}')").formats(Brightbox::Compute::Formats::Full::API_CLIENT) do pending if Fog.mocking? - Fog::Compute[:brightbox].update_api_client(@api_client_id, :name => "New name from Fog test") + Fog::Compute[:brightbox].update_api_client(@api_client_id, update_options) end tests("#destroy_api_client('#{@api_client_id}')").formats(Brightbox::Compute::Formats::Full::API_CLIENT) do diff --git a/tests/compute/requests/brightbox/helper.rb b/tests/compute/requests/brightbox/helper.rb index da47c2c88..1f33f5390 100644 --- a/tests/compute/requests/brightbox/helper.rb +++ b/tests/compute/requests/brightbox/helper.rb @@ -199,7 +199,10 @@ class Brightbox "name" => String, "status" => String, "created_at" => String, - "deleted_at" => Fog::Nullable::String + "deleted_at" => Fog::Nullable::String, + "account" => Brightbox::Compute::Formats::Nested::ACCOUNT, + "nodes" => [Brightbox::Compute::Formats::Nested::SERVER], + "cloud_ips" => [Brightbox::Compute::Formats::Nested::CLOUD_IP] } SERVER = { diff --git a/tests/compute/requests/brightbox/load_balancer_tests.rb b/tests/compute/requests/brightbox/load_balancer_tests.rb index f8ab419df..5c9f1997a 100644 --- a/tests/compute/requests/brightbox/load_balancer_tests.rb +++ b/tests/compute/requests/brightbox/load_balancer_tests.rb @@ -7,7 +7,7 @@ Shindo.tests('Fog::Compute[:brightbox] | load balancer requests', ['brightbox']) node_id = @node.id end - creation_args = { + create_options = { :nodes => [{ :node => node_id }], @@ -22,9 +22,9 @@ Shindo.tests('Fog::Compute[:brightbox] | load balancer requests', ['brightbox']) } } - tests("#create_load_balancer(#{creation_args.inspect})").formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) do + tests("#create_load_balancer(#{create_options.inspect})").formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) do pending if Fog.mocking? - data = Fog::Compute[:brightbox].create_load_balancer(creation_args) + data = Fog::Compute[:brightbox].create_load_balancer(create_options) @load_balancer_id = data["id"] data end @@ -33,9 +33,9 @@ Shindo.tests('Fog::Compute[:brightbox] | load balancer requests', ['brightbox']) Fog::Compute[:brightbox].load_balancers.get(@load_balancer_id).wait_for { ready? } end - # tests("#list_load_balancers()").formats(Brightbox::Compute::Formats::Collection::LOAD_BALANCERS) do - # Fog::Compute[:brightbox].list_load_balancers - # end + tests("#list_load_balancers()").formats(Brightbox::Compute::Formats::Collection::LOAD_BALANCERS) do + Fog::Compute[:brightbox].list_load_balancers + end tests("#get_load_balancer('#{@load_balancer_id}')").formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) do pending if Fog.mocking? diff --git a/tests/compute/requests/brightbox/server_tests.rb b/tests/compute/requests/brightbox/server_tests.rb index 33a72a820..33f0beec9 100644 --- a/tests/compute/requests/brightbox/server_tests.rb +++ b/tests/compute/requests/brightbox/server_tests.rb @@ -28,7 +28,7 @@ Shindo.tests('Fog::Compute[:brightbox] | server requests', ['brightbox']) do tests("#update_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do pending if Fog.mocking? - Fog::Compute[:brightbox].update_server(server_id, :name => "New name from Fog test") + Fog::Compute[:brightbox].update_server(server_id, :name => "Fog@#{Time.now.iso8601}") end tests("#activate_console_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do diff --git a/tests/compute/requests/brightbox/user_tests.rb b/tests/compute/requests/brightbox/user_tests.rb index bd30fa258..ef22af5c2 100644 --- a/tests/compute/requests/brightbox/user_tests.rb +++ b/tests/compute/requests/brightbox/user_tests.rb @@ -16,7 +16,7 @@ Shindo.tests('Fog::Compute[:brightbox] | user requests', ['brightbox']) do data end - update_options = { :name => "New name from Fog" } + update_options = { :name => "Fog@#{Time.now.iso8601}" } tests("#update_user('#{@user_id}', #{update_options.inspect})").formats(Brightbox::Compute::Formats::Full::USER) do pending if Fog.mocking? From 35bbd854e00af569988c9c9f626bac0c7010c6b9 Mon Sep 17 00:00:00 2001 From: geemus Date: Tue, 23 Aug 2011 09:43:24 -0500 Subject: [PATCH 10/29] [core] add collection#destroy(identity) --- lib/fog/core/collection.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/fog/core/collection.rb b/lib/fog/core/collection.rb index 802db6052..165db0efe 100644 --- a/lib/fog/core/collection.rb +++ b/lib/fog/core/collection.rb @@ -51,6 +51,11 @@ module Fog object end + def destroy(identity) + object = new(:identity => identity) + object.destroy + end + def initialize(attributes = {}) @loaded = false merge_attributes(attributes) From e256cc729ab8dd9789832cc3d726796f1e6016a6 Mon Sep 17 00:00:00 2001 From: Paul Thornthwaite Date: Tue, 23 Aug 2011 17:22:07 +0100 Subject: [PATCH 11/29] [compute|brightbox] Added resave warning to a few Brightbox models --- lib/fog/compute/models/brightbox/image.rb | 1 + lib/fog/compute/models/brightbox/load_balancer.rb | 1 + lib/fog/compute/models/brightbox/server.rb | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/fog/compute/models/brightbox/image.rb b/lib/fog/compute/models/brightbox/image.rb index 3fd28d5e5..bda4a8024 100644 --- a/lib/fog/compute/models/brightbox/image.rb +++ b/lib/fog/compute/models/brightbox/image.rb @@ -37,6 +37,7 @@ module Fog end def save + raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity requires :source, :arch options = { :source => source, diff --git a/lib/fog/compute/models/brightbox/load_balancer.rb b/lib/fog/compute/models/brightbox/load_balancer.rb index 706e73da6..b0de81a50 100644 --- a/lib/fog/compute/models/brightbox/load_balancer.rb +++ b/lib/fog/compute/models/brightbox/load_balancer.rb @@ -32,6 +32,7 @@ module Fog end def save + raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity requires :nodes, :listeners, :healthcheck options = { :nodes => nodes, diff --git a/lib/fog/compute/models/brightbox/server.rb b/lib/fog/compute/models/brightbox/server.rb index 6fcfaa16d..235a46c26 100644 --- a/lib/fog/compute/models/brightbox/server.rb +++ b/lib/fog/compute/models/brightbox/server.rb @@ -100,6 +100,7 @@ module Fog end def save + raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity requires :image_id options = { :image => image_id, From ec934bdcf65791045e731ad0fbc8da3bd0e01570 Mon Sep 17 00:00:00 2001 From: Dylan Egan Date: Mon, 22 Aug 2011 13:50:18 -0700 Subject: [PATCH 12/29] [compute|aws] Suffix with _tests.rb. --- .../models/aws/{security_groups.rb => security_groups_tests.rb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/compute/models/aws/{security_groups.rb => security_groups_tests.rb} (100%) diff --git a/tests/compute/models/aws/security_groups.rb b/tests/compute/models/aws/security_groups_tests.rb similarity index 100% rename from tests/compute/models/aws/security_groups.rb rename to tests/compute/models/aws/security_groups_tests.rb From fd708c6a709600f9bc2ab99d71f2dd016fe4fc57 Mon Sep 17 00:00:00 2001 From: Dylan Egan Date: Mon, 22 Aug 2011 13:50:18 -0700 Subject: [PATCH 13/29] [compute|aws] IpPermissionsEgress is returned from AWS. --- tests/compute/requests/aws/security_group_tests.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/compute/requests/aws/security_group_tests.rb b/tests/compute/requests/aws/security_group_tests.rb index 584adaeef..628f889e7 100644 --- a/tests/compute/requests/aws/security_group_tests.rb +++ b/tests/compute/requests/aws/security_group_tests.rb @@ -12,6 +12,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do 'ipRanges' => [], 'toPort' => Integer, }], + 'ipPermissionsEgress' => [], 'ownerId' => String }] } From 7829bb73aada96bbe28ab65c68231c5a27ff3454 Mon Sep 17 00:00:00 2001 From: Dylan Egan Date: Tue, 23 Aug 2011 11:47:30 -0700 Subject: [PATCH 14/29] [compute|aws] Simple test to verify revoke_group_and_owner behaviour. --- tests/compute/models/aws/security_group_tests.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/compute/models/aws/security_group_tests.rb b/tests/compute/models/aws/security_group_tests.rb index a2707813c..ac7ce4e25 100644 --- a/tests/compute/models/aws/security_group_tests.rb +++ b/tests/compute/models/aws/security_group_tests.rb @@ -12,6 +12,21 @@ Shindo.tests("Fog::Compute[:aws] | security_group", ['aws']) do @group.description == " fog group desc " end + @other_group = Fog::Compute[:aws].security_groups.create(:name => 'other group', :description => 'another group') + + test("authorize access by another security group") do + @group.authorize_group_and_owner(@other_group.name, @other_group.owner_id) + @group.reload + @group.ip_permissions.size == 3 + end + + test("revoke access from another security group") do + @group.revoke_group_and_owner(@other_group.name, @other_group.owner_id) + @group.reload + @group.ip_permissions.size == 0 + end + + @other_group.destroy @group.destroy end end From 1755190ca4d84a3b4521e7ed39a94fc3f27c7b5f Mon Sep 17 00:00:00 2001 From: Dylan Egan Date: Tue, 23 Aug 2011 12:09:55 -0700 Subject: [PATCH 15/29] [compute|aws] Apparently passing a nil value works against live AWS. Only use SourceSecurityGroupOwnerId in mocks if supplied. --- .../requests/aws/authorize_security_group_ingress.rb | 6 +++--- .../requests/aws/revoke_security_group_ingress.rb | 12 ++++++++---- tests/compute/models/aws/security_group_tests.rb | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/fog/compute/requests/aws/authorize_security_group_ingress.rb b/lib/fog/compute/requests/aws/authorize_security_group_ingress.rb index 472a2e0e4..10cbef2b6 100644 --- a/lib/fog/compute/requests/aws/authorize_security_group_ingress.rb +++ b/lib/fog/compute/requests/aws/authorize_security_group_ingress.rb @@ -62,10 +62,10 @@ module Fog if group group['ipPermissions'] ||= [] - if group_name && options['SourceSecurityGroupName'] && options['SourceSecurityGroupOwnerId'] + if group_name && source_group_name = options['SourceSecurityGroupName'] ['tcp', 'udp'].each do |protocol| group['ipPermissions'] << { - 'groups' => [{'groupName' => group_name, 'userId' => self.data[:owner_id]}], + 'groups' => [{'groupName' => source_group_name, 'userId' => (options['SourceSecurityGroupOwnerId'] || self.data[:owner_id]) }], 'fromPort' => 1, 'ipRanges' => [], 'ipProtocol' => protocol, @@ -73,7 +73,7 @@ module Fog } end group['ipPermissions'] << { - 'groups' => [{'groupName' => group_name, 'userId' => self.data[:owner_id]}], + 'groups' => [{'groupName' => source_group_name, 'userId' => (options['SourceSecurityGroupOwnerId'] || self.data[:owner_id]) }], 'fromPort' => -1, 'ipRanges' => [], 'ipProtocol' => 'icmp', diff --git a/lib/fog/compute/requests/aws/revoke_security_group_ingress.rb b/lib/fog/compute/requests/aws/revoke_security_group_ingress.rb index 8b4a6bf66..40ab76518 100644 --- a/lib/fog/compute/requests/aws/revoke_security_group_ingress.rb +++ b/lib/fog/compute/requests/aws/revoke_security_group_ingress.rb @@ -58,10 +58,14 @@ module Fog response = Excon::Response.new group = self.data[:security_groups][group_name] if group - if options['SourceSecurityGroupName'] && options['SourceSecurityGroupOwnerId'] - group['ipPermissions'].delete_if {|permission| - permission['groups'].first['groupName'] == group_name - } + if source_group_name = options['SourceSecurityGroupName'] + group['ipPermissions'].delete_if do |permission| + if source_owner_id = options['SourceSecurityGroupOwnerId'] + permission['groups'].first['groupName'] == source_group_name && permission['groups'].first['userId'] == source_owner_id + else + permission['groups'].first['groupName'] == source_group_name + end + end else ingress = group['ipPermissions'].select {|permission| permission['fromPort'] == options['FromPort'] && diff --git a/tests/compute/models/aws/security_group_tests.rb b/tests/compute/models/aws/security_group_tests.rb index ac7ce4e25..add4a4eda 100644 --- a/tests/compute/models/aws/security_group_tests.rb +++ b/tests/compute/models/aws/security_group_tests.rb @@ -23,7 +23,7 @@ Shindo.tests("Fog::Compute[:aws] | security_group", ['aws']) do test("revoke access from another security group") do @group.revoke_group_and_owner(@other_group.name, @other_group.owner_id) @group.reload - @group.ip_permissions.size == 0 + @group.ip_permissions.empty? end @other_group.destroy From c86fe16c5ea1e79890b7f6a96af819d56a754cdd Mon Sep 17 00:00:00 2001 From: Dylan Egan Date: Tue, 23 Aug 2011 16:19:49 -0700 Subject: [PATCH 16/29] [compute|aws] Since this is really proving the use of nil, let's just not pretend there's a value for owner_id. --- lib/fog/compute/models/aws/security_group.rb | 4 ++-- tests/compute/models/aws/security_group_tests.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/fog/compute/models/aws/security_group.rb b/lib/fog/compute/models/aws/security_group.rb index 1bbd941a1..40a2099d5 100644 --- a/lib/fog/compute/models/aws/security_group.rb +++ b/lib/fog/compute/models/aws/security_group.rb @@ -38,7 +38,7 @@ module Fog # "Server"=>"AmazonEC2"} # - def authorize_group_and_owner(group, owner) + def authorize_group_and_owner(group, owner = nil) requires :name connection.authorize_security_group_ingress( @@ -130,7 +130,7 @@ module Fog # "Server"=>"AmazonEC2"} # - def revoke_group_and_owner(group, owner) + def revoke_group_and_owner(group, owner = nil) requires :name connection.revoke_security_group_ingress( diff --git a/tests/compute/models/aws/security_group_tests.rb b/tests/compute/models/aws/security_group_tests.rb index add4a4eda..7d38dd89f 100644 --- a/tests/compute/models/aws/security_group_tests.rb +++ b/tests/compute/models/aws/security_group_tests.rb @@ -15,13 +15,13 @@ Shindo.tests("Fog::Compute[:aws] | security_group", ['aws']) do @other_group = Fog::Compute[:aws].security_groups.create(:name => 'other group', :description => 'another group') test("authorize access by another security group") do - @group.authorize_group_and_owner(@other_group.name, @other_group.owner_id) + @group.authorize_group_and_owner(@other_group.name) @group.reload @group.ip_permissions.size == 3 end test("revoke access from another security group") do - @group.revoke_group_and_owner(@other_group.name, @other_group.owner_id) + @group.revoke_group_and_owner(@other_group.name) @group.reload @group.ip_permissions.empty? end From 0e9d46afdaf6d82ce65a96a1fd6eb866eee0ea9b Mon Sep 17 00:00:00 2001 From: Paul Thornthwaite Date: Wed, 17 Aug 2011 17:03:45 +0100 Subject: [PATCH 17/29] [compute|brightbox] Requests for server group management --- lib/fog/compute/brightbox.rb | 8 ++ .../brightbox/add_servers_server_group.rb | 28 ++++++ .../requests/brightbox/create_server_group.rb | 13 +++ .../brightbox/destroy_server_group.rb | 14 +++ .../requests/brightbox/get_server_group.rb | 14 +++ .../requests/brightbox/list_server_groups.rb | 13 +++ .../brightbox/move_servers_server_group.rb | 29 ++++++ .../brightbox/remove_servers_server_group.rb | 27 ++++++ .../requests/brightbox/update_server_group.rb | 15 ++++ tests/compute/requests/brightbox/helper.rb | 34 +++++++ .../requests/brightbox/server_group_tests.rb | 89 +++++++++++++++++++ 11 files changed, 284 insertions(+) create mode 100644 lib/fog/compute/requests/brightbox/add_servers_server_group.rb create mode 100644 lib/fog/compute/requests/brightbox/create_server_group.rb create mode 100644 lib/fog/compute/requests/brightbox/destroy_server_group.rb create mode 100644 lib/fog/compute/requests/brightbox/get_server_group.rb create mode 100644 lib/fog/compute/requests/brightbox/list_server_groups.rb create mode 100644 lib/fog/compute/requests/brightbox/move_servers_server_group.rb create mode 100644 lib/fog/compute/requests/brightbox/remove_servers_server_group.rb create mode 100644 lib/fog/compute/requests/brightbox/update_server_group.rb create mode 100644 tests/compute/requests/brightbox/server_group_tests.rb diff --git a/lib/fog/compute/brightbox.rb b/lib/fog/compute/brightbox.rb index 0efe2cc4a..2afd1d54e 100644 --- a/lib/fog/compute/brightbox.rb +++ b/lib/fog/compute/brightbox.rb @@ -28,16 +28,19 @@ module Fog request :activate_console_server request :add_listeners_load_balancer request :add_nodes_load_balancer + request :add_servers_server_group request :create_api_client request :create_cloud_ip request :create_image request :create_load_balancer request :create_server + request :create_server_group request :destroy_api_client request :destroy_cloud_ip request :destroy_image request :destroy_load_balancer request :destroy_server + request :destroy_server_group request :get_account request :get_api_client request :get_cloud_ip @@ -45,6 +48,7 @@ module Fog request :get_interface request :get_load_balancer request :get_server + request :get_server_group request :get_server_type request :get_user request :get_zone @@ -52,13 +56,16 @@ module Fog request :list_cloud_ips request :list_images request :list_load_balancers + request :list_server_groups request :list_server_types request :list_servers request :list_users request :list_zones request :map_cloud_ip + request :move_servers_server_group request :remove_listeners_load_balancer request :remove_nodes_load_balancer + request :remove_servers_server_group request :reset_ftp_password_account request :resize_server request :shutdown_server @@ -71,6 +78,7 @@ module Fog request :update_image request :update_load_balancer request :update_server + request :update_server_group request :update_user class Mock diff --git a/lib/fog/compute/requests/brightbox/add_servers_server_group.rb b/lib/fog/compute/requests/brightbox/add_servers_server_group.rb new file mode 100644 index 000000000..1c259cede --- /dev/null +++ b/lib/fog/compute/requests/brightbox/add_servers_server_group.rb @@ -0,0 +1,28 @@ +module Fog + module Compute + class Brightbox + class Real + + # Add a number of servers to a server group + # + # >> Compute[:brightbox].add_servers_server_group "grp-12345", :servers => [{:server => "srv-abcde"}] + # + # == Parameters: + # * identifier (String) - The identifier of the server group to add to + # * options + # * servers (Array) - An Array of Hashes containing {"server" => server_id} for each server to add + # [\[{"server" => "srv-abcde"}, {"server" => "srv-fghij"}\]] + # + # == Returns: + # + # A Ruby hash of the server response + # + def add_servers_server_group(identifier, options) + return nil if identifier.nil? || identifier == "" + request("post", "/1.0/server_groups/#{identifier}/add_servers", [202], options) + end + + end + end + end +end \ No newline at end of file diff --git a/lib/fog/compute/requests/brightbox/create_server_group.rb b/lib/fog/compute/requests/brightbox/create_server_group.rb new file mode 100644 index 000000000..2972c9a9e --- /dev/null +++ b/lib/fog/compute/requests/brightbox/create_server_group.rb @@ -0,0 +1,13 @@ +module Fog + module Compute + class Brightbox + class Real + + def create_server_group(options) + request("post", "/1.0/server_groups", [202], options) + end + + end + end + end +end \ No newline at end of file diff --git a/lib/fog/compute/requests/brightbox/destroy_server_group.rb b/lib/fog/compute/requests/brightbox/destroy_server_group.rb new file mode 100644 index 000000000..05ceaa934 --- /dev/null +++ b/lib/fog/compute/requests/brightbox/destroy_server_group.rb @@ -0,0 +1,14 @@ +module Fog + module Compute + class Brightbox + class Real + + def destroy_server_group(identifier) + return nil if identifier.nil? || identifier == "" + request("delete", "/1.0/server_groups/#{identifier}", [202]) + end + + end + end + end +end \ No newline at end of file diff --git a/lib/fog/compute/requests/brightbox/get_server_group.rb b/lib/fog/compute/requests/brightbox/get_server_group.rb new file mode 100644 index 000000000..01bc1aebb --- /dev/null +++ b/lib/fog/compute/requests/brightbox/get_server_group.rb @@ -0,0 +1,14 @@ +module Fog + module Compute + class Brightbox + class Real + + def get_server_group(identifier) + return nil if identifier.nil? || identifier == "" + request("get", "/1.0/server_groups/#{identifier}", [200]) + end + + end + end + end +end \ No newline at end of file diff --git a/lib/fog/compute/requests/brightbox/list_server_groups.rb b/lib/fog/compute/requests/brightbox/list_server_groups.rb new file mode 100644 index 000000000..ff6fca024 --- /dev/null +++ b/lib/fog/compute/requests/brightbox/list_server_groups.rb @@ -0,0 +1,13 @@ +module Fog + module Compute + class Brightbox + class Real + + def list_server_groups + request("get", "/1.0/server_groups", [200]) + end + + end + end + end +end \ No newline at end of file diff --git a/lib/fog/compute/requests/brightbox/move_servers_server_group.rb b/lib/fog/compute/requests/brightbox/move_servers_server_group.rb new file mode 100644 index 000000000..140a4767a --- /dev/null +++ b/lib/fog/compute/requests/brightbox/move_servers_server_group.rb @@ -0,0 +1,29 @@ +module Fog + module Compute + class Brightbox + class Real + + # Moves a number of servers between two server groups + # + # >> Compute[:brightbox].remove_servers_server_group "grp-12345", :destination => "grp-67890", :servers => [{:server => "srv-abcde"}] + # + # == Parameters: + # * identifier - The identifier (String) of the server group to remove from + # * options (Hash) + # * destination (String)- The identifier of the server group to move to + # * servers (Array) - Array of Hashes containing {"server" => server_id} for each server to remove + # [\[{"server" => "srv-abcde"}, {"server" => "srv-fghij"}\]] + # + # == Returns: + # + # A Ruby hash of the server response + # + def move_servers_server_group(identifier, options) + return nil if identifier.nil? || identifier == "" + request("post", "/1.0/server_groups/#{identifier}/move_servers", [202], options) + end + + end + end + end +end \ No newline at end of file diff --git a/lib/fog/compute/requests/brightbox/remove_servers_server_group.rb b/lib/fog/compute/requests/brightbox/remove_servers_server_group.rb new file mode 100644 index 000000000..04d8b7b18 --- /dev/null +++ b/lib/fog/compute/requests/brightbox/remove_servers_server_group.rb @@ -0,0 +1,27 @@ +module Fog + module Compute + class Brightbox + class Real + + # Remove a number of servers from a server group + # + # >> Compute[:brightbox].remove_servers_server_group "grp-12345", :servers => [{:server => "srv-abcde"}] + # + # == Parameters: + # * identifier (String) - The identifier of the server group to remove from + # * options (Array) - An Array of Hashes containing {"server" => server_id} for each server to remove + # [\[{"server" => "srv-abcde"}, {"server" => "srv-fghij"}\]] + # + # == Returns: + # + # A Ruby hash of the server response + # + def remove_servers_server_group(identifier, options) + return nil if identifier.nil? || identifier == "" + request("post", "/1.0/server_groups/#{identifier}/remove_servers", [202], options) + end + + end + end + end +end \ No newline at end of file diff --git a/lib/fog/compute/requests/brightbox/update_server_group.rb b/lib/fog/compute/requests/brightbox/update_server_group.rb new file mode 100644 index 000000000..0ea23f804 --- /dev/null +++ b/lib/fog/compute/requests/brightbox/update_server_group.rb @@ -0,0 +1,15 @@ +module Fog + module Compute + class Brightbox + class Real + + def update_server_group(identifier, options) + return nil if identifier.nil? || identifier == "" + return nil if options.empty? || options.nil? + request("put", "/1.0/server_groups/#{identifier}", [202]) + end + + end + end + end +end \ No newline at end of file diff --git a/tests/compute/requests/brightbox/helper.rb b/tests/compute/requests/brightbox/helper.rb index 1f33f5390..1625e0048 100644 --- a/tests/compute/requests/brightbox/helper.rb +++ b/tests/compute/requests/brightbox/helper.rb @@ -119,6 +119,15 @@ class Brightbox "deleted_at" => Fog::Nullable::String } + SERVER_GROUP = { + "id" => String, + "resource_type" => String, + "url" => String, + "name" => String, + "default" => Fog::Boolean, + "description" => Fog::Nullable::String + } + SERVER_TYPE = { "name" => String, "handle" => Fog::Nullable::String, @@ -219,11 +228,23 @@ class Brightbox "server_type" => Brightbox::Compute::Formats::Nested::SERVER_TYPE, "cloud_ips" => [Brightbox::Compute::Formats::Nested::CLOUD_IP], "image" => Brightbox::Compute::Formats::Nested::IMAGE, + "server_groups" => [Brightbox::Compute::Formats::Nested::SERVER_GROUP], "snapshots" => [Brightbox::Compute::Formats::Nested::IMAGE], "interfaces" => [Brightbox::Compute::Formats::Nested::INTERFACE], "zone" => Fog::Brightbox::Nullable::Zone } + SERVER_GROUP = { + "id" => String, + "resource_type" => String, + "url" => String, + "name" => String, + "description" => Fog::Nullable::String, + "default" => Fog::Boolean, + "account" => Brightbox::Compute::Formats::Nested::ACCOUNT, + "servers" => [Brightbox::Compute::Formats::Nested::SERVER] + } + SERVER_TYPE = { "id" => String, "resource_type" => String, @@ -383,10 +404,22 @@ class Brightbox "cloud_ips" => [Brightbox::Compute::Formats::Nested::CLOUD_IP], "image" => Brightbox::Compute::Formats::Nested::IMAGE, "snapshots" => [Brightbox::Compute::Formats::Nested::IMAGE], + "server_groups" => [Brightbox::Compute::Formats::Nested::SERVER_GROUP], "interfaces" => [Brightbox::Compute::Formats::Nested::INTERFACE], "zone" => Brightbox::Compute::Formats::Nested::ZONE } + SERVER_GROUP = { + "id" => String, + "resource_type" => String, + "url" => String, + "name" => String, + "description" => Fog::Nullable::String, + "default" => Fog::Boolean, + "account" => Brightbox::Compute::Formats::Nested::ACCOUNT, + "servers" => [Brightbox::Compute::Formats::Nested::SERVER] + } + SERVER_TYPE = { "id" => String, "resource_type" => String, @@ -427,6 +460,7 @@ class Brightbox IMAGES = [Brightbox::Compute::Formats::Collected::IMAGE] LOAD_BALANCERS = [Brightbox::Compute::Formats::Collected::LOAD_BALANCER] SERVERS = [Brightbox::Compute::Formats::Collected::SERVER] + SERVER_GROUPS = [Brightbox::Compute::Formats::Collected::SERVER_GROUP] SERVER_TYPES = [Brightbox::Compute::Formats::Collected::SERVER_TYPE] USERS = [Brightbox::Compute::Formats::Collected::USER] ZONES = [Brightbox::Compute::Formats::Collected::ZONE] diff --git a/tests/compute/requests/brightbox/server_group_tests.rb b/tests/compute/requests/brightbox/server_group_tests.rb new file mode 100644 index 000000000..1e38f2b51 --- /dev/null +++ b/tests/compute/requests/brightbox/server_group_tests.rb @@ -0,0 +1,89 @@ +Shindo.tests('Fog::Compute[:brightbox] | server group requests', ['brightbox']) do + + tests('success') do + + unless Fog.mocking? + @server = Fog::Compute[:brightbox].servers.create(:image_id => Brightbox::Compute::TestSupport::IMAGE_IDENTIFER) + server_id = @server.id + end + + create_options = { + :name => "Fog@#{Time.now.iso8601}", + :servers => [{ + :server => server_id + }] + } + + tests("#create_server_group(#{create_options.inspect})").formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) do + pending if Fog.mocking? + data = Fog::Compute[:brightbox].create_server_group(create_options) + @server_group_id = data["id"] + data + end + + tests("#list_server_groups").formats(Brightbox::Compute::Formats::Collection::SERVER_GROUPS) do + pending if Fog.mocking? + Fog::Compute[:brightbox].list_server_groups + end + + tests("#get_server_group('#{@server_group_id}')").formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) do + pending if Fog.mocking? + Fog::Compute[:brightbox].get_server_group(@server_group_id) + end + + update_options = {:name => "Fog@#{Time.now.iso8601}"} + tests("#update_server_group(#{update_options.inspect})").formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) do + pending if Fog.mocking? + Fog::Compute[:brightbox].update_server_group(@server_group_id, update_options) + end + + remove_options = {:servers => [{:server => server_id}]} + tests("#remove_servers_server_group(#{remove_options.inspect})").formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) do + pending if Fog.mocking? + Fog::Compute[:brightbox].remove_servers_server_group(@server_group_id, remove_options) + end + + add_options = {:servers => [{:server => server_id}]} + tests("#add_servers_server_group(#{remove_options.inspect})").formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) do + pending if Fog.mocking? + Fog::Compute[:brightbox].add_servers_server_group(@server_group_id, add_options) + end + + # Server Group must be empty to delete so we need to remove it again + remove_options = {:servers => [{:server => server_id}]} + tests("#remove_servers_server_group(#{remove_options.inspect})").formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) do + pending if Fog.mocking? + Fog::Compute[:brightbox].remove_servers_server_group(@server_group_id, remove_options) + end + + tests("#destroy_server_group('#{@server_group_id}')").formats(Brightbox::Compute::Formats::Full::SERVER_GROUP) do + pending if Fog.mocking? + Fog::Compute[:brightbox].destroy_server_group(@server_group_id) + end + + unless Fog.mocking? + @server.wait_for { ready? } + @server.destroy + end + + end + + tests('failure') do + + tests("#create_server_group").raises(ArgumentError) do + pending if Fog.mocking? + Fog::Compute[:brightbox].create_server_group + end + + tests("#get_server_group('grp-00000')").raises(Excon::Errors::NotFound) do + pending if Fog.mocking? + Fog::Compute[:brightbox].get_server_group('grp-00000') + end + + tests("#get_server_group").raises(ArgumentError) do + pending if Fog.mocking? + Fog::Compute[:brightbox].get_server_group + end + end + +end From b664f37ac3f96634d9d3e47b8835aa2ceebeb992 Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 24 Aug 2011 13:18:29 -0500 Subject: [PATCH 18/29] [core] move openssl to more central location --- lib/fog/core.rb | 1 + lib/fog/providers/aws.rb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/core.rb b/lib/fog/core.rb index a2383f52a..77988ef00 100644 --- a/lib/fog/core.rb +++ b/lib/fog/core.rb @@ -12,6 +12,7 @@ require 'uri' require 'excon' require 'fileutils' require 'formatador' +require 'openssl' require 'time' require 'timeout' diff --git a/lib/fog/providers/aws.rb b/lib/fog/providers/aws.rb index e818ee302..b6ce30ce4 100644 --- a/lib/fog/providers/aws.rb +++ b/lib/fog/providers/aws.rb @@ -1,5 +1,4 @@ require 'fog/core' -require 'openssl' # For RSA key pairs require 'base64' # For console output module Fog From b1c48e7d569187863745692c920bdc507bb6861c Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 24 Aug 2011 13:20:07 -0500 Subject: [PATCH 19/29] [aws] remove base64 require (duplicates require in fog/core) --- lib/fog/providers/aws.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/fog/providers/aws.rb b/lib/fog/providers/aws.rb index b6ce30ce4..defae0438 100644 --- a/lib/fog/providers/aws.rb +++ b/lib/fog/providers/aws.rb @@ -1,5 +1,4 @@ require 'fog/core' -require 'base64' # For console output module Fog module AWS From 65c1bfffe26828bb612ab5fa15c61705d39c81cb Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 24 Aug 2011 13:35:08 -0500 Subject: [PATCH 20/29] [core] first steps toward seperately requirable bits --- lib/fog/{providers => aws}/aws.rb | 0 lib/fog/{providers => bluebox}/bluebox.rb | 0 lib/fog/{providers => brightbox}/brightbox.rb | 0 lib/fog/{providers => dnsimple}/dnsimple.rb | 0 .../{providers => dnsmadeeasy}/dnsmadeeasy.rb | 0 lib/fog/{providers => dynect}/dynect.rb | 0 lib/fog/{providers => ecloud}/ecloud.rb | 0 lib/fog/{providers => go_grid}/go_grid.rb | 0 lib/fog/{providers => google}/google.rb | 0 lib/fog/{providers => linode}/linode.rb | 0 lib/fog/{providers => local}/local.rb | 0 .../{providers => new_servers}/new_servers.rb | 0 lib/fog/{providers => ninefold}/ninefold.rb | 0 lib/fog/providers.rb | 40 +++++++++---------- lib/fog/{providers => rackspace}/rackspace.rb | 0 lib/fog/{providers => slicehost}/slicehost.rb | 0 .../storm_on_demand.rb | 0 lib/fog/{providers => vcloud}/vcloud.rb | 0 .../{providers => virtual_box}/virtual_box.rb | 0 lib/fog/{providers => voxel}/voxel.rb | 0 lib/fog/{providers => zerigo}/zerigo.rb | 0 21 files changed, 20 insertions(+), 20 deletions(-) rename lib/fog/{providers => aws}/aws.rb (100%) rename lib/fog/{providers => bluebox}/bluebox.rb (100%) rename lib/fog/{providers => brightbox}/brightbox.rb (100%) rename lib/fog/{providers => dnsimple}/dnsimple.rb (100%) rename lib/fog/{providers => dnsmadeeasy}/dnsmadeeasy.rb (100%) rename lib/fog/{providers => dynect}/dynect.rb (100%) rename lib/fog/{providers => ecloud}/ecloud.rb (100%) rename lib/fog/{providers => go_grid}/go_grid.rb (100%) rename lib/fog/{providers => google}/google.rb (100%) rename lib/fog/{providers => linode}/linode.rb (100%) rename lib/fog/{providers => local}/local.rb (100%) rename lib/fog/{providers => new_servers}/new_servers.rb (100%) rename lib/fog/{providers => ninefold}/ninefold.rb (100%) rename lib/fog/{providers => rackspace}/rackspace.rb (100%) rename lib/fog/{providers => slicehost}/slicehost.rb (100%) rename lib/fog/{providers => storm_on_demand}/storm_on_demand.rb (100%) rename lib/fog/{providers => vcloud}/vcloud.rb (100%) rename lib/fog/{providers => virtual_box}/virtual_box.rb (100%) rename lib/fog/{providers => voxel}/voxel.rb (100%) rename lib/fog/{providers => zerigo}/zerigo.rb (100%) diff --git a/lib/fog/providers/aws.rb b/lib/fog/aws/aws.rb similarity index 100% rename from lib/fog/providers/aws.rb rename to lib/fog/aws/aws.rb diff --git a/lib/fog/providers/bluebox.rb b/lib/fog/bluebox/bluebox.rb similarity index 100% rename from lib/fog/providers/bluebox.rb rename to lib/fog/bluebox/bluebox.rb diff --git a/lib/fog/providers/brightbox.rb b/lib/fog/brightbox/brightbox.rb similarity index 100% rename from lib/fog/providers/brightbox.rb rename to lib/fog/brightbox/brightbox.rb diff --git a/lib/fog/providers/dnsimple.rb b/lib/fog/dnsimple/dnsimple.rb similarity index 100% rename from lib/fog/providers/dnsimple.rb rename to lib/fog/dnsimple/dnsimple.rb diff --git a/lib/fog/providers/dnsmadeeasy.rb b/lib/fog/dnsmadeeasy/dnsmadeeasy.rb similarity index 100% rename from lib/fog/providers/dnsmadeeasy.rb rename to lib/fog/dnsmadeeasy/dnsmadeeasy.rb diff --git a/lib/fog/providers/dynect.rb b/lib/fog/dynect/dynect.rb similarity index 100% rename from lib/fog/providers/dynect.rb rename to lib/fog/dynect/dynect.rb diff --git a/lib/fog/providers/ecloud.rb b/lib/fog/ecloud/ecloud.rb similarity index 100% rename from lib/fog/providers/ecloud.rb rename to lib/fog/ecloud/ecloud.rb diff --git a/lib/fog/providers/go_grid.rb b/lib/fog/go_grid/go_grid.rb similarity index 100% rename from lib/fog/providers/go_grid.rb rename to lib/fog/go_grid/go_grid.rb diff --git a/lib/fog/providers/google.rb b/lib/fog/google/google.rb similarity index 100% rename from lib/fog/providers/google.rb rename to lib/fog/google/google.rb diff --git a/lib/fog/providers/linode.rb b/lib/fog/linode/linode.rb similarity index 100% rename from lib/fog/providers/linode.rb rename to lib/fog/linode/linode.rb diff --git a/lib/fog/providers/local.rb b/lib/fog/local/local.rb similarity index 100% rename from lib/fog/providers/local.rb rename to lib/fog/local/local.rb diff --git a/lib/fog/providers/new_servers.rb b/lib/fog/new_servers/new_servers.rb similarity index 100% rename from lib/fog/providers/new_servers.rb rename to lib/fog/new_servers/new_servers.rb diff --git a/lib/fog/providers/ninefold.rb b/lib/fog/ninefold/ninefold.rb similarity index 100% rename from lib/fog/providers/ninefold.rb rename to lib/fog/ninefold/ninefold.rb diff --git a/lib/fog/providers.rb b/lib/fog/providers.rb index 22809ba6a..a7c2af31e 100644 --- a/lib/fog/providers.rb +++ b/lib/fog/providers.rb @@ -6,23 +6,23 @@ module Fog end -require 'fog/providers/aws' -require 'fog/providers/bluebox' -require 'fog/providers/brightbox' -require 'fog/providers/dnsimple' -require 'fog/providers/dnsmadeeasy' -require 'fog/providers/dynect' -require 'fog/providers/ecloud' -require 'fog/providers/go_grid' -require 'fog/providers/google' -require 'fog/providers/linode' -require 'fog/providers/local' -require 'fog/providers/new_servers' -require 'fog/providers/ninefold' -require 'fog/providers/rackspace' -require 'fog/providers/slicehost' -require 'fog/providers/storm_on_demand' -require 'fog/providers/vcloud' -require 'fog/providers/virtual_box' -require 'fog/providers/voxel' -require 'fog/providers/zerigo' +require 'fog/aws/aws' +require 'fog/bluebox/bluebox' +require 'fog/brightbox/brightbox' +require 'fog/dnsimple/dnsimple' +require 'fog/dnsmadeeasy/dnsmadeeasy' +require 'fog/dynect/dynect' +require 'fog/ecloud/ecloud' +require 'fog/go_grid/go_grid' +require 'fog/google/google' +require 'fog/linode/linode' +require 'fog/local/local' +require 'fog/new_servers/new_servers' +require 'fog/ninefold/ninefold' +require 'fog/rackspace/rackspace' +require 'fog/slicehost/slicehost' +require 'fog/storm_on_demand/storm_on_demand' +require 'fog/vcloud/vcloud' +require 'fog/virtual_box/virtual_box' +require 'fog/voxel/voxel' +require 'fog/zerigo/zerigo' diff --git a/lib/fog/providers/rackspace.rb b/lib/fog/rackspace/rackspace.rb similarity index 100% rename from lib/fog/providers/rackspace.rb rename to lib/fog/rackspace/rackspace.rb diff --git a/lib/fog/providers/slicehost.rb b/lib/fog/slicehost/slicehost.rb similarity index 100% rename from lib/fog/providers/slicehost.rb rename to lib/fog/slicehost/slicehost.rb diff --git a/lib/fog/providers/storm_on_demand.rb b/lib/fog/storm_on_demand/storm_on_demand.rb similarity index 100% rename from lib/fog/providers/storm_on_demand.rb rename to lib/fog/storm_on_demand/storm_on_demand.rb diff --git a/lib/fog/providers/vcloud.rb b/lib/fog/vcloud/vcloud.rb similarity index 100% rename from lib/fog/providers/vcloud.rb rename to lib/fog/vcloud/vcloud.rb diff --git a/lib/fog/providers/virtual_box.rb b/lib/fog/virtual_box/virtual_box.rb similarity index 100% rename from lib/fog/providers/virtual_box.rb rename to lib/fog/virtual_box/virtual_box.rb diff --git a/lib/fog/providers/voxel.rb b/lib/fog/voxel/voxel.rb similarity index 100% rename from lib/fog/providers/voxel.rb rename to lib/fog/voxel/voxel.rb diff --git a/lib/fog/providers/zerigo.rb b/lib/fog/zerigo/zerigo.rb similarity index 100% rename from lib/fog/providers/zerigo.rb rename to lib/fog/zerigo/zerigo.rb From 9b8240bfbaf399688a8f6b63ba44cd015b9b2767 Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 24 Aug 2011 13:50:42 -0500 Subject: [PATCH 21/29] [storage|aws] move aws storage back with other aws stuff (namespacing should probably be recorrected as well) --- lib/fog/aws/aws.rb | 2 +- .../{storage/models/aws => aws/models/storage}/directories.rb | 2 +- .../{storage/models/aws => aws/models/storage}/directory.rb | 2 +- lib/fog/{storage/models/aws => aws/models/storage}/file.rb | 0 lib/fog/{storage/models/aws => aws/models/storage}/files.rb | 2 +- .../aws => aws/parsers/storage}/access_control_list.rb | 0 .../aws => aws/parsers/storage}/complete_multipart_upload.rb | 0 .../parsers/aws => aws/parsers/storage}/copy_object.rb | 0 .../parsers/aws => aws/parsers/storage}/get_bucket.rb | 0 .../aws => aws/parsers/storage}/get_bucket_location.rb | 0 .../parsers/aws => aws/parsers/storage}/get_bucket_logging.rb | 0 .../aws => aws/parsers/storage}/get_bucket_object_versions.rb | 0 .../aws => aws/parsers/storage}/get_bucket_versioning.rb | 0 .../parsers/aws => aws/parsers/storage}/get_bucket_website.rb | 0 .../aws => aws/parsers/storage}/get_request_payment.rb | 0 .../parsers/aws => aws/parsers/storage}/get_service.rb | 0 .../aws => aws/parsers/storage}/initiate_multipart_upload.rb | 0 .../aws => aws/parsers/storage}/list_multipart_uploads.rb | 0 .../parsers/aws => aws/parsers/storage}/list_parts.rb | 0 .../aws => aws/requests/storage}/abort_multipart_upload.rb | 0 .../aws => aws/requests/storage}/complete_multipart_upload.rb | 2 +- .../requests/aws => aws/requests/storage}/copy_object.rb | 2 +- .../requests/aws => aws/requests/storage}/delete_bucket.rb | 0 .../aws => aws/requests/storage}/delete_bucket_policy.rb | 0 .../aws => aws/requests/storage}/delete_bucket_website.rb | 0 .../requests/aws => aws/requests/storage}/delete_object.rb | 0 .../requests/aws => aws/requests/storage}/get_bucket.rb | 2 +- .../requests/aws => aws/requests/storage}/get_bucket_acl.rb | 2 +- .../aws => aws/requests/storage}/get_bucket_location.rb | 2 +- .../aws => aws/requests/storage}/get_bucket_logging.rb | 2 +- .../requests/storage}/get_bucket_object_versions.rb | 2 +- .../aws => aws/requests/storage}/get_bucket_policy.rb | 0 .../aws => aws/requests/storage}/get_bucket_versioning.rb | 2 +- .../aws => aws/requests/storage}/get_bucket_website.rb | 2 +- .../requests/aws => aws/requests/storage}/get_object.rb | 0 .../requests/aws => aws/requests/storage}/get_object_acl.rb | 2 +- .../aws => aws/requests/storage}/get_object_http_url.rb | 0 .../aws => aws/requests/storage}/get_object_https_url.rb | 0 .../aws => aws/requests/storage}/get_object_torrent.rb | 0 .../requests/aws => aws/requests/storage}/get_object_url.rb | 0 .../aws => aws/requests/storage}/get_request_payment.rb | 2 +- .../requests/aws => aws/requests/storage}/get_service.rb | 2 +- .../requests/aws => aws/requests/storage}/head_object.rb | 0 .../aws => aws/requests/storage}/initiate_multipart_upload.rb | 2 +- .../aws => aws/requests/storage}/list_multipart_uploads.rb | 2 +- .../requests/aws => aws/requests/storage}/list_parts.rb | 2 +- .../aws => aws/requests/storage}/post_object_hidden_fields.rb | 0 .../requests/aws => aws/requests/storage}/put_bucket.rb | 0 .../requests/aws => aws/requests/storage}/put_bucket_acl.rb | 0 .../aws => aws/requests/storage}/put_bucket_logging.rb | 0 .../aws => aws/requests/storage}/put_bucket_policy.rb | 0 .../aws => aws/requests/storage}/put_bucket_versioning.rb | 0 .../aws => aws/requests/storage}/put_bucket_website.rb | 0 .../requests/aws => aws/requests/storage}/put_object.rb | 0 .../requests/aws => aws/requests/storage}/put_object_acl.rb | 0 .../requests/aws => aws/requests/storage}/put_object_url.rb | 0 .../aws => aws/requests/storage}/put_request_payment.rb | 0 .../requests/aws => aws/requests/storage}/sync_clock.rb | 0 .../requests/aws => aws/requests/storage}/upload_part.rb | 0 lib/fog/{storage/aws.rb => aws/storage.rb} | 4 ++-- lib/fog/storage.rb | 2 +- 61 files changed, 22 insertions(+), 22 deletions(-) rename lib/fog/{storage/models/aws => aws/models/storage}/directories.rb (96%) rename lib/fog/{storage/models/aws => aws/models/storage}/directory.rb (98%) rename lib/fog/{storage/models/aws => aws/models/storage}/file.rb (100%) rename lib/fog/{storage/models/aws => aws/models/storage}/files.rb (98%) rename lib/fog/{storage/parsers/aws => aws/parsers/storage}/access_control_list.rb (100%) rename lib/fog/{storage/parsers/aws => aws/parsers/storage}/complete_multipart_upload.rb (100%) rename lib/fog/{storage/parsers/aws => aws/parsers/storage}/copy_object.rb (100%) rename lib/fog/{storage/parsers/aws => aws/parsers/storage}/get_bucket.rb (100%) rename lib/fog/{storage/parsers/aws => aws/parsers/storage}/get_bucket_location.rb (100%) rename lib/fog/{storage/parsers/aws => aws/parsers/storage}/get_bucket_logging.rb (100%) rename lib/fog/{storage/parsers/aws => aws/parsers/storage}/get_bucket_object_versions.rb (100%) rename lib/fog/{storage/parsers/aws => aws/parsers/storage}/get_bucket_versioning.rb (100%) rename lib/fog/{storage/parsers/aws => aws/parsers/storage}/get_bucket_website.rb (100%) rename lib/fog/{storage/parsers/aws => aws/parsers/storage}/get_request_payment.rb (100%) rename lib/fog/{storage/parsers/aws => aws/parsers/storage}/get_service.rb (100%) rename lib/fog/{storage/parsers/aws => aws/parsers/storage}/initiate_multipart_upload.rb (100%) rename lib/fog/{storage/parsers/aws => aws/parsers/storage}/list_multipart_uploads.rb (100%) rename lib/fog/{storage/parsers/aws => aws/parsers/storage}/list_parts.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/abort_multipart_upload.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/complete_multipart_upload.rb (96%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/copy_object.rb (98%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/delete_bucket.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/delete_bucket_policy.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/delete_bucket_website.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/delete_object.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/get_bucket.rb (98%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/get_bucket_acl.rb (97%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/get_bucket_location.rb (96%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/get_bucket_logging.rb (96%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/get_bucket_object_versions.rb (98%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/get_bucket_policy.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/get_bucket_versioning.rb (94%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/get_bucket_website.rb (95%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/get_object.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/get_object_acl.rb (97%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/get_object_http_url.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/get_object_https_url.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/get_object_torrent.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/get_object_url.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/get_request_payment.rb (95%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/get_service.rb (96%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/head_object.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/initiate_multipart_upload.rb (96%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/list_multipart_uploads.rb (97%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/list_parts.rb (97%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/post_object_hidden_fields.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/put_bucket.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/put_bucket_acl.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/put_bucket_logging.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/put_bucket_policy.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/put_bucket_versioning.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/put_bucket_website.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/put_object.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/put_object_acl.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/put_object_url.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/put_request_payment.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/sync_clock.rb (100%) rename lib/fog/{storage/requests/aws => aws/requests/storage}/upload_part.rb (100%) rename lib/fog/{storage/aws.rb => aws/storage.rb} (99%) diff --git a/lib/fog/aws/aws.rb b/lib/fog/aws/aws.rb index defae0438..829131ec7 100644 --- a/lib/fog/aws/aws.rb +++ b/lib/fog/aws/aws.rb @@ -18,7 +18,7 @@ module Fog service(:simpledb, 'aws/simpledb') service(:sns, 'aws/sns') service(:sqs, 'aws/sqs') - service(:storage, 'storage/aws') + service(:storage, 'aws/storage') def self.indexed_param(key, values) params = {} diff --git a/lib/fog/storage/models/aws/directories.rb b/lib/fog/aws/models/storage/directories.rb similarity index 96% rename from lib/fog/storage/models/aws/directories.rb rename to lib/fog/aws/models/storage/directories.rb index 588de55b1..ac66856cf 100644 --- a/lib/fog/storage/models/aws/directories.rb +++ b/lib/fog/aws/models/storage/directories.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/storage/models/aws/directory' +require 'fog/aws/models/storage/directory' module Fog module Storage diff --git a/lib/fog/storage/models/aws/directory.rb b/lib/fog/aws/models/storage/directory.rb similarity index 98% rename from lib/fog/storage/models/aws/directory.rb rename to lib/fog/aws/models/storage/directory.rb index 634da05f9..d13017fbe 100644 --- a/lib/fog/storage/models/aws/directory.rb +++ b/lib/fog/aws/models/storage/directory.rb @@ -1,5 +1,5 @@ require 'fog/core/model' -require 'fog/storage/models/aws/files' +require 'fog/aws/models/storage/files' module Fog module Storage diff --git a/lib/fog/storage/models/aws/file.rb b/lib/fog/aws/models/storage/file.rb similarity index 100% rename from lib/fog/storage/models/aws/file.rb rename to lib/fog/aws/models/storage/file.rb diff --git a/lib/fog/storage/models/aws/files.rb b/lib/fog/aws/models/storage/files.rb similarity index 98% rename from lib/fog/storage/models/aws/files.rb rename to lib/fog/aws/models/storage/files.rb index 42f2ea704..b96ce8328 100644 --- a/lib/fog/storage/models/aws/files.rb +++ b/lib/fog/aws/models/storage/files.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/storage/models/aws/file' +require 'fog/aws/models/storage/file' module Fog module Storage diff --git a/lib/fog/storage/parsers/aws/access_control_list.rb b/lib/fog/aws/parsers/storage/access_control_list.rb similarity index 100% rename from lib/fog/storage/parsers/aws/access_control_list.rb rename to lib/fog/aws/parsers/storage/access_control_list.rb diff --git a/lib/fog/storage/parsers/aws/complete_multipart_upload.rb b/lib/fog/aws/parsers/storage/complete_multipart_upload.rb similarity index 100% rename from lib/fog/storage/parsers/aws/complete_multipart_upload.rb rename to lib/fog/aws/parsers/storage/complete_multipart_upload.rb diff --git a/lib/fog/storage/parsers/aws/copy_object.rb b/lib/fog/aws/parsers/storage/copy_object.rb similarity index 100% rename from lib/fog/storage/parsers/aws/copy_object.rb rename to lib/fog/aws/parsers/storage/copy_object.rb diff --git a/lib/fog/storage/parsers/aws/get_bucket.rb b/lib/fog/aws/parsers/storage/get_bucket.rb similarity index 100% rename from lib/fog/storage/parsers/aws/get_bucket.rb rename to lib/fog/aws/parsers/storage/get_bucket.rb diff --git a/lib/fog/storage/parsers/aws/get_bucket_location.rb b/lib/fog/aws/parsers/storage/get_bucket_location.rb similarity index 100% rename from lib/fog/storage/parsers/aws/get_bucket_location.rb rename to lib/fog/aws/parsers/storage/get_bucket_location.rb diff --git a/lib/fog/storage/parsers/aws/get_bucket_logging.rb b/lib/fog/aws/parsers/storage/get_bucket_logging.rb similarity index 100% rename from lib/fog/storage/parsers/aws/get_bucket_logging.rb rename to lib/fog/aws/parsers/storage/get_bucket_logging.rb diff --git a/lib/fog/storage/parsers/aws/get_bucket_object_versions.rb b/lib/fog/aws/parsers/storage/get_bucket_object_versions.rb similarity index 100% rename from lib/fog/storage/parsers/aws/get_bucket_object_versions.rb rename to lib/fog/aws/parsers/storage/get_bucket_object_versions.rb diff --git a/lib/fog/storage/parsers/aws/get_bucket_versioning.rb b/lib/fog/aws/parsers/storage/get_bucket_versioning.rb similarity index 100% rename from lib/fog/storage/parsers/aws/get_bucket_versioning.rb rename to lib/fog/aws/parsers/storage/get_bucket_versioning.rb diff --git a/lib/fog/storage/parsers/aws/get_bucket_website.rb b/lib/fog/aws/parsers/storage/get_bucket_website.rb similarity index 100% rename from lib/fog/storage/parsers/aws/get_bucket_website.rb rename to lib/fog/aws/parsers/storage/get_bucket_website.rb diff --git a/lib/fog/storage/parsers/aws/get_request_payment.rb b/lib/fog/aws/parsers/storage/get_request_payment.rb similarity index 100% rename from lib/fog/storage/parsers/aws/get_request_payment.rb rename to lib/fog/aws/parsers/storage/get_request_payment.rb diff --git a/lib/fog/storage/parsers/aws/get_service.rb b/lib/fog/aws/parsers/storage/get_service.rb similarity index 100% rename from lib/fog/storage/parsers/aws/get_service.rb rename to lib/fog/aws/parsers/storage/get_service.rb diff --git a/lib/fog/storage/parsers/aws/initiate_multipart_upload.rb b/lib/fog/aws/parsers/storage/initiate_multipart_upload.rb similarity index 100% rename from lib/fog/storage/parsers/aws/initiate_multipart_upload.rb rename to lib/fog/aws/parsers/storage/initiate_multipart_upload.rb diff --git a/lib/fog/storage/parsers/aws/list_multipart_uploads.rb b/lib/fog/aws/parsers/storage/list_multipart_uploads.rb similarity index 100% rename from lib/fog/storage/parsers/aws/list_multipart_uploads.rb rename to lib/fog/aws/parsers/storage/list_multipart_uploads.rb diff --git a/lib/fog/storage/parsers/aws/list_parts.rb b/lib/fog/aws/parsers/storage/list_parts.rb similarity index 100% rename from lib/fog/storage/parsers/aws/list_parts.rb rename to lib/fog/aws/parsers/storage/list_parts.rb diff --git a/lib/fog/storage/requests/aws/abort_multipart_upload.rb b/lib/fog/aws/requests/storage/abort_multipart_upload.rb similarity index 100% rename from lib/fog/storage/requests/aws/abort_multipart_upload.rb rename to lib/fog/aws/requests/storage/abort_multipart_upload.rb diff --git a/lib/fog/storage/requests/aws/complete_multipart_upload.rb b/lib/fog/aws/requests/storage/complete_multipart_upload.rb similarity index 96% rename from lib/fog/storage/requests/aws/complete_multipart_upload.rb rename to lib/fog/aws/requests/storage/complete_multipart_upload.rb index c20ab5bcb..50ce025f8 100644 --- a/lib/fog/storage/requests/aws/complete_multipart_upload.rb +++ b/lib/fog/aws/requests/storage/complete_multipart_upload.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/storage/parsers/aws/complete_multipart_upload' + require 'fog/aws/parsers/storage/complete_multipart_upload' # Complete a multipart upload # diff --git a/lib/fog/storage/requests/aws/copy_object.rb b/lib/fog/aws/requests/storage/copy_object.rb similarity index 98% rename from lib/fog/storage/requests/aws/copy_object.rb rename to lib/fog/aws/requests/storage/copy_object.rb index 3a5234e2e..dd7a16d55 100644 --- a/lib/fog/storage/requests/aws/copy_object.rb +++ b/lib/fog/aws/requests/storage/copy_object.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/storage/parsers/aws/copy_object' + require 'fog/aws/parsers/storage/copy_object' # Copy an object from one S3 bucket to another # diff --git a/lib/fog/storage/requests/aws/delete_bucket.rb b/lib/fog/aws/requests/storage/delete_bucket.rb similarity index 100% rename from lib/fog/storage/requests/aws/delete_bucket.rb rename to lib/fog/aws/requests/storage/delete_bucket.rb diff --git a/lib/fog/storage/requests/aws/delete_bucket_policy.rb b/lib/fog/aws/requests/storage/delete_bucket_policy.rb similarity index 100% rename from lib/fog/storage/requests/aws/delete_bucket_policy.rb rename to lib/fog/aws/requests/storage/delete_bucket_policy.rb diff --git a/lib/fog/storage/requests/aws/delete_bucket_website.rb b/lib/fog/aws/requests/storage/delete_bucket_website.rb similarity index 100% rename from lib/fog/storage/requests/aws/delete_bucket_website.rb rename to lib/fog/aws/requests/storage/delete_bucket_website.rb diff --git a/lib/fog/storage/requests/aws/delete_object.rb b/lib/fog/aws/requests/storage/delete_object.rb similarity index 100% rename from lib/fog/storage/requests/aws/delete_object.rb rename to lib/fog/aws/requests/storage/delete_object.rb diff --git a/lib/fog/storage/requests/aws/get_bucket.rb b/lib/fog/aws/requests/storage/get_bucket.rb similarity index 98% rename from lib/fog/storage/requests/aws/get_bucket.rb rename to lib/fog/aws/requests/storage/get_bucket.rb index a15cfd476..bec419508 100644 --- a/lib/fog/storage/requests/aws/get_bucket.rb +++ b/lib/fog/aws/requests/storage/get_bucket.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/storage/parsers/aws/get_bucket' + require 'fog/aws/parsers/storage/get_bucket' # List information about objects in an S3 bucket # diff --git a/lib/fog/storage/requests/aws/get_bucket_acl.rb b/lib/fog/aws/requests/storage/get_bucket_acl.rb similarity index 97% rename from lib/fog/storage/requests/aws/get_bucket_acl.rb rename to lib/fog/aws/requests/storage/get_bucket_acl.rb index 563a7daff..d8f7eeda9 100644 --- a/lib/fog/storage/requests/aws/get_bucket_acl.rb +++ b/lib/fog/aws/requests/storage/get_bucket_acl.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/storage/parsers/aws/access_control_list' + require 'fog/aws/parsers/storage/access_control_list' # Get access control list for an S3 bucket # diff --git a/lib/fog/storage/requests/aws/get_bucket_location.rb b/lib/fog/aws/requests/storage/get_bucket_location.rb similarity index 96% rename from lib/fog/storage/requests/aws/get_bucket_location.rb rename to lib/fog/aws/requests/storage/get_bucket_location.rb index 7b495ba9f..72db46837 100644 --- a/lib/fog/storage/requests/aws/get_bucket_location.rb +++ b/lib/fog/aws/requests/storage/get_bucket_location.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/storage/parsers/aws/get_bucket_location' + require 'fog/aws/parsers/storage/get_bucket_location' # Get location constraint for an S3 bucket # diff --git a/lib/fog/storage/requests/aws/get_bucket_logging.rb b/lib/fog/aws/requests/storage/get_bucket_logging.rb similarity index 96% rename from lib/fog/storage/requests/aws/get_bucket_logging.rb rename to lib/fog/aws/requests/storage/get_bucket_logging.rb index de364ee17..9a3809139 100644 --- a/lib/fog/storage/requests/aws/get_bucket_logging.rb +++ b/lib/fog/aws/requests/storage/get_bucket_logging.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/storage/parsers/aws/get_bucket_logging' + require 'fog/aws/parsers/storage/get_bucket_logging' # Get logging status for an S3 bucket # diff --git a/lib/fog/storage/requests/aws/get_bucket_object_versions.rb b/lib/fog/aws/requests/storage/get_bucket_object_versions.rb similarity index 98% rename from lib/fog/storage/requests/aws/get_bucket_object_versions.rb rename to lib/fog/aws/requests/storage/get_bucket_object_versions.rb index 2a6566969..e417dba37 100644 --- a/lib/fog/storage/requests/aws/get_bucket_object_versions.rb +++ b/lib/fog/aws/requests/storage/get_bucket_object_versions.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/storage/parsers/aws/get_bucket_object_versions' + require 'fog/aws/parsers/storage/get_bucket_object_versions' # List information about object versions in an S3 bucket # diff --git a/lib/fog/storage/requests/aws/get_bucket_policy.rb b/lib/fog/aws/requests/storage/get_bucket_policy.rb similarity index 100% rename from lib/fog/storage/requests/aws/get_bucket_policy.rb rename to lib/fog/aws/requests/storage/get_bucket_policy.rb diff --git a/lib/fog/storage/requests/aws/get_bucket_versioning.rb b/lib/fog/aws/requests/storage/get_bucket_versioning.rb similarity index 94% rename from lib/fog/storage/requests/aws/get_bucket_versioning.rb rename to lib/fog/aws/requests/storage/get_bucket_versioning.rb index a81d4dfb9..f04d3ecbb 100644 --- a/lib/fog/storage/requests/aws/get_bucket_versioning.rb +++ b/lib/fog/aws/requests/storage/get_bucket_versioning.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/storage/parsers/aws/get_bucket_versioning' + require 'fog/aws/parsers/storage/get_bucket_versioning' # Get versioning status for an S3 bucket # diff --git a/lib/fog/storage/requests/aws/get_bucket_website.rb b/lib/fog/aws/requests/storage/get_bucket_website.rb similarity index 95% rename from lib/fog/storage/requests/aws/get_bucket_website.rb rename to lib/fog/aws/requests/storage/get_bucket_website.rb index 092033a4d..aa9aa511a 100644 --- a/lib/fog/storage/requests/aws/get_bucket_website.rb +++ b/lib/fog/aws/requests/storage/get_bucket_website.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/storage/parsers/aws/get_bucket_website' + require 'fog/aws/parsers/storage/get_bucket_website' # Get website configuration for an S3 bucket # diff --git a/lib/fog/storage/requests/aws/get_object.rb b/lib/fog/aws/requests/storage/get_object.rb similarity index 100% rename from lib/fog/storage/requests/aws/get_object.rb rename to lib/fog/aws/requests/storage/get_object.rb diff --git a/lib/fog/storage/requests/aws/get_object_acl.rb b/lib/fog/aws/requests/storage/get_object_acl.rb similarity index 97% rename from lib/fog/storage/requests/aws/get_object_acl.rb rename to lib/fog/aws/requests/storage/get_object_acl.rb index eecdaccca..dbd81389e 100644 --- a/lib/fog/storage/requests/aws/get_object_acl.rb +++ b/lib/fog/aws/requests/storage/get_object_acl.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/storage/parsers/aws/access_control_list' + require 'fog/aws/parsers/storage/access_control_list' # Get access control list for an S3 object # diff --git a/lib/fog/storage/requests/aws/get_object_http_url.rb b/lib/fog/aws/requests/storage/get_object_http_url.rb similarity index 100% rename from lib/fog/storage/requests/aws/get_object_http_url.rb rename to lib/fog/aws/requests/storage/get_object_http_url.rb diff --git a/lib/fog/storage/requests/aws/get_object_https_url.rb b/lib/fog/aws/requests/storage/get_object_https_url.rb similarity index 100% rename from lib/fog/storage/requests/aws/get_object_https_url.rb rename to lib/fog/aws/requests/storage/get_object_https_url.rb diff --git a/lib/fog/storage/requests/aws/get_object_torrent.rb b/lib/fog/aws/requests/storage/get_object_torrent.rb similarity index 100% rename from lib/fog/storage/requests/aws/get_object_torrent.rb rename to lib/fog/aws/requests/storage/get_object_torrent.rb diff --git a/lib/fog/storage/requests/aws/get_object_url.rb b/lib/fog/aws/requests/storage/get_object_url.rb similarity index 100% rename from lib/fog/storage/requests/aws/get_object_url.rb rename to lib/fog/aws/requests/storage/get_object_url.rb diff --git a/lib/fog/storage/requests/aws/get_request_payment.rb b/lib/fog/aws/requests/storage/get_request_payment.rb similarity index 95% rename from lib/fog/storage/requests/aws/get_request_payment.rb rename to lib/fog/aws/requests/storage/get_request_payment.rb index ebb53afad..fd42256b7 100644 --- a/lib/fog/storage/requests/aws/get_request_payment.rb +++ b/lib/fog/aws/requests/storage/get_request_payment.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/storage/parsers/aws/get_request_payment' + require 'fog/aws/parsers/storage/get_request_payment' # Get configured payer for an S3 bucket # diff --git a/lib/fog/storage/requests/aws/get_service.rb b/lib/fog/aws/requests/storage/get_service.rb similarity index 96% rename from lib/fog/storage/requests/aws/get_service.rb rename to lib/fog/aws/requests/storage/get_service.rb index c29f87c22..7c83e76e5 100644 --- a/lib/fog/storage/requests/aws/get_service.rb +++ b/lib/fog/aws/requests/storage/get_service.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/storage/parsers/aws/get_service' + require 'fog/aws/parsers/storage/get_service' # List information about S3 buckets for authorized user # diff --git a/lib/fog/storage/requests/aws/head_object.rb b/lib/fog/aws/requests/storage/head_object.rb similarity index 100% rename from lib/fog/storage/requests/aws/head_object.rb rename to lib/fog/aws/requests/storage/head_object.rb diff --git a/lib/fog/storage/requests/aws/initiate_multipart_upload.rb b/lib/fog/aws/requests/storage/initiate_multipart_upload.rb similarity index 96% rename from lib/fog/storage/requests/aws/initiate_multipart_upload.rb rename to lib/fog/aws/requests/storage/initiate_multipart_upload.rb index a8e177f30..57e926d6e 100644 --- a/lib/fog/storage/requests/aws/initiate_multipart_upload.rb +++ b/lib/fog/aws/requests/storage/initiate_multipart_upload.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/storage/parsers/aws/initiate_multipart_upload' + require 'fog/aws/parsers/storage/initiate_multipart_upload' # Initiate a multipart upload to an S3 bucket # diff --git a/lib/fog/storage/requests/aws/list_multipart_uploads.rb b/lib/fog/aws/requests/storage/list_multipart_uploads.rb similarity index 97% rename from lib/fog/storage/requests/aws/list_multipart_uploads.rb rename to lib/fog/aws/requests/storage/list_multipart_uploads.rb index 15e3ec7a6..e3ecf2772 100644 --- a/lib/fog/storage/requests/aws/list_multipart_uploads.rb +++ b/lib/fog/aws/requests/storage/list_multipart_uploads.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/storage/parsers/aws/list_multipart_uploads' + require 'fog/aws/parsers/storage/list_multipart_uploads' # List multipart uploads for a bucket # diff --git a/lib/fog/storage/requests/aws/list_parts.rb b/lib/fog/aws/requests/storage/list_parts.rb similarity index 97% rename from lib/fog/storage/requests/aws/list_parts.rb rename to lib/fog/aws/requests/storage/list_parts.rb index b72238f38..c1077d720 100644 --- a/lib/fog/storage/requests/aws/list_parts.rb +++ b/lib/fog/aws/requests/storage/list_parts.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/storage/parsers/aws/list_parts' + require 'fog/aws/parsers/storage/list_parts' # List parts for a multipart upload # diff --git a/lib/fog/storage/requests/aws/post_object_hidden_fields.rb b/lib/fog/aws/requests/storage/post_object_hidden_fields.rb similarity index 100% rename from lib/fog/storage/requests/aws/post_object_hidden_fields.rb rename to lib/fog/aws/requests/storage/post_object_hidden_fields.rb diff --git a/lib/fog/storage/requests/aws/put_bucket.rb b/lib/fog/aws/requests/storage/put_bucket.rb similarity index 100% rename from lib/fog/storage/requests/aws/put_bucket.rb rename to lib/fog/aws/requests/storage/put_bucket.rb diff --git a/lib/fog/storage/requests/aws/put_bucket_acl.rb b/lib/fog/aws/requests/storage/put_bucket_acl.rb similarity index 100% rename from lib/fog/storage/requests/aws/put_bucket_acl.rb rename to lib/fog/aws/requests/storage/put_bucket_acl.rb diff --git a/lib/fog/storage/requests/aws/put_bucket_logging.rb b/lib/fog/aws/requests/storage/put_bucket_logging.rb similarity index 100% rename from lib/fog/storage/requests/aws/put_bucket_logging.rb rename to lib/fog/aws/requests/storage/put_bucket_logging.rb diff --git a/lib/fog/storage/requests/aws/put_bucket_policy.rb b/lib/fog/aws/requests/storage/put_bucket_policy.rb similarity index 100% rename from lib/fog/storage/requests/aws/put_bucket_policy.rb rename to lib/fog/aws/requests/storage/put_bucket_policy.rb diff --git a/lib/fog/storage/requests/aws/put_bucket_versioning.rb b/lib/fog/aws/requests/storage/put_bucket_versioning.rb similarity index 100% rename from lib/fog/storage/requests/aws/put_bucket_versioning.rb rename to lib/fog/aws/requests/storage/put_bucket_versioning.rb diff --git a/lib/fog/storage/requests/aws/put_bucket_website.rb b/lib/fog/aws/requests/storage/put_bucket_website.rb similarity index 100% rename from lib/fog/storage/requests/aws/put_bucket_website.rb rename to lib/fog/aws/requests/storage/put_bucket_website.rb diff --git a/lib/fog/storage/requests/aws/put_object.rb b/lib/fog/aws/requests/storage/put_object.rb similarity index 100% rename from lib/fog/storage/requests/aws/put_object.rb rename to lib/fog/aws/requests/storage/put_object.rb diff --git a/lib/fog/storage/requests/aws/put_object_acl.rb b/lib/fog/aws/requests/storage/put_object_acl.rb similarity index 100% rename from lib/fog/storage/requests/aws/put_object_acl.rb rename to lib/fog/aws/requests/storage/put_object_acl.rb diff --git a/lib/fog/storage/requests/aws/put_object_url.rb b/lib/fog/aws/requests/storage/put_object_url.rb similarity index 100% rename from lib/fog/storage/requests/aws/put_object_url.rb rename to lib/fog/aws/requests/storage/put_object_url.rb diff --git a/lib/fog/storage/requests/aws/put_request_payment.rb b/lib/fog/aws/requests/storage/put_request_payment.rb similarity index 100% rename from lib/fog/storage/requests/aws/put_request_payment.rb rename to lib/fog/aws/requests/storage/put_request_payment.rb diff --git a/lib/fog/storage/requests/aws/sync_clock.rb b/lib/fog/aws/requests/storage/sync_clock.rb similarity index 100% rename from lib/fog/storage/requests/aws/sync_clock.rb rename to lib/fog/aws/requests/storage/sync_clock.rb diff --git a/lib/fog/storage/requests/aws/upload_part.rb b/lib/fog/aws/requests/storage/upload_part.rb similarity index 100% rename from lib/fog/storage/requests/aws/upload_part.rb rename to lib/fog/aws/requests/storage/upload_part.rb diff --git a/lib/fog/storage/aws.rb b/lib/fog/aws/storage.rb similarity index 99% rename from lib/fog/storage/aws.rb rename to lib/fog/aws/storage.rb index 15abc4e49..c7ce13df0 100644 --- a/lib/fog/storage/aws.rb +++ b/lib/fog/aws/storage.rb @@ -5,13 +5,13 @@ module Fog requires :aws_access_key_id, :aws_secret_access_key recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent - model_path 'fog/storage/models/aws' + model_path 'fog/aws/models/storage' collection :directories model :directory collection :files model :file - request_path 'fog/storage/requests/aws' + request_path 'fog/aws/requests/storage' request :abort_multipart_upload request :complete_multipart_upload request :copy_object diff --git a/lib/fog/storage.rb b/lib/fog/storage.rb index c9a0b6e96..73f2a0d22 100644 --- a/lib/fog/storage.rb +++ b/lib/fog/storage.rb @@ -9,7 +9,7 @@ module Fog attributes = attributes.dup # prevent delete from having side effects case provider = attributes.delete(:provider).to_s.downcase.to_sym when :aws - require 'fog/storage/aws' + require 'fog/aws/storage' Fog::Storage::AWS.new(attributes) when :google require 'fog/storage/google' From 1a4a0efda01c30221ab900d129f17a95692ef57c Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 24 Aug 2011 13:55:35 -0500 Subject: [PATCH 22/29] [storage|google] move google storage to shared google stuff (namespacing should probably be corrected) --- lib/fog/google/google.rb | 2 +- .../models/google => google/models/storage}/directories.rb | 2 +- .../models/google => google/models/storage}/directory.rb | 2 +- .../{storage/models/google => google/models/storage}/file.rb | 0 .../{storage/models/google => google/models/storage}/files.rb | 2 +- .../google => google/parsers/storage}/access_control_list.rb | 0 .../parsers/google => google/parsers/storage}/copy_object.rb | 0 .../parsers/google => google/parsers/storage}/get_bucket.rb | 0 .../google => google/parsers/storage}/get_bucket_logging.rb | 0 .../parsers/storage}/get_bucket_object_versions.rb | 0 .../parsers/storage}/get_bucket_versioning.rb | 0 .../google => google/parsers/storage}/get_request_payment.rb | 0 .../parsers/google => google/parsers/storage}/get_service.rb | 0 .../google => google/requests/storage}/copy_object.rb | 2 +- .../google => google/requests/storage}/delete_bucket.rb | 0 .../google => google/requests/storage}/delete_object.rb | 0 .../requests/google => google/requests/storage}/get_bucket.rb | 2 +- .../google => google/requests/storage}/get_bucket_acl.rb | 2 +- .../requests/google => google/requests/storage}/get_object.rb | 0 .../google => google/requests/storage}/get_object_acl.rb | 2 +- .../google => google/requests/storage}/get_object_http_url.rb | 0 .../requests/storage}/get_object_https_url.rb | 0 .../google => google/requests/storage}/get_object_torrent.rb | 0 .../google => google/requests/storage}/get_object_url.rb | 0 .../google => google/requests/storage}/get_service.rb | 2 +- .../google => google/requests/storage}/head_object.rb | 0 .../requests/google => google/requests/storage}/put_bucket.rb | 0 .../google => google/requests/storage}/put_bucket_acl.rb | 0 .../requests/google => google/requests/storage}/put_object.rb | 0 .../google => google/requests/storage}/put_object_url.rb | 0 lib/fog/{storage/google.rb => google/storage.rb} | 4 ++-- lib/fog/storage.rb | 2 +- 32 files changed, 12 insertions(+), 12 deletions(-) rename lib/fog/{storage/models/google => google/models/storage}/directories.rb (95%) rename lib/fog/{storage/models/google => google/models/storage}/directory.rb (97%) rename lib/fog/{storage/models/google => google/models/storage}/file.rb (100%) rename lib/fog/{storage/models/google => google/models/storage}/files.rb (98%) rename lib/fog/{storage/parsers/google => google/parsers/storage}/access_control_list.rb (100%) rename lib/fog/{storage/parsers/google => google/parsers/storage}/copy_object.rb (100%) rename lib/fog/{storage/parsers/google => google/parsers/storage}/get_bucket.rb (100%) rename lib/fog/{storage/parsers/google => google/parsers/storage}/get_bucket_logging.rb (100%) rename lib/fog/{storage/parsers/google => google/parsers/storage}/get_bucket_object_versions.rb (100%) rename lib/fog/{storage/parsers/google => google/parsers/storage}/get_bucket_versioning.rb (100%) rename lib/fog/{storage/parsers/google => google/parsers/storage}/get_request_payment.rb (100%) rename lib/fog/{storage/parsers/google => google/parsers/storage}/get_service.rb (100%) rename lib/fog/{storage/requests/google => google/requests/storage}/copy_object.rb (98%) rename lib/fog/{storage/requests/google => google/requests/storage}/delete_bucket.rb (100%) rename lib/fog/{storage/requests/google => google/requests/storage}/delete_object.rb (100%) rename lib/fog/{storage/requests/google => google/requests/storage}/get_bucket.rb (98%) rename lib/fog/{storage/requests/google => google/requests/storage}/get_bucket_acl.rb (96%) rename lib/fog/{storage/requests/google => google/requests/storage}/get_object.rb (100%) rename lib/fog/{storage/requests/google => google/requests/storage}/get_object_acl.rb (97%) rename lib/fog/{storage/requests/google => google/requests/storage}/get_object_http_url.rb (100%) rename lib/fog/{storage/requests/google => google/requests/storage}/get_object_https_url.rb (100%) rename lib/fog/{storage/requests/google => google/requests/storage}/get_object_torrent.rb (100%) rename lib/fog/{storage/requests/google => google/requests/storage}/get_object_url.rb (100%) rename lib/fog/{storage/requests/google => google/requests/storage}/get_service.rb (96%) rename lib/fog/{storage/requests/google => google/requests/storage}/head_object.rb (100%) rename lib/fog/{storage/requests/google => google/requests/storage}/put_bucket.rb (100%) rename lib/fog/{storage/requests/google => google/requests/storage}/put_bucket_acl.rb (100%) rename lib/fog/{storage/requests/google => google/requests/storage}/put_object.rb (100%) rename lib/fog/{storage/requests/google => google/requests/storage}/put_object_url.rb (100%) rename lib/fog/{storage/google.rb => google/storage.rb} (98%) diff --git a/lib/fog/google/google.rb b/lib/fog/google/google.rb index 3efa78382..5e6dedae0 100644 --- a/lib/fog/google/google.rb +++ b/lib/fog/google/google.rb @@ -5,7 +5,7 @@ module Fog extend Fog::Provider - service(:storage, 'storage/google') + service(:storage, 'google/storage') class Mock diff --git a/lib/fog/storage/models/google/directories.rb b/lib/fog/google/models/storage/directories.rb similarity index 95% rename from lib/fog/storage/models/google/directories.rb rename to lib/fog/google/models/storage/directories.rb index 5dfd15bdb..1747fbbd7 100644 --- a/lib/fog/storage/models/google/directories.rb +++ b/lib/fog/google/models/storage/directories.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/storage/models/google/directory' +require 'fog/google/models/storage/directory' module Fog module Storage diff --git a/lib/fog/storage/models/google/directory.rb b/lib/fog/google/models/storage/directory.rb similarity index 97% rename from lib/fog/storage/models/google/directory.rb rename to lib/fog/google/models/storage/directory.rb index 79004cd70..95a49fc91 100644 --- a/lib/fog/storage/models/google/directory.rb +++ b/lib/fog/google/models/storage/directory.rb @@ -1,5 +1,5 @@ require 'fog/core/model' -require 'fog/storage/models/google/files' +require 'fog/google/models/storage/files' module Fog module Storage diff --git a/lib/fog/storage/models/google/file.rb b/lib/fog/google/models/storage/file.rb similarity index 100% rename from lib/fog/storage/models/google/file.rb rename to lib/fog/google/models/storage/file.rb diff --git a/lib/fog/storage/models/google/files.rb b/lib/fog/google/models/storage/files.rb similarity index 98% rename from lib/fog/storage/models/google/files.rb rename to lib/fog/google/models/storage/files.rb index baf5a4d55..a5cc6d290 100644 --- a/lib/fog/storage/models/google/files.rb +++ b/lib/fog/google/models/storage/files.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/storage/models/google/file' +require 'fog/google/models/storage/file' module Fog module Storage diff --git a/lib/fog/storage/parsers/google/access_control_list.rb b/lib/fog/google/parsers/storage/access_control_list.rb similarity index 100% rename from lib/fog/storage/parsers/google/access_control_list.rb rename to lib/fog/google/parsers/storage/access_control_list.rb diff --git a/lib/fog/storage/parsers/google/copy_object.rb b/lib/fog/google/parsers/storage/copy_object.rb similarity index 100% rename from lib/fog/storage/parsers/google/copy_object.rb rename to lib/fog/google/parsers/storage/copy_object.rb diff --git a/lib/fog/storage/parsers/google/get_bucket.rb b/lib/fog/google/parsers/storage/get_bucket.rb similarity index 100% rename from lib/fog/storage/parsers/google/get_bucket.rb rename to lib/fog/google/parsers/storage/get_bucket.rb diff --git a/lib/fog/storage/parsers/google/get_bucket_logging.rb b/lib/fog/google/parsers/storage/get_bucket_logging.rb similarity index 100% rename from lib/fog/storage/parsers/google/get_bucket_logging.rb rename to lib/fog/google/parsers/storage/get_bucket_logging.rb diff --git a/lib/fog/storage/parsers/google/get_bucket_object_versions.rb b/lib/fog/google/parsers/storage/get_bucket_object_versions.rb similarity index 100% rename from lib/fog/storage/parsers/google/get_bucket_object_versions.rb rename to lib/fog/google/parsers/storage/get_bucket_object_versions.rb diff --git a/lib/fog/storage/parsers/google/get_bucket_versioning.rb b/lib/fog/google/parsers/storage/get_bucket_versioning.rb similarity index 100% rename from lib/fog/storage/parsers/google/get_bucket_versioning.rb rename to lib/fog/google/parsers/storage/get_bucket_versioning.rb diff --git a/lib/fog/storage/parsers/google/get_request_payment.rb b/lib/fog/google/parsers/storage/get_request_payment.rb similarity index 100% rename from lib/fog/storage/parsers/google/get_request_payment.rb rename to lib/fog/google/parsers/storage/get_request_payment.rb diff --git a/lib/fog/storage/parsers/google/get_service.rb b/lib/fog/google/parsers/storage/get_service.rb similarity index 100% rename from lib/fog/storage/parsers/google/get_service.rb rename to lib/fog/google/parsers/storage/get_service.rb diff --git a/lib/fog/storage/requests/google/copy_object.rb b/lib/fog/google/requests/storage/copy_object.rb similarity index 98% rename from lib/fog/storage/requests/google/copy_object.rb rename to lib/fog/google/requests/storage/copy_object.rb index 1f82f1af4..882d24062 100644 --- a/lib/fog/storage/requests/google/copy_object.rb +++ b/lib/fog/google/requests/storage/copy_object.rb @@ -3,7 +3,7 @@ module Fog class Google class Real - require 'fog/storage/parsers/google/copy_object' + require 'fog/google/parsers/storage/copy_object' # Copy an object from one Google Storage bucket to another # diff --git a/lib/fog/storage/requests/google/delete_bucket.rb b/lib/fog/google/requests/storage/delete_bucket.rb similarity index 100% rename from lib/fog/storage/requests/google/delete_bucket.rb rename to lib/fog/google/requests/storage/delete_bucket.rb diff --git a/lib/fog/storage/requests/google/delete_object.rb b/lib/fog/google/requests/storage/delete_object.rb similarity index 100% rename from lib/fog/storage/requests/google/delete_object.rb rename to lib/fog/google/requests/storage/delete_object.rb diff --git a/lib/fog/storage/requests/google/get_bucket.rb b/lib/fog/google/requests/storage/get_bucket.rb similarity index 98% rename from lib/fog/storage/requests/google/get_bucket.rb rename to lib/fog/google/requests/storage/get_bucket.rb index 427b8db13..f64dd66df 100644 --- a/lib/fog/storage/requests/google/get_bucket.rb +++ b/lib/fog/google/requests/storage/get_bucket.rb @@ -4,7 +4,7 @@ module Fog class Google class Real - require 'fog/storage/parsers/google/get_bucket' + require 'fog/google/parsers/storage/get_bucket' # List information about objects in an Google Storage bucket # diff --git a/lib/fog/storage/requests/google/get_bucket_acl.rb b/lib/fog/google/requests/storage/get_bucket_acl.rb similarity index 96% rename from lib/fog/storage/requests/google/get_bucket_acl.rb rename to lib/fog/google/requests/storage/get_bucket_acl.rb index f80b23235..972bb8e09 100644 --- a/lib/fog/storage/requests/google/get_bucket_acl.rb +++ b/lib/fog/google/requests/storage/get_bucket_acl.rb @@ -3,7 +3,7 @@ module Fog class Storage class Real - require 'fog/storage/parsers/google/access_control_list' + require 'fog/google/parsers/storage/access_control_list' # Get access control list for an Google Storage bucket # diff --git a/lib/fog/storage/requests/google/get_object.rb b/lib/fog/google/requests/storage/get_object.rb similarity index 100% rename from lib/fog/storage/requests/google/get_object.rb rename to lib/fog/google/requests/storage/get_object.rb diff --git a/lib/fog/storage/requests/google/get_object_acl.rb b/lib/fog/google/requests/storage/get_object_acl.rb similarity index 97% rename from lib/fog/storage/requests/google/get_object_acl.rb rename to lib/fog/google/requests/storage/get_object_acl.rb index 479968459..0023ad8e4 100644 --- a/lib/fog/storage/requests/google/get_object_acl.rb +++ b/lib/fog/google/requests/storage/get_object_acl.rb @@ -3,7 +3,7 @@ module Fog class Google class Real - require 'fog/storage/parsers/google/access_control_list' + require 'fog/google/parsers/storage/access_control_list' # Get access control list for an Google Storage object # diff --git a/lib/fog/storage/requests/google/get_object_http_url.rb b/lib/fog/google/requests/storage/get_object_http_url.rb similarity index 100% rename from lib/fog/storage/requests/google/get_object_http_url.rb rename to lib/fog/google/requests/storage/get_object_http_url.rb diff --git a/lib/fog/storage/requests/google/get_object_https_url.rb b/lib/fog/google/requests/storage/get_object_https_url.rb similarity index 100% rename from lib/fog/storage/requests/google/get_object_https_url.rb rename to lib/fog/google/requests/storage/get_object_https_url.rb diff --git a/lib/fog/storage/requests/google/get_object_torrent.rb b/lib/fog/google/requests/storage/get_object_torrent.rb similarity index 100% rename from lib/fog/storage/requests/google/get_object_torrent.rb rename to lib/fog/google/requests/storage/get_object_torrent.rb diff --git a/lib/fog/storage/requests/google/get_object_url.rb b/lib/fog/google/requests/storage/get_object_url.rb similarity index 100% rename from lib/fog/storage/requests/google/get_object_url.rb rename to lib/fog/google/requests/storage/get_object_url.rb diff --git a/lib/fog/storage/requests/google/get_service.rb b/lib/fog/google/requests/storage/get_service.rb similarity index 96% rename from lib/fog/storage/requests/google/get_service.rb rename to lib/fog/google/requests/storage/get_service.rb index fd7c974b4..bbbb2f9ee 100644 --- a/lib/fog/storage/requests/google/get_service.rb +++ b/lib/fog/google/requests/storage/get_service.rb @@ -3,7 +3,7 @@ module Fog class Google class Real - require 'fog/storage/parsers/google/get_service' + require 'fog/google/parsers/storage/get_service' # List information about Google Storage buckets for authorized user # diff --git a/lib/fog/storage/requests/google/head_object.rb b/lib/fog/google/requests/storage/head_object.rb similarity index 100% rename from lib/fog/storage/requests/google/head_object.rb rename to lib/fog/google/requests/storage/head_object.rb diff --git a/lib/fog/storage/requests/google/put_bucket.rb b/lib/fog/google/requests/storage/put_bucket.rb similarity index 100% rename from lib/fog/storage/requests/google/put_bucket.rb rename to lib/fog/google/requests/storage/put_bucket.rb diff --git a/lib/fog/storage/requests/google/put_bucket_acl.rb b/lib/fog/google/requests/storage/put_bucket_acl.rb similarity index 100% rename from lib/fog/storage/requests/google/put_bucket_acl.rb rename to lib/fog/google/requests/storage/put_bucket_acl.rb diff --git a/lib/fog/storage/requests/google/put_object.rb b/lib/fog/google/requests/storage/put_object.rb similarity index 100% rename from lib/fog/storage/requests/google/put_object.rb rename to lib/fog/google/requests/storage/put_object.rb diff --git a/lib/fog/storage/requests/google/put_object_url.rb b/lib/fog/google/requests/storage/put_object_url.rb similarity index 100% rename from lib/fog/storage/requests/google/put_object_url.rb rename to lib/fog/google/requests/storage/put_object_url.rb diff --git a/lib/fog/storage/google.rb b/lib/fog/google/storage.rb similarity index 98% rename from lib/fog/storage/google.rb rename to lib/fog/google/storage.rb index 95709bd8a..372e227e9 100644 --- a/lib/fog/storage/google.rb +++ b/lib/fog/google/storage.rb @@ -5,13 +5,13 @@ module Fog requires :google_storage_access_key_id, :google_storage_secret_access_key recognizes :host, :port, :scheme, :persistent - model_path 'fog/storage/models/google' + model_path 'fog/google/models/storage' collection :directories model :directory collection :files model :file - request_path 'fog/storage/requests/google' + request_path 'fog/google/requests/storage' request :copy_object request :delete_bucket request :delete_object diff --git a/lib/fog/storage.rb b/lib/fog/storage.rb index 73f2a0d22..018e2fbfb 100644 --- a/lib/fog/storage.rb +++ b/lib/fog/storage.rb @@ -12,7 +12,7 @@ module Fog require 'fog/aws/storage' Fog::Storage::AWS.new(attributes) when :google - require 'fog/storage/google' + require 'fog/google/storage' Fog::Storage::Google.new(attributes) when :local require 'fog/storage/local' From dc61fc09b2d8a560080382cf28ab8708bfe74c71 Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 24 Aug 2011 14:03:25 -0500 Subject: [PATCH 23/29] [storage|local] move local storage to its own shared area (namespacing should probably be corrected) ninefold fix --- lib/fog/local/local.rb | 2 +- .../models/local => local/models/storage}/directories.rb | 2 +- .../{storage/models/local => local/models/storage}/directory.rb | 2 +- lib/fog/{storage/models/local => local/models/storage}/file.rb | 0 lib/fog/{storage/models/local => local/models/storage}/files.rb | 2 +- lib/fog/{storage/local.rb => local/storage.rb} | 0 lib/fog/storage.rb | 2 +- lib/fog/storage/ninefold.rb | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) rename lib/fog/{storage/models/local => local/models/storage}/directories.rb (93%) rename lib/fog/{storage/models/local => local/models/storage}/directory.rb (95%) rename lib/fog/{storage/models/local => local/models/storage}/file.rb (100%) rename lib/fog/{storage/models/local => local/models/storage}/files.rb (98%) rename lib/fog/{storage/local.rb => local/storage.rb} (100%) diff --git a/lib/fog/local/local.rb b/lib/fog/local/local.rb index d0f96d9aa..5d872f22c 100644 --- a/lib/fog/local/local.rb +++ b/lib/fog/local/local.rb @@ -5,7 +5,7 @@ module Fog extend Fog::Provider - service(:storage, 'storage/local') + service(:storage, 'local/storage') end end diff --git a/lib/fog/storage/models/local/directories.rb b/lib/fog/local/models/storage/directories.rb similarity index 93% rename from lib/fog/storage/models/local/directories.rb rename to lib/fog/local/models/storage/directories.rb index 35c4d2860..cf0725718 100644 --- a/lib/fog/storage/models/local/directories.rb +++ b/lib/fog/local/models/storage/directories.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/storage/models/local/directory' +require 'fog/local/models/storage/directory' module Fog module Storage diff --git a/lib/fog/storage/models/local/directory.rb b/lib/fog/local/models/storage/directory.rb similarity index 95% rename from lib/fog/storage/models/local/directory.rb rename to lib/fog/local/models/storage/directory.rb index a967ef3d5..300267359 100644 --- a/lib/fog/storage/models/local/directory.rb +++ b/lib/fog/local/models/storage/directory.rb @@ -1,5 +1,5 @@ require 'fog/core/model' -require 'fog/storage/models/local/files' +require 'fog/local/models/storage/files' module Fog module Storage diff --git a/lib/fog/storage/models/local/file.rb b/lib/fog/local/models/storage/file.rb similarity index 100% rename from lib/fog/storage/models/local/file.rb rename to lib/fog/local/models/storage/file.rb diff --git a/lib/fog/storage/models/local/files.rb b/lib/fog/local/models/storage/files.rb similarity index 98% rename from lib/fog/storage/models/local/files.rb rename to lib/fog/local/models/storage/files.rb index 485b9f442..f3543a204 100644 --- a/lib/fog/storage/models/local/files.rb +++ b/lib/fog/local/models/storage/files.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/storage/models/local/file' +require 'fog/local/models/storage/file' module Fog module Storage diff --git a/lib/fog/storage/local.rb b/lib/fog/local/storage.rb similarity index 100% rename from lib/fog/storage/local.rb rename to lib/fog/local/storage.rb diff --git a/lib/fog/storage.rb b/lib/fog/storage.rb index 018e2fbfb..74f36dc8d 100644 --- a/lib/fog/storage.rb +++ b/lib/fog/storage.rb @@ -15,7 +15,7 @@ module Fog require 'fog/google/storage' Fog::Storage::Google.new(attributes) when :local - require 'fog/storage/local' + require 'fog/local/storage' Fog::Storage::Local.new(attributes) when :ninefold require 'fog/storage/ninefold' diff --git a/lib/fog/storage/ninefold.rb b/lib/fog/storage/ninefold.rb index b12817591..9a180a1f8 100644 --- a/lib/fog/storage/ninefold.rb +++ b/lib/fog/storage/ninefold.rb @@ -17,7 +17,7 @@ module Fog model :file collection :files - request_path 'fog/storage/requests/ninefold' + request_path 'fog/ninefold/requests/storage' # request :delete_container request :get_namespace request :post_namespace From 8338c5f81aec235ce777ad8c432c936742468b0e Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 24 Aug 2011 14:07:16 -0500 Subject: [PATCH 24/29] [storage|ninefold] move ninefold storage to its own shared area (namespacing should probably be corrected) local fix --- lib/fog/local/storage.rb | 2 +- .../models/ninefold => ninefold/models/storage}/directories.rb | 2 +- .../models/ninefold => ninefold/models/storage}/directory.rb | 0 .../models/ninefold => ninefold/models/storage}/file.rb | 0 .../models/ninefold => ninefold/models/storage}/files.rb | 2 +- lib/fog/ninefold/ninefold.rb | 2 +- .../ninefold => ninefold/requests/storage}/delete_namespace.rb | 0 .../ninefold => ninefold/requests/storage}/get_namespace.rb | 0 .../ninefold => ninefold/requests/storage}/post_namespace.rb | 0 .../ninefold => ninefold/requests/storage}/put_namespace.rb | 0 lib/fog/{storage/ninefold.rb => ninefold/storage.rb} | 2 +- lib/fog/storage.rb | 2 +- 12 files changed, 6 insertions(+), 6 deletions(-) rename lib/fog/{storage/models/ninefold => ninefold/models/storage}/directories.rb (96%) rename lib/fog/{storage/models/ninefold => ninefold/models/storage}/directory.rb (100%) rename lib/fog/{storage/models/ninefold => ninefold/models/storage}/file.rb (100%) rename lib/fog/{storage/models/ninefold => ninefold/models/storage}/files.rb (97%) rename lib/fog/{storage/requests/ninefold => ninefold/requests/storage}/delete_namespace.rb (100%) rename lib/fog/{storage/requests/ninefold => ninefold/requests/storage}/get_namespace.rb (100%) rename lib/fog/{storage/requests/ninefold => ninefold/requests/storage}/post_namespace.rb (100%) rename lib/fog/{storage/requests/ninefold => ninefold/requests/storage}/put_namespace.rb (100%) rename lib/fog/{storage/ninefold.rb => ninefold/storage.rb} (99%) diff --git a/lib/fog/local/storage.rb b/lib/fog/local/storage.rb index 446b03bc2..6f908879b 100644 --- a/lib/fog/local/storage.rb +++ b/lib/fog/local/storage.rb @@ -4,7 +4,7 @@ module Fog requires :local_root - model_path 'fog/storage/models/local' + model_path 'fog/local/models/storage' collection :directories model :directory model :file diff --git a/lib/fog/storage/models/ninefold/directories.rb b/lib/fog/ninefold/models/storage/directories.rb similarity index 96% rename from lib/fog/storage/models/ninefold/directories.rb rename to lib/fog/ninefold/models/storage/directories.rb index e3e12c825..516d429da 100644 --- a/lib/fog/storage/models/ninefold/directories.rb +++ b/lib/fog/ninefold/models/storage/directories.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/storage/models/ninefold/directory' +require 'fog/ninefold/models/storage/directory' module Fog module Storage diff --git a/lib/fog/storage/models/ninefold/directory.rb b/lib/fog/ninefold/models/storage/directory.rb similarity index 100% rename from lib/fog/storage/models/ninefold/directory.rb rename to lib/fog/ninefold/models/storage/directory.rb diff --git a/lib/fog/storage/models/ninefold/file.rb b/lib/fog/ninefold/models/storage/file.rb similarity index 100% rename from lib/fog/storage/models/ninefold/file.rb rename to lib/fog/ninefold/models/storage/file.rb diff --git a/lib/fog/storage/models/ninefold/files.rb b/lib/fog/ninefold/models/storage/files.rb similarity index 97% rename from lib/fog/storage/models/ninefold/files.rb rename to lib/fog/ninefold/models/storage/files.rb index 1ee9f3008..c1fcd7675 100644 --- a/lib/fog/storage/models/ninefold/files.rb +++ b/lib/fog/ninefold/models/storage/files.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/storage/models/ninefold/file' +require 'fog/ninefold/models/storage/file' module Fog module Storage diff --git a/lib/fog/ninefold/ninefold.rb b/lib/fog/ninefold/ninefold.rb index 02de670b8..64d5ea83b 100644 --- a/lib/fog/ninefold/ninefold.rb +++ b/lib/fog/ninefold/ninefold.rb @@ -6,7 +6,7 @@ module Fog extend Fog::Provider service(:compute, 'compute/ninefold') - service(:storage, 'storage/ninefold') + service(:storage, 'ninefold/storage') end end diff --git a/lib/fog/storage/requests/ninefold/delete_namespace.rb b/lib/fog/ninefold/requests/storage/delete_namespace.rb similarity index 100% rename from lib/fog/storage/requests/ninefold/delete_namespace.rb rename to lib/fog/ninefold/requests/storage/delete_namespace.rb diff --git a/lib/fog/storage/requests/ninefold/get_namespace.rb b/lib/fog/ninefold/requests/storage/get_namespace.rb similarity index 100% rename from lib/fog/storage/requests/ninefold/get_namespace.rb rename to lib/fog/ninefold/requests/storage/get_namespace.rb diff --git a/lib/fog/storage/requests/ninefold/post_namespace.rb b/lib/fog/ninefold/requests/storage/post_namespace.rb similarity index 100% rename from lib/fog/storage/requests/ninefold/post_namespace.rb rename to lib/fog/ninefold/requests/storage/post_namespace.rb diff --git a/lib/fog/storage/requests/ninefold/put_namespace.rb b/lib/fog/ninefold/requests/storage/put_namespace.rb similarity index 100% rename from lib/fog/storage/requests/ninefold/put_namespace.rb rename to lib/fog/ninefold/requests/storage/put_namespace.rb diff --git a/lib/fog/storage/ninefold.rb b/lib/fog/ninefold/storage.rb similarity index 99% rename from lib/fog/storage/ninefold.rb rename to lib/fog/ninefold/storage.rb index 9a180a1f8..df15ddfc4 100644 --- a/lib/fog/storage/ninefold.rb +++ b/lib/fog/ninefold/storage.rb @@ -11,7 +11,7 @@ module Fog requires :ninefold_storage_token, :ninefold_storage_secret - model_path 'fog/storage/models/ninefold' + model_path 'fog/ninefold/models/storage' model :directory collection :directories model :file diff --git a/lib/fog/storage.rb b/lib/fog/storage.rb index 74f36dc8d..874355797 100644 --- a/lib/fog/storage.rb +++ b/lib/fog/storage.rb @@ -18,7 +18,7 @@ module Fog require 'fog/local/storage' Fog::Storage::Local.new(attributes) when :ninefold - require 'fog/storage/ninefold' + require 'fog/ninefold/storage' Fog::Storage::Ninefold.new(attributes) when :rackspace require 'fog/storage/rackspace' From ff6e4397271eacf0a809bbb141186a563b52e657 Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 24 Aug 2011 14:12:29 -0500 Subject: [PATCH 25/29] [storage|rackspace] move rackspace storage to its own shared area (namespacing should probably be corrected) --- lib/fog/rackspace/rackspace.rb | 8 ++++---- .../requests/storage}/delete_container.rb | 0 .../requests/storage}/delete_object.rb | 0 .../requests/storage}/get_container.rb | 0 .../requests/storage}/get_containers.rb | 0 .../requests/storage}/get_object.rb | 0 .../requests/storage}/head_container.rb | 0 .../requests/storage}/head_containers.rb | 0 .../requests/storage}/head_object.rb | 0 .../requests/storage}/put_container.rb | 0 .../requests/storage}/put_object.rb | 0 .../requests/storage}/put_object_manifest.rb | 0 .../requests/storage}/rackspace/directories.rb | 2 +- .../requests/storage}/rackspace/directory.rb | 2 +- .../requests/storage}/rackspace/file.rb | 0 .../requests/storage}/rackspace/files.rb | 2 +- lib/fog/{storage/rackspace.rb => rackspace/storage.rb} | 4 ++-- lib/fog/storage.rb | 2 +- 18 files changed, 10 insertions(+), 10 deletions(-) rename lib/fog/{storage/requests/rackspace => rackspace/requests/storage}/delete_container.rb (100%) rename lib/fog/{storage/requests/rackspace => rackspace/requests/storage}/delete_object.rb (100%) rename lib/fog/{storage/requests/rackspace => rackspace/requests/storage}/get_container.rb (100%) rename lib/fog/{storage/requests/rackspace => rackspace/requests/storage}/get_containers.rb (100%) rename lib/fog/{storage/requests/rackspace => rackspace/requests/storage}/get_object.rb (100%) rename lib/fog/{storage/requests/rackspace => rackspace/requests/storage}/head_container.rb (100%) rename lib/fog/{storage/requests/rackspace => rackspace/requests/storage}/head_containers.rb (100%) rename lib/fog/{storage/requests/rackspace => rackspace/requests/storage}/head_object.rb (100%) rename lib/fog/{storage/requests/rackspace => rackspace/requests/storage}/put_container.rb (100%) rename lib/fog/{storage/requests/rackspace => rackspace/requests/storage}/put_object.rb (100%) rename lib/fog/{storage/requests/rackspace => rackspace/requests/storage}/put_object_manifest.rb (100%) rename lib/fog/{storage/models => rackspace/requests/storage}/rackspace/directories.rb (96%) rename lib/fog/{storage/models => rackspace/requests/storage}/rackspace/directory.rb (97%) rename lib/fog/{storage/models => rackspace/requests/storage}/rackspace/file.rb (100%) rename lib/fog/{storage/models => rackspace/requests/storage}/rackspace/files.rb (98%) rename lib/fog/{storage/rackspace.rb => rackspace/storage.rb} (97%) diff --git a/lib/fog/rackspace/rackspace.rb b/lib/fog/rackspace/rackspace.rb index 6d3d175b6..5e4bc97b6 100644 --- a/lib/fog/rackspace/rackspace.rb +++ b/lib/fog/rackspace/rackspace.rb @@ -5,10 +5,10 @@ module Fog extend Fog::Provider - service(:cdn, 'cdn/rackspace') - service(:compute, 'compute/rackspace') - service(:storage, 'storage/rackspace') - service(:load_balancers, 'rackspace/load_balancers') + service(:cdn, 'cdn/rackspace') + service(:compute, 'compute/rackspace') + service(:storage, 'rackspace/storage') + service(:load_balancers, 'rackspace/load_balancers') def self.authenticate(options) rackspace_auth_url = options[:rackspace_auth_url] || "auth.api.rackspacecloud.com" diff --git a/lib/fog/storage/requests/rackspace/delete_container.rb b/lib/fog/rackspace/requests/storage/delete_container.rb similarity index 100% rename from lib/fog/storage/requests/rackspace/delete_container.rb rename to lib/fog/rackspace/requests/storage/delete_container.rb diff --git a/lib/fog/storage/requests/rackspace/delete_object.rb b/lib/fog/rackspace/requests/storage/delete_object.rb similarity index 100% rename from lib/fog/storage/requests/rackspace/delete_object.rb rename to lib/fog/rackspace/requests/storage/delete_object.rb diff --git a/lib/fog/storage/requests/rackspace/get_container.rb b/lib/fog/rackspace/requests/storage/get_container.rb similarity index 100% rename from lib/fog/storage/requests/rackspace/get_container.rb rename to lib/fog/rackspace/requests/storage/get_container.rb diff --git a/lib/fog/storage/requests/rackspace/get_containers.rb b/lib/fog/rackspace/requests/storage/get_containers.rb similarity index 100% rename from lib/fog/storage/requests/rackspace/get_containers.rb rename to lib/fog/rackspace/requests/storage/get_containers.rb diff --git a/lib/fog/storage/requests/rackspace/get_object.rb b/lib/fog/rackspace/requests/storage/get_object.rb similarity index 100% rename from lib/fog/storage/requests/rackspace/get_object.rb rename to lib/fog/rackspace/requests/storage/get_object.rb diff --git a/lib/fog/storage/requests/rackspace/head_container.rb b/lib/fog/rackspace/requests/storage/head_container.rb similarity index 100% rename from lib/fog/storage/requests/rackspace/head_container.rb rename to lib/fog/rackspace/requests/storage/head_container.rb diff --git a/lib/fog/storage/requests/rackspace/head_containers.rb b/lib/fog/rackspace/requests/storage/head_containers.rb similarity index 100% rename from lib/fog/storage/requests/rackspace/head_containers.rb rename to lib/fog/rackspace/requests/storage/head_containers.rb diff --git a/lib/fog/storage/requests/rackspace/head_object.rb b/lib/fog/rackspace/requests/storage/head_object.rb similarity index 100% rename from lib/fog/storage/requests/rackspace/head_object.rb rename to lib/fog/rackspace/requests/storage/head_object.rb diff --git a/lib/fog/storage/requests/rackspace/put_container.rb b/lib/fog/rackspace/requests/storage/put_container.rb similarity index 100% rename from lib/fog/storage/requests/rackspace/put_container.rb rename to lib/fog/rackspace/requests/storage/put_container.rb diff --git a/lib/fog/storage/requests/rackspace/put_object.rb b/lib/fog/rackspace/requests/storage/put_object.rb similarity index 100% rename from lib/fog/storage/requests/rackspace/put_object.rb rename to lib/fog/rackspace/requests/storage/put_object.rb diff --git a/lib/fog/storage/requests/rackspace/put_object_manifest.rb b/lib/fog/rackspace/requests/storage/put_object_manifest.rb similarity index 100% rename from lib/fog/storage/requests/rackspace/put_object_manifest.rb rename to lib/fog/rackspace/requests/storage/put_object_manifest.rb diff --git a/lib/fog/storage/models/rackspace/directories.rb b/lib/fog/rackspace/requests/storage/rackspace/directories.rb similarity index 96% rename from lib/fog/storage/models/rackspace/directories.rb rename to lib/fog/rackspace/requests/storage/rackspace/directories.rb index 8ad5ad969..ce5d233d6 100644 --- a/lib/fog/storage/models/rackspace/directories.rb +++ b/lib/fog/rackspace/requests/storage/rackspace/directories.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/storage/models/rackspace/directory' +require 'fog/rackspace/models/storage/directory' module Fog module Storage diff --git a/lib/fog/storage/models/rackspace/directory.rb b/lib/fog/rackspace/requests/storage/rackspace/directory.rb similarity index 97% rename from lib/fog/storage/models/rackspace/directory.rb rename to lib/fog/rackspace/requests/storage/rackspace/directory.rb index df0dd3468..2f1ea1fd9 100644 --- a/lib/fog/storage/models/rackspace/directory.rb +++ b/lib/fog/rackspace/requests/storage/rackspace/directory.rb @@ -1,5 +1,5 @@ require 'fog/core/model' -require 'fog/storage/models/rackspace/files' +require 'fog/rackspace/models/storage/files' module Fog module Storage diff --git a/lib/fog/storage/models/rackspace/file.rb b/lib/fog/rackspace/requests/storage/rackspace/file.rb similarity index 100% rename from lib/fog/storage/models/rackspace/file.rb rename to lib/fog/rackspace/requests/storage/rackspace/file.rb diff --git a/lib/fog/storage/models/rackspace/files.rb b/lib/fog/rackspace/requests/storage/rackspace/files.rb similarity index 98% rename from lib/fog/storage/models/rackspace/files.rb rename to lib/fog/rackspace/requests/storage/rackspace/files.rb index 27ae87a15..65b93413d 100644 --- a/lib/fog/storage/models/rackspace/files.rb +++ b/lib/fog/rackspace/requests/storage/rackspace/files.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/storage/models/rackspace/file' +require 'fog/rackspace/models/storage/file' module Fog module Storage diff --git a/lib/fog/storage/rackspace.rb b/lib/fog/rackspace/storage.rb similarity index 97% rename from lib/fog/storage/rackspace.rb rename to lib/fog/rackspace/storage.rb index fa83d20a6..11fda2aad 100644 --- a/lib/fog/storage/rackspace.rb +++ b/lib/fog/rackspace/storage.rb @@ -5,13 +5,13 @@ module Fog requires :rackspace_api_key, :rackspace_username recognizes :rackspace_auth_url, :rackspace_servicenet, :rackspace_cdn_ssl, :persistent - model_path 'fog/storage/models/rackspace' + model_path 'fog/rackspace/models/storage' model :directory collection :directories model :file collection :files - request_path 'fog/storage/requests/rackspace' + request_path 'fog/rackspace/requests/storage' request :delete_container request :delete_object request :get_container diff --git a/lib/fog/storage.rb b/lib/fog/storage.rb index 874355797..262fb1c25 100644 --- a/lib/fog/storage.rb +++ b/lib/fog/storage.rb @@ -21,7 +21,7 @@ module Fog require 'fog/ninefold/storage' Fog::Storage::Ninefold.new(attributes) when :rackspace - require 'fog/storage/rackspace' + require 'fog/rackspace/storage' Fog::Storage::Rackspace.new(attributes) else raise ArgumentError.new("#{provider} is not a recognized storage provider") From 0e5fe57e3dfd397e88df6b5c4057baf0f5f3f554 Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 24 Aug 2011 14:17:46 -0500 Subject: [PATCH 26/29] [core] move providers to lib/fog/. --- lib/fog/{aws => }/aws.rb | 0 lib/fog/{bluebox => }/bluebox.rb | 0 lib/fog/{brightbox => }/brightbox.rb | 0 lib/fog/{dnsimple => }/dnsimple.rb | 0 lib/fog/{dnsmadeeasy => }/dnsmadeeasy.rb | 0 lib/fog/{dynect => }/dynect.rb | 0 lib/fog/{ecloud => }/ecloud.rb | 0 lib/fog/{go_grid => }/go_grid.rb | 0 lib/fog/{google => }/google.rb | 0 lib/fog/{linode => }/linode.rb | 0 lib/fog/{local => }/local.rb | 0 lib/fog/{new_servers => }/new_servers.rb | 0 lib/fog/{ninefold => }/ninefold.rb | 0 lib/fog/providers.rb | 40 +++++++++---------- lib/fog/{rackspace => }/rackspace.rb | 0 lib/fog/{slicehost => }/slicehost.rb | 0 .../{storm_on_demand => }/storm_on_demand.rb | 0 lib/fog/{vcloud => }/vcloud.rb | 0 lib/fog/{virtual_box => }/virtual_box.rb | 0 lib/fog/{voxel => }/voxel.rb | 0 lib/fog/{zerigo => }/zerigo.rb | 0 21 files changed, 20 insertions(+), 20 deletions(-) rename lib/fog/{aws => }/aws.rb (100%) rename lib/fog/{bluebox => }/bluebox.rb (100%) rename lib/fog/{brightbox => }/brightbox.rb (100%) rename lib/fog/{dnsimple => }/dnsimple.rb (100%) rename lib/fog/{dnsmadeeasy => }/dnsmadeeasy.rb (100%) rename lib/fog/{dynect => }/dynect.rb (100%) rename lib/fog/{ecloud => }/ecloud.rb (100%) rename lib/fog/{go_grid => }/go_grid.rb (100%) rename lib/fog/{google => }/google.rb (100%) rename lib/fog/{linode => }/linode.rb (100%) rename lib/fog/{local => }/local.rb (100%) rename lib/fog/{new_servers => }/new_servers.rb (100%) rename lib/fog/{ninefold => }/ninefold.rb (100%) rename lib/fog/{rackspace => }/rackspace.rb (100%) rename lib/fog/{slicehost => }/slicehost.rb (100%) rename lib/fog/{storm_on_demand => }/storm_on_demand.rb (100%) rename lib/fog/{vcloud => }/vcloud.rb (100%) rename lib/fog/{virtual_box => }/virtual_box.rb (100%) rename lib/fog/{voxel => }/voxel.rb (100%) rename lib/fog/{zerigo => }/zerigo.rb (100%) diff --git a/lib/fog/aws/aws.rb b/lib/fog/aws.rb similarity index 100% rename from lib/fog/aws/aws.rb rename to lib/fog/aws.rb diff --git a/lib/fog/bluebox/bluebox.rb b/lib/fog/bluebox.rb similarity index 100% rename from lib/fog/bluebox/bluebox.rb rename to lib/fog/bluebox.rb diff --git a/lib/fog/brightbox/brightbox.rb b/lib/fog/brightbox.rb similarity index 100% rename from lib/fog/brightbox/brightbox.rb rename to lib/fog/brightbox.rb diff --git a/lib/fog/dnsimple/dnsimple.rb b/lib/fog/dnsimple.rb similarity index 100% rename from lib/fog/dnsimple/dnsimple.rb rename to lib/fog/dnsimple.rb diff --git a/lib/fog/dnsmadeeasy/dnsmadeeasy.rb b/lib/fog/dnsmadeeasy.rb similarity index 100% rename from lib/fog/dnsmadeeasy/dnsmadeeasy.rb rename to lib/fog/dnsmadeeasy.rb diff --git a/lib/fog/dynect/dynect.rb b/lib/fog/dynect.rb similarity index 100% rename from lib/fog/dynect/dynect.rb rename to lib/fog/dynect.rb diff --git a/lib/fog/ecloud/ecloud.rb b/lib/fog/ecloud.rb similarity index 100% rename from lib/fog/ecloud/ecloud.rb rename to lib/fog/ecloud.rb diff --git a/lib/fog/go_grid/go_grid.rb b/lib/fog/go_grid.rb similarity index 100% rename from lib/fog/go_grid/go_grid.rb rename to lib/fog/go_grid.rb diff --git a/lib/fog/google/google.rb b/lib/fog/google.rb similarity index 100% rename from lib/fog/google/google.rb rename to lib/fog/google.rb diff --git a/lib/fog/linode/linode.rb b/lib/fog/linode.rb similarity index 100% rename from lib/fog/linode/linode.rb rename to lib/fog/linode.rb diff --git a/lib/fog/local/local.rb b/lib/fog/local.rb similarity index 100% rename from lib/fog/local/local.rb rename to lib/fog/local.rb diff --git a/lib/fog/new_servers/new_servers.rb b/lib/fog/new_servers.rb similarity index 100% rename from lib/fog/new_servers/new_servers.rb rename to lib/fog/new_servers.rb diff --git a/lib/fog/ninefold/ninefold.rb b/lib/fog/ninefold.rb similarity index 100% rename from lib/fog/ninefold/ninefold.rb rename to lib/fog/ninefold.rb diff --git a/lib/fog/providers.rb b/lib/fog/providers.rb index a7c2af31e..f1916e5a3 100644 --- a/lib/fog/providers.rb +++ b/lib/fog/providers.rb @@ -6,23 +6,23 @@ module Fog end -require 'fog/aws/aws' -require 'fog/bluebox/bluebox' -require 'fog/brightbox/brightbox' -require 'fog/dnsimple/dnsimple' -require 'fog/dnsmadeeasy/dnsmadeeasy' -require 'fog/dynect/dynect' -require 'fog/ecloud/ecloud' -require 'fog/go_grid/go_grid' -require 'fog/google/google' -require 'fog/linode/linode' -require 'fog/local/local' -require 'fog/new_servers/new_servers' -require 'fog/ninefold/ninefold' -require 'fog/rackspace/rackspace' -require 'fog/slicehost/slicehost' -require 'fog/storm_on_demand/storm_on_demand' -require 'fog/vcloud/vcloud' -require 'fog/virtual_box/virtual_box' -require 'fog/voxel/voxel' -require 'fog/zerigo/zerigo' +require 'fog/aws' +require 'fog/bluebox' +require 'fog/brightbox' +require 'fog/dnsimple' +require 'fog/dnsmadeeasy' +require 'fog/dynect' +require 'fog/ecloud' +require 'fog/go_grid' +require 'fog/google' +require 'fog/linode' +require 'fog/local' +require 'fog/new_servers' +require 'fog/ninefold' +require 'fog/rackspace' +require 'fog/slicehost' +require 'fog/storm_on_demand' +require 'fog/vcloud' +require 'fog/virtual_box' +require 'fog/voxel' +require 'fog/zerigo' diff --git a/lib/fog/rackspace/rackspace.rb b/lib/fog/rackspace.rb similarity index 100% rename from lib/fog/rackspace/rackspace.rb rename to lib/fog/rackspace.rb diff --git a/lib/fog/slicehost/slicehost.rb b/lib/fog/slicehost.rb similarity index 100% rename from lib/fog/slicehost/slicehost.rb rename to lib/fog/slicehost.rb diff --git a/lib/fog/storm_on_demand/storm_on_demand.rb b/lib/fog/storm_on_demand.rb similarity index 100% rename from lib/fog/storm_on_demand/storm_on_demand.rb rename to lib/fog/storm_on_demand.rb diff --git a/lib/fog/vcloud/vcloud.rb b/lib/fog/vcloud.rb similarity index 100% rename from lib/fog/vcloud/vcloud.rb rename to lib/fog/vcloud.rb diff --git a/lib/fog/virtual_box/virtual_box.rb b/lib/fog/virtual_box.rb similarity index 100% rename from lib/fog/virtual_box/virtual_box.rb rename to lib/fog/virtual_box.rb diff --git a/lib/fog/voxel/voxel.rb b/lib/fog/voxel.rb similarity index 100% rename from lib/fog/voxel/voxel.rb rename to lib/fog/voxel.rb diff --git a/lib/fog/zerigo/zerigo.rb b/lib/fog/zerigo.rb similarity index 100% rename from lib/fog/zerigo/zerigo.rb rename to lib/fog/zerigo.rb From 2abb668040b5943e5aa6e06e831279f5bb5cee65 Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 24 Aug 2011 14:20:21 -0500 Subject: [PATCH 27/29] [cdn|aws] move aws cdn to its own shared area (namespacing should probably be corrected) --- lib/fog/aws.rb | 2 +- lib/fog/{cdn/aws.rb => aws/cdn.rb} | 4 ++-- lib/fog/{cdn/parsers/aws => aws/parsers/cdn}/distribution.rb | 0 .../parsers/aws => aws/parsers/cdn}/get_distribution_list.rb | 0 .../parsers/aws => aws/parsers/cdn}/get_invalidation_list.rb | 0 .../parsers/cdn}/get_streaming_distribution_list.rb | 0 .../{cdn/parsers/aws => aws/parsers/cdn}/post_invalidation.rb | 0 .../parsers/aws => aws/parsers/cdn}/streaming_distribution.rb | 0 .../requests/aws => aws/requests/cdn}/delete_distribution.rb | 0 .../aws => aws/requests/cdn}/delete_streaming_distribution.rb | 0 .../requests/aws => aws/requests/cdn}/get_distribution.rb | 2 +- .../aws => aws/requests/cdn}/get_distribution_list.rb | 2 +- .../aws => aws/requests/cdn}/get_invalidation_list.rb | 2 +- .../aws => aws/requests/cdn}/get_streaming_distribution.rb | 2 +- .../requests/cdn}/get_streaming_distribution_list.rb | 2 +- .../requests/aws => aws/requests/cdn}/post_distribution.rb | 2 +- .../requests/aws => aws/requests/cdn}/post_invalidation.rb | 2 +- .../aws => aws/requests/cdn}/post_streaming_distribution.rb | 2 +- .../aws => aws/requests/cdn}/put_distribution_config.rb | 2 +- .../requests/cdn}/put_streaming_distribution_config.rb | 2 +- lib/fog/cdn.rb | 2 +- 21 files changed, 14 insertions(+), 14 deletions(-) rename lib/fog/{cdn/aws.rb => aws/cdn.rb} (97%) rename lib/fog/{cdn/parsers/aws => aws/parsers/cdn}/distribution.rb (100%) rename lib/fog/{cdn/parsers/aws => aws/parsers/cdn}/get_distribution_list.rb (100%) rename lib/fog/{cdn/parsers/aws => aws/parsers/cdn}/get_invalidation_list.rb (100%) rename lib/fog/{cdn/parsers/aws => aws/parsers/cdn}/get_streaming_distribution_list.rb (100%) rename lib/fog/{cdn/parsers/aws => aws/parsers/cdn}/post_invalidation.rb (100%) rename lib/fog/{cdn/parsers/aws => aws/parsers/cdn}/streaming_distribution.rb (100%) rename lib/fog/{cdn/requests/aws => aws/requests/cdn}/delete_distribution.rb (100%) rename lib/fog/{cdn/requests/aws => aws/requests/cdn}/delete_streaming_distribution.rb (100%) rename lib/fog/{cdn/requests/aws => aws/requests/cdn}/get_distribution.rb (97%) rename lib/fog/{cdn/requests/aws => aws/requests/cdn}/get_distribution_list.rb (97%) rename lib/fog/{cdn/requests/aws => aws/requests/cdn}/get_invalidation_list.rb (96%) rename lib/fog/{cdn/requests/aws => aws/requests/cdn}/get_streaming_distribution.rb (97%) rename lib/fog/{cdn/requests/aws => aws/requests/cdn}/get_streaming_distribution_list.rb (97%) rename lib/fog/{cdn/requests/aws => aws/requests/cdn}/post_distribution.rb (98%) rename lib/fog/{cdn/requests/aws => aws/requests/cdn}/post_invalidation.rb (97%) rename lib/fog/{cdn/requests/aws => aws/requests/cdn}/post_streaming_distribution.rb (98%) rename lib/fog/{cdn/requests/aws => aws/requests/cdn}/put_distribution_config.rb (98%) rename lib/fog/{cdn/requests/aws => aws/requests/cdn}/put_streaming_distribution_config.rb (98%) diff --git a/lib/fog/aws.rb b/lib/fog/aws.rb index 829131ec7..25a077368 100644 --- a/lib/fog/aws.rb +++ b/lib/fog/aws.rb @@ -6,7 +6,7 @@ module Fog extend Fog::Provider service(:auto_scaling, 'aws/auto_scaling') - service(:cdn, 'cdn/aws') + service(:cdn, 'aws/cdn') service(:compute, 'compute/aws') service(:cloud_formation, 'aws/cloud_formation') service(:cloud_watch, 'aws/cloud_watch') diff --git a/lib/fog/cdn/aws.rb b/lib/fog/aws/cdn.rb similarity index 97% rename from lib/fog/cdn/aws.rb rename to lib/fog/aws/cdn.rb index e9d9ed3e1..611910901 100644 --- a/lib/fog/cdn/aws.rb +++ b/lib/fog/aws/cdn.rb @@ -5,9 +5,9 @@ module Fog requires :aws_access_key_id, :aws_secret_access_key recognizes :host, :path, :port, :scheme, :version, :persistent - model_path 'fog/cdn/models/aws' + model_path 'fog/aws/cdn/models' - request_path 'fog/cdn/requests/aws' + request_path 'fog/aws/requests/cdn' request 'delete_distribution' request 'delete_streaming_distribution' request 'get_distribution' diff --git a/lib/fog/cdn/parsers/aws/distribution.rb b/lib/fog/aws/parsers/cdn/distribution.rb similarity index 100% rename from lib/fog/cdn/parsers/aws/distribution.rb rename to lib/fog/aws/parsers/cdn/distribution.rb diff --git a/lib/fog/cdn/parsers/aws/get_distribution_list.rb b/lib/fog/aws/parsers/cdn/get_distribution_list.rb similarity index 100% rename from lib/fog/cdn/parsers/aws/get_distribution_list.rb rename to lib/fog/aws/parsers/cdn/get_distribution_list.rb diff --git a/lib/fog/cdn/parsers/aws/get_invalidation_list.rb b/lib/fog/aws/parsers/cdn/get_invalidation_list.rb similarity index 100% rename from lib/fog/cdn/parsers/aws/get_invalidation_list.rb rename to lib/fog/aws/parsers/cdn/get_invalidation_list.rb diff --git a/lib/fog/cdn/parsers/aws/get_streaming_distribution_list.rb b/lib/fog/aws/parsers/cdn/get_streaming_distribution_list.rb similarity index 100% rename from lib/fog/cdn/parsers/aws/get_streaming_distribution_list.rb rename to lib/fog/aws/parsers/cdn/get_streaming_distribution_list.rb diff --git a/lib/fog/cdn/parsers/aws/post_invalidation.rb b/lib/fog/aws/parsers/cdn/post_invalidation.rb similarity index 100% rename from lib/fog/cdn/parsers/aws/post_invalidation.rb rename to lib/fog/aws/parsers/cdn/post_invalidation.rb diff --git a/lib/fog/cdn/parsers/aws/streaming_distribution.rb b/lib/fog/aws/parsers/cdn/streaming_distribution.rb similarity index 100% rename from lib/fog/cdn/parsers/aws/streaming_distribution.rb rename to lib/fog/aws/parsers/cdn/streaming_distribution.rb diff --git a/lib/fog/cdn/requests/aws/delete_distribution.rb b/lib/fog/aws/requests/cdn/delete_distribution.rb similarity index 100% rename from lib/fog/cdn/requests/aws/delete_distribution.rb rename to lib/fog/aws/requests/cdn/delete_distribution.rb diff --git a/lib/fog/cdn/requests/aws/delete_streaming_distribution.rb b/lib/fog/aws/requests/cdn/delete_streaming_distribution.rb similarity index 100% rename from lib/fog/cdn/requests/aws/delete_streaming_distribution.rb rename to lib/fog/aws/requests/cdn/delete_streaming_distribution.rb diff --git a/lib/fog/cdn/requests/aws/get_distribution.rb b/lib/fog/aws/requests/cdn/get_distribution.rb similarity index 97% rename from lib/fog/cdn/requests/aws/get_distribution.rb rename to lib/fog/aws/requests/cdn/get_distribution.rb index 9840c3d36..3232fd400 100644 --- a/lib/fog/cdn/requests/aws/get_distribution.rb +++ b/lib/fog/aws/requests/cdn/get_distribution.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/cdn/parsers/aws/distribution' + require 'fog/aws/parsers/cdn/distribution' # Get information about a distribution from CloudFront # diff --git a/lib/fog/cdn/requests/aws/get_distribution_list.rb b/lib/fog/aws/requests/cdn/get_distribution_list.rb similarity index 97% rename from lib/fog/cdn/requests/aws/get_distribution_list.rb rename to lib/fog/aws/requests/cdn/get_distribution_list.rb index 33d64a9d1..a45d8acc3 100644 --- a/lib/fog/cdn/requests/aws/get_distribution_list.rb +++ b/lib/fog/aws/requests/cdn/get_distribution_list.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/cdn/parsers/aws/get_distribution_list' + require 'fog/aws/parsers/cdn/get_distribution_list' # List information about distributions in CloudFront # diff --git a/lib/fog/cdn/requests/aws/get_invalidation_list.rb b/lib/fog/aws/requests/cdn/get_invalidation_list.rb similarity index 96% rename from lib/fog/cdn/requests/aws/get_invalidation_list.rb rename to lib/fog/aws/requests/cdn/get_invalidation_list.rb index a906ad1e3..00f8e977a 100644 --- a/lib/fog/cdn/requests/aws/get_invalidation_list.rb +++ b/lib/fog/aws/requests/cdn/get_invalidation_list.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/cdn/parsers/aws/get_invalidation_list' + require 'fog/aws/parsers/cdn/get_invalidation_list' # ==== Parameters # * options<~Hash> - config arguments for list. Defaults to {}. diff --git a/lib/fog/cdn/requests/aws/get_streaming_distribution.rb b/lib/fog/aws/requests/cdn/get_streaming_distribution.rb similarity index 97% rename from lib/fog/cdn/requests/aws/get_streaming_distribution.rb rename to lib/fog/aws/requests/cdn/get_streaming_distribution.rb index bff94035e..f45b96449 100644 --- a/lib/fog/cdn/requests/aws/get_streaming_distribution.rb +++ b/lib/fog/aws/requests/cdn/get_streaming_distribution.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/cdn/parsers/aws/streaming_distribution' + require 'fog/aws/parsers/cdn/streaming_distribution' # Get information about a streaming distribution from CloudFront # diff --git a/lib/fog/cdn/requests/aws/get_streaming_distribution_list.rb b/lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb similarity index 97% rename from lib/fog/cdn/requests/aws/get_streaming_distribution_list.rb rename to lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb index f6083a176..38c6dd552 100644 --- a/lib/fog/cdn/requests/aws/get_streaming_distribution_list.rb +++ b/lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/cdn/parsers/aws/get_streaming_distribution_list' + require 'fog/aws/parsers/cdn/get_streaming_distribution_list' # List information about distributions in CloudFront # diff --git a/lib/fog/cdn/requests/aws/post_distribution.rb b/lib/fog/aws/requests/cdn/post_distribution.rb similarity index 98% rename from lib/fog/cdn/requests/aws/post_distribution.rb rename to lib/fog/aws/requests/cdn/post_distribution.rb index d75d10a04..b121fa7db 100644 --- a/lib/fog/cdn/requests/aws/post_distribution.rb +++ b/lib/fog/aws/requests/cdn/post_distribution.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/cdn/parsers/aws/distribution' + require 'fog/aws/parsers/cdn/distribution' # create a new distribution in CloudFront # diff --git a/lib/fog/cdn/requests/aws/post_invalidation.rb b/lib/fog/aws/requests/cdn/post_invalidation.rb similarity index 97% rename from lib/fog/cdn/requests/aws/post_invalidation.rb rename to lib/fog/aws/requests/cdn/post_invalidation.rb index 09fc899f4..5adcab19a 100644 --- a/lib/fog/cdn/requests/aws/post_invalidation.rb +++ b/lib/fog/aws/requests/cdn/post_invalidation.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/cdn/parsers/aws/post_invalidation' + require 'fog/aws/parsers/cdn/post_invalidation' # List information about distributions in CloudFront # diff --git a/lib/fog/cdn/requests/aws/post_streaming_distribution.rb b/lib/fog/aws/requests/cdn/post_streaming_distribution.rb similarity index 98% rename from lib/fog/cdn/requests/aws/post_streaming_distribution.rb rename to lib/fog/aws/requests/cdn/post_streaming_distribution.rb index 8ac09e6fd..33077dc5d 100644 --- a/lib/fog/cdn/requests/aws/post_streaming_distribution.rb +++ b/lib/fog/aws/requests/cdn/post_streaming_distribution.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/cdn/parsers/aws/streaming_distribution' + require 'fog/aws/parsers/cdn/streaming_distribution' # create a new streaming distribution in CloudFront # diff --git a/lib/fog/cdn/requests/aws/put_distribution_config.rb b/lib/fog/aws/requests/cdn/put_distribution_config.rb similarity index 98% rename from lib/fog/cdn/requests/aws/put_distribution_config.rb rename to lib/fog/aws/requests/cdn/put_distribution_config.rb index 6188f3ad8..adc836300 100644 --- a/lib/fog/cdn/requests/aws/put_distribution_config.rb +++ b/lib/fog/aws/requests/cdn/put_distribution_config.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/cdn/parsers/aws/distribution' + require 'fog/aws/parsers/cdn/distribution' # update a distribution in CloudFront # diff --git a/lib/fog/cdn/requests/aws/put_streaming_distribution_config.rb b/lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb similarity index 98% rename from lib/fog/cdn/requests/aws/put_streaming_distribution_config.rb rename to lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb index 88deacc3f..5fe6a27cc 100644 --- a/lib/fog/cdn/requests/aws/put_streaming_distribution_config.rb +++ b/lib/fog/aws/requests/cdn/put_streaming_distribution_config.rb @@ -3,7 +3,7 @@ module Fog class AWS class Real - require 'fog/cdn/parsers/aws/streaming_distribution' + require 'fog/aws/parsers/cdn/streaming_distribution' # update a streaming distribution in CloudFront # diff --git a/lib/fog/cdn.rb b/lib/fog/cdn.rb index 0c3dce627..e0c20c9c3 100644 --- a/lib/fog/cdn.rb +++ b/lib/fog/cdn.rb @@ -9,7 +9,7 @@ module Fog attributes = attributes.dup # prevent delete from having side effects case provider = attributes.delete(:provider).to_s.downcase.to_sym when :aws - require 'fog/cdn/aws' + require 'fog/aws/cdn' Fog::CDN::AWS.new(attributes) when :rackspace require 'fog/cdn/rackspace' From a662046d1a3c84f9b32b1920e60f160ee6e383c4 Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 24 Aug 2011 14:22:49 -0500 Subject: [PATCH 28/29] [cdn|rackspace] move rackspace cdn to its own shared area (namespacing should probably be corrected) --- lib/fog/cdn.rb | 2 +- lib/fog/rackspace.rb | 2 +- lib/fog/{cdn/rackspace.rb => rackspace/cdn.rb} | 4 ++-- .../rackspace => rackspace/requests/cdn}/get_containers.rb | 0 .../rackspace => rackspace/requests/cdn}/head_container.rb | 0 .../rackspace => rackspace/requests/cdn}/post_container.rb | 0 .../rackspace => rackspace/requests/cdn}/put_container.rb | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename lib/fog/{cdn/rackspace.rb => rackspace/cdn.rb} (96%) rename lib/fog/{cdn/requests/rackspace => rackspace/requests/cdn}/get_containers.rb (100%) rename lib/fog/{cdn/requests/rackspace => rackspace/requests/cdn}/head_container.rb (100%) rename lib/fog/{cdn/requests/rackspace => rackspace/requests/cdn}/post_container.rb (100%) rename lib/fog/{cdn/requests/rackspace => rackspace/requests/cdn}/put_container.rb (100%) diff --git a/lib/fog/cdn.rb b/lib/fog/cdn.rb index e0c20c9c3..898d8a5fb 100644 --- a/lib/fog/cdn.rb +++ b/lib/fog/cdn.rb @@ -12,7 +12,7 @@ module Fog require 'fog/aws/cdn' Fog::CDN::AWS.new(attributes) when :rackspace - require 'fog/cdn/rackspace' + require 'fog/rackspace/cdn' Fog::CDN::Rackspace.new(attributes) else raise ArgumentError.new("#{provider} is not a recognized cdn provider") diff --git a/lib/fog/rackspace.rb b/lib/fog/rackspace.rb index 5e4bc97b6..faefe2bb6 100644 --- a/lib/fog/rackspace.rb +++ b/lib/fog/rackspace.rb @@ -5,7 +5,7 @@ module Fog extend Fog::Provider - service(:cdn, 'cdn/rackspace') + service(:cdn, 'rackspace/cdn') service(:compute, 'compute/rackspace') service(:storage, 'rackspace/storage') service(:load_balancers, 'rackspace/load_balancers') diff --git a/lib/fog/cdn/rackspace.rb b/lib/fog/rackspace/cdn.rb similarity index 96% rename from lib/fog/cdn/rackspace.rb rename to lib/fog/rackspace/cdn.rb index a023ba7ba..8d60b38d9 100644 --- a/lib/fog/cdn/rackspace.rb +++ b/lib/fog/rackspace/cdn.rb @@ -5,9 +5,9 @@ module Fog requires :rackspace_api_key, :rackspace_username recognizes :rackspace_auth_url, :persistent - model_path 'fog/cdn/models/rackspace' + model_path 'fog/rackspace/models/cdn' - request_path 'fog/cdn/requests/rackspace' + request_path 'fog/rackspace/requests/cdn' request :get_containers request :head_container request :post_container diff --git a/lib/fog/cdn/requests/rackspace/get_containers.rb b/lib/fog/rackspace/requests/cdn/get_containers.rb similarity index 100% rename from lib/fog/cdn/requests/rackspace/get_containers.rb rename to lib/fog/rackspace/requests/cdn/get_containers.rb diff --git a/lib/fog/cdn/requests/rackspace/head_container.rb b/lib/fog/rackspace/requests/cdn/head_container.rb similarity index 100% rename from lib/fog/cdn/requests/rackspace/head_container.rb rename to lib/fog/rackspace/requests/cdn/head_container.rb diff --git a/lib/fog/cdn/requests/rackspace/post_container.rb b/lib/fog/rackspace/requests/cdn/post_container.rb similarity index 100% rename from lib/fog/cdn/requests/rackspace/post_container.rb rename to lib/fog/rackspace/requests/cdn/post_container.rb diff --git a/lib/fog/cdn/requests/rackspace/put_container.rb b/lib/fog/rackspace/requests/cdn/put_container.rb similarity index 100% rename from lib/fog/cdn/requests/rackspace/put_container.rb rename to lib/fog/rackspace/requests/cdn/put_container.rb From 0763c6370a61d8d8354e9616e44f9695536c8fc4 Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 24 Aug 2011 14:40:47 -0500 Subject: [PATCH 29/29] [dns|zerigo] move zerigo dns to its own shared area (namespacing should probably be corrected) --- lib/fog/dns.rb | 2 +- lib/fog/zerigo.rb | 2 +- lib/fog/{dns/zerigo.rb => zerigo/dns.rb} | 4 ++-- lib/fog/{dns/models/zerigo => zerigo/models/dns}/record.rb | 0 lib/fog/{dns/models/zerigo => zerigo/models/dns}/records.rb | 2 +- lib/fog/{dns/models/zerigo => zerigo/models/dns}/zone.rb | 2 +- lib/fog/{dns/models/zerigo => zerigo/models/dns}/zones.rb | 2 +- .../{dns/parsers/zerigo => zerigo/parsers/dns}/count_hosts.rb | 0 .../{dns/parsers/zerigo => zerigo/parsers/dns}/count_zones.rb | 0 .../{dns/parsers/zerigo => zerigo/parsers/dns}/create_host.rb | 0 .../{dns/parsers/zerigo => zerigo/parsers/dns}/create_zone.rb | 0 .../{dns/parsers/zerigo => zerigo/parsers/dns}/find_hosts.rb | 0 .../{dns/parsers/zerigo => zerigo/parsers/dns}/get_host.rb | 0 .../{dns/parsers/zerigo => zerigo/parsers/dns}/get_zone.rb | 0 .../parsers/zerigo => zerigo/parsers/dns}/get_zone_stats.rb | 0 .../{dns/parsers/zerigo => zerigo/parsers/dns}/list_hosts.rb | 0 .../{dns/parsers/zerigo => zerigo/parsers/dns}/list_zones.rb | 0 .../requests/zerigo => zerigo/requests/dns}/count_hosts.rb | 2 +- .../requests/zerigo => zerigo/requests/dns}/count_zones.rb | 2 +- .../requests/zerigo => zerigo/requests/dns}/create_host.rb | 2 +- .../requests/zerigo => zerigo/requests/dns}/create_zone.rb | 2 +- .../requests/zerigo => zerigo/requests/dns}/delete_host.rb | 0 .../requests/zerigo => zerigo/requests/dns}/delete_zone.rb | 0 .../requests/zerigo => zerigo/requests/dns}/find_hosts.rb | 2 +- .../{dns/requests/zerigo => zerigo/requests/dns}/get_host.rb | 2 +- .../{dns/requests/zerigo => zerigo/requests/dns}/get_zone.rb | 2 +- .../requests/zerigo => zerigo/requests/dns}/get_zone_stats.rb | 2 +- .../requests/zerigo => zerigo/requests/dns}/list_hosts.rb | 2 +- .../requests/zerigo => zerigo/requests/dns}/list_zones.rb | 2 +- .../requests/zerigo => zerigo/requests/dns}/update_host.rb | 0 .../requests/zerigo => zerigo/requests/dns}/update_zone.rb | 0 31 files changed, 17 insertions(+), 17 deletions(-) rename lib/fog/{dns/zerigo.rb => zerigo/dns.rb} (96%) rename lib/fog/{dns/models/zerigo => zerigo/models/dns}/record.rb (100%) rename lib/fog/{dns/models/zerigo => zerigo/models/dns}/records.rb (95%) rename lib/fog/{dns/models/zerigo => zerigo/models/dns}/zone.rb (98%) rename lib/fog/{dns/models/zerigo => zerigo/models/dns}/zones.rb (93%) rename lib/fog/{dns/parsers/zerigo => zerigo/parsers/dns}/count_hosts.rb (100%) rename lib/fog/{dns/parsers/zerigo => zerigo/parsers/dns}/count_zones.rb (100%) rename lib/fog/{dns/parsers/zerigo => zerigo/parsers/dns}/create_host.rb (100%) rename lib/fog/{dns/parsers/zerigo => zerigo/parsers/dns}/create_zone.rb (100%) rename lib/fog/{dns/parsers/zerigo => zerigo/parsers/dns}/find_hosts.rb (100%) rename lib/fog/{dns/parsers/zerigo => zerigo/parsers/dns}/get_host.rb (100%) rename lib/fog/{dns/parsers/zerigo => zerigo/parsers/dns}/get_zone.rb (100%) rename lib/fog/{dns/parsers/zerigo => zerigo/parsers/dns}/get_zone_stats.rb (100%) rename lib/fog/{dns/parsers/zerigo => zerigo/parsers/dns}/list_hosts.rb (100%) rename lib/fog/{dns/parsers/zerigo => zerigo/parsers/dns}/list_zones.rb (100%) rename lib/fog/{dns/requests/zerigo => zerigo/requests/dns}/count_hosts.rb (93%) rename lib/fog/{dns/requests/zerigo => zerigo/requests/dns}/count_zones.rb (92%) rename lib/fog/{dns/requests/zerigo => zerigo/requests/dns}/create_host.rb (97%) rename lib/fog/{dns/requests/zerigo => zerigo/requests/dns}/create_zone.rb (98%) rename lib/fog/{dns/requests/zerigo => zerigo/requests/dns}/delete_host.rb (100%) rename lib/fog/{dns/requests/zerigo => zerigo/requests/dns}/delete_zone.rb (100%) rename lib/fog/{dns/requests/zerigo => zerigo/requests/dns}/find_hosts.rb (96%) rename lib/fog/{dns/requests/zerigo => zerigo/requests/dns}/get_host.rb (95%) rename lib/fog/{dns/requests/zerigo => zerigo/requests/dns}/get_zone.rb (96%) rename lib/fog/{dns/requests/zerigo => zerigo/requests/dns}/get_zone_stats.rb (95%) rename lib/fog/{dns/requests/zerigo => zerigo/requests/dns}/list_hosts.rb (95%) rename lib/fog/{dns/requests/zerigo => zerigo/requests/dns}/list_zones.rb (96%) rename lib/fog/{dns/requests/zerigo => zerigo/requests/dns}/update_host.rb (100%) rename lib/fog/{dns/requests/zerigo => zerigo/requests/dns}/update_zone.rb (100%) diff --git a/lib/fog/dns.rb b/lib/fog/dns.rb index 76f29fe5d..6ecdcd87d 100644 --- a/lib/fog/dns.rb +++ b/lib/fog/dns.rb @@ -30,7 +30,7 @@ module Fog require 'fog/dns/slicehost' Fog::DNS::Slicehost.new(attributes) when :zerigo - require 'fog/dns/zerigo' + require 'fog/zerigo/dns' Fog::DNS::Zerigo.new(attributes) else raise ArgumentError.new("#{provider} is not a recognized dns provider") diff --git a/lib/fog/zerigo.rb b/lib/fog/zerigo.rb index 09ac79c69..596ff8281 100644 --- a/lib/fog/zerigo.rb +++ b/lib/fog/zerigo.rb @@ -5,7 +5,7 @@ module Fog extend Fog::Provider - service(:dns, 'dns/zerigo') + service(:dns, 'zerigo/dns') end end diff --git a/lib/fog/dns/zerigo.rb b/lib/fog/zerigo/dns.rb similarity index 96% rename from lib/fog/dns/zerigo.rb rename to lib/fog/zerigo/dns.rb index a5e924443..6338a576e 100644 --- a/lib/fog/dns/zerigo.rb +++ b/lib/fog/zerigo/dns.rb @@ -5,13 +5,13 @@ module Fog requires :zerigo_email, :zerigo_token recognizes :host, :persistent, :port, :scheme, :timeout - model_path 'fog/dns/models/zerigo' + model_path 'fog/zerigo/models/dns' model :record collection :records model :zone collection :zones - request_path 'fog/dns/requests/zerigo' + request_path 'fog/zerigo/requests/dns' request :count_hosts request :count_zones request :create_host diff --git a/lib/fog/dns/models/zerigo/record.rb b/lib/fog/zerigo/models/dns/record.rb similarity index 100% rename from lib/fog/dns/models/zerigo/record.rb rename to lib/fog/zerigo/models/dns/record.rb diff --git a/lib/fog/dns/models/zerigo/records.rb b/lib/fog/zerigo/models/dns/records.rb similarity index 95% rename from lib/fog/dns/models/zerigo/records.rb rename to lib/fog/zerigo/models/dns/records.rb index c8f8d7d07..d78912976 100644 --- a/lib/fog/dns/models/zerigo/records.rb +++ b/lib/fog/zerigo/models/dns/records.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/dns/models/zerigo/record' +require 'fog/zerigo/models/dns/record' module Fog module DNS diff --git a/lib/fog/dns/models/zerigo/zone.rb b/lib/fog/zerigo/models/dns/zone.rb similarity index 98% rename from lib/fog/dns/models/zerigo/zone.rb rename to lib/fog/zerigo/models/dns/zone.rb index f9a35a4ac..5f6b69827 100644 --- a/lib/fog/dns/models/zerigo/zone.rb +++ b/lib/fog/zerigo/models/dns/zone.rb @@ -1,5 +1,5 @@ require 'fog/core/model' -require 'fog/dns/models/zerigo/records' +require 'fog/zerigo/models/dns/records' module Fog module DNS diff --git a/lib/fog/dns/models/zerigo/zones.rb b/lib/fog/zerigo/models/dns/zones.rb similarity index 93% rename from lib/fog/dns/models/zerigo/zones.rb rename to lib/fog/zerigo/models/dns/zones.rb index 68c75fae6..c4b12a84e 100644 --- a/lib/fog/dns/models/zerigo/zones.rb +++ b/lib/fog/zerigo/models/dns/zones.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/dns/models/zerigo/zone' +require 'fog/zerigo/models/dns/zone' module Fog module DNS diff --git a/lib/fog/dns/parsers/zerigo/count_hosts.rb b/lib/fog/zerigo/parsers/dns/count_hosts.rb similarity index 100% rename from lib/fog/dns/parsers/zerigo/count_hosts.rb rename to lib/fog/zerigo/parsers/dns/count_hosts.rb diff --git a/lib/fog/dns/parsers/zerigo/count_zones.rb b/lib/fog/zerigo/parsers/dns/count_zones.rb similarity index 100% rename from lib/fog/dns/parsers/zerigo/count_zones.rb rename to lib/fog/zerigo/parsers/dns/count_zones.rb diff --git a/lib/fog/dns/parsers/zerigo/create_host.rb b/lib/fog/zerigo/parsers/dns/create_host.rb similarity index 100% rename from lib/fog/dns/parsers/zerigo/create_host.rb rename to lib/fog/zerigo/parsers/dns/create_host.rb diff --git a/lib/fog/dns/parsers/zerigo/create_zone.rb b/lib/fog/zerigo/parsers/dns/create_zone.rb similarity index 100% rename from lib/fog/dns/parsers/zerigo/create_zone.rb rename to lib/fog/zerigo/parsers/dns/create_zone.rb diff --git a/lib/fog/dns/parsers/zerigo/find_hosts.rb b/lib/fog/zerigo/parsers/dns/find_hosts.rb similarity index 100% rename from lib/fog/dns/parsers/zerigo/find_hosts.rb rename to lib/fog/zerigo/parsers/dns/find_hosts.rb diff --git a/lib/fog/dns/parsers/zerigo/get_host.rb b/lib/fog/zerigo/parsers/dns/get_host.rb similarity index 100% rename from lib/fog/dns/parsers/zerigo/get_host.rb rename to lib/fog/zerigo/parsers/dns/get_host.rb diff --git a/lib/fog/dns/parsers/zerigo/get_zone.rb b/lib/fog/zerigo/parsers/dns/get_zone.rb similarity index 100% rename from lib/fog/dns/parsers/zerigo/get_zone.rb rename to lib/fog/zerigo/parsers/dns/get_zone.rb diff --git a/lib/fog/dns/parsers/zerigo/get_zone_stats.rb b/lib/fog/zerigo/parsers/dns/get_zone_stats.rb similarity index 100% rename from lib/fog/dns/parsers/zerigo/get_zone_stats.rb rename to lib/fog/zerigo/parsers/dns/get_zone_stats.rb diff --git a/lib/fog/dns/parsers/zerigo/list_hosts.rb b/lib/fog/zerigo/parsers/dns/list_hosts.rb similarity index 100% rename from lib/fog/dns/parsers/zerigo/list_hosts.rb rename to lib/fog/zerigo/parsers/dns/list_hosts.rb diff --git a/lib/fog/dns/parsers/zerigo/list_zones.rb b/lib/fog/zerigo/parsers/dns/list_zones.rb similarity index 100% rename from lib/fog/dns/parsers/zerigo/list_zones.rb rename to lib/fog/zerigo/parsers/dns/list_zones.rb diff --git a/lib/fog/dns/requests/zerigo/count_hosts.rb b/lib/fog/zerigo/requests/dns/count_hosts.rb similarity index 93% rename from lib/fog/dns/requests/zerigo/count_hosts.rb rename to lib/fog/zerigo/requests/dns/count_hosts.rb index 20b5d77ed..5e19769de 100644 --- a/lib/fog/dns/requests/zerigo/count_hosts.rb +++ b/lib/fog/zerigo/requests/dns/count_hosts.rb @@ -3,7 +3,7 @@ module Fog class Zerigo class Real - require 'fog/dns/parsers/zerigo/count_hosts' + require 'fog/zerigo/parsers/dns/count_hosts' # total number of hosts available for the specified zone. It is the same value as provided # in the X-Query-Count header in the list_hosts API method diff --git a/lib/fog/dns/requests/zerigo/count_zones.rb b/lib/fog/zerigo/requests/dns/count_zones.rb similarity index 92% rename from lib/fog/dns/requests/zerigo/count_zones.rb rename to lib/fog/zerigo/requests/dns/count_zones.rb index a423949e4..b1eac98ea 100644 --- a/lib/fog/dns/requests/zerigo/count_zones.rb +++ b/lib/fog/zerigo/requests/dns/count_zones.rb @@ -3,7 +3,7 @@ module Fog class Zerigo class Real - require 'fog/dns/parsers/zerigo/count_zones' + require 'fog/zerigo/parsers/dns/count_zones' # Total number of zones hosted Zerigo for this account. It is the same value as provided # in the X-Query-Count header in the list_zones API method diff --git a/lib/fog/dns/requests/zerigo/create_host.rb b/lib/fog/zerigo/requests/dns/create_host.rb similarity index 97% rename from lib/fog/dns/requests/zerigo/create_host.rb rename to lib/fog/zerigo/requests/dns/create_host.rb index d141fa6e8..4f3eddacd 100644 --- a/lib/fog/dns/requests/zerigo/create_host.rb +++ b/lib/fog/zerigo/requests/dns/create_host.rb @@ -3,7 +3,7 @@ module Fog class Zerigo class Real - require 'fog/dns/parsers/zerigo/create_host' + require 'fog/zerigo/parsers/dns/create_host' # Create a new host in the specified zone # diff --git a/lib/fog/dns/requests/zerigo/create_zone.rb b/lib/fog/zerigo/requests/dns/create_zone.rb similarity index 98% rename from lib/fog/dns/requests/zerigo/create_zone.rb rename to lib/fog/zerigo/requests/dns/create_zone.rb index a0251182a..aa034cbf3 100644 --- a/lib/fog/dns/requests/zerigo/create_zone.rb +++ b/lib/fog/zerigo/requests/dns/create_zone.rb @@ -3,7 +3,7 @@ module Fog class Zerigo class Real - require 'fog/dns/parsers/zerigo/create_zone' + require 'fog/zerigo/parsers/dns/create_zone' # Create a new zone for Zerigo's DNS servers to serve/host # ==== Parameters diff --git a/lib/fog/dns/requests/zerigo/delete_host.rb b/lib/fog/zerigo/requests/dns/delete_host.rb similarity index 100% rename from lib/fog/dns/requests/zerigo/delete_host.rb rename to lib/fog/zerigo/requests/dns/delete_host.rb diff --git a/lib/fog/dns/requests/zerigo/delete_zone.rb b/lib/fog/zerigo/requests/dns/delete_zone.rb similarity index 100% rename from lib/fog/dns/requests/zerigo/delete_zone.rb rename to lib/fog/zerigo/requests/dns/delete_zone.rb diff --git a/lib/fog/dns/requests/zerigo/find_hosts.rb b/lib/fog/zerigo/requests/dns/find_hosts.rb similarity index 96% rename from lib/fog/dns/requests/zerigo/find_hosts.rb rename to lib/fog/zerigo/requests/dns/find_hosts.rb index 07e4d0f9c..dbe3848d5 100644 --- a/lib/fog/dns/requests/zerigo/find_hosts.rb +++ b/lib/fog/zerigo/requests/dns/find_hosts.rb @@ -3,7 +3,7 @@ module Fog class Zerigo class Real - require 'fog/dns/parsers/zerigo/find_hosts' + require 'fog/zerigo/parsers/dns/find_hosts' # Get list of all the host records that match the FQDN. If desired, can limit # search to a specific zone diff --git a/lib/fog/dns/requests/zerigo/get_host.rb b/lib/fog/zerigo/requests/dns/get_host.rb similarity index 95% rename from lib/fog/dns/requests/zerigo/get_host.rb rename to lib/fog/zerigo/requests/dns/get_host.rb index e9362fcbc..e2410c28e 100644 --- a/lib/fog/dns/requests/zerigo/get_host.rb +++ b/lib/fog/zerigo/requests/dns/get_host.rb @@ -3,7 +3,7 @@ module Fog class Zerigo class Real - require 'fog/dns/parsers/zerigo/get_host' + require 'fog/zerigo/parsers/dns/get_host' # get details about a given host record # diff --git a/lib/fog/dns/requests/zerigo/get_zone.rb b/lib/fog/zerigo/requests/dns/get_zone.rb similarity index 96% rename from lib/fog/dns/requests/zerigo/get_zone.rb rename to lib/fog/zerigo/requests/dns/get_zone.rb index 951c440e0..c335ca0c2 100644 --- a/lib/fog/dns/requests/zerigo/get_zone.rb +++ b/lib/fog/zerigo/requests/dns/get_zone.rb @@ -3,7 +3,7 @@ module Fog class Zerigo class Real - require 'fog/dns/parsers/zerigo/get_zone' + require 'fog/zerigo/parsers/dns/get_zone' # Get details of a DNS zone. The response is similar to list_zones, with the # addition of hosts-count and possibly hosts. diff --git a/lib/fog/dns/requests/zerigo/get_zone_stats.rb b/lib/fog/zerigo/requests/dns/get_zone_stats.rb similarity index 95% rename from lib/fog/dns/requests/zerigo/get_zone_stats.rb rename to lib/fog/zerigo/requests/dns/get_zone_stats.rb index 776fe2651..c7726f10e 100644 --- a/lib/fog/dns/requests/zerigo/get_zone_stats.rb +++ b/lib/fog/zerigo/requests/dns/get_zone_stats.rb @@ -3,7 +3,7 @@ module Fog class Zerigo class Real - require 'fog/dns/parsers/zerigo/get_zone_stats' + require 'fog/zerigo/parsers/dns/get_zone_stats' # returns current traffic statistics about this zone. Queries is measured from the # beginning of the current period through the time of the API call. diff --git a/lib/fog/dns/requests/zerigo/list_hosts.rb b/lib/fog/zerigo/requests/dns/list_hosts.rb similarity index 95% rename from lib/fog/dns/requests/zerigo/list_hosts.rb rename to lib/fog/zerigo/requests/dns/list_hosts.rb index a7c7fdd1f..3a980bac3 100644 --- a/lib/fog/dns/requests/zerigo/list_hosts.rb +++ b/lib/fog/zerigo/requests/dns/list_hosts.rb @@ -3,7 +3,7 @@ module Fog class Zerigo class Real - require 'fog/dns/parsers/zerigo/list_hosts' + require 'fog/zerigo/parsers/dns/list_hosts' # Get list of all DNS zones hosted on Slicehost (for this account) # diff --git a/lib/fog/dns/requests/zerigo/list_zones.rb b/lib/fog/zerigo/requests/dns/list_zones.rb similarity index 96% rename from lib/fog/dns/requests/zerigo/list_zones.rb rename to lib/fog/zerigo/requests/dns/list_zones.rb index 47988a382..b7f541bf0 100644 --- a/lib/fog/dns/requests/zerigo/list_zones.rb +++ b/lib/fog/zerigo/requests/dns/list_zones.rb @@ -3,7 +3,7 @@ module Fog class Zerigo class Real - require 'fog/dns/parsers/zerigo/list_zones' + require 'fog/zerigo/parsers/dns/list_zones' # Get list of all DNS zones hosted on Slicehost (for this account) # diff --git a/lib/fog/dns/requests/zerigo/update_host.rb b/lib/fog/zerigo/requests/dns/update_host.rb similarity index 100% rename from lib/fog/dns/requests/zerigo/update_host.rb rename to lib/fog/zerigo/requests/dns/update_host.rb diff --git a/lib/fog/dns/requests/zerigo/update_zone.rb b/lib/fog/zerigo/requests/dns/update_zone.rb similarity index 100% rename from lib/fog/dns/requests/zerigo/update_zone.rb rename to lib/fog/zerigo/requests/dns/update_zone.rb