convert lib/fog to simply include all providers

this forces each provider to set up its own requires and share
through fog/core.

lib/fog.rb

@@ -1,17 +1,38 @@
-require File.join(File.dirname(__FILE__), 'fog', 'core')
-
-module Fog
-end
-
-# FIXME: these should go away (force usage of Fog::[Compute, CDN, DNS, Storage]  etc)
-require 'fog/providers'
+# any one of these can be required separately.
+# they all depend on fog/core for shared functionality.
+require 'fog/atmos'
+require 'fog/aws'
+require 'fog/bluebox'
+require 'fog/brightbox'
+require 'fog/cloudstack'
+require 'fog/clodo'
+require 'fog/dnsimple'
+require 'fog/dnsmadeeasy'
+require 'fog/dreamhost'
+require 'fog/dynect'
+require 'fog/ecloud'
+require 'fog/glesys'
+require 'fog/go_grid'
+require 'fog/google'
+require 'fog/hp'
+require 'fog/ibm'
+require 'fog/internet_archive'
+require 'fog/joyent'
+require 'fog/libvirt'
+require 'fog/linode'
+require 'fog/local'
+require 'fog/bare_metal_cloud'
+require 'fog/ninefold'
+require 'fog/rackspace'
+require 'fog/riakcs'
+require 'fog/openstack'
+require 'fog/ovirt'
+require 'fog/serverlove'
+require 'fog/storm_on_demand'
 require 'fog/terremark'
-
-require 'fog/compute'
-require 'fog/identity'
-require 'fog/image'
-require 'fog/volume'
-require 'fog/cdn'
-require 'fog/dns'
-require 'fog/network'
-require 'fog/storage'
+require 'fog/vcloud'
+require 'fog/vmfusion'
+require 'fog/vsphere'
+require 'fog/voxel'
+require 'fog/xenserver'
+require 'fog/zerigo'

lib/fog/core.rb

@@ -36,3 +36,13 @@ require 'fog/core/scp'
 require 'fog/core/time'
 require 'fog/core/timeout'
 require 'fog/core/wait_for'
+
+# service wrappers
+require 'fog/compute'
+require 'fog/identity'
+require 'fog/image'
+require 'fog/volume'
+require 'fog/cdn'
+require 'fog/dns'
+require 'fog/network'
+require 'fog/storage'

lib/fog/providers.rb

@@ -1,35 +0,0 @@
-require 'fog/atmos'
-require 'fog/aws'
-require 'fog/bluebox'
-require 'fog/brightbox'
-require 'fog/cloudstack'
-require 'fog/clodo'
-require 'fog/dnsimple'
-require 'fog/dnsmadeeasy'
-require 'fog/dreamhost'
-require 'fog/dynect'
-require 'fog/ecloud'
-require 'fog/glesys'
-require 'fog/go_grid'
-require 'fog/google'
-require 'fog/hp'
-require 'fog/ibm'
-require 'fog/internet_archive'
-require 'fog/joyent'
-require 'fog/libvirt'
-require 'fog/linode'
-require 'fog/local'
-require 'fog/bare_metal_cloud'
-require 'fog/ninefold'
-require 'fog/rackspace'
-require 'fog/riakcs'
-require 'fog/openstack'
-require 'fog/ovirt'
-require 'fog/serverlove'
-require 'fog/storm_on_demand'
-require 'fog/vcloud'
-require 'fog/vmfusion'
-require 'fog/vsphere'
-require 'fog/voxel'
-require 'fog/xenserver'
-require 'fog/zerigo'