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

Merge branch 'master' into scp_download

Browse source
This commit is contained in:
Christoph Schiessl 2011-12-20 13:40:37 +01:00
commit eea0aed120
4 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/compute_tests.rb
View file

@ -7,7 +7,7 @@ require File.join(File.dirname(__FILE__), '..', 'tests', 'helper')
Shindo.tests('compute examples', 'compute') do
# iterate over all the providers
Fog.providers.each do |provider|
Fog.providers.values.each do |provider|
# FIXME: implement expected shared compute stuff for these providers as well
next if ['Bluebox', 'Brightbox', 'Ecloud', 'GoGrid', 'Linode', 'NewServers', 'Ninefold', 'Slicehost', 'StormOnDemand', 'VirtualBox', 'Voxel'].include?(provider)

2
examples/dns_tests.rb
View file

@ -7,7 +7,7 @@ require File.join(File.dirname(__FILE__), '..', 'tests', 'helper')
Shindo.tests('dns examples', 'dns') do
# iterate over all the providers
Fog.providers.each do |provider|
Fog.providers.values.each do |provider|
provider = eval(provider) # convert from string to object

2
examples/storage_tests.rb
View file

@ -7,7 +7,7 @@ require File.join(File.dirname(__FILE__), '..', 'tests', 'helper')
Shindo.tests('storage examples', 'storage') do
# iterate over all the providers
Fog.providers.each do |provider|
Fog.providers.values.each do |provider|
provider = eval(provider) # convert from string to object

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

@ -26,10 +26,10 @@ module Fog
# collection :snapshots
# model :parameter_group
# collection :parameter_groups
#
#
# model :parameter
# collection :parameters
#
#
# model :security_group
# collection :security_groups
@ -68,12 +68,30 @@ module Fog
@hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
options[:region] ||= 'us-east-1'
@host = options[:host] || 'elasticmapreduce.amazonaws.com'
@host = options[:host] || case options[:region]
when 'ap-northeast-1'
'elasticmapreduce.ap-northeast-1.amazonaws.com'
when 'ap-southeast-1'
'elasticmapreduce.ap-southeast-1.amazonaws.com'
when 'eu-west-1'
'elasticmapreduce.eu-west-1.amazonaws.com'
when 'us-east-1'
'elasticmapreduce.us-east-1.amazonaws.com'
when 'us-west-1'
'elasticmapreduce.us-west-1.amazonaws.com'
when 'us-west-2'
'elasticmapreduce.us-west-2.amazonaws.com'
when 'sa-east-1'
'elasticmapreduce.sa-east-1.amazonaws.com'
else
raise ArgumentError, "Unknown region: #{options[:region].inspect}"
end
@path = options[:path] || '/'
@persistent = options[:persistent] || false
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
@region = options[:region]
end
def reload