kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Revert "[core] Replace Fog::Connection with stable version"

Browse source 
This reverts commit 7ee3535d99.
This commit is contained in:
Paul Thornthwaite 2014-02-26 09:52:02 +00:00
parent df75833afd
commit 5007aac401
90 changed files with 98 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/fog/atmos/storage.rb
View file

@ -83,7 +83,7 @@ module Fog
@hmac = Fog::HMAC.new('sha1', @storage_secret_decoded)
@persistent = options.fetch(:persistent, false)
@connection = Fog::Core::Connection.new("#{@prefix}://#{@storage_host}:#{@storage_port}",
@connection = Fog::Connection.new("#{@prefix}://#{@storage_host}:#{@storage_port}",
@persistent, @connection_options)
end

2
lib/fog/aws/auto_scaling.rb
View file

@ -104,7 +104,7 @@ module Fog
@port = options[:port] || 443
@persistent = options[:persistent] || false
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
def reload

2
lib/fog/aws/beanstalk.rb
View file

@ -78,7 +78,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
def reload

2
lib/fog/aws/cdn.rb
View file

@ -154,7 +154,7 @@ EOF
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@version = options[:version] || '2010-11-01'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
def reload

2
lib/fog/aws/cloud_formation.rb
View file

@ -60,7 +60,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
def reload

2
lib/fog/aws/cloud_watch.rb
View file

@ -104,7 +104,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
def reload

2
lib/fog/aws/compute.rb
View file

@ -399,7 +399,7 @@ module Fog
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
end
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
def reload

2
lib/fog/aws/data_pipeline.rb
View file

@ -62,7 +62,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
setup_credentials(options)
end

2
lib/fog/aws/dns.rb
View file

@ -99,7 +99,7 @@ module Fog
@scheme = options[:scheme] || 'https'
@version = options[:version] || '2012-02-29'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
def reload

2
lib/fog/aws/dynamodb.rb
View file

@ -88,7 +88,7 @@ module Fog
@port = options[:port] || '443'
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
private

2
lib/fog/aws/elasticache.rb
View file

@ -62,7 +62,7 @@ module Fog
@path = options[:path] || '/'
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new(
@connection = Fog::Connection.new(
"#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent]
)
end

2
lib/fog/aws/elb.rb
View file

@ -139,7 +139,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
def reload

2
lib/fog/aws/emr.rb
View file

@ -73,7 +73,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@region = options[:region]
end

2
lib/fog/aws/glacier.rb
View file

@ -134,7 +134,7 @@ module Fog
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end

2
lib/fog/aws/iam.rb
View file

@ -170,7 +170,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
def reload

2
lib/fog/aws/rds.rb
View file

@ -168,7 +168,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@version = options[:version] || '2013-05-15'
end

2
lib/fog/aws/redshift.rb
View file

@ -90,7 +90,7 @@ module Fog
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end

2
lib/fog/aws/ses.rb
View file

@ -62,7 +62,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
def reload

2
lib/fog/aws/simpledb.rb
View file

@ -89,7 +89,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
private

2
lib/fog/aws/sns.rb
View file

@ -61,7 +61,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
def reload

2
lib/fog/aws/sqs.rb
View file

@ -89,7 +89,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
def reload

4
lib/fog/aws/storage.rb
View file

@ -523,7 +523,7 @@ DATA
else
@connection = nil
end
@connection ||= Fog::XML::SAXParserConnection.new(uri, @persistent, @connection_options)
@connection ||= Fog::Connection.new(uri, @persistent, @connection_options)
end
def request(params, &block)
@ -550,7 +550,7 @@ DATA
headers = (error.response.is_a?(Hash) ? error.response[:headers] : error.response.headers)
uri = URI.parse(headers['Location'])
Fog::Logger.warning("fog: followed redirect to #{uri.host}, connecting to the matching region will be more performant")
response = Fog::XML::SAXParserConnection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, @connection_options).request(original_params, &block)
response = Fog::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, @connection_options).request(original_params, &block)
end
response

2
lib/fog/aws/sts.rb
View file

@ -83,7 +83,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
def reload

2
lib/fog/bare_metal_cloud/compute.rb
View file

@ -58,7 +58,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/bluebox/blb.rb
View file

@ -50,7 +50,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:bluebox_port] || 443
@scheme = options[:bluebox_scheme] || 'https'
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/bluebox/compute.rb
View file

@ -68,7 +68,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:bluebox_port] || 443
@scheme = options[:bluebox_scheme] || 'https'
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/bluebox/dns.rb
View file

@ -59,7 +59,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:bluebox_port] || 443
@scheme = options[:bluebox_scheme] || 'https'
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/clodo/compute.rb
View file

@ -84,7 +84,7 @@ module Fog
@clodo_must_reauthenticate = false
authenticate
Excon.ssl_verify_peer = false if options[:clodo_servicenet] == true
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
end
def reload

2
lib/fog/clodo/core.rb
View file

@ -13,7 +13,7 @@ module Fog
url = clodo_auth_url.match(/^https?:/) ? \
clodo_auth_url : 'https://' + clodo_auth_url
uri = URI.parse(url)
connection = Fog::Core::Connection.new(url)
connection = Fog::Connection.new(url)
@clodo_api_key = options[:clodo_api_key]
@clodo_username = options[:clodo_username]
response = connection.request({

2
lib/fog/cloudsigma/connection.rb
View file

@ -37,7 +37,7 @@ module Fog
@api_version = options[:cloudsigma_api_version] || '2.0'
@path_prefix = "#{@api_path_prefix}/#{@api_version}/"
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def request(params)

2
lib/fog/cloudstack/compute.rb
View file

@ -149,7 +149,7 @@ module Fog
@path = options[:cloudstack_path] || '/client/api'
@port = options[:cloudstack_port] || 443
@scheme = options[:cloudstack_scheme] || 'https'
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:cloudstack_persistent], {:ssl_verify_peer => false})
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:cloudstack_persistent], {:ssl_verify_peer => false})
end
def reload

2
lib/fog/core/deprecated/connection.rb
View file

@ -15,10 +15,8 @@ module Fog
class Connection < Fog::XML::SAXParserConnection
def request(params, &block)
if (parser = params.delete(:parser))
Fog::Logger.deprecation("Fog::Connection is deprecated use Fog::XML::SAXParserConnection instead [light_black](#{caller.first})[/]")
super(parser, params)
else
Fog::Logger.deprecation("Fog::Connection is deprecated use Fog::Core::Connection instead [light_black](#{caller.first})[/]")
original_request(params)
end
end

2
lib/fog/digitalocean/compute.rb
View file

@ -77,7 +77,7 @@ module Fog
@digitalocean_client_id = options[:digitalocean_client_id]
@digitalocean_api_url = options[:digitalocean_api_url] || \
"https://api.digitalocean.com"
@connection = Fog::Core::Connection.new(@digitalocean_api_url)
@connection = Fog::Connection.new(@digitalocean_api_url)
end
def reload

2
lib/fog/dnsimple/dns.rb
View file

@ -70,7 +70,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/dnsmadeeasy/dns.rb
View file

@ -87,7 +87,7 @@ module Fog
@persistent = options.fetch(:persistent, true)
@port = options[:port] || 80 #443 Not yet
@scheme = options[:scheme] || 'http' #'https Not yet
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/dreamhost/dns.rb
View file

@ -57,7 +57,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent)
end
def reload

2
lib/fog/dynect/dns.rb
View file

@ -72,7 +72,7 @@ module Fog
@persistent = options[:persistent] || false
@scheme = options[:scheme] || 'https'
@version = options[:version] || '3.5.2'
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def auth_token

2
lib/fog/ecloud/compute.rb
View file

@ -317,7 +317,7 @@ module Fog
# Hash connections on the host_url ... There's nothing to say we won't get URI's that go to
# different hosts.
@connections[host_url] ||= Fog::XML::SAXParserConnection.new(host_url, @persistent, @connection_options)
@connections[host_url] ||= Fog::Connection.new(host_url, @persistent, @connection_options)
# Set headers to an empty hash if none are set.
headers = set_extra_headers_for(params) || set_extra_headers_for({})

2
lib/fog/glesys/compute.rb
View file

@ -79,7 +79,7 @@ module Fog
@glesys_api_key = options[:glesys_api_key] || Fog.credentials[:glesys_api_key]
@connection_options = options[:connection_options] || {}
@persistent = options[:persistent] || false
@connection = Fog::XML::SAXParserConnection.new(@api_url, @persistent, @connection_options)
@connection = Fog::Connection.new(@api_url, @persistent, @connection_options)
end
def request(method_name, options = {})

2
lib/fog/go_grid/compute.rb
View file

@ -68,7 +68,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/google/storage.rb
View file

@ -283,7 +283,7 @@ DATA
else
@connection = nil
end
@connection ||= Fog::Core::Connection.new(uri, @persistent, @connection_options)
@connection ||= Fog::Connection.new(uri, @persistent, @connection_options)
end
private

2
lib/fog/hp/block_storage.rb
View file

@ -138,7 +138,7 @@ module Fog
@port = uri.port
@scheme = uri.scheme
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/hp/block_storage_v2.rb
View file

@ -127,7 +127,7 @@ module Fog
@port = uri.port
@scheme = uri.scheme
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/hp/cdn.rb
View file

@ -115,7 +115,7 @@ module Fog
@path = uri.path.chomp("/")
@port = uri.port
@scheme = uri.scheme
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@enabled = true
end
end

2
lib/fog/hp/compute.rb
View file

@ -220,7 +220,7 @@ module Fog
@port = uri.port
@scheme = uri.scheme
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/hp/compute_v2.rb
View file

@ -274,7 +274,7 @@ module Fog
@port = uri.port
@scheme = uri.scheme
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

4
lib/fog/hp/core.rb
View file

@ -82,7 +82,7 @@ module Fog
# Set the User-Agent
@user_agent = options[:user_agent]
set_user_agent_header(connection_options, "fog/#{Fog::VERSION}", @user_agent)
connection = Fog::Core::Connection.new(service_url, false, connection_options)
connection = Fog::Connection.new(service_url, false, connection_options)
@hp_access_key = options[:hp_access_key]
@hp_secret_key = options[:hp_secret_key]
response = connection.request({
@ -158,7 +158,7 @@ module Fog
# Set the User-Agent. If the caller sets a user_agent, use it.
@user_agent = options[:user_agent]
set_user_agent_header(connection_options, "fog/#{Fog::VERSION}", @user_agent)
connection = Fog::Core::Connection.new(service_url, false, connection_options)
connection = Fog::Connection.new(service_url, false, connection_options)
### Implement HP Control Services Authentication services ###
# Get the style of auth credentials passed, defaults to access/secret key style

2
lib/fog/hp/dns.rb
View file

@ -97,7 +97,7 @@ module Fog
@port = uri.port
@scheme = uri.scheme
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/hp/lb.rb
View file

@ -132,7 +132,7 @@ module Fog
@port = uri.port
@scheme = uri.scheme
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/hp/network.rb
View file

@ -155,7 +155,7 @@ module Fog
@port = uri.port
@scheme = uri.scheme
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/hp/storage.rb
View file

@ -351,7 +351,7 @@ module Fog
@port = uri.port
@scheme = uri.scheme
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/ibm/core.rb
View file

@ -16,7 +16,7 @@ module Fog
1800
end
class Connection < Fog::Core::Connection
class Connection < Fog::Connection
def initialize(user, password)
@user = user

4
lib/fog/internet_archive/storage.rb
View file

@ -269,7 +269,7 @@ module Fog
@port = options[:port] || 80
@scheme = options[:scheme] || 'http'
end
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
end
def reload
@ -376,7 +376,7 @@ DATA
rescue Excon::Errors::TemporaryRedirect => error
uri = URI.parse(error.response.headers['location'])
Fog::Logger.warning("fog: followed redirect to #{uri.host}, connecting to the matching region will be more performant")
response = Fog::XML::SAXParserConnection.new("#{@scheme}://#{uri.host}:#{@port}", false, @connection_options).request(original_params, &block)
response = Fog::Connection.new("#{@scheme}://#{uri.host}:#{@port}", false, @connection_options).request(original_params, &block)
end
response

2
lib/fog/joyent/analytics.rb
View file

@ -188,7 +188,7 @@ module Fog
raise ArgumentError, "Must provide either a joyent_password or joyent_keyname and joyent_keyfile pair"
end
@connection = Fog::Core::Connection.new(
@connection = Fog::Connection.new(
@joyent_url,
@persistent,
@connection_options

2
lib/fog/joyent/compute.rb
View file

@ -158,7 +158,7 @@ module Fog
raise ArgumentError, "Must provide either a joyent_password or joyent_keyname and joyent_keyfile pair"
end
@connection = Fog::Core::Connection.new(
@connection = Fog::Connection.new(
@joyent_url,
@persistent,
@connection_options

2
lib/fog/linode/compute.rb
View file

@ -83,7 +83,7 @@ module Fog
@host = options[:host] || "api.linode.com"
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
end
def reload

2
lib/fog/linode/dns.rb
View file

@ -58,7 +58,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/ninefold/compute.rb
View file

@ -89,7 +89,7 @@ module Fog
@ninefold_compute_secret = options[:ninefold_compute_secret] || Fog.credentials[:ninefold_compute_secret]
@connection_options = options[:connection_options] || {}
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new(@api_url, @persistent, @connection_options)
@connection = Fog::Connection.new(@api_url, @persistent, @connection_options)
end
def request(command, params, options)

4
lib/fog/openstack/compute.rb
View file

@ -320,7 +320,7 @@ module Fog
authenticate
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def credentials
@ -422,7 +422,7 @@ module Fog
# Not all implementations have identity service in the catalog
if @openstack_identity_public_endpoint || @openstack_management_url
@identity_connection = Fog::Core::Connection.new(
@identity_connection = Fog::Connection.new(
@openstack_identity_public_endpoint || @openstack_management_url,
false, @connection_options)
end

8
lib/fog/openstack/core.rb
View file

@ -63,7 +63,7 @@ module Fog
# legacy v1.0 style auth
def self.authenticate_v1(options, connection_options = {})
uri = options[:openstack_auth_uri]
connection = Fog::Core::Connection.new(uri.to_s, false, connection_options)
connection = Fog::Connection.new(uri.to_s, false, connection_options)
@openstack_api_key = options[:openstack_api_key]
@openstack_username = options[:openstack_username]
@ -102,7 +102,7 @@ module Fog
unless service
unless tenant_name
response = Fog::Core::Connection.new(
response = Fog::Connection.new(
"#{uri.scheme}://#{uri.host}:#{uri.port}/v2.0/tenants", false, connection_options).request({
:expects => [200, 204],
:headers => {'Content-Type' => 'application/json',
@ -186,7 +186,7 @@ module Fog
auth_token = options[:openstack_auth_token] || options[:unscoped_token]
uri = options[:openstack_auth_uri]
connection = Fog::Core::Connection.new(uri.to_s, false, connection_options)
connection = Fog::Connection.new(uri.to_s, false, connection_options)
request_body = {:auth => Hash.new}
if auth_token
@ -213,7 +213,7 @@ module Fog
end
def self.get_supported_version(supported_versions, uri, auth_token, connection_options = {})
connection = Fog::Core::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, connection_options)
connection = Fog::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, connection_options)
response = connection.request({
:expects => [200, 204, 300],
:headers => {'Content-Type' => 'application/json',

2
lib/fog/openstack/identity.rb
View file

@ -200,7 +200,7 @@ module Fog
authenticate
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def credentials

2
lib/fog/openstack/image.rb
View file

@ -122,7 +122,7 @@ module Fog
authenticate
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def credentials

2
lib/fog/openstack/metering.rb
View file

@ -116,7 +116,7 @@ module Fog
authenticate
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def credentials

2
lib/fog/openstack/network.rb
View file

@ -256,7 +256,7 @@ module Fog
authenticate
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def credentials

4
lib/fog/openstack/orchestration.rb
View file

@ -114,7 +114,7 @@ module Fog
authenticate
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def credentials
@ -214,7 +214,7 @@ module Fog
# Not all implementations have identity service in the catalog
if @openstack_identity_public_endpoint || @openstack_management_url
@identity_connection = Fog::Core::Connection.new(
@identity_connection = Fog::Connection.new(
@openstack_identity_public_endpoint || @openstack_management_url,
false, @connection_options)
end

2
lib/fog/openstack/storage.rb
View file

@ -92,7 +92,7 @@ module Fog
@openstack_temp_url_key = options[:openstack_temp_url_key]
authenticate
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/openstack/volume.rb
View file

@ -136,7 +136,7 @@ module Fog
authenticate
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def credentials

2
lib/fog/rackspace/auto_scale.rb
View file

@ -96,7 +96,7 @@ module Fog
authenticate
@connection = Fog::Core::Connection.new(endpoint_uri.to_s, @options[:persistent], @options[:connection_options])
@connection = Fog::Connection.new(endpoint_uri.to_s, @options[:persistent], @options[:connection_options])
end
def request(params, parse_json = true, &block)

2
lib/fog/rackspace/block_storage.rb
View file

@ -82,7 +82,7 @@ module Fog
deprecation_warnings(options)
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
@connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
end
def request(params, parse_json = true)

2
lib/fog/rackspace/cdn.rb
View file

@ -143,7 +143,7 @@ module Fog
@persistent = options[:persistent] || false
if endpoint_uri
@connection = Fog::Core::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
@connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
@enabled = true
end
end

2
lib/fog/rackspace/compute.rb
View file

@ -197,7 +197,7 @@ module Fog
authenticate
Excon.defaults[:ssl_verify_peer] = false if service_net?
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
@connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
end
def reload

2
lib/fog/rackspace/compute_v2.rb
View file

@ -145,7 +145,7 @@ module Fog
deprecation_warnings(options)
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
@connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
end
def request(params, parse_json = true)

2
lib/fog/rackspace/core.rb
View file

@ -104,7 +104,7 @@ module Fog
url = rackspace_auth_url.match(/^https?:/) ? \
rackspace_auth_url : 'https://' + rackspace_auth_url
uri = URI.parse(url)
connection = Fog::Core::Connection.new(url, false, connection_options)
connection = Fog::Connection.new(url, false, connection_options)
@rackspace_api_key = options[:rackspace_api_key]
@rackspace_username = options[:rackspace_username]
response = connection.request({

2
lib/fog/rackspace/databases.rb
View file

@ -82,7 +82,7 @@ module Fog
deprecation_warnings(options)
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
@connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
end
def request(params, parse_json = true)

2
lib/fog/rackspace/dns.rb
View file

@ -101,7 +101,7 @@ module Fog
deprecation_warnings(options)
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
@connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
end
def endpoint_uri(service_endpoint_url=nil)

2
lib/fog/rackspace/identity.rb
View file

@ -74,7 +74,7 @@ module Fog
def initialize(options={})
apply_options(options)
@connection = Fog::Core::Connection.new(@uri.to_s, @persistent, @connection_options)
@connection = Fog::Connection.new(@uri.to_s, @persistent, @connection_options)
authenticate
end

2
lib/fog/rackspace/load_balancers.rb
View file

@ -119,7 +119,7 @@ module Fog
deprecation_warnings(options)
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
@connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
end
def request(params, parse_json = true)

2
lib/fog/rackspace/monitoring.rb
View file

@ -140,7 +140,7 @@ module Fog
authenticate
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
@connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
end
def reload

2
lib/fog/rackspace/queues.rb
View file

@ -378,7 +378,7 @@ module Fog
authenticate
@persistent = options[:persistent] || false
@connection = Fog::Core::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
@connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
end
def request(params, parse_json = true, &block)

2
lib/fog/rackspace/storage.rb
View file

@ -419,7 +419,7 @@ module Fog
authenticate
@persistent = options[:persistent] || false
Excon.defaults[:ssl_verify_peer] = false if service_net?
@connection = Fog::Core::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
@connection = Fog::Connection.new(endpoint_uri.to_s, @persistent, @connection_options)
end
# Using SSL?

2
lib/fog/rage4/dns.rb
View file

@ -48,7 +48,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/riakcs/provisioning.rb
View file

@ -53,7 +53,7 @@ module Fog
@connection_options = options[:connection_options] || {}
@persistent = options[:persistent] || false
@raw_connection = Fog::Core::Connection.new(riakcs_uri, @persistent, @connection_options)
@raw_connection = Fog::Connection.new(riakcs_uri, @persistent, @connection_options)
@s3_connection = Fog::Storage.new(
:provider => 'AWS',

2
lib/fog/serverlove/compute.rb
View file

@ -59,7 +59,7 @@ module Fog
@api_key = options[:serverlove_api_key] || Fog.credentials[:serverlove_api_key]
@api_host = options[:serverlove_api_url] || Fog.credentials[:serverlove_api_url] || API_HOST
@connection = Fog::Core::Connection.new("https://#{@api_uuid}:#{@api_key}@#{@api_host}")
@connection = Fog::Connection.new("https://#{@api_uuid}:#{@api_key}@#{@api_host}")
end
def request(params)

2
lib/fog/storm_on_demand/shared.rb
View file

@ -15,7 +15,7 @@ module Fog
@scheme = uri.scheme
@storm_on_demand_username = options[:storm_on_demand_username]
@storm_on_demand_password = options[:storm_on_demand_password]
@connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload

2
lib/fog/terremark/vcloud.rb
View file

@ -46,7 +46,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || Fog::Terremark::Vcloud::Defaults::PORT
@scheme = options[:scheme] || Fog::Terremark::Vcloud::Defaults::SCHEME
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def default_vdc_id

2
lib/fog/vcloud/compute.rb
View file

@ -319,7 +319,7 @@ module Fog
# Hash connections on the host_url ... There's nothing to say we won't get URI's that go to
# different hosts.
@connections[host_url] ||= Fog::XML::SAXParserConnection.new(host_url, @persistent, @connection_options)
@connections[host_url] ||= Fog::Connection.new(host_url, @persistent, @connection_options)
# Set headers to an empty hash if none are set.
headers = params[:headers] || {}

4
lib/fog/vcloud_director/compute.rb
View file

@ -335,7 +335,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || Fog::Compute::VcloudDirector::Defaults::PORT
@scheme = options[:scheme] || Fog::Compute::VcloudDirector::Defaults::SCHEME
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@end_point = "#{@scheme}://#{@host}#{@path}/"
@api_version = options[:vcloud_director_api_version] || Fog::Compute::VcloudDirector::Defaults::API_VERSION
@show_progress = options[:vcloud_director_show_progress]
@ -670,7 +670,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || Fog::Compute::VcloudDirector::Defaults::PORT
@scheme = options[:scheme] || Fog::Compute::VcloudDirector::Defaults::SCHEME
#@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
#@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@end_point = "#{@scheme}://#{@host}#{@path}/"
@api_version = options[:vcloud_director_api_version] || Fog::Compute::VcloudDirector::Defaults::API_VERSION
end

2
lib/fog/voxel/compute.rb
View file

@ -86,7 +86,7 @@ module Fog
@connection_options[:ssl_verify_peer] = false
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def request(method_name, options = {})

2
lib/fog/xenserver/compute.rb
View file

@ -164,7 +164,7 @@ module Fog
@host = options[:xenserver_pool_master]
@username = options[:xenserver_username]
@password = options[:xenserver_password]
@connection = Fog::Core::Connection.new(@host)
@connection = Fog::Connection.new(@host)
@connection.authenticate(@username, @password)
end

2
lib/fog/zerigo/dns.rb
View file

@ -79,7 +79,7 @@ module Fog
@persistent = options[:persistent] || false
@port = options[:port] || 80
@scheme = options[:scheme] || 'http'
@connection = Fog::XML::SAXParserConnection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
end
def reload