fog 0.4.0 → 0.4.1

data/lib/fog/{aws/cdn.rb → cdn/aws.rb}

@@ -4,10 +4,11 @@ module Fog
 
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :host, :path, :port, :scheme, :version, :persistent
+      recognizes :provider # remove post deprecation
 
-      model_path 'fog/aws/models/cdn'
+      model_path 'fog/cdn/models/aws'
 
-      request_path 'fog/aws/requests/cdn'
+      request_path 'fog/cdn/requests/aws'
       request 'delete_distribution'
       request 'get_distribution'
       request 'get_distribution_list'
@@ -34,6 +35,13 @@ 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]
           @data = self.class.data[options[:region]][@aws_access_key_id]
@@ -64,6 +72,13 @@ 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
+
           @aws_access_key_id = options[:aws_access_key_id]
           @aws_secret_access_key = options[:aws_secret_access_key]
           @hmac     = Fog::HMAC.new('sha1', @aws_secret_access_key)

data/lib/fog/{rackspace/cdn.rb → cdn/rackspace.rb}

@@ -4,10 +4,11 @@ module Fog
 
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url, :persistent
+      recognizes :provider # remove post deprecation
 
-      model_path 'fog/rackspace/models/cdn'
+      model_path 'fog/cdn/models/rackspace'
 
-      request_path 'fog/rackspace/requests/cdn'
+      request_path 'fog/cdn/requests/rackspace'
       request :get_containers
       request :head_container
       request :put_container
@@ -27,6 +28,13 @@ 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]
           @data = self.class.data[@rackspace_username]
         end
@@ -36,6 +44,13 @@ 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/{aws/requests/cdn → cdn/requests/aws}/get_distribution.rb

@@ -3,7 +3,7 @@ module Fog
     class CDN
       class Real
 
-        require 'fog/aws/parsers/cdn/distribution'
+        require 'fog/cdn/parsers/aws/distribution'
 
         # Get information about a distribution from CloudFront
         #

data/lib/fog/{aws/requests/cdn → cdn/requests/aws}/get_distribution_list.rb

@@ -3,7 +3,7 @@ module Fog
     class CDN
       class Real
 
-        require 'fog/aws/parsers/cdn/get_distribution_list'
+        require 'fog/cdn/parsers/aws/get_distribution_list'
 
         # List information about distributions in CloudFront
         #

data/lib/fog/{aws/requests/cdn → cdn/requests/aws}/post_distribution.rb

@@ -3,7 +3,7 @@ module Fog
     class CDN
       class Real
 
-        require 'fog/aws/parsers/cdn/distribution'
+        require 'fog/cdn/parsers/aws/distribution'
 
         # create a new distribution in CloudFront
         #
@@ -16,8 +16,8 @@ module Fog
         #   or
         #   * 'CustomOrigin'<~Hash>:
         #     * 'DNSName'<~String> - origin to associate with distribution, ie 'www.example.com'
-        #     * 'HTTPPort'<~Integer> - HTTP port of origin, in [80, 443] or (1024...65535)
-        #     * 'HTTPSPort'<~Integer> - HTTPS port of origin, in [80, 443] or (1024...65535)
+        #     * 'HTTPPort'<~Integer> - Optional HTTP port of origin, in [80, 443] or (1024...65535), defaults to 80
+        #     * 'HTTPSPort'<~Integer> - Optional HTTPS port of origin, in [80, 443] or (1024...65535), defaults to 443
         #     * 'OriginProtocolPolicy'<~String> - Policy on using http vs https, in ['http-only', 'match-viewer']
         #   OPTIONAL:
         #   * 'CallerReference'<~String> - Used to prevent replay, defaults to Time.now.to_i.to_s

data/lib/fog/{aws/requests/cdn → cdn/requests/aws}/post_invalidation.rb

@@ -3,7 +3,7 @@ module Fog
     class CDN
       class Real
 
-        require 'fog/aws/parsers/cdn/post_invalidation'
+        require 'fog/cdn/parsers/aws/post_invalidation'
 
         # List information about distributions in CloudFront
         #

data/lib/fog/{aws/requests/cdn → cdn/requests/aws}/put_distribution_config.rb

@@ -3,7 +3,7 @@ module Fog
     class CDN
       class Real
 
-        require 'fog/aws/parsers/cdn/distribution'
+        require 'fog/cdn/parsers/aws/distribution'
 
         # update a distribution in CloudFront
         #

data/lib/fog/{core/compute.rb → compute.rb}

@@ -3,35 +3,38 @@ module Fog
 
     def self.new(attributes)
       attributes = attributes.dup # prevent delete from having side effects
-      case provider = attributes.delete(:provider)
+      case provider = attributes[:provider] # attributes.delete(:provider)
       when 'AWS'
-        require 'fog/aws'
+        require 'fog/compute/aws'
         Fog::AWS::Compute.new(attributes)
       when 'Bluebox'
-        require 'fog/bluebox'
+        require 'fog/compute/bluebox'
         Fog::Bluebox::Compute.new(attributes)
       when 'Brightbox'
-        require 'fog/brightbox'
+        require 'fog/compute/brightbox'
         Fog::Brightbox::Compute.new(attributes)
       when 'GoGrid'
-        require 'fog/go_grid'
+        require 'fog/compute/go_grid'
         Fog::GoGrid::Compute.new(attributes)
       when 'Linode'
-        require 'fog/linode'
+        require 'fog/compute/linode'
         Fog::Linode::Compute.new(attributes)
       when 'NewServers'
-        require 'fog/new_servers'
+        require 'fog/compute/new_servers'
         Fog::NewServers::Compute.new(attributes)
       when 'Rackspace'
-        require 'fog/rackspace'
+        require 'fog/compute/rackspace'
         Fog::Rackspace::Compute.new(attributes)
       when 'Slicehost'
-        require 'fog/slicehost'
+        require 'fog/compute/slicehost'
         Fog::Slicehost::Compute.new(attributes)
+      when 'TerremarkEcloud'
+        require 'fog/compute/terremark_ecloud'
+        Fog::TerremarkEcloud::Compute.new(attributes)
       else
         raise ArgumentError.new("#{provider} is not a recognized compute provider")
       end
     end
 
   end
-end
+end

data/lib/fog/{aws/compute.rb → compute/aws.rb}

@@ -1,11 +1,28 @@
+module Fog
+  module AWS
+    class EC2
+
+      def self.new(attributes = {})
+        location = caller.first
+        warning = "[yellow][WARN] Fog::AWS::EC2#new is deprecated, use Fog::AWS::Compute#new instead[/]"
+        warning << " [light_black](" << location << ")[/] "
+        Formatador.display_line(warning)
+        Fog::AWS::Compute.new(attributes)
+      end
+
+    end
+  end
+end
+
 module Fog
   module AWS
     class Compute < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
+      recognizes :provider # remove post deprecation
 
-      model_path 'fog/aws/models/compute'
+      model_path 'fog/compute/models/aws'
       model       :address
       collection  :addresses
       model       :flavor
@@ -25,9 +42,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
@@ -129,6 +146,13 @@ module Fog
         end
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::AWS::Compute.new is deprecated, use Fog::Compute.new(:provider => 'AWS') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           @aws_access_key_id = options[:aws_access_key_id]
           @region = options[:region] || 'us-east-1'
           @data = self.class.data[@region][@aws_access_key_id]
@@ -158,6 +182,13 @@ module Fog
         # ==== Returns
         # * EC2 object with connection to aws.
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::AWS::Compute.new is deprecated, use Fog::Compute.new(:provider => 'AWS') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           @aws_access_key_id      = options[:aws_access_key_id]
           @aws_secret_access_key  = options[:aws_secret_access_key]
           @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)

data/lib/fog/{bluebox/compute.rb → compute/bluebox.rb}

@@ -4,8 +4,9 @@ module Fog
 
       requires :bluebox_api_key, :bluebox_customer_id
       recognizes :bluebox_host, :bluebox_port, :bluebox_scheme, :persistent
+      recognizes :provider # remove post deprecation
 
-      model_path 'fog/bluebox/models/compute'
+      model_path 'fog/compute/models/bluebox'
       model       :flavor
       collection  :flavors
       model       :image
@@ -13,7 +14,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
@@ -39,6 +40,13 @@ module Fog
         end
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Bluebox::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Bluebox') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           @bluebox_api_key = options[:bluebox_api_key]
           @data = self.class.data[@bluebox_api_key]
         end
@@ -48,10 +56,17 @@ module Fog
       class Real
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Bluebox::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Bluebox') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           require 'json'
           @bluebox_api_key      = options[:bluebox_api_key]
           @bluebox_customer_id  = options[:bluebox_customer_id]
-          @host   = options[:bluebox_host]    || "boxpanel.blueboxgrp.com"
+          @host   = options[:bluebox_host]    || "boxpanel.bluebox.net"
           @port   = options[:bluebox_port]    || 443
           @scheme = options[:bluebox_scheme]  || 'https'
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])

data/lib/fog/{brightbox/compute.rb → compute/brightbox.rb}

@@ -6,25 +6,26 @@ module Fog
 
       requires :brightbox_client_id, :brightbox_secret
       recognizes :brightbox_auth_url, :brightbox_api_url
+      recognizes :provider # remove post deprecation
 
-      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
-
-      request_path 'fog/brightbox/requests/compute'
+      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/compute/requests/brightbox'
       request :add_nodes_load_balancer
       request :create_api_client
       request :create_cloud_ip
@@ -73,6 +74,13 @@ module Fog
       class Mock
 
         def initialize(options)
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Brightbox::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Brightbox') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           @brightbox_client_id = options[:brightbox_client_id] || Fog.credentials[:brightbox_client_id]
           @brightbox_secret = options[:brightbox_secret] || Fog.credentials[:brightbox_secret]
         end
@@ -85,6 +93,13 @@ module Fog
       class Real
 
         def initialize(options)
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Brightbox::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Brightbox') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           require "json"
           # Currently authentication and api endpoints are the same but may change
           @auth_url = options[:brightbox_auth_url] || Fog.credentials[:brightbox_auth_url] || API_URL
@@ -141,4 +156,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/{go_grid/compute.rb → compute/go_grid.rb}

@@ -4,14 +4,15 @@ module Fog
 
       requires :go_grid_api_key, :go_grid_shared_secret
       recognizes :host, :path, :port, :scheme, :persistent
+      recognizes :provider # remove post deprecation
 
-      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
@@ -38,6 +39,13 @@ module Fog
         end
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::GoGrid::Compute.new is deprecated, use Fog::Compute.new(:provider => 'GoGrid') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           @go_grid_api_key = options[:go_grid_api_key]
           @go_grid_shared_secret = options[:go_grid_shared_secret]
           @data = self.class.data[@go_grid_api_key]
@@ -48,6 +56,13 @@ module Fog
       class Real
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::GoGrid::Compute.new is deprecated, use Fog::Compute.new(:provider => 'GoGrid') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           require 'digest/md5'
           require 'json'
           @go_grid_api_key = options[:go_grid_api_key]