[core] cleanup providers/services setup

bin/fog

@@ -10,7 +10,7 @@ end
 
 require 'fog/bin'
 
-providers = Fog.providers.map{|provider| provider.to_s}
+providers = Fog.providers.map{|provider| provider.to_s.split('::').last}
 providers = if providers.length > 1
   providers[0...-1].join(', ') << ' and ' << providers[-1]
 else

lib/fog/bin.rb

@@ -3,24 +3,6 @@ require 'fog/core/credentials'
 module Fog
   class << self
 
-    def providers
-      [
-        ::AWS,
-        ::Bluebox,
-        ::Brightbox,
-        ::GoGrid,
-        ::Google,
-        ::Linode,
-        ::Local,
-        ::NewServers,
-        ::Rackspace,
-        ::Slicehost,
-        ::Terremark,
-        ::TerremarkEcloud,
-        ::Zerigo
-      ].select {|provider| provider.available?}
-    end
-
     def modules
       [
         ::Vcloud

lib/fog/bin/aws.rb

@@ -61,14 +61,14 @@ class AWS < Fog::Bin
         when :storage
           Fog::Storage.new(:provider => 'AWS')
         else
-          raise ArgumentError, "Unrecognized service: #{service}"
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end
       end
       @@connections[service]
     end
 
     def services
-      [:cdn, :compute, :dns, :elb, :iam, :sdb, :ses, :storage]
+      Fog::AWS.services
     end
 
   end

lib/fog/bin/bluebox.rb

@@ -29,7 +29,7 @@ class Bluebox < Fog::Bin
     end
 
     def services
-      [:compute]
+      Fog::Bluebox.services
     end
 
   end

lib/fog/bin/brightbox.rb

@@ -16,19 +16,19 @@ class Brightbox < Fog::Bin
         when :compute
           Fog::Compute.new(:provider => 'Brightbox')
         else
-          raise ArgumentError, "Unrecognized service: #{service}"
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end
       end
       @@connections[service]
     end
 
-    def services
-      [:compute]
-    end
-
     def account
       @@connections[:compute].account
     end
 
+    def services
+      Fog::Brightbox.services
+    end
+
   end
 end

lib/fog/bin/go_grid.rb

@@ -22,14 +22,14 @@ class GoGrid < Fog::Bin
           Formatador.display_line(warning)
           Fog::Compute.new(:provider => 'GoGrid')
         else
-          raise ArgumentError, "Unrecognized service: #{service}"
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end
       end
       @@connections[service]
     end
 
     def services
-      [:compute]
+      Fog::GoGrid.services
     end
 
   end

lib/fog/bin/google.rb

@@ -16,14 +16,14 @@ class Google < Fog::Bin
         when :storage
           Fog::Storage.new(:provider => 'Google')
         else
-          raise ArgumentError, "Unrecognized service: #{service}"
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end
       end
       @@connections[service]
     end
 
     def services
-      [:storage]
+      Fog::Google.services
     end
 
   end

lib/fog/bin/linode.rb

@@ -26,14 +26,14 @@ class Linode < Fog::Bin
           Formatador.display_line(warning)
           Fog::Compute.new(:provider => 'Linode')
         else
-          raise ArgumentError, "Unrecognized service: #{service}"
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end
       end
       @@connections[service]
     end
 
     def services
-      [:compute, :dns]
+      Fog::Linode.services
     end
 
   end

lib/fog/bin/local.rb

@@ -22,14 +22,14 @@ class Local < Fog::Bin
         when :storage
           Fog::Storage.new(:provider => 'Local')
         else
-          raise ArgumentError, "Unrecognized service: #{service}"
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end
       end
       @@connections[service]
     end
 
     def services
-      [:storage]
+      Fog::Local.services
     end
 
   end

lib/fog/bin/new_servers.rb

@@ -22,14 +22,14 @@ class NewServers < Fog::Bin
           Formatador.display_line(warning)
           Fog::Compute.new(:provider => 'NewServers')
         else
-          raise ArgumentError, "Unrecognized service: #{service}"
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end
       end
       @@connections[service]
     end
 
     def services
-      [:compute]
+      Fog::NewServers.services
     end
 
   end

lib/fog/bin/rackspace.rb

@@ -38,14 +38,14 @@ class Rackspace < Fog::Bin
         when :storage
           Fog::Storage.new(:provider => 'Rackspace')
         else
-          raise ArgumentError, "Unrecognized service: #{service}"
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end
       end
       @@connections[service]
     end
 
     def services
-      [:cdn, :compute, :storage]
+      Fog::Rackspace.services
     end
 
   end

lib/fog/bin/slicehost.rb

@@ -26,14 +26,14 @@ class Slicehost < Fog::Bin
         when :dns
           Fog::DNS.new(:provider => 'Slicehost')
         else
-          raise ArgumentError, "Unrecognized service: #{service}"
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end
       end
       @@connections[service]
     end
 
     def services
-      [:compute, :dns]
+      Fog::Slicehost.services
     end
 
   end

lib/fog/bin/terremark_ecloud.rb

@@ -21,7 +21,7 @@ class TerremarkEcloud < Fog::Bin
     end
 
     def services
-      [:compute]
+      Fog::TerremarkEcloud.services
     end
 
   end

lib/fog/bin/vcloud.rb

@@ -42,7 +42,7 @@ module Vcloud
             _module_ = eval(credentials.delete(:module))
             hash[key] = _module_.new(credentials)
           else
-            raise ArgumentError.new("Unregistered service: :#{key}. Registered services are: #{Vcloud.registered_services}")
+            raise ArgumentError.new("Unregistered service: #{key.inspect}. Registered services are: #{Vcloud.registered_services}")
           end
         end
         @@connections[service]

lib/fog/bin/zerigo.rb

@@ -16,14 +16,14 @@ class Zerigo < Fog::Bin
         when :dns
           Fog::DNS.new(:provider => 'Zerigo')
         else
-          raise ArgumentError, "Unrecognized service: #{service}"
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end
       end
       @@connections[service]
     end
 
     def services
-      [:dns]
+      Fog::Zerigo.services
     end
 
   end

lib/fog/core/provider.rb

@@ -1,6 +1,10 @@
 module Fog
   module Provider
 
+    def self.extended(base)
+      Fog.providers << base
+    end
+
     def service(new_service, path)
       services << new_service
       require File.join('fog', path)

lib/fog/providers.rb

@@ -1,3 +1,11 @@
+module Fog
+
+  def self.providers
+    @providers ||= []
+  end
+
+end
+
 require 'fog/providers/aws'
 require 'fog/providers/bluebox'
 require 'fog/providers/brightbox'