Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fix load paths for shared initializers

  • Loading branch information...
commit 0a85cd8a9a2404ae8f073f77d65275f229d279d0 1 parent abe07ea
Wesley Beary geemus authored
4 lib/fog/cdn.rb
@@ -5,10 +5,10 @@ def self.new(attributes)
5 5 attributes = attributes.dup # prevent delete from having side effects
6 6 case provider = attributes.delete(:provider)
7 7 when 'AWS'
8   - require 'fog/aws'
  8 + require 'fog/cdn/aws'
9 9 Fog::AWS::CDN.new(attributes)
10 10 when 'Rackspace'
11   - require 'fog/rackspace'
  11 + require 'fog/cdn/rackspace'
12 12 Fog::Rackspace::CDN.new(attributes)
13 13 else
14 14 raise ArgumentError.new("#{provider} is not a recognized storage provider")
16 lib/fog/compute.rb
@@ -5,28 +5,28 @@ def self.new(attributes)
5 5 attributes = attributes.dup # prevent delete from having side effects
6 6 case provider = attributes.delete(:provider)
7 7 when 'AWS'
8   - require 'fog/aws'
  8 + require 'fog/compute/aws'
9 9 Fog::AWS::Compute.new(attributes)
10 10 when 'Bluebox'
11   - require 'fog/bluebox'
  11 + require 'fog/compute/bluebox'
12 12 Fog::Bluebox::Compute.new(attributes)
13 13 when 'Brightbox'
14   - require 'fog/brightbox'
  14 + require 'fog/compute/brightbox'
15 15 Fog::Brightbox::Compute.new(attributes)
16 16 when 'GoGrid'
17   - require 'fog/go_grid'
  17 + require 'fog/compute/go_grid'
18 18 Fog::GoGrid::Compute.new(attributes)
19 19 when 'Linode'
20   - require 'fog/linode'
  20 + require 'fog/compute/linode'
21 21 Fog::Linode::Compute.new(attributes)
22 22 when 'NewServers'
23   - require 'fog/new_servers'
  23 + require 'fog/compute/new_servers'
24 24 Fog::NewServers::Compute.new(attributes)
25 25 when 'Rackspace'
26   - require 'fog/rackspace'
  26 + require 'fog/compute/rackspace'
27 27 Fog::Rackspace::Compute.new(attributes)
28 28 when 'Slicehost'
29   - require 'fog/slicehost'
  29 + require 'fog/compute/slicehost'
30 30 Fog::Slicehost::Compute.new(attributes)
31 31 else
32 32 raise ArgumentError.new("#{provider} is not a recognized compute provider")
8 lib/fog/dns.rb
@@ -5,16 +5,16 @@ def self.new(attributes)
5 5 attributes = attributes.dup # prevent delete from having side effects
6 6 case provider = attributes.delete(:provider)
7 7 when 'AWS'
8   - require 'fog/aws'
  8 + require 'fog/dns/aws'
9 9 Fog::AWS::DNS.new(attributes)
10 10 when 'Linode'
11   - require 'fog/linode'
  11 + require 'fog/dns/linode'
12 12 Fog::Linode::DNS.new(attributes)
13 13 when 'Slicehost'
14   - require 'fog/slicehost'
  14 + require 'fog/dns/slicehost'
15 15 Fog::Slicehost::DNS.new(attributes)
16 16 when 'Zerigo'
17   - require 'fog/zerigo'
  17 + require 'fog/dns/zerigo'
18 18 Fog::Zerigo::DNS.new(attributes)
19 19 else
20 20 raise ArgumentError.new("#{provider} is not a recognized storage provider")
4 lib/fog/providers/rackspace.rb
@@ -6,9 +6,9 @@ module Rackspace
6 6 extend Fog::Provider
7 7
8 8 service(:cdn, 'cdn/rackspace')
9   - service(:compute, 'rackspace/compute')
  9 + service(:compute, 'compute/rackspace')
10 10 service(:files, 'storage/rackspace')
11   - service(:servers, 'rackspace/compute')
  11 + service(:servers, 'compute/rackspace')
12 12 service(:storage, 'storage/rackspace')
13 13
14 14 def self.authenticate(options)
8 lib/fog/storage.rb
@@ -5,16 +5,16 @@ def self.new(attributes)
5 5 attributes = attributes.dup # prevent delete from having side effects
6 6 case provider = attributes.delete(:provider)
7 7 when 'AWS'
8   - require 'fog/aws'
  8 + require 'fog/storage/aws'
9 9 Fog::AWS::Storage.new(attributes)
10 10 when 'Google'
11   - require 'fog/google'
  11 + require 'fog/storage/google'
12 12 Fog::Google::Storage.new(attributes)
13 13 when 'Local'
14   - require 'fog/local'
  14 + require 'fog/storage/local'
15 15 Fog::Local::Storage.new(attributes)
16 16 when 'Rackspace'
17   - require 'fog/rackspace'
  17 + require 'fog/storage/rackspace'
18 18 Fog::Rackspace::Storage.new(attributes)
19 19 else
20 20 raise ArgumentError.new("#{provider} is not a recognized storage provider")

0 comments on commit 0a85cd8

Please sign in to comment.
Something went wrong with that request. Please try again.