fog 0.8.2 → 0.9.0

data/lib/fog/bin/rackspace.rb

@@ -4,11 +4,11 @@ class Rackspace < Fog::Bin
     def class_for(key)
       case key
       when :cdn
-        Fog::Rackspace::CDN
+        Fog::CDN::Rackspace
       when :compute
-        Fog::Rackspace::Compute
+        Fog::Compute::Rackspace
       when :storage
-        Fog::Rackspace::Storage
+        Fog::Storage::Rackspace
       else 
         raise ArgumentError, "Unrecognized service: #{key}"
       end
@@ -18,12 +18,15 @@ class Rackspace < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :cdn
+          Formatador.display_line("[yellow][WARN] Rackspace[:cdn] is deprecated, use CDN[:rackspace] instead[/]")
           Fog::CDN.new(:provider => 'Rackspace')
         when :compute
+          Formatador.display_line("[yellow][WARN] Rackspace[:compute] is deprecated, use Compute[:rackspace] instead[/]")
           Fog::Compute.new(:provider => 'Rackspace')
         when :dns
           Fog::DNS.new(:provider => 'Rackspace')
         when :storage
+          Formatador.display_line("[yellow][WARN] Rackspace[:storage] is deprecated, use Storage[:rackspace] instead[/]")
           Fog::Storage.new(:provider => 'Rackspace')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/slicehost.rb

@@ -4,9 +4,9 @@ class Slicehost < Fog::Bin
     def class_for(key)
       case key
       when :compute
-        Fog::Slicehost::Compute
+        Fog::Compute::Slicehost
       when :dns
-        Fog::Slicehost::DNS
+        Fog::DNS::Slicehost
       else 
         raise ArgumentError, "Unrecognized service: #{key}"
       end
@@ -16,8 +16,10 @@ class Slicehost < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
+          Formatador.display_line("[yellow][WARN] Slicehost[:compute] is deprecated, use Compute[:slicehost] instead[/]")
           Fog::Compute.new(:provider => 'Slicehost')
         when :dns
+          Formatador.display_line("[yellow][WARN] Slicehost[:dns] is deprecated, use Storage[:slicehost] instead[/]")
           Fog::DNS.new(:provider => 'Slicehost')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/stormondemand.rb

@@ -4,7 +4,7 @@ class StormOnDemand < Fog::Bin
     def class_for(key)
       case key
       when :compute
-        Fog::StormOnDemand::Compute
+        Fog::Compute::StormOnDemand
       else 
         raise ArgumentError, "Unsupported #{self} service: #{key}"
       end
@@ -14,6 +14,7 @@ class StormOnDemand < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
+          Formatador.display_line("[yellow][WARN] StormOnDemand[:compute] is deprecated, use Compute[:stormondemand] instead[/]")
           Fog::Compute.new(:provider => 'StormOnDemand')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/virtual_box.rb

@@ -4,7 +4,7 @@ module VirtualBox # deviates from other bin stuff to accomodate gem
     def class_for(key)
       case key
       when :compute
-        Fog::VirtualBox::Compute
+        Fog::Compute::VirtualBox
       else
         raise ArgumentError, "Unrecognized service: #{key}"
       end
@@ -14,6 +14,7 @@ module VirtualBox # deviates from other bin stuff to accomodate gem
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
+          Formatador.display_line("[yellow][WARN] VirtualBox[:compute] is deprecated, use Compute[:virtualbox] instead[/]")
           Fog::Compute.new(:provider => 'VirtualBox')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/voxel.rb

@@ -4,7 +4,7 @@ class Voxel < Fog::Bin
     def class_for(key)
       case key
       when :compute
-        Fog::Voxel::Compute
+        Fog::Compute::Voxel
       else
         raise ArgumentError, "Unrecognized service: #{key}"
       end
@@ -14,6 +14,7 @@ class Voxel < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
+          Formatador.display_line("[yellow][WARN] Voxel[:compute] is deprecated, use Compute[:voxel] instead[/]")
           Fog::Compute.new(:provider => 'Voxel')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/zerigo.rb

@@ -4,7 +4,7 @@ class Zerigo < Fog::Bin
     def class_for(key)
       case key
       when :dns
-        Fog::Zerigo::DNS
+        Fog::DNS::Zerigo
       else 
         raise ArgumentError, "Unrecognized service: #{key}"
       end
@@ -14,6 +14,7 @@ class Zerigo < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :dns
+          Formatador.display_line("[yellow][WARN] Zerigo[:dns] is deprecated, use Storage[:zerigo] instead[/]")
           Fog::DNS.new(:provider => 'Zerigo')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/cdn.rb

@@ -1,15 +1,19 @@
 module Fog
-  class CDN
+  module CDN
+
+    def self.[](provider)
+      self.new(:provider => provider)
+    end
 
     def self.new(attributes)
       attributes = attributes.dup # prevent delete from having side effects
-      case provider = attributes[:provider] # attributes.delete(:provider)
-      when 'AWS'
+      case provider = attributes.delete(:provider).to_s.downcase.to_sym
+      when :aws
         require 'fog/cdn/aws'
-        Fog::AWS::CDN.new(attributes)
-      when 'Rackspace'
+        Fog::CDN::AWS.new(attributes)
+      when :rackspace
         require 'fog/cdn/rackspace'
-        Fog::Rackspace::CDN.new(attributes)
+        Fog::CDN::Rackspace.new(attributes)
       else
         raise ArgumentError.new("#{provider} is not a recognized cdn provider")
       end

data/lib/fog/cdn/aws.rb

@@ -1,10 +1,9 @@
 module Fog
-  module AWS
-    class CDN < Fog::Service
+  module CDN
+    class AWS < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :host, :path, :port, :scheme, :version, :persistent
-      recognizes :provider # remove post deprecation
 
       model_path 'fog/cdn/models/aws'
 
@@ -33,13 +32,6 @@ module Fog
         end
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::AWS::CDN.new is deprecated, use Fog::CDN.new(:provider => 'AWS') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           require 'mime/types'
           @aws_access_key_id  = options[:aws_access_key_id]
           @region             = options[:region]
@@ -79,13 +71,6 @@ module Fog
         # ==== Returns
         # * cdn object with connection to aws.
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::AWS::CDN.new is deprecated, use Fog::CDN.new(:provider => 'AWS') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           require 'fog/core/parser'
 
           @aws_access_key_id = options[:aws_access_key_id]

data/lib/fog/cdn/parsers/aws/distribution.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module CDN
+    module CDN
+      module AWS
 
         class Distribution < Fog::Parsers::Base
 

data/lib/fog/cdn/parsers/aws/get_distribution_list.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module CDN
+    module CDN
+      module AWS
 
         class GetDistributionList < Fog::Parsers::Base
 

data/lib/fog/cdn/parsers/aws/post_invalidation.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module AWS
-      module CDN
+    module CDN
+      module AWS
 
         class PostInvalidation < Fog::Parsers::Base
 

data/lib/fog/cdn/rackspace.rb

@@ -1,10 +1,9 @@
 module Fog
-  module Rackspace
-    class CDN < Fog::Service
+  module CDN
+    class Rackspace < Fog::Service
 
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url, :persistent
-      recognizes :provider # remove post deprecation
 
       model_path 'fog/cdn/models/rackspace'
 
@@ -27,13 +26,6 @@ module Fog
         end
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::Rackspace::CDN.new is deprecated, use Fog::CDN.new(:provider => 'Rackspace') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           @rackspace_username = options[:rackspace_username]
         end
 
@@ -50,13 +42,6 @@ module Fog
       class Real
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::Rackspace::CDN.new is deprecated, use Fog::CDN.new(:provider => 'Rackspace') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           require 'json'
           credentials = Fog::Rackspace.authenticate(options)
           @auth_token = credentials['X-Auth-Token']

data/lib/fog/cdn/requests/aws/delete_distribution.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class CDN
+  module CDN
+    class AWS
       class Real
 
         # Delete a distribution from CloudFront

data/lib/fog/cdn/requests/aws/get_distribution.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class CDN
+  module CDN
+    class AWS
       class Real
 
         require 'fog/cdn/parsers/aws/distribution'
@@ -46,7 +46,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::AWS::CDN::Distribution.new,
+            :parser     => Fog::Parsers::CDN::AWS::Distribution.new,
             :path       => "/distribution/#{distribution_id}"
           })
         end

data/lib/fog/cdn/requests/aws/get_distribution_list.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class CDN
+  module CDN
+    class AWS
       class Real
 
         require 'fog/cdn/parsers/aws/get_distribution_list'
@@ -47,7 +47,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::AWS::CDN::GetDistributionList.new,
+            :parser   => Fog::Parsers::CDN::AWS::GetDistributionList.new,
             :path       => "/distribution",
             :query      => options
           })

data/lib/fog/cdn/requests/aws/post_distribution.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class CDN
+  module CDN
+    class AWS
       class Real
 
         require 'fog/cdn/parsers/aws/distribution'
@@ -80,7 +80,7 @@ module Fog
             :headers    => { 'Content-Type' => 'text/xml' },
             :idempotent => true,
             :method     => 'POST',
-            :parser     => Fog::Parsers::AWS::CDN::Distribution.new,
+            :parser     => Fog::Parsers::CDN::AWS::Distribution.new,
             :path       => "/distribution"
           })
         end

data/lib/fog/cdn/requests/aws/post_invalidation.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class CDN
+  module CDN
+    class AWS
       class Real
 
         require 'fog/cdn/parsers/aws/post_invalidation'
@@ -40,7 +40,7 @@ module Fog
             :headers    => {'Content-Type' => 'text/xml'},
             :idempotent => true,
             :method     => 'POST',
-            :parser     => Fog::Parsers::AWS::CDN::PostInvalidation.new,
+            :parser     => Fog::Parsers::CDN::AWS::PostInvalidation.new,
             :path       => "/distribution/#{distribution_id}/invalidation"
           })
         end

data/lib/fog/cdn/requests/aws/put_distribution_config.rb

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class CDN
+  module CDN
+    class AWS
       class Real
 
         require 'fog/cdn/parsers/aws/distribution'
@@ -83,7 +83,7 @@ module Fog
             },
             :idempotent => true,
             :method     => 'PUT',
-            :parser     => Fog::Parsers::AWS::CDN::Distribution.new,
+            :parser     => Fog::Parsers::CDN::AWS::Distribution.new,
             :path       => "/distribution/#{distribution_id}/config"
           })
         end

data/lib/fog/cdn/requests/rackspace/get_containers.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Rackspace
-    class CDN
+  module CDN
+    class Rackspace
       class Real
 
         # List existing cdn-enabled storage containers

data/lib/fog/cdn/requests/rackspace/head_container.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Rackspace
-    class CDN
+  module CDN
+    class Rackspace
       class Real
 
         # List cdn properties for a container

data/lib/fog/cdn/requests/rackspace/post_container.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Rackspace
-    class CDN
+  module CDN
+    class Rackspace
       class Real
 
         # modify CDN properties for a container

data/lib/fog/cdn/requests/rackspace/put_container.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Rackspace
-    class CDN
+  module CDN
+    class Rackspace
       class Real
 
         # enable CDN for a container

data/lib/fog/compute.rb

@@ -1,49 +1,67 @@
 module Fog
-  class Compute
+  module Compute
+
+    def self.[](provider)
+      self.new(:provider => provider)
+    end
 
     def self.new(attributes)
       attributes = attributes.dup # prevent delete from having side effects
-      case provider = attributes[:provider] # attributes.delete(:provider)
-      when 'AWS'
+      case provider = attributes.delete(:provider).to_s.downcase.to_sym
+      when :aws
         require 'fog/compute/aws'
-        Fog::AWS::Compute.new(attributes)
-      when 'Bluebox'
+        Fog::Compute::AWS.new(attributes)
+      when :bluebox
         require 'fog/compute/bluebox'
-        Fog::Bluebox::Compute.new(attributes)
-      when 'Brightbox'
+        Fog::Compute::Bluebox.new(attributes)
+      when :brightbox
         require 'fog/compute/brightbox'
-        Fog::Brightbox::Compute.new(attributes)
-      when 'Ecloud'
+        Fog::Compute::Brightbox.new(attributes)
+      when :ecloud
         require 'fog/compute/ecloud'
-        Fog::Ecloud::Compute.new(attributes)
-      when 'GoGrid'
+        Fog::Compute::Ecloud.new(attributes)
+      when :gogrid
         require 'fog/compute/go_grid'
-        Fog::GoGrid::Compute.new(attributes)
-      when 'Linode'
+        Fog::Compute::GoGrid.new(attributes)
+      when :linode
         require 'fog/compute/linode'
-        Fog::Linode::Compute.new(attributes)
-      when 'NewServers'
+        Fog::Compute::Linode.new(attributes)
+      when :newservers
         require 'fog/compute/new_servers'
-        Fog::NewServers::Compute.new(attributes)
-      when 'Rackspace'
+        Fog::Compute::NewServers.new(attributes)
+      when :ninefold
+        require 'fog/compute/ninefold'
+        Fog::Compute::Ninefold.new(attributes)
+      when :rackspace
         require 'fog/compute/rackspace'
-        Fog::Rackspace::Compute.new(attributes)
-      when 'Slicehost'
+        Fog::Compute::Rackspace.new(attributes)
+      when :slicehost
         require 'fog/compute/slicehost'
-        Fog::Slicehost::Compute.new(attributes)
-      when 'StormOnDemand'
+        Fog::Compute::Slicehost.new(attributes)
+      when :stormondemand
         require 'fog/compute/storm_on_demand'
-        Fog::StormOnDemand::Compute.new(attributes)
-      when 'VirtualBox'
+        Fog::Compute::StormOnDemand.new(attributes)
+      when :virtualbox
         require 'fog/compute/virtual_box'
-        Fog::VirtualBox::Compute.new(attributes)
-      when 'Voxel'
+        Fog::Compute::VirtualBox.new(attributes)
+      when :voxel
         require 'fog/compute/voxel'
-        Fog::Voxel::Compute.new(attributes)
+        Fog::Compute::Voxel.new(attributes)
       else
         raise ArgumentError.new("#{provider} is not a recognized compute provider")
       end
     end
 
+    def self.servers
+      servers = []
+      for provider in [:aws, :bluebox, :brightbox, :ecloud, :gogrid, :linode, :newservers, :ninefold, :rackspace, :slicehost, :stormondemand, :virtualbox, :voxel]
+        begin
+          servers.concat(self[provider].servers)
+        rescue # ignore any missing credentials/etc
+        end
+      end
+      servers
+    end
+
   end
 end