From 11462e23cc521f713e26e57bc334202bbafdaeb3 Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 24 Aug 2011 20:04:55 -0500 Subject: [PATCH] [compute|voxel] move voxel compute to its own shared area (namespacing should probably be corrected) --- lib/fog/compute.rb | 2 +- lib/fog/voxel.rb | 2 +- lib/fog/{compute/voxel.rb => voxel/compute.rb} | 4 ++-- .../{compute/models/voxel => voxel/models/compute}/image.rb | 0 .../{compute/models/voxel => voxel/models/compute}/images.rb | 2 +- .../{compute/models/voxel => voxel/models/compute}/server.rb | 0 .../{compute/models/voxel => voxel/models/compute}/servers.rb | 2 +- .../{compute/parsers/voxel => voxel/parsers/compute}/basic.rb | 0 .../parsers/voxel => voxel/parsers/compute}/devices_list.rb | 0 .../parsers/voxel => voxel/parsers/compute}/images_list.rb | 0 .../voxel => voxel/parsers/compute}/voxcloud_create.rb | 0 .../voxel => voxel/parsers/compute}/voxcloud_delete.rb | 0 .../voxel => voxel/parsers/compute}/voxcloud_status.rb | 0 .../requests/voxel => voxel/requests/compute}/devices_list.rb | 2 +- .../voxel => voxel/requests/compute}/devices_power.rb | 2 +- .../requests/voxel => voxel/requests/compute}/images_list.rb | 2 +- .../voxel => voxel/requests/compute}/voxcloud_create.rb | 2 +- .../voxel => voxel/requests/compute}/voxcloud_delete.rb | 2 +- .../voxel => voxel/requests/compute}/voxcloud_status.rb | 2 +- 19 files changed, 12 insertions(+), 12 deletions(-) rename lib/fog/{compute/voxel.rb => voxel/compute.rb} (97%) rename lib/fog/{compute/models/voxel => voxel/models/compute}/image.rb (100%) rename lib/fog/{compute/models/voxel => voxel/models/compute}/images.rb (92%) rename lib/fog/{compute/models/voxel => voxel/models/compute}/server.rb (100%) rename lib/fog/{compute/models/voxel => voxel/models/compute}/servers.rb (94%) rename lib/fog/{compute/parsers/voxel => voxel/parsers/compute}/basic.rb (100%) rename lib/fog/{compute/parsers/voxel => voxel/parsers/compute}/devices_list.rb (100%) rename lib/fog/{compute/parsers/voxel => voxel/parsers/compute}/images_list.rb (100%) rename lib/fog/{compute/parsers/voxel => voxel/parsers/compute}/voxcloud_create.rb (100%) rename lib/fog/{compute/parsers/voxel => voxel/parsers/compute}/voxcloud_delete.rb (100%) rename lib/fog/{compute/parsers/voxel => voxel/parsers/compute}/voxcloud_status.rb (100%) rename lib/fog/{compute/requests/voxel => voxel/requests/compute}/devices_list.rb (88%) rename lib/fog/{compute/requests/voxel => voxel/requests/compute}/devices_power.rb (89%) rename lib/fog/{compute/requests/voxel => voxel/requests/compute}/images_list.rb (91%) rename lib/fog/{compute/requests/voxel => voxel/requests/compute}/voxcloud_create.rb (87%) rename lib/fog/{compute/requests/voxel => voxel/requests/compute}/voxcloud_delete.rb (85%) rename lib/fog/{compute/requests/voxel => voxel/requests/compute}/voxcloud_status.rb (88%) diff --git a/lib/fog/compute.rb b/lib/fog/compute.rb index 8235e44fe..271c790cb 100644 --- a/lib/fog/compute.rb +++ b/lib/fog/compute.rb @@ -48,7 +48,7 @@ module Fog require 'fog/compute/virtual_box' Fog::Compute::VirtualBox.new(attributes) when :voxel - require 'fog/compute/voxel' + require 'fog/voxel/compute' Fog::Compute::Voxel.new(attributes) else raise ArgumentError.new("#{provider} is not a recognized compute provider") diff --git a/lib/fog/voxel.rb b/lib/fog/voxel.rb index 9e81448fb..3c2257b42 100644 --- a/lib/fog/voxel.rb +++ b/lib/fog/voxel.rb @@ -6,7 +6,7 @@ module Fog extend Fog::Provider - service(:compute, 'compute/voxel') + service(:compute, 'voxel/compute') def self.create_signature(secret, options) to_sign = options.keys.map { |k| k.to_s }.sort.map { |k| "#{k}#{options[k.to_sym]}" }.join("") diff --git a/lib/fog/compute/voxel.rb b/lib/fog/voxel/compute.rb similarity index 97% rename from lib/fog/compute/voxel.rb rename to lib/fog/voxel/compute.rb index a992a533c..c9747d633 100644 --- a/lib/fog/compute/voxel.rb +++ b/lib/fog/voxel/compute.rb @@ -5,13 +5,13 @@ module Fog requires :voxel_api_key, :voxel_api_secret recognizes :host, :port, :scheme, :persistent - model_path 'fog/compute/models/voxel' + model_path 'fog/voxel/models/compute' model :image collection :images model :server collection :servers - request_path 'fog/compute/requests/voxel' + request_path 'fog/voxel/requests/compute' request :images_list request :devices_list request :devices_power diff --git a/lib/fog/compute/models/voxel/image.rb b/lib/fog/voxel/models/compute/image.rb similarity index 100% rename from lib/fog/compute/models/voxel/image.rb rename to lib/fog/voxel/models/compute/image.rb diff --git a/lib/fog/compute/models/voxel/images.rb b/lib/fog/voxel/models/compute/images.rb similarity index 92% rename from lib/fog/compute/models/voxel/images.rb rename to lib/fog/voxel/models/compute/images.rb index b3a5888e6..222bca33d 100644 --- a/lib/fog/compute/models/voxel/images.rb +++ b/lib/fog/voxel/models/compute/images.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/voxel/image' +require 'fog/voxel/models/compute/image' module Fog module Compute diff --git a/lib/fog/compute/models/voxel/server.rb b/lib/fog/voxel/models/compute/server.rb similarity index 100% rename from lib/fog/compute/models/voxel/server.rb rename to lib/fog/voxel/models/compute/server.rb diff --git a/lib/fog/compute/models/voxel/servers.rb b/lib/fog/voxel/models/compute/servers.rb similarity index 94% rename from lib/fog/compute/models/voxel/servers.rb rename to lib/fog/voxel/models/compute/servers.rb index 45f718c10..7f4e43317 100644 --- a/lib/fog/compute/models/voxel/servers.rb +++ b/lib/fog/voxel/models/compute/servers.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/voxel/server' +require 'fog/voxel/models/compute/server' module Fog module Compute diff --git a/lib/fog/compute/parsers/voxel/basic.rb b/lib/fog/voxel/parsers/compute/basic.rb similarity index 100% rename from lib/fog/compute/parsers/voxel/basic.rb rename to lib/fog/voxel/parsers/compute/basic.rb diff --git a/lib/fog/compute/parsers/voxel/devices_list.rb b/lib/fog/voxel/parsers/compute/devices_list.rb similarity index 100% rename from lib/fog/compute/parsers/voxel/devices_list.rb rename to lib/fog/voxel/parsers/compute/devices_list.rb diff --git a/lib/fog/compute/parsers/voxel/images_list.rb b/lib/fog/voxel/parsers/compute/images_list.rb similarity index 100% rename from lib/fog/compute/parsers/voxel/images_list.rb rename to lib/fog/voxel/parsers/compute/images_list.rb diff --git a/lib/fog/compute/parsers/voxel/voxcloud_create.rb b/lib/fog/voxel/parsers/compute/voxcloud_create.rb similarity index 100% rename from lib/fog/compute/parsers/voxel/voxcloud_create.rb rename to lib/fog/voxel/parsers/compute/voxcloud_create.rb diff --git a/lib/fog/compute/parsers/voxel/voxcloud_delete.rb b/lib/fog/voxel/parsers/compute/voxcloud_delete.rb similarity index 100% rename from lib/fog/compute/parsers/voxel/voxcloud_delete.rb rename to lib/fog/voxel/parsers/compute/voxcloud_delete.rb diff --git a/lib/fog/compute/parsers/voxel/voxcloud_status.rb b/lib/fog/voxel/parsers/compute/voxcloud_status.rb similarity index 100% rename from lib/fog/compute/parsers/voxel/voxcloud_status.rb rename to lib/fog/voxel/parsers/compute/voxcloud_status.rb diff --git a/lib/fog/compute/requests/voxel/devices_list.rb b/lib/fog/voxel/requests/compute/devices_list.rb similarity index 88% rename from lib/fog/compute/requests/voxel/devices_list.rb rename to lib/fog/voxel/requests/compute/devices_list.rb index 6b798d0a2..259d453aa 100644 --- a/lib/fog/compute/requests/voxel/devices_list.rb +++ b/lib/fog/voxel/requests/compute/devices_list.rb @@ -3,7 +3,7 @@ module Fog class Voxel class Real - require 'fog/compute/parsers/voxel/devices_list' + require 'fog/voxel/parsers/compute/devices_list' def devices_list(device_id = nil) options = { diff --git a/lib/fog/compute/requests/voxel/devices_power.rb b/lib/fog/voxel/requests/compute/devices_power.rb similarity index 89% rename from lib/fog/compute/requests/voxel/devices_power.rb rename to lib/fog/voxel/requests/compute/devices_power.rb index 5da68b45e..8ea1aae35 100644 --- a/lib/fog/compute/requests/voxel/devices_power.rb +++ b/lib/fog/voxel/requests/compute/devices_power.rb @@ -3,7 +3,7 @@ module Fog class Voxel class Real - require 'fog/compute/parsers/voxel/basic' + require 'fog/voxel/parsers/compute/basic' def devices_power(device_id, power_action) options = { diff --git a/lib/fog/compute/requests/voxel/images_list.rb b/lib/fog/voxel/requests/compute/images_list.rb similarity index 91% rename from lib/fog/compute/requests/voxel/images_list.rb rename to lib/fog/voxel/requests/compute/images_list.rb index 4d761b1bc..1bd644ffc 100644 --- a/lib/fog/compute/requests/voxel/images_list.rb +++ b/lib/fog/voxel/requests/compute/images_list.rb @@ -3,7 +3,7 @@ module Fog class Voxel class Real - require 'fog/compute/parsers/voxel/images_list' + require 'fog/voxel/parsers/compute/images_list' def images_list(image_id = nil) options = { diff --git a/lib/fog/compute/requests/voxel/voxcloud_create.rb b/lib/fog/voxel/requests/compute/voxcloud_create.rb similarity index 87% rename from lib/fog/compute/requests/voxel/voxcloud_create.rb rename to lib/fog/voxel/requests/compute/voxcloud_create.rb index 6c0f46efa..b1e58d7fa 100644 --- a/lib/fog/compute/requests/voxel/voxcloud_create.rb +++ b/lib/fog/voxel/requests/compute/voxcloud_create.rb @@ -3,7 +3,7 @@ module Fog class Voxel class Real - require 'fog/compute/parsers/voxel/voxcloud_create' + require 'fog/voxel/parsers/compute/voxcloud_create' def voxcloud_create(options) options[:parser] = Fog::Parsers::Compute::Voxel::VoxcloudCreate.new diff --git a/lib/fog/compute/requests/voxel/voxcloud_delete.rb b/lib/fog/voxel/requests/compute/voxcloud_delete.rb similarity index 85% rename from lib/fog/compute/requests/voxel/voxcloud_delete.rb rename to lib/fog/voxel/requests/compute/voxcloud_delete.rb index 91933b6ec..58c94dd87 100644 --- a/lib/fog/compute/requests/voxel/voxcloud_delete.rb +++ b/lib/fog/voxel/requests/compute/voxcloud_delete.rb @@ -3,7 +3,7 @@ module Fog class Voxel class Real - require 'fog/compute/parsers/voxel/voxcloud_delete' + require 'fog/voxel/parsers/compute/voxcloud_delete' def voxcloud_delete(device_id) options = { diff --git a/lib/fog/compute/requests/voxel/voxcloud_status.rb b/lib/fog/voxel/requests/compute/voxcloud_status.rb similarity index 88% rename from lib/fog/compute/requests/voxel/voxcloud_status.rb rename to lib/fog/voxel/requests/compute/voxcloud_status.rb index 2e1a10ecd..ecea33a39 100644 --- a/lib/fog/compute/requests/voxel/voxcloud_status.rb +++ b/lib/fog/voxel/requests/compute/voxcloud_status.rb @@ -3,7 +3,7 @@ module Fog class Voxel class Real - require 'fog/compute/parsers/voxel/voxcloud_status' + require 'fog/voxel/parsers/compute/voxcloud_status' def voxcloud_status(device_id = nil) options = {