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

misc small tweaks and fixes

This commit is contained in:
geemus 2011-03-10 16:34:55 -08:00
parent 2e2c6dd183
commit 32b0eb8392
7 changed files with 20 additions and 19 deletions

View file

@ -4,7 +4,7 @@ PATH
fog (0.6.0)
builder
excon (>= 0.5.5)
formatador (>= 0.0.16)
formatador (>= 0.1.1)
json
mime-types
net-ssh (>= 2.0.23)
@ -18,16 +18,16 @@ GEM
excon (0.5.6)
ffi (0.6.3)
rake (>= 0.8.7)
formatador (0.0.16)
formatador (0.1.1)
json (1.5.1)
mime-types (1.16)
net-ssh (2.1.3)
net-ssh (2.1.0)
nokogiri (1.4.4)
rake (0.8.7)
rspec (1.3.1)
ruby-hmac (0.4.0)
shindo (0.2.2)
formatador (>= 0.0.16)
shindo (0.3.2)
formatador (>= 0.1.1)
virtualbox (0.8.3)
ffi (~> 0.6.3)
@ -38,5 +38,5 @@ DEPENDENCIES
fog!
rake
rspec (= 1.3.1)
shindo (= 0.2.2)
shindo (= 0.3.2)
virtualbox (= 0.8.3)

View file

@ -44,7 +44,7 @@ Gem::Specification.new do |s|
## that are needed for an end user to actually USE your code.
s.add_dependency('builder')
s.add_dependency('excon', '>=0.5.5')
s.add_dependency('formatador', '>=0.0.16')
s.add_dependency('formatador', '>=0.1.1')
s.add_dependency('json')
s.add_dependency('mime-types')
s.add_dependency('net-ssh', '>=2.0.23')
@ -55,7 +55,7 @@ Gem::Specification.new do |s|
## those that are only needed during development
s.add_development_dependency('rake')
s.add_development_dependency('rspec', '1.3.1')
s.add_development_dependency('shindo', '0.2.2')
s.add_development_dependency('shindo', '0.3.2')
s.add_development_dependency('virtualbox', '0.8.3')
s.files = `git ls-files`.split("\n")

View file

@ -74,7 +74,7 @@ module Fog
when 'eu-west-1'
'sdb.eu-west-1.amazonaws.com'
when 'us-east-1'
'sdb.us-east-1.amazonaws.com'
'sdb.amazonaws.com'
when 'us-west-1'
'sdb.us-west-1.amazonaws.com'
else

View file

@ -134,8 +134,8 @@ module Fog
@aws_access_key_id = options[:aws_access_key_id]
@region = options[:region] || 'us-east-1'
@owner_id = @data[:owner_id]
reset_data
@owner_id = @data[:owner_id]
end
def reset_data

View file

@ -15,12 +15,13 @@ module Fog
def get(device_id)
if device_id && server = connection.devices_list(device_id).body['devices']
if server.empty?
nil
else
new(server.first)
end
rescue Fog::Service::Error => error
if error.message == "The device_id passed in can't be matched to a valid device."
nil
else
raise error
end
end

View file

@ -1,5 +1,6 @@
Shindo.tests('AWS::RDS | parameter group requests', ['aws', 'rds']) do
tests('success') do
pending if Fog.mocking?
tests("#create_db_parameter_groups").formats(AWS::RDS::Formats::CREATE_DB_PARAMETER_GROUP) do
pending if Fog.mocking?

View file

@ -34,7 +34,6 @@ Shindo.tests('Voxel::Compute | server requests', ['voxel']) do
'id' => String,
'value' => String
},
'position' => String,
'rack' => {
'id' => String,
'value' => String
@ -66,8 +65,8 @@ Shindo.tests('Voxel::Compute | server requests', ['voxel']) do
'id' => String,
'value' => String
},
}],
'stat' => String,
}]
}
tests('success') do