From f0e2cfd21d102609bce8c9f0b421cfccbc80fce7 Mon Sep 17 00:00:00 2001 From: geemus Date: Tue, 14 Sep 2010 10:51:13 -0700 Subject: [PATCH] rely on service to include collections --- lib/fog/aws/compute.rb | 2 -- lib/fog/aws/elb.rb | 2 -- lib/fog/aws/simpledb.rb | 2 -- lib/fog/aws/storage.rb | 2 -- lib/fog/bluebox/compute.rb | 2 -- lib/fog/go_grid/compute.rb | 2 -- lib/fog/linode/compute.rb | 2 -- lib/fog/local/storage.rb | 2 -- lib/fog/new_servers/compute.rb | 2 -- lib/fog/rackspace/compute.rb | 2 -- lib/fog/rackspace/storage.rb | 2 -- lib/fog/slicehost/compute.rb | 2 -- lib/fog/vcloud/bin.rb | 2 +- lib/fog/vcloud/terremark/ecloud.rb | 2 -- lib/fog/vcloud/terremark/vcloud.rb | 3 --- 15 files changed, 1 insertion(+), 30 deletions(-) diff --git a/lib/fog/aws/compute.rb b/lib/fog/aws/compute.rb index b6fadcdfc..4f92c33d3 100644 --- a/lib/fog/aws/compute.rb +++ b/lib/fog/aws/compute.rb @@ -64,7 +64,6 @@ module Fog request :stop_instances class Mock - include Collections def self.data @data ||= Hash.new do |hash, key| @@ -127,7 +126,6 @@ module Fog end class Real - include Collections # Initialize connection to EC2 # diff --git a/lib/fog/aws/elb.rb b/lib/fog/aws/elb.rb index 0555334c6..05610bc2f 100644 --- a/lib/fog/aws/elb.rb +++ b/lib/fog/aws/elb.rb @@ -15,7 +15,6 @@ module Fog request :register_instances_with_load_balancer class Mock - include Collections def initialize(options={}) Fog::Mock.not_implemented @@ -24,7 +23,6 @@ module Fog end class Real - include Collections # Initialize connection to ELB # diff --git a/lib/fog/aws/simpledb.rb b/lib/fog/aws/simpledb.rb index 8c5fdcb32..e571c7675 100644 --- a/lib/fog/aws/simpledb.rb +++ b/lib/fog/aws/simpledb.rb @@ -16,7 +16,6 @@ module Fog request :select class Mock - include Collections def self.data @data ||= Hash.new do |hash, key| @@ -40,7 +39,6 @@ module Fog end class Real - include Collections # Initialize connection to SimpleDB # diff --git a/lib/fog/aws/storage.rb b/lib/fog/aws/storage.rb index d01b6fbe4..8ccc0bd35 100644 --- a/lib/fog/aws/storage.rb +++ b/lib/fog/aws/storage.rb @@ -70,7 +70,6 @@ module Fog end class Mock - include Collections include Utils def self.data @@ -98,7 +97,6 @@ module Fog end class Real - include Collections include Utils extend Fog::Deprecation deprecate(:reset, :reload) diff --git a/lib/fog/bluebox/compute.rb b/lib/fog/bluebox/compute.rb index a374c1f70..f245832ba 100644 --- a/lib/fog/bluebox/compute.rb +++ b/lib/fog/bluebox/compute.rb @@ -24,7 +24,6 @@ module Fog request :reboot_block class Mock - include Collections def self.data @data ||= Hash.new do |hash, key| @@ -46,7 +45,6 @@ module Fog end class Real - include Collections def initialize(options={}) @bluebox_api_key = options[:bluebox_api_key] diff --git a/lib/fog/go_grid/compute.rb b/lib/fog/go_grid/compute.rb index 3e3a5c43f..69c60e39c 100644 --- a/lib/fog/go_grid/compute.rb +++ b/lib/fog/go_grid/compute.rb @@ -19,7 +19,6 @@ module Fog request :grid_server_power class Mock - include Collections def self.data @data ||= Hash.new do |hash, key| @@ -42,7 +41,6 @@ module Fog end class Real - include Collections def initialize(options={}) @go_grid_api_key = options[:go_grid_api_key] diff --git a/lib/fog/linode/compute.rb b/lib/fog/linode/compute.rb index e6479c392..eac1df3a4 100644 --- a/lib/fog/linode/compute.rb +++ b/lib/fog/linode/compute.rb @@ -18,7 +18,6 @@ module Fog request :linode_reboot class Mock - include Collections def self.data @data ||= Hash.new do |hash, key| @@ -40,7 +39,6 @@ module Fog end class Real - include Collections def initialize(options={}) @linode_api_key = options[:linode_api_key] diff --git a/lib/fog/local/storage.rb b/lib/fog/local/storage.rb index b336f51c0..be75633ed 100644 --- a/lib/fog/local/storage.rb +++ b/lib/fog/local/storage.rb @@ -11,7 +11,6 @@ module Fog collection :files class Mock - include Collections def self.data @data ||= Hash.new do |hash, key| @@ -40,7 +39,6 @@ module Fog end class Real - include Collections def initialize(options={}) @local_root = ::File.expand_path(options[:local_root]) diff --git a/lib/fog/new_servers/compute.rb b/lib/fog/new_servers/compute.rb index c735be5ac..7b3f3f897 100644 --- a/lib/fog/new_servers/compute.rb +++ b/lib/fog/new_servers/compute.rb @@ -19,7 +19,6 @@ module Fog request :reboot_server class Mock - include Collections def self.data @data ||= Hash.new do |hash, key| @@ -41,7 +40,6 @@ module Fog end class Real - include Collections def initialize(options={}) @new_servers_password = options[:new_servers_password] diff --git a/lib/fog/rackspace/compute.rb b/lib/fog/rackspace/compute.rb index f0a92857d..2c225242f 100644 --- a/lib/fog/rackspace/compute.rb +++ b/lib/fog/rackspace/compute.rb @@ -33,7 +33,6 @@ module Fog request :update_server class Mock - include Collections def self.data @data ||= Hash.new do |hash, key| @@ -62,7 +61,6 @@ module Fog end class Real - include Collections def initialize(options={}) credentials = Fog::Rackspace.authenticate(options) diff --git a/lib/fog/rackspace/storage.rb b/lib/fog/rackspace/storage.rb index a7aa93df0..4aeda1cd5 100644 --- a/lib/fog/rackspace/storage.rb +++ b/lib/fog/rackspace/storage.rb @@ -48,7 +48,6 @@ module Fog end class Mock - include Collections include Utils def self.data @@ -71,7 +70,6 @@ module Fog end class Real - include Collections include Utils def initialize(options={}) diff --git a/lib/fog/slicehost/compute.rb b/lib/fog/slicehost/compute.rb index 158c7dd34..bdacefc8c 100644 --- a/lib/fog/slicehost/compute.rb +++ b/lib/fog/slicehost/compute.rb @@ -25,7 +25,6 @@ module Fog request :reboot_slice class Mock - include Collections def self.data @data ||= Hash.new do |hash, key| @@ -47,7 +46,6 @@ module Fog end class Real - include Collections def initialize(options={}) @slicehost_password = options[:slicehost_password] diff --git a/lib/fog/vcloud/bin.rb b/lib/fog/vcloud/bin.rb index 770cea180..af3e7d3b1 100644 --- a/lib/fog/vcloud/bin.rb +++ b/lib/fog/vcloud/bin.rb @@ -38,7 +38,7 @@ module Vcloud def [](service) @@connections ||= Hash.new do |hash, key| if credentials = Fog.credentials[:vcloud][key] - hash[key] = Fog::Vcloud.new(credentials) + hash[key] = eval(credentials[:module]).new(credentials) else raise ArgumentError.new("Unregistered service: :#{key}. Registered services are: #{Vcloud.registered_services}") end diff --git a/lib/fog/vcloud/terremark/ecloud.rb b/lib/fog/vcloud/terremark/ecloud.rb index 557156c9d..95a79f5ae 100644 --- a/lib/fog/vcloud/terremark/ecloud.rb +++ b/lib/fog/vcloud/terremark/ecloud.rb @@ -63,7 +63,6 @@ module Fog request :power_shutdown class Mock < Fog::Vcloud::Mock - include Collections def initialize(options={}) end @@ -192,7 +191,6 @@ module Fog end class Real < Fog::Vcloud::Real - include Collections def supporting_versions ["v0.8b-ext2.3", "0.8b-ext2.3"] diff --git a/lib/fog/vcloud/terremark/vcloud.rb b/lib/fog/vcloud/terremark/vcloud.rb index 821f1ae6c..ecf832021 100644 --- a/lib/fog/vcloud/terremark/vcloud.rb +++ b/lib/fog/vcloud/terremark/vcloud.rb @@ -6,7 +6,6 @@ module Fog request :get_vdc class Real < Fog::Vcloud::Real - include Collections def supporting_versions ["0.8", "0.8a-ext1.6"] @@ -15,8 +14,6 @@ module Fog end class Mock < Fog::Vcloud::Mock - include Collections - end end