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

leftovers that I missed on the first pass in the last few commits

Browse source
This commit is contained in:
geemus 2010-09-08 14:00:43 -07:00
parent 58577e17bf
commit eb6bca6f34
20 changed files with 64 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/fog/bluebox/bin.rb
View file

@ -10,6 +10,12 @@ module Bluebox
def [](service)
@@connections ||= Hash.new do |hash, key|
hash[key] = case key
when :blocks
location = caller.first
warning = "[yellow][WARN] Bluebox[:blocks] is deprecated, use Bluebox[:compute] instead[/]"
warning << " [light_black](" << location << ")[/] "
Formatador.display_line(warning)
Fog::Bluebox::Compute.new
when :compute
Fog::Bluebox::Compute.new
end

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

@ -72,7 +72,7 @@ module Fog
rescue Excon::Errors::Error => error
raise case error
when Excon::Errors::NotFound
Fog::Bluebox::NotFound.slurp(error)
Fog::Bluebox::Compute::NotFound.slurp(error)
else
error
end

6
lib/fog/bluebox/models/compute/flavors.rb
View file

@ -1,5 +1,5 @@
require 'fog/collection'
require 'fog/bluebox/models/flavor'
require 'fog/bluebox/models/compute/flavor'
module Fog
module Bluebox
@ -7,7 +7,7 @@ module Fog
class Flavors < Fog::Collection
model Fog::Bluebox::Flavor
model Fog::Bluebox::Compute::Flavor
def all
data = connection.get_products.body
@ -17,7 +17,7 @@ module Fog
def get(product_id)
response = connection.get_product(product_id)
new(response.body)
rescue Fog::Bluebox::NotFound
rescue Fog::Bluebox::Compute::NotFound
nil
end

6
lib/fog/bluebox/models/compute/images.rb
View file

@ -1,5 +1,5 @@
require 'fog/collection'
require 'fog/bluebox/models/image'
require 'fog/bluebox/models/compute/image'
module Fog
module Bluebox
@ -7,7 +7,7 @@ module Fog
class Images < Fog::Collection
model Fog::Bluebox::Image
model Fog::Bluebox::Compute::Image
def all
data = connection.get_templates.body
@ -17,7 +17,7 @@ module Fog
def get(template_id)
response = connection.get_template(template_id)
new(response.body)
rescue Fog::Bluebox::NotFound
rescue Fog::Bluebox::Compute::NotFound
nil
end

6
lib/fog/bluebox/models/compute/servers.rb
View file

@ -1,5 +1,5 @@
require 'fog/collection'
require 'fog/bluebox/models/server'
require 'fog/bluebox/models/compute/server'
module Fog
module Bluebox
@ -7,7 +7,7 @@ module Fog
class Servers < Fog::Collection
model Fog::Bluebox::Server
model Fog::Bluebox::Compute::Server
def all
data = connection.get_blocks.body
@ -18,7 +18,7 @@ module Fog
if server_id && server = connection.get_block(server_id).body
new(server)
end
rescue Fog::Bluebox::NotFound
rescue Fog::Bluebox::Compute::NotFound
nil
end

6
lib/fog/go_grid/bin.rb
View file

@ -11,6 +11,12 @@ module GoGrid
hash[key] = case key
when :compute
Fog::GoGrid::Compute.new
when :servers
location = caller.first
warning = "[yellow][WARN] GoGrid[:servers] is deprecated, use GoGrid[:compute] instead[/]"
warning << " [light_black](" << location << ")[/] "
Formatador.display_line(warning)
Fog::GoGrid::Compute.new
end
end
@@connections[service]

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

@ -79,7 +79,7 @@ module Fog
rescue Excon::Errors::Error => error
raise case error
when Excon::Errors::NotFound
Fog::Go_Grid::NotFound.slurp(error)
Fog::GoGrid::Compute::NotFound.slurp(error)
else
error
end

6
lib/fog/linode/bin.rb
View file

@ -11,6 +11,12 @@ module Linode
hash[key] = case key
when :compute
Fog::Linode::Compute.new
when :linode
location = caller.first
warning = "[yellow][WARN] Linode[:linode] is deprecated, use Linode[:compute] instead[/]"
warning << " [light_black](" << location << ")[/] "
Formatador.display_line(warning)
Fog::Linode::Compute.new
end
end
@@connections[service]

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

@ -65,9 +65,9 @@ module Fog
if data = response.body['ERRORARRAY'].first
error = case data['ERRORCODE']
when 5
Fog::Linode::NotFound
Fog::Linode::Compute::NotFound
else
Fog::Linode::Error
Fog::Linode::Compute::Error
end
raise error.new(data['ERRORMESSAGE'])
end

6
lib/fog/local/bin.rb
View file

@ -9,6 +9,12 @@ module Local
def [](service)
@@connections ||= Hash.new do |hash, key|
hash[key] = case key
when :files
location = caller.first
warning = "[yellow][WARN] Local[:files] is deprecated, use Local[:storage] instead[/]"
warning << " [light_black](" << location << ")[/] "
Formatador.display_line(warning)
Fog::Local::Storage.new
when :storage
Fog::Local::Storage.new
end

2
lib/fog/local/models/storage/directory.rb
View file

@ -1,5 +1,5 @@
require 'fog/model'
# require 'fog/local/models/files'
require 'fog/local/models/storage/files'
module Fog
module Local

2
lib/fog/local/models/storage/files.rb
View file

@ -1,5 +1,5 @@
require 'fog/collection'
require 'fog/local/models/file'
require 'fog/local/models/storage/file'
module Fog
module Local

6
lib/fog/new_servers/bin.rb
View file

@ -11,6 +11,12 @@ module NewServers
hash[key] = case key
when :compute
Fog::NewServers::Compute.new
when :new_servers
location = caller.first
warning = "[yellow][WARN] NewServers[:servers] is deprecated, use NewServers[:compute] instead[/]"
warning << " [light_black](" << location << ")[/] "
Formatador.display_line(warning)
Fog::NewServers::Compute.new
end
end
@@connections[service]

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

@ -75,7 +75,7 @@ module Fog
rescue Excon::Errors::Error => error
raise case error
when Excon::Errors::NotFound
Fog::NewServers::NotFound.slurp(error)
Fog::NewServers::Compute::NotFound.slurp(error)
else
error
end

12
lib/fog/rackspace/bin.rb
View file

@ -11,6 +11,18 @@ module Rackspace
hash[key] = case key
when :compute
Fog::Rackspace::Compute.new
when :files
location = caller.first
warning = "[yellow][WARN] Rackspace[:files] is deprecated, use Rackspace[:storage] instead[/]"
warning << " [light_black](" << location << ")[/] "
Formatador.display_line(warning)
Fog::Rackspace::Storage.new
when :servers
location = caller.first
warning = "[yellow][WARN] Rackspace[:servers] is deprecated, use Rackspace[:compute] instead[/]"
warning << " [light_black](" << location << ")[/] "
Formatador.display_line(warning)
Fog::Rackspace::Compute.new
when :storage
Fog::Rackspace::Storage.new
end

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

@ -1,5 +1,5 @@
require 'fog/collection'
require 'fog/rackspace/models/servers/flavor'
require 'fog/rackspace/models/compute/flavor'
module Fog
module Rackspace

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

@ -1,5 +1,5 @@
require 'fog/collection'
require 'fog/rackspace/models/servers/image'
require 'fog/rackspace/models/compute/image'
module Fog
module Rackspace

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

@ -1,5 +1,5 @@
require 'fog/collection'
require 'fog/rackspace/models/servers/server'
require 'fog/rackspace/models/compute/server'
module Fog
module Rackspace

4
lib/fog/rackspace/models/storage/directory.rb
View file

@ -1,5 +1,5 @@
require 'fog/model'
require 'fog/rackspace/models/files/files'
require 'fog/rackspace/models/storage/files'
module Fog
module Rackspace
@ -25,7 +25,7 @@ module Fog
def files
@files ||= begin
Fog::Rackspace::Files::Files.new(
Fog::Rackspace::Storage::Files.new(
:directory => self,
:connection => connection
)

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

@ -1,5 +1,5 @@
require 'fog/collection'
require 'fog/rackspace/models/files/file'
require 'fog/rackspace/models/storage/file'
module Fog
module Rackspace