[compute] consolidate

lib/fog.rb

@@ -22,4 +22,6 @@ require 'fog/terremark'
 require 'fog/vcloud'
 require 'fog/zerigo'
 
-require 'fog/storage'
+require 'fog/compute'
+require 'fog/dns'
+require 'fog/storage'

lib/fog/aws.rb

@@ -9,7 +9,7 @@ module Fog
     extend Fog::Provider
 
     service(:cdn,       'aws/cdn')
-    service(:compute,   'aws/compute')
+    service(:compute,   'compute/aws')
     service(:dns,       'dns/aws')
     service(:ec2,       'aws/ec2')
     service(:elb,       'aws/elb')

lib/fog/bluebox.rb

@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:compute, 'bluebox/compute')
+    service(:compute, 'compute/bluebox')
 
     def self.new(attributes = {})
       location = caller.first

lib/fog/brightbox.rb

@@ -4,6 +4,6 @@ module Fog
   module Brightbox
     extend Fog::Provider
 
-    service(:compute, 'brightbox/compute')
+    service(:compute, 'compute/brightbox')
   end
-end
+end

lib/fog/compute.rb

@@ -1,3 +1,12 @@
+require 'fog/aws'
+require 'fog/bluebox'
+require 'fog/brightbox'
+require 'fog/go_grid'
+require 'fog/linode'
+require 'fog/new_servers'
+require 'fog/rackspace'
+require 'fog/slicehost'
+
 module Fog
   class Compute
 
@@ -34,4 +43,4 @@ module Fog
     end
 
   end
-end
+end

lib/fog/compute/aws.rb

@@ -5,7 +5,7 @@ module Fog
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
 
-      model_path 'fog/aws/models/compute'
+      model_path 'fog/compute/models/aws'
       model       :address
       collection  :addresses
       model       :flavor
@@ -25,9 +25,9 @@ module Fog
       model       :volume
       collection  :volumes
 
-      require 'fog/aws/parsers/compute/basic'
+      require 'fog/compute/parsers/aws/basic'
 
-      request_path 'fog/aws/requests/compute'
+      request_path 'fog/compute/requests/aws'
       request :allocate_address
       request :associate_address
       request :attach_volume

lib/fog/compute/bluebox.rb

@@ -5,7 +5,7 @@ module Fog
       requires :bluebox_api_key, :bluebox_customer_id
       recognizes :bluebox_host, :bluebox_port, :bluebox_scheme, :persistent
 
-      model_path 'fog/bluebox/models/compute'
+      model_path 'fog/compute/models/bluebox'
       model       :flavor
       collection  :flavors
       model       :image
@@ -13,7 +13,7 @@ module Fog
       model       :server
       collection  :servers
 
-      request_path 'fog/bluebox/requests/compute'
+      request_path 'fog/compute/requests/bluebox'
       request :create_block
       request :destroy_block
       request :get_block

lib/fog/compute/brightbox.rb

@@ -7,24 +7,24 @@ module Fog
       requires :brightbox_client_id, :brightbox_secret
       recognizes :brightbox_auth_url, :brightbox_api_url
 
-      model_path 'fog/brightbox/models/compute'
-      model :account # Singular resource, no collection
-      collection :servers
-      model :server
-      collection :flavors
-      model :flavor
-      collection :images
-      model :image
-      collection :load_balancers
-      model :load_balancer
-      collection :zones
-      model :zone
-      collection :cloud_ips
-      model :cloud_ip
-      collection :users
-      model :user
+      model_path 'fog/compute/models/brightbox'
+      model       :account # Singular resource, no collection
+      collection  :servers
+      model       :server
+      collection  :flavors
+      model       :flavor
+      collection  :images
+      model       :image
+      collection  :load_balancers
+      model       :load_balancer
+      collection  :zones
+      model       :zone
+      collection  :cloud_ips
+      model       :cloud_ip
+      collection  :users
+      model       :user
 
-      request_path 'fog/brightbox/requests/compute'
+      request_path 'fog/compute/requests/brightbox'
       request :add_nodes_load_balancer
       request :create_api_client
       request :create_cloud_ip
@@ -141,4 +141,4 @@ module Fog
       end
     end
   end
-end
+end

lib/fog/compute/go_grid.rb

@@ -5,13 +5,13 @@ module Fog
       requires :go_grid_api_key, :go_grid_shared_secret
       recognizes :host, :path, :port, :scheme, :persistent
 
-      model_path 'fog/go_grid/models/compute'
+      model_path 'fog/compute/models/go_grid'
       model         :image
       collection    :images
       model         :server
       collection    :servers
 
-      request_path 'fog/go_grid/requests/compute'
+      request_path 'fog/compute/requests/go_grid'
       request :common_lookup_list
       request :grid_image_get
       request :grid_image_list

lib/fog/compute/linode.rb

@@ -5,9 +5,9 @@ module Fog
       requires :linode_api_key
       recognizes :port, :scheme, :persistent
 
-      model_path 'fog/linode/models/compute'
+      model_path 'fog/compute/models/linode'
 
-      request_path 'fog/linode/requests/compute'
+      request_path 'fog/compute/requests/linode'
       request :avail_datacenters
       request :avail_distributions
       request :avail_kernels

lib/fog/compute/new_servers.rb

@@ -7,9 +7,9 @@ module Fog
       requires :new_servers_password, :new_servers_username
       recognizes :host, :port, :scheme, :persistent
 
-      model_path 'fog/new_servers/models/compute'
+      model_path 'fog/compute/models/new_servers'
 
-      request_path 'fog/new_servers/requests/compute'
+      request_path 'fog/compute/requests/new_servers'
       request :add_server
       request :cancel_server
       request :get_server