fog-maestrodev 1.19.0.20140212012611 → 1.20.0.20140305101305

data/lib/fog/ovirt/compute.rb

@@ -1,3 +1,5 @@
+require 'fog/ovirt/core'
+
 module Fog
   module Compute
     class Ovirt < Fog::Service

data/lib/fog/ovirt/core.rb

@@ -0,0 +1,17 @@
+require 'fog/core'
+
+module Fog
+  module Ovirt
+
+    extend Fog::Provider
+
+    module Errors
+      class ServiceError < Fog::Errors::Error; end
+      class SecurityError < ServiceError; end
+      class NotFound < ServiceError; end
+    end
+
+    service(:compute, 'Compute')
+
+  end
+end

data/lib/fog/rackspace.rb

@@ -1,145 +1,12 @@
-require 'fog/core'
-require 'fog/rackspace/mock_data'
-require 'fog/rackspace/service'
-require 'fog/rackspace/errors'
-
-module Fog
-  module Rackspace
-    extend Fog::Provider
-
-    US_AUTH_ENDPOINT = 'https://identity.api.rackspacecloud.com/v2.0' unless defined? US_AUTH_ENDPOINT
-    UK_AUTH_ENDPOINT = 'https://lon.identity.api.rackspacecloud.com/v2.0' unless defined? UK_AUTH_ENDPOINT
-
-    module Errors
-      class ServiceError < Fog::Errors::Error
-        attr_reader :response_data, :status_code, :transaction_id
-
-        def to_s
-          status = status_code ? "HTTP #{status_code}" : "HTTP <Unknown>"
-          "[#{status} | #{transaction_id}] #{super}"
-        end
-
-        def self.slurp(error, service=nil)
-          data = nil
-          message = nil
-          status_code = nil
-
-          if error.response
-            status_code = error.response.status
-            unless error.response.body.empty?
-              begin
-                data = Fog::JSON.decode(error.response.body)
-                message = extract_message(data)
-              rescue  => e
-                Fog::Logger.warning("Received exception '#{e}' while decoding>> #{error.response.body}")
-                message = error.response.body
-                data = error.response.body
-              end
-            end
-          end
-
-          new_error = super(error, message)
-          new_error.instance_variable_set(:@response_data, data)
-          new_error.instance_variable_set(:@status_code, status_code)
-          new_error.set_transaction_id(error, service)
-          new_error
-        end
-
-        def set_transaction_id(error, service)
-          return unless service && service.respond_to?(:request_id_header) && error.response
-          @transaction_id = error.response.headers[service.request_id_header]
-        end
-
-        def self.extract_message(data)
-          if data.is_a?(Hash)
-            message = data.values.first['message'] if data.values.first.is_a?(Hash)
-            message ||= data['message']
-          end
-          message || data.inspect
-        end
-      end
-
-      class InternalServerError < ServiceError; end
-      class Conflict < ServiceError; end
-      class ServiceUnavailable < ServiceError; end
-      class MethodNotAllowed < ServiceError; end
-      class BadRequest < ServiceError
-        attr_reader :validation_errors
-
-        def to_s
-          "#{super} - #{validation_errors}"
-        end
-
-        def self.slurp(error, service=nil)
-          new_error = super(error)
-          unless new_error.response_data.nil? or new_error.response_data['badRequest'].nil?
-            new_error.instance_variable_set(:@validation_errors, new_error.response_data['badRequest']['validationErrors'])
-          end
-
-          status_code = error.response ? error.response.status : nil
-          new_error.instance_variable_set(:@status_code, status_code)
-          new_error.set_transaction_id(error, service)
-          new_error
-        end
-      end
-    end
-
-    service(:auto_scale,       'rackspace/auto_scale',        'AutoScale')
-    service(:block_storage,    'rackspace/block_storage',     'BlockStorage')
-    service(:cdn,              'rackspace/cdn',               'CDN')
-    service(:compute,          'rackspace/compute',           'Compute')
-    service(:compute_v2,       'rackspace/compute_v2',        'Compute v2')
-    service(:dns,              'rackspace/dns',               'DNS')
-    service(:storage,          'rackspace/storage',           'Storage')
-    service(:load_balancers,   'rackspace/load_balancers',    'LoadBalancers')
-    service(:identity,         'rackspace/identity',          'Identity')
-    service(:databases,        'rackspace/databases',         'Databases')
-    service(:monitoring,       'rackspace/monitoring',        'Monitoring')
-    service(:queues,           'rackspace/queues',            'Queues')
-
-    def self.authenticate(options, connection_options = {})
-      rackspace_auth_url = options[:rackspace_auth_url]
-      rackspace_auth_url ||= options[:rackspace_endpoint] == Fog::Compute::RackspaceV2::LON_ENDPOINT ? "lon.auth.api.rackspacecloud.com" : "auth.api.rackspacecloud.com"
-      url = rackspace_auth_url.match(/^https?:/) ? \
-                rackspace_auth_url : 'https://' + rackspace_auth_url
-      uri = URI.parse(url)
-      connection = Fog::Connection.new(url, false, connection_options)
-      @rackspace_api_key  = options[:rackspace_api_key]
-      @rackspace_username = options[:rackspace_username]
-      response = connection.request({
-        :expects  => [200, 204],
-        :headers  => {
-          'X-Auth-Key'  => @rackspace_api_key,
-          'X-Auth-User' => @rackspace_username
-        },
-        :method   => 'GET',
-        :path     =>  (uri.path and not uri.path.empty?) ? uri.path : 'v1.0'
-      })
-      response.headers.reject do |key, value|
-        !['X-Server-Management-Url', 'X-Storage-Url', 'X-CDN-Management-Url', 'X-Auth-Token'].include?(key)
-      end
-    end
-
-    def self.json_response?(response)
-      return false unless response && response.headers
-      response.headers['Content-Type'] =~ %r{application/json}i ? true : false
-    end
-
-    def self.normalize_url(endpoint)
-      return nil unless endpoint
-      str = endpoint.chomp " "
-      str = str.chomp "/"
-      str.downcase
-    end
-
-    # CGI.escape, but without special treatment on spaces
-    def self.escape(str,extra_exclude_chars = '')
-      # '-' is a special character inside a regex class so it must be first or last.
-      # Add extra excludes before the final '-' so it always remains trailing, otherwise
-      # an unwanted range is created by mistake.
-      str.gsub(/([^a-zA-Z0-9_.#{extra_exclude_chars}-]+)/) do
-        '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
-      end
-    end
-  end
-end
+require 'fog/rackspace/auto_scale'
+require 'fog/rackspace/block_storage'
+require 'fog/rackspace/cdn'
+require 'fog/rackspace/compute'
+require 'fog/rackspace/compute_v2'
+require 'fog/rackspace/databases'
+require 'fog/rackspace/dns'
+require 'fog/rackspace/identity'
+require 'fog/rackspace/load_balancers'
+require 'fog/rackspace/monitoring'
+require 'fog/rackspace/queues'
+require 'fog/rackspace/storage'

data/lib/fog/rackspace/auto_scale.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rackspace'))
+require 'fog/rackspace/core'
 
 module Fog
   module Rackspace

data/lib/fog/rackspace/block_storage.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rackspace'))
+require 'fog/rackspace/core'
 
 module Fog
   module Rackspace
@@ -154,6 +154,10 @@ module Fog
             regions = @identity_service.service_catalog.display_service_regions(service_name)
             Fog::Logger.deprecation("Please specify region using :rackspace_region rather than :rackspace_endpoint. Valid region for :rackspace_region are #{regions}.")
           end
+
+          unless options[:rackspace_region]
+            Fog::Logger.deprecation("Default region support will be removed in an upcoming release. Please switch to manually setting your endpoint. This requires settng the :rackspace_region option")
+          end
         end
 
         def append_tenant_v1(credentials)

data/lib/fog/rackspace/cdn.rb

@@ -1,4 +1,4 @@
-require 'fog/rackspace'
+require 'fog/rackspace/core'
 require 'fog/cdn'
 
 module Fog
@@ -23,6 +23,17 @@ module Fog
           "X-Cdn-Ssl-Uri" => :ssl_uri
         }.freeze
 
+        def apply_options(options)
+          # api_key and username missing from instance variable sets
+          @rackspace_api_key = options[:rackspace_api_key]
+          @rackspace_username = options[:rackspace_username]
+
+          @connection_options = options[:connection_options] || {}
+          @rackspace_auth_url = options[:rackspace_auth_url]
+          @rackspace_cdn_url = options[:rackspace_cdn_url]
+          @rackspace_region = options[:rackspace_region] || :dfw
+        end
+
         def service_name
           :cloudFilesCDN
         end
@@ -35,6 +46,12 @@ module Fog
           "X-Trans-Id"
         end
 
+        # Returns true if CDN service is enabled
+        # @return [Boolean]
+        def enabled?
+          @enabled
+        end
+
         def endpoint_uri(service_endpoint_url=nil)
           @uri = super(@rackspace_cdn_url || service_endpoint_url, :rackspace_cdn_url)
         end
@@ -97,7 +114,9 @@ module Fog
         end
 
         def initialize(options={})
-          @rackspace_username = options[:rackspace_username]
+          apply_options(options)
+          authenticate(options)
+          @enabled = !! endpoint_uri
         end
 
         def data
@@ -119,14 +138,7 @@ module Fog
         include Base
 
         def initialize(options={})
-          # api_key and username missing from instance variable sets
-          @rackspace_api_key = options[:rackspace_api_key]
-          @rackspace_username = options[:rackspace_username]
-
-          @connection_options = options[:connection_options] || {}
-          @rackspace_auth_url = options[:rackspace_auth_url]
-          @rackspace_cdn_url = options[:rackspace_cdn_url]
-          @rackspace_region = options[:rackspace_region] || :dfw
+          apply_options(options)
           authenticate(options)
           @enabled = false
           @persistent = options[:persistent] || false
@@ -137,12 +149,6 @@ module Fog
           end
         end
 
-        # Returns true if CDN service is enabled
-        # @return [Boolean]
-        def enabled?
-          @enabled
-        end
-
         # Resets CDN connection
         def reload
           @cdn_connection.reset

data/lib/fog/rackspace/compute.rb

@@ -1,4 +1,4 @@
-require 'fog/rackspace'
+require 'fog/rackspace/core'
 require 'fog/compute'
 
 module Fog

data/lib/fog/rackspace/compute_v2.rb

@@ -1,4 +1,4 @@
-require 'fog/rackspace'
+require 'fog/rackspace/core'
 require 'fog/compute'
 
 module Fog
@@ -208,7 +208,7 @@ module Fog
             end
           else
             #if we are using auth1 and the endpoint is not set, default to DFW_ENDPOINT for historical reasons
-             @rackspace_endpoint ||= DFW_ENDPOINT
+            @rackspace_endpoint ||= DFW_ENDPOINT
           end
         end
 
@@ -219,6 +219,10 @@ module Fog
             regions = @identity_service.service_catalog.display_service_regions(service_name)
             Fog::Logger.deprecation("Please specify region using :rackspace_region rather than :rackspace_endpoint. Valid regions for :rackspace_region are #{regions}.")
           end
+
+          unless options[:rackspace_region]
+            Fog::Logger.deprecation("Default region support will be removed in an upcoming release. Please switch to manually setting your endpoint. This requires settng the :rackspace_region option")
+          end
         end
 
         def append_tenant_v1(credentials)

data/lib/fog/rackspace/core.rb

@@ -0,0 +1,145 @@
+require 'fog/core'
+require 'fog/rackspace/mock_data'
+require 'fog/rackspace/service'
+require 'fog/rackspace/errors'
+
+module Fog
+  module Rackspace
+    extend Fog::Provider
+
+    US_AUTH_ENDPOINT = 'https://identity.api.rackspacecloud.com/v2.0' unless defined? US_AUTH_ENDPOINT
+    UK_AUTH_ENDPOINT = 'https://lon.identity.api.rackspacecloud.com/v2.0' unless defined? UK_AUTH_ENDPOINT
+
+    module Errors
+      class ServiceError < Fog::Errors::Error
+        attr_reader :response_data, :status_code, :transaction_id
+
+        def to_s
+          status = status_code ? "HTTP #{status_code}" : "HTTP <Unknown>"
+          "[#{status} | #{transaction_id}] #{super}"
+        end
+
+        def self.slurp(error, service=nil)
+          data = nil
+          message = nil
+          status_code = nil
+
+          if error.response
+            status_code = error.response.status
+            unless error.response.body.empty?
+              begin
+                data = Fog::JSON.decode(error.response.body)
+                message = extract_message(data)
+              rescue  => e
+                Fog::Logger.warning("Received exception '#{e}' while decoding>> #{error.response.body}")
+                message = error.response.body
+                data = error.response.body
+              end
+            end
+          end
+
+          new_error = super(error, message)
+          new_error.instance_variable_set(:@response_data, data)
+          new_error.instance_variable_set(:@status_code, status_code)
+          new_error.set_transaction_id(error, service)
+          new_error
+        end
+
+        def set_transaction_id(error, service)
+          return unless service && service.respond_to?(:request_id_header) && error.response
+          @transaction_id = error.response.headers[service.request_id_header]
+        end
+
+        def self.extract_message(data)
+          if data.is_a?(Hash)
+            message = data.values.first['message'] if data.values.first.is_a?(Hash)
+            message ||= data['message']
+          end
+          message || data.inspect
+        end
+      end
+
+      class InternalServerError < ServiceError; end
+      class Conflict < ServiceError; end
+      class ServiceUnavailable < ServiceError; end
+      class MethodNotAllowed < ServiceError; end
+      class BadRequest < ServiceError
+        attr_reader :validation_errors
+
+        def to_s
+          "#{super} - #{validation_errors}"
+        end
+
+        def self.slurp(error, service=nil)
+          new_error = super(error)
+          unless new_error.response_data.nil? or new_error.response_data['badRequest'].nil?
+            new_error.instance_variable_set(:@validation_errors, new_error.response_data['badRequest']['validationErrors'])
+          end
+
+          status_code = error.response ? error.response.status : nil
+          new_error.instance_variable_set(:@status_code, status_code)
+          new_error.set_transaction_id(error, service)
+          new_error
+        end
+      end
+    end
+
+    service(:auto_scale,       'AutoScale')
+    service(:block_storage,    'BlockStorage')
+    service(:cdn,              'CDN')
+    service(:compute,          'Compute')
+    service(:compute_v2,       'Compute v2')
+    service(:dns,              'DNS')
+    service(:storage,          'Storage')
+    service(:load_balancers,   'LoadBalancers')
+    service(:identity,         'Identity')
+    service(:databases,        'Databases')
+    service(:monitoring,       'Monitoring')
+    service(:queues,           'Queues')
+
+    def self.authenticate(options, connection_options = {})
+      rackspace_auth_url = options[:rackspace_auth_url]
+      rackspace_auth_url ||= options[:rackspace_endpoint] == Fog::Compute::RackspaceV2::LON_ENDPOINT ? "lon.auth.api.rackspacecloud.com" : "auth.api.rackspacecloud.com"
+      url = rackspace_auth_url.match(/^https?:/) ? \
+                rackspace_auth_url : 'https://' + rackspace_auth_url
+      uri = URI.parse(url)
+      connection = Fog::Connection.new(url, false, connection_options)
+      @rackspace_api_key  = options[:rackspace_api_key]
+      @rackspace_username = options[:rackspace_username]
+      response = connection.request({
+        :expects  => [200, 204],
+        :headers  => {
+          'X-Auth-Key'  => @rackspace_api_key,
+          'X-Auth-User' => @rackspace_username
+        },
+        :method   => 'GET',
+        :path     =>  (uri.path and not uri.path.empty?) ? uri.path : 'v1.0'
+      })
+      response.headers.reject do |key, value|
+        !['X-Server-Management-Url', 'X-Storage-Url', 'X-CDN-Management-Url', 'X-Auth-Token'].include?(key)
+      end
+    end
+
+    def self.json_response?(response)
+      return false unless response && response.headers
+      response.get_header('Content-Type') =~ %r{application/json}i ? true : false
+    end
+
+    def self.normalize_url(endpoint)
+      return nil unless endpoint
+      str = endpoint.chomp " "
+      str = str.chomp "/"
+      str.downcase
+    end
+
+    # CGI.escape, but without special treatment on spaces
+    def self.escape(str,extra_exclude_chars = '')
+      # '-' is a special character inside a regex class so it must be first or last.
+      # Add extra excludes before the final '-' so it always remains trailing, otherwise
+      # an unwanted range is created by mistake.
+      str.gsub(/([^a-zA-Z0-9_.#{extra_exclude_chars}-]+)/) do
+        '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
+      end
+    end
+  end
+end