From 5e2a7f3c9d7d2a0ac70f30988d019daf7444f1cf Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 24 Aug 2011 19:58:47 -0500 Subject: [PATCH] [dns|bluebox] move bluebox dns to its own shared area (namespacing should probably be corrected) --- lib/fog/bluebox.rb | 2 +- lib/fog/{dns/bluebox.rb => bluebox/dns.rb} | 4 ++-- lib/fog/{dns/models/bluebox => bluebox/models/dns}/record.rb | 0 lib/fog/{dns/models/bluebox => bluebox/models/dns}/records.rb | 2 +- lib/fog/{dns/models/bluebox => bluebox/models/dns}/zone.rb | 2 +- lib/fog/{dns/models/bluebox => bluebox/models/dns}/zones.rb | 2 +- .../parsers/bluebox => bluebox/parsers/dns}/create_record.rb | 0 .../parsers/bluebox => bluebox/parsers/dns}/create_zone.rb | 0 .../parsers/bluebox => bluebox/parsers/dns}/get_record.rb | 0 .../parsers/bluebox => bluebox/parsers/dns}/get_records.rb | 0 .../{dns/parsers/bluebox => bluebox/parsers/dns}/get_zone.rb | 0 .../{dns/parsers/bluebox => bluebox/parsers/dns}/get_zones.rb | 0 .../bluebox => bluebox/requests/dns}/create_record.rb | 2 +- .../requests/bluebox => bluebox/requests/dns}/create_zone.rb | 2 +- .../bluebox => bluebox/requests/dns}/delete_record.rb | 0 .../requests/bluebox => bluebox/requests/dns}/delete_zone.rb | 0 .../requests/bluebox => bluebox/requests/dns}/get_record.rb | 2 +- .../requests/bluebox => bluebox/requests/dns}/get_records.rb | 2 +- .../requests/bluebox => bluebox/requests/dns}/get_zone.rb | 2 +- .../requests/bluebox => bluebox/requests/dns}/get_zones.rb | 2 +- .../bluebox => bluebox/requests/dns}/update_record.rb | 0 .../requests/bluebox => bluebox/requests/dns}/update_zone.rb | 0 22 files changed, 12 insertions(+), 12 deletions(-) rename lib/fog/{dns/bluebox.rb => bluebox/dns.rb} (96%) rename lib/fog/{dns/models/bluebox => bluebox/models/dns}/record.rb (100%) rename lib/fog/{dns/models/bluebox => bluebox/models/dns}/records.rb (94%) rename lib/fog/{dns/models/bluebox => bluebox/models/dns}/zone.rb (97%) rename lib/fog/{dns/models/bluebox => bluebox/models/dns}/zones.rb (92%) rename lib/fog/{dns/parsers/bluebox => bluebox/parsers/dns}/create_record.rb (100%) rename lib/fog/{dns/parsers/bluebox => bluebox/parsers/dns}/create_zone.rb (100%) rename lib/fog/{dns/parsers/bluebox => bluebox/parsers/dns}/get_record.rb (100%) rename lib/fog/{dns/parsers/bluebox => bluebox/parsers/dns}/get_records.rb (100%) rename lib/fog/{dns/parsers/bluebox => bluebox/parsers/dns}/get_zone.rb (100%) rename lib/fog/{dns/parsers/bluebox => bluebox/parsers/dns}/get_zones.rb (100%) rename lib/fog/{dns/requests/bluebox => bluebox/requests/dns}/create_record.rb (96%) rename lib/fog/{dns/requests/bluebox => bluebox/requests/dns}/create_zone.rb (97%) rename lib/fog/{dns/requests/bluebox => bluebox/requests/dns}/delete_record.rb (100%) rename lib/fog/{dns/requests/bluebox => bluebox/requests/dns}/delete_zone.rb (100%) rename lib/fog/{dns/requests/bluebox => bluebox/requests/dns}/get_record.rb (95%) rename lib/fog/{dns/requests/bluebox => bluebox/requests/dns}/get_records.rb (95%) rename lib/fog/{dns/requests/bluebox => bluebox/requests/dns}/get_zone.rb (95%) rename lib/fog/{dns/requests/bluebox => bluebox/requests/dns}/get_zones.rb (96%) rename lib/fog/{dns/requests/bluebox => bluebox/requests/dns}/update_record.rb (100%) rename lib/fog/{dns/requests/bluebox => bluebox/requests/dns}/update_zone.rb (100%) diff --git a/lib/fog/bluebox.rb b/lib/fog/bluebox.rb index 41b907966..7d80cf032 100644 --- a/lib/fog/bluebox.rb +++ b/lib/fog/bluebox.rb @@ -6,7 +6,7 @@ module Fog extend Fog::Provider service(:compute, 'compute/bluebox') - service(:dns, 'dns/bluebox') + service(:dns, 'bluebox/dns') end end diff --git a/lib/fog/dns/bluebox.rb b/lib/fog/bluebox/dns.rb similarity index 96% rename from lib/fog/dns/bluebox.rb rename to lib/fog/bluebox/dns.rb index dedb9426e..8d8eed37c 100644 --- a/lib/fog/dns/bluebox.rb +++ b/lib/fog/bluebox/dns.rb @@ -5,13 +5,13 @@ module Fog requires :bluebox_api_key, :bluebox_customer_id recognizes :bluebox_host, :bluebox_port, :bluebox_scheme, :persistent - model_path 'fog/dns/models/bluebox' + model_path 'fog/bluebox/models/dns' model :record collection :records model :zone collection :zones - request_path 'fog/dns/requests/bluebox' + request_path 'fog/bluebox/requests/dns' request :create_record request :update_record request :delete_record diff --git a/lib/fog/dns/models/bluebox/record.rb b/lib/fog/bluebox/models/dns/record.rb similarity index 100% rename from lib/fog/dns/models/bluebox/record.rb rename to lib/fog/bluebox/models/dns/record.rb diff --git a/lib/fog/dns/models/bluebox/records.rb b/lib/fog/bluebox/models/dns/records.rb similarity index 94% rename from lib/fog/dns/models/bluebox/records.rb rename to lib/fog/bluebox/models/dns/records.rb index 135a08d9c..eb7fd2493 100644 --- a/lib/fog/dns/models/bluebox/records.rb +++ b/lib/fog/bluebox/models/dns/records.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/dns/models/bluebox/record' +require 'fog/bluebox/models/dns/record' module Fog module DNS diff --git a/lib/fog/dns/models/bluebox/zone.rb b/lib/fog/bluebox/models/dns/zone.rb similarity index 97% rename from lib/fog/dns/models/bluebox/zone.rb rename to lib/fog/bluebox/models/dns/zone.rb index 25030d037..f081e8c44 100644 --- a/lib/fog/dns/models/bluebox/zone.rb +++ b/lib/fog/bluebox/models/dns/zone.rb @@ -1,5 +1,5 @@ require 'fog/core/model' -require 'fog/dns/models/bluebox/records' +require 'fog/bluebox/models/dns/records' module Fog module DNS diff --git a/lib/fog/dns/models/bluebox/zones.rb b/lib/fog/bluebox/models/dns/zones.rb similarity index 92% rename from lib/fog/dns/models/bluebox/zones.rb rename to lib/fog/bluebox/models/dns/zones.rb index cdcf341ef..dfb2f7fcd 100644 --- a/lib/fog/dns/models/bluebox/zones.rb +++ b/lib/fog/bluebox/models/dns/zones.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/dns/models/bluebox/zone' +require 'fog/bluebox/models/dns/zone' module Fog module DNS diff --git a/lib/fog/dns/parsers/bluebox/create_record.rb b/lib/fog/bluebox/parsers/dns/create_record.rb similarity index 100% rename from lib/fog/dns/parsers/bluebox/create_record.rb rename to lib/fog/bluebox/parsers/dns/create_record.rb diff --git a/lib/fog/dns/parsers/bluebox/create_zone.rb b/lib/fog/bluebox/parsers/dns/create_zone.rb similarity index 100% rename from lib/fog/dns/parsers/bluebox/create_zone.rb rename to lib/fog/bluebox/parsers/dns/create_zone.rb diff --git a/lib/fog/dns/parsers/bluebox/get_record.rb b/lib/fog/bluebox/parsers/dns/get_record.rb similarity index 100% rename from lib/fog/dns/parsers/bluebox/get_record.rb rename to lib/fog/bluebox/parsers/dns/get_record.rb diff --git a/lib/fog/dns/parsers/bluebox/get_records.rb b/lib/fog/bluebox/parsers/dns/get_records.rb similarity index 100% rename from lib/fog/dns/parsers/bluebox/get_records.rb rename to lib/fog/bluebox/parsers/dns/get_records.rb diff --git a/lib/fog/dns/parsers/bluebox/get_zone.rb b/lib/fog/bluebox/parsers/dns/get_zone.rb similarity index 100% rename from lib/fog/dns/parsers/bluebox/get_zone.rb rename to lib/fog/bluebox/parsers/dns/get_zone.rb diff --git a/lib/fog/dns/parsers/bluebox/get_zones.rb b/lib/fog/bluebox/parsers/dns/get_zones.rb similarity index 100% rename from lib/fog/dns/parsers/bluebox/get_zones.rb rename to lib/fog/bluebox/parsers/dns/get_zones.rb diff --git a/lib/fog/dns/requests/bluebox/create_record.rb b/lib/fog/bluebox/requests/dns/create_record.rb similarity index 96% rename from lib/fog/dns/requests/bluebox/create_record.rb rename to lib/fog/bluebox/requests/dns/create_record.rb index 3b699e4f3..05dc16c42 100644 --- a/lib/fog/dns/requests/bluebox/create_record.rb +++ b/lib/fog/bluebox/requests/dns/create_record.rb @@ -3,7 +3,7 @@ module Fog class Bluebox class Real - require 'fog/dns/parsers/bluebox/create_record' + require 'fog/bluebox/parsers/dns/create_record' # Create a new record in a DNS zone # ==== Parameters diff --git a/lib/fog/dns/requests/bluebox/create_zone.rb b/lib/fog/bluebox/requests/dns/create_zone.rb similarity index 97% rename from lib/fog/dns/requests/bluebox/create_zone.rb rename to lib/fog/bluebox/requests/dns/create_zone.rb index 9014353e6..8f5a6feef 100644 --- a/lib/fog/dns/requests/bluebox/create_zone.rb +++ b/lib/fog/bluebox/requests/dns/create_zone.rb @@ -3,7 +3,7 @@ module Fog class Bluebox class Real - require 'fog/dns/parsers/bluebox/create_zone' + require 'fog/bluebox/parsers/dns/create_zone' # Create a new DNS zone # ==== Parameters diff --git a/lib/fog/dns/requests/bluebox/delete_record.rb b/lib/fog/bluebox/requests/dns/delete_record.rb similarity index 100% rename from lib/fog/dns/requests/bluebox/delete_record.rb rename to lib/fog/bluebox/requests/dns/delete_record.rb diff --git a/lib/fog/dns/requests/bluebox/delete_zone.rb b/lib/fog/bluebox/requests/dns/delete_zone.rb similarity index 100% rename from lib/fog/dns/requests/bluebox/delete_zone.rb rename to lib/fog/bluebox/requests/dns/delete_zone.rb diff --git a/lib/fog/dns/requests/bluebox/get_record.rb b/lib/fog/bluebox/requests/dns/get_record.rb similarity index 95% rename from lib/fog/dns/requests/bluebox/get_record.rb rename to lib/fog/bluebox/requests/dns/get_record.rb index 2e15000de..82609b057 100644 --- a/lib/fog/dns/requests/bluebox/get_record.rb +++ b/lib/fog/bluebox/requests/dns/get_record.rb @@ -3,7 +3,7 @@ module Fog class Bluebox class Real - require 'fog/dns/parsers/bluebox/get_record' + require 'fog/bluebox/parsers/dns/get_record' # Get an individual DNS record from the specified zone # diff --git a/lib/fog/dns/requests/bluebox/get_records.rb b/lib/fog/bluebox/requests/dns/get_records.rb similarity index 95% rename from lib/fog/dns/requests/bluebox/get_records.rb rename to lib/fog/bluebox/requests/dns/get_records.rb index e709d8311..82d29effd 100644 --- a/lib/fog/dns/requests/bluebox/get_records.rb +++ b/lib/fog/bluebox/requests/dns/get_records.rb @@ -3,7 +3,7 @@ module Fog class Bluebox class Real - require 'fog/dns/parsers/bluebox/get_records' + require 'fog/bluebox/parsers/dns/get_records' # Get all the DNS records across all the DNS zones for this account # diff --git a/lib/fog/dns/requests/bluebox/get_zone.rb b/lib/fog/bluebox/requests/dns/get_zone.rb similarity index 95% rename from lib/fog/dns/requests/bluebox/get_zone.rb rename to lib/fog/bluebox/requests/dns/get_zone.rb index 8438492ea..815319a61 100644 --- a/lib/fog/dns/requests/bluebox/get_zone.rb +++ b/lib/fog/bluebox/requests/dns/get_zone.rb @@ -3,7 +3,7 @@ module Fog class Bluebox class Real - require 'fog/dns/parsers/bluebox/get_zone' + require 'fog/bluebox/parsers/dns/get_zone' # Get details of a DNS zone # diff --git a/lib/fog/dns/requests/bluebox/get_zones.rb b/lib/fog/bluebox/requests/dns/get_zones.rb similarity index 96% rename from lib/fog/dns/requests/bluebox/get_zones.rb rename to lib/fog/bluebox/requests/dns/get_zones.rb index eb1e463f1..0035ee23e 100644 --- a/lib/fog/dns/requests/bluebox/get_zones.rb +++ b/lib/fog/bluebox/requests/dns/get_zones.rb @@ -3,7 +3,7 @@ module Fog class Bluebox class Real - require 'fog/dns/parsers/bluebox/get_zones' + require 'fog/bluebox/parsers/dns/get_zones' # Get list of all DNS zones hosted on Bluebox (for this account) # diff --git a/lib/fog/dns/requests/bluebox/update_record.rb b/lib/fog/bluebox/requests/dns/update_record.rb similarity index 100% rename from lib/fog/dns/requests/bluebox/update_record.rb rename to lib/fog/bluebox/requests/dns/update_record.rb diff --git a/lib/fog/dns/requests/bluebox/update_zone.rb b/lib/fog/bluebox/requests/dns/update_zone.rb similarity index 100% rename from lib/fog/dns/requests/bluebox/update_zone.rb rename to lib/fog/bluebox/requests/dns/update_zone.rb