cleanup load/reload/require stuff a bit

This commit is contained in:
geemus (Wesley Beary) 2010-02-11 23:41:40 -08:00
parent 6d671821b2
commit 4771ae5d1a
10 changed files with 249 additions and 217 deletions

View File

@ -29,16 +29,21 @@ module Fog
!!@mocking
end
def self.reload
load "fog/collection.rb"
load "fog/connection.rb"
load "fog/model.rb"
load "fog/parser.rb"
def self.dependencies
[
'fog/collection.rb',
'fog/connection.rb',
'fog/model.rb',
'fog/parser.rb',
'fog/aws.rb',
'fog/rackspace.rb',
'fog/slicehost.rb',
'fog/terremark.rb'
]
end
load "fog/aws.rb"
load "fog/rackspace.rb"
load "fog/slicehost.rb"
load "fog/terremark.rb"
def self.reload
self.dependencies.each {|dependency| load(dependency)}
end
def self.credential=(new_credential)
@ -83,4 +88,4 @@ YML
end
Fog.reload
Fog.dependencies.each {|dependency| require(dependency)}

View File

@ -1,10 +1,16 @@
module Fog
module AWS
def self.dependencies
[
'fog/aws/ec2.rb',
'fog/aws/simpledb.rb',
'fog/aws/s3.rb'
]
end
def self.reload
load "fog/aws/ec2.rb"
load "fog/aws/simpledb.rb"
load "fog/aws/s3.rb"
self.dependencies.each {|dependency| load(dependency)}
end
def self.indexed_param(key, values)
@ -172,4 +178,4 @@ module Fog
end
end
Fog::AWS.reload
Fog::AWS.dependencies.each {|dependency| require(dependency)}

View File

@ -19,94 +19,80 @@ module Fog
end
end
def self.dependencies
[
"fog/aws/models/ec2/address.rb",
"fog/aws/models/ec2/addresses.rb",
"fog/aws/models/ec2/flavor.rb",
"fog/aws/models/ec2/flavors.rb",
"fog/aws/models/ec2/image.rb",
"fog/aws/models/ec2/images.rb",
"fog/aws/models/ec2/key_pair.rb",
"fog/aws/models/ec2/key_pairs.rb",
"fog/aws/models/ec2/security_group.rb",
"fog/aws/models/ec2/security_groups.rb",
"fog/aws/models/ec2/server.rb",
"fog/aws/models/ec2/servers.rb",
"fog/aws/models/ec2/snapshot.rb",
"fog/aws/models/ec2/snapshots.rb",
"fog/aws/models/ec2/volume.rb",
"fog/aws/models/ec2/volumes.rb",
"fog/aws/parsers/ec2/allocate_address.rb",
"fog/aws/parsers/ec2/attach_volume.rb",
"fog/aws/parsers/ec2/basic.rb",
"fog/aws/parsers/ec2/create_key_pair.rb",
"fog/aws/parsers/ec2/create_snapshot.rb",
"fog/aws/parsers/ec2/create_volume.rb",
"fog/aws/parsers/ec2/describe_addresses.rb",
"fog/aws/parsers/ec2/describe_availability_zones.rb",
"fog/aws/parsers/ec2/describe_images.rb",
"fog/aws/parsers/ec2/describe_instances.rb",
"fog/aws/parsers/ec2/describe_key_pairs.rb",
"fog/aws/parsers/ec2/describe_regions.rb",
"fog/aws/parsers/ec2/describe_security_groups.rb",
"fog/aws/parsers/ec2/describe_snapshots.rb",
"fog/aws/parsers/ec2/describe_volumes.rb",
"fog/aws/parsers/ec2/detach_volume.rb",
"fog/aws/parsers/ec2/get_console_output.rb",
"fog/aws/parsers/ec2/run_instances.rb",
"fog/aws/parsers/ec2/terminate_instances.rb",
"fog/aws/requests/ec2/allocate_address.rb",
"fog/aws/requests/ec2/associate_address.rb",
"fog/aws/requests/ec2/attach_volume.rb",
"fog/aws/requests/ec2/authorize_security_group_ingress.rb",
"fog/aws/requests/ec2/create_key_pair.rb",
"fog/aws/requests/ec2/create_security_group.rb",
"fog/aws/requests/ec2/create_snapshot.rb",
"fog/aws/requests/ec2/create_volume.rb",
"fog/aws/requests/ec2/delete_key_pair.rb",
"fog/aws/requests/ec2/delete_security_group.rb",
"fog/aws/requests/ec2/delete_snapshot.rb",
"fog/aws/requests/ec2/delete_volume.rb",
"fog/aws/requests/ec2/describe_addresses.rb",
"fog/aws/requests/ec2/describe_availability_zones.rb",
"fog/aws/requests/ec2/describe_images.rb",
"fog/aws/requests/ec2/describe_instances.rb",
"fog/aws/requests/ec2/describe_key_pairs.rb",
"fog/aws/requests/ec2/describe_regions.rb",
"fog/aws/requests/ec2/describe_security_groups.rb",
"fog/aws/requests/ec2/describe_snapshots.rb",
"fog/aws/requests/ec2/describe_volumes.rb",
"fog/aws/requests/ec2/detach_volume.rb",
"fog/aws/requests/ec2/disassociate_address.rb",
"fog/aws/requests/ec2/get_console_output.rb",
"fog/aws/requests/ec2/reboot_instances.rb",
"fog/aws/requests/ec2/release_address.rb",
"fog/aws/requests/ec2/revoke_security_group_ingress.rb",
"fog/aws/requests/ec2/run_instances.rb",
"fog/aws/requests/ec2/terminate_instances.rb"
]
end
def self.reload
load "fog/aws/models/ec2/address.rb"
load "fog/aws/models/ec2/addresses.rb"
load "fog/aws/models/ec2/flavor.rb"
load "fog/aws/models/ec2/flavors.rb"
load "fog/aws/models/ec2/image.rb"
load "fog/aws/models/ec2/images.rb"
load "fog/aws/models/ec2/key_pair.rb"
load "fog/aws/models/ec2/key_pairs.rb"
load "fog/aws/models/ec2/security_group.rb"
load "fog/aws/models/ec2/security_groups.rb"
load "fog/aws/models/ec2/server.rb"
load "fog/aws/models/ec2/servers.rb"
load "fog/aws/models/ec2/snapshot.rb"
load "fog/aws/models/ec2/snapshots.rb"
load "fog/aws/models/ec2/volume.rb"
load "fog/aws/models/ec2/volumes.rb"
load "fog/aws/parsers/ec2/allocate_address.rb"
load "fog/aws/parsers/ec2/attach_volume.rb"
load "fog/aws/parsers/ec2/basic.rb"
load "fog/aws/parsers/ec2/create_key_pair.rb"
load "fog/aws/parsers/ec2/create_snapshot.rb"
load "fog/aws/parsers/ec2/create_volume.rb"
load "fog/aws/parsers/ec2/describe_addresses.rb"
load "fog/aws/parsers/ec2/describe_availability_zones.rb"
load "fog/aws/parsers/ec2/describe_images.rb"
load "fog/aws/parsers/ec2/describe_instances.rb"
load "fog/aws/parsers/ec2/describe_key_pairs.rb"
load "fog/aws/parsers/ec2/describe_regions.rb"
load "fog/aws/parsers/ec2/describe_security_groups.rb"
load "fog/aws/parsers/ec2/describe_snapshots.rb"
load "fog/aws/parsers/ec2/describe_volumes.rb"
load "fog/aws/parsers/ec2/detach_volume.rb"
load "fog/aws/parsers/ec2/get_console_output.rb"
load "fog/aws/parsers/ec2/run_instances.rb"
load "fog/aws/parsers/ec2/terminate_instances.rb"
load "fog/aws/requests/ec2/allocate_address.rb"
load "fog/aws/requests/ec2/associate_address.rb"
load "fog/aws/requests/ec2/attach_volume.rb"
load "fog/aws/requests/ec2/authorize_security_group_ingress.rb"
# TODO: require "fog/aws/requests/ec2/bundle_instance.rb"
# TODO: require "fog/aws/requests/ec2/cancel_bundle_task.rb"
# TODO: require "fog/aws/requests/ec2/confirm_product_instance.rb"
load "fog/aws/requests/ec2/create_key_pair.rb"
load "fog/aws/requests/ec2/create_security_group.rb"
load "fog/aws/requests/ec2/create_snapshot.rb"
load "fog/aws/requests/ec2/create_volume.rb"
load "fog/aws/requests/ec2/delete_key_pair.rb"
load "fog/aws/requests/ec2/delete_security_group.rb"
load "fog/aws/requests/ec2/delete_snapshot.rb"
load "fog/aws/requests/ec2/delete_volume.rb"
# TODO: require "fog/aws/requests/ec2/deregister_image.rb"
load "fog/aws/requests/ec2/describe_addresses.rb"
load "fog/aws/requests/ec2/describe_availability_zones.rb"
# TODO: require "fog/aws/requests/ec2/describe_bundle_tasks.rb"
# TODO: require "fog/aws/requests/ec2/describe_image_attribute.rb"
load "fog/aws/requests/ec2/describe_images.rb"
load "fog/aws/requests/ec2/describe_instances.rb"
load "fog/aws/requests/ec2/describe_key_pairs.rb"
load "fog/aws/requests/ec2/describe_regions.rb"
# TODO: require "fog/aws/requests/ec2/describe_reserved_instances.rb"
# TODO: require "fog/aws/requests/ec2/describe_reserved_instances_offerings.rb"
load "fog/aws/requests/ec2/describe_security_groups.rb"
load "fog/aws/requests/ec2/describe_snapshots.rb"
load "fog/aws/requests/ec2/describe_volumes.rb"
load "fog/aws/requests/ec2/detach_volume.rb"
load "fog/aws/requests/ec2/disassociate_address.rb"
load "fog/aws/requests/ec2/get_console_output.rb"
# TODO: require "fog/aws/requests/ec2/modify_image_attribute.rb"
# TODO: require "fog/aws/requests/ec2/modify_snapshot_attribute.rb"
# TODO: require "fog/aws/requests/ec2/monitor_instances.rb"
# TODO: require "fog/aws/requests/ec2/purchase_reserved_instances_offering.rb"
load "fog/aws/requests/ec2/reboot_instances.rb"
# TODO: require "fog/aws/requests/ec2/register_image.rb"
load "fog/aws/requests/ec2/release_address.rb"
# TODO: require "fog/aws/requests/ec2/reset_image_attributes.rb"
# TODO: require "fog/aws/requests/ec2/reset_snapshot_attributes.rb"
load "fog/aws/requests/ec2/revoke_security_group_ingress.rb"
load "fog/aws/requests/ec2/run_instances.rb"
load "fog/aws/requests/ec2/terminate_instances.rb"
# TODO: require "fog/aws/requests/ec2/unmonitor_instances.rb"
self.dependencies.each {|dependency| load(dependency)}
if Fog.mocking?
reset_data
end
end
# Initialize connection to EC2
@ -178,4 +164,4 @@ module Fog
end
end
Fog::AWS::EC2.reload
Fog::AWS::EC2.dependencies.each {|dependency| require(dependency)}

View File

@ -11,31 +11,34 @@ module Fog
end
end
def self.dependencies
[
"fog/aws/models/s3/directory.rb",
"fog/aws/models/s3/directories.rb",
"fog/aws/models/s3/file.rb",
"fog/aws/models/s3/files.rb",
"fog/aws/parsers/s3/copy_object.rb",
"fog/aws/parsers/s3/get_bucket.rb",
"fog/aws/parsers/s3/get_bucket_location.rb",
"fog/aws/parsers/s3/get_request_payment.rb",
"fog/aws/parsers/s3/get_service.rb",
"fog/aws/requests/s3/copy_object.rb",
"fog/aws/requests/s3/delete_bucket.rb",
"fog/aws/requests/s3/delete_object.rb",
"fog/aws/requests/s3/get_bucket.rb",
"fog/aws/requests/s3/get_bucket_location.rb",
"fog/aws/requests/s3/get_object.rb",
"fog/aws/requests/s3/get_request_payment.rb",
"fog/aws/requests/s3/get_service.rb",
"fog/aws/requests/s3/head_object.rb",
"fog/aws/requests/s3/put_bucket.rb",
"fog/aws/requests/s3/put_object.rb",
"fog/aws/requests/s3/put_request_payment.rb"
]
end
def self.reload
load "fog/aws/models/s3/directory.rb"
load "fog/aws/models/s3/directories.rb"
load "fog/aws/models/s3/file.rb"
load "fog/aws/models/s3/files.rb"
load "fog/aws/parsers/s3/copy_object.rb"
load "fog/aws/parsers/s3/get_bucket.rb"
load "fog/aws/parsers/s3/get_bucket_location.rb"
load "fog/aws/parsers/s3/get_request_payment.rb"
load "fog/aws/parsers/s3/get_service.rb"
load "fog/aws/requests/s3/copy_object.rb"
load "fog/aws/requests/s3/delete_bucket.rb"
load "fog/aws/requests/s3/delete_object.rb"
load "fog/aws/requests/s3/get_bucket.rb"
load "fog/aws/requests/s3/get_bucket_location.rb"
load "fog/aws/requests/s3/get_object.rb"
load "fog/aws/requests/s3/get_request_payment.rb"
load "fog/aws/requests/s3/get_service.rb"
load "fog/aws/requests/s3/head_object.rb"
load "fog/aws/requests/s3/put_bucket.rb"
load "fog/aws/requests/s3/put_object.rb"
load "fog/aws/requests/s3/put_request_payment.rb"
self.dependencies.each {|dependency| load(dependency)}
if Fog.mocking?
reset_data
end
@ -164,4 +167,4 @@ DATA
end
end
Fog::AWS::S3.reload
Fog::AWS::S3.dependencies.each {|dependency| require(dependency)}

View File

@ -11,23 +11,27 @@ module Fog
end
end
def self.dependencies
[
"fog/aws/parsers/simpledb/basic.rb",
"fog/aws/parsers/simpledb/domain_metadata.rb",
"fog/aws/parsers/simpledb/get_attributes.rb",
"fog/aws/parsers/simpledb/list_domains.rb",
"fog/aws/parsers/simpledb/select.rb",
"fog/aws/requests/simpledb/batch_put_attributes.rb",
"fog/aws/requests/simpledb/create_domain.rb",
"fog/aws/requests/simpledb/delete_attributes.rb",
"fog/aws/requests/simpledb/delete_domain.rb",
"fog/aws/requests/simpledb/domain_metadata.rb",
"fog/aws/requests/simpledb/get_attributes.rb",
"fog/aws/requests/simpledb/list_domains.rb",
"fog/aws/requests/simpledb/put_attributes.rb",
"fog/aws/requests/simpledb/select.rb"
]
end
def self.reload
load "fog/aws/parsers/simpledb/basic.rb"
load "fog/aws/parsers/simpledb/domain_metadata.rb"
load "fog/aws/parsers/simpledb/get_attributes.rb"
load "fog/aws/parsers/simpledb/list_domains.rb"
load "fog/aws/parsers/simpledb/select.rb"
load "fog/aws/requests/simpledb/batch_put_attributes.rb"
load "fog/aws/requests/simpledb/create_domain.rb"
load "fog/aws/requests/simpledb/delete_attributes.rb"
load "fog/aws/requests/simpledb/delete_domain.rb"
load "fog/aws/requests/simpledb/domain_metadata.rb"
load "fog/aws/requests/simpledb/get_attributes.rb"
load "fog/aws/requests/simpledb/list_domains.rb"
load "fog/aws/requests/simpledb/put_attributes.rb"
load "fog/aws/requests/simpledb/select.rb"
self.dependencies.each {|dependency| load(dependency)}
if Fog.mocking?
reset_data
end
@ -152,4 +156,4 @@ module Fog
end
end
Fog::AWS::SimpleDB.reload
Fog::AWS::SimpleDB.dependencies.each {|dependency| require(dependency)}

View File

@ -1,9 +1,15 @@
module Fog
module Rackspace
def self.dependencies
[
'fog/rackspace/files.rb',
'fog/rackspace/servers.rb'
]
end
def self.reload
load 'fog/rackspace/files.rb'
load 'fog/rackspace/servers.rb'
self.dependencies.each {|dependency| load(dependency)}
end
unless Fog.mocking?
@ -51,4 +57,5 @@ module Fog
end
end
Fog::Rackspace.reload
Fog::Rackspace.dependencies.each {|dependency| require(dependency)}

View File

@ -2,15 +2,21 @@ module Fog
module Rackspace
class Files
def self.dependencies
[
"fog/rackspace/requests/files/delete_container.rb",
"fog/rackspace/requests/files/delete_object.rb",
"fog/rackspace/requests/files/get_container.rb",
"fog/rackspace/requests/files/get_containers.rb",
"fog/rackspace/requests/files/head_container.rb",
"fog/rackspace/requests/files/head_containers.rb",
"fog/rackspace/requests/files/put_container.rb",
"fog/rackspace/requests/files/put_object.rb"
]
end
def self.reload
load "fog/rackspace/requests/files/delete_container.rb"
load "fog/rackspace/requests/files/delete_object.rb"
load "fog/rackspace/requests/files/get_container.rb"
load "fog/rackspace/requests/files/get_containers.rb"
load "fog/rackspace/requests/files/head_container.rb"
load "fog/rackspace/requests/files/head_containers.rb"
load "fog/rackspace/requests/files/put_container.rb"
load "fog/rackspace/requests/files/put_object.rb"
self.dependencies.each {|dependency| load(dependency)}
end
def initialize(options={})
@ -92,4 +98,5 @@ module Fog
end
end
end
Fog::Rackspace::Files.reload
Fog::Rackspace::Files.dependencies.each {|dependency| require(dependency)}

View File

@ -18,32 +18,36 @@ module Fog
end
end
def self.dependencies
[
"fog/rackspace/models/servers/flavor.rb",
"fog/rackspace/models/servers/flavors.rb",
"fog/rackspace/models/servers/image.rb",
"fog/rackspace/models/servers/images.rb",
"fog/rackspace/models/servers/server.rb",
"fog/rackspace/models/servers/servers.rb",
"fog/rackspace/requests/servers/create_image.rb",
"fog/rackspace/requests/servers/create_server.rb",
"fog/rackspace/requests/servers/delete_image.rb",
"fog/rackspace/requests/servers/delete_server.rb",
"fog/rackspace/requests/servers/get_flavor_details.rb",
"fog/rackspace/requests/servers/get_server_details.rb",
"fog/rackspace/requests/servers/list_addresses.rb",
"fog/rackspace/requests/servers/list_private_addresses.rb",
"fog/rackspace/requests/servers/list_public_addresses.rb",
"fog/rackspace/requests/servers/list_flavors.rb",
"fog/rackspace/requests/servers/list_flavors_detail.rb",
"fog/rackspace/requests/servers/list_images.rb",
"fog/rackspace/requests/servers/list_images_detail.rb",
"fog/rackspace/requests/servers/list_servers.rb",
"fog/rackspace/requests/servers/list_servers_detail.rb",
"fog/rackspace/requests/servers/reboot_server.rb",
"fog/rackspace/requests/servers/update_server.rb"
]
end
def self.reload
load "fog/rackspace/models/servers/flavor.rb"
load "fog/rackspace/models/servers/flavors.rb"
load "fog/rackspace/models/servers/image.rb"
load "fog/rackspace/models/servers/images.rb"
load "fog/rackspace/models/servers/server.rb"
load "fog/rackspace/models/servers/servers.rb"
load "fog/rackspace/requests/servers/create_image.rb"
load "fog/rackspace/requests/servers/create_server.rb"
load "fog/rackspace/requests/servers/delete_image.rb"
load "fog/rackspace/requests/servers/delete_server.rb"
load "fog/rackspace/requests/servers/get_flavor_details.rb"
load "fog/rackspace/requests/servers/get_server_details.rb"
load "fog/rackspace/requests/servers/list_addresses.rb"
load "fog/rackspace/requests/servers/list_private_addresses.rb"
load "fog/rackspace/requests/servers/list_public_addresses.rb"
load "fog/rackspace/requests/servers/list_flavors.rb"
load "fog/rackspace/requests/servers/list_flavors_detail.rb"
load "fog/rackspace/requests/servers/list_images.rb"
load "fog/rackspace/requests/servers/list_images_detail.rb"
load "fog/rackspace/requests/servers/list_servers.rb"
load "fog/rackspace/requests/servers/list_servers_detail.rb"
load "fog/rackspace/requests/servers/reboot_server.rb"
load "fog/rackspace/requests/servers/update_server.rb"
self.dependencies.each {|dependency| load(dependency)}
if Fog.mocking?
reset_data
end
@ -81,4 +85,5 @@ module Fog
end
end
end
Fog::Rackspace::Servers.reload
Fog::Rackspace::Servers.dependencies.each {|dependency| require(dependency)}

View File

@ -10,34 +10,37 @@ module Fog
end
end
def self.dependencies
[
"fog/slicehost/models/flavor.rb",
"fog/slicehost/models/flavors.rb",
"fog/slicehost/models/image.rb",
"fog/slicehost/models/images.rb",
"fog/slicehost/models/server.rb",
"fog/slicehost/models/servers.rb",
"fog/slicehost/parsers/create_slice.rb",
"fog/slicehost/parsers/get_backups.rb",
"fog/slicehost/parsers/get_flavor.rb",
"fog/slicehost/parsers/get_flavors.rb",
"fog/slicehost/parsers/get_image.rb",
"fog/slicehost/parsers/get_images.rb",
"fog/slicehost/parsers/get_slice.rb",
"fog/slicehost/parsers/get_slices.rb",
"fog/slicehost/requests/create_slice.rb",
"fog/slicehost/requests/delete_slice.rb",
"fog/slicehost/requests/get_backups.rb",
"fog/slicehost/requests/get_flavor.rb",
"fog/slicehost/requests/get_flavors.rb",
"fog/slicehost/requests/get_image.rb",
"fog/slicehost/requests/get_images.rb",
"fog/slicehost/requests/get_slice.rb",
"fog/slicehost/requests/get_slices.rb",
"fog/slicehost/requests/reboot_slice.rb"
]
end
def self.reload
load "fog/slicehost/models/flavor.rb"
load "fog/slicehost/models/flavors.rb"
load "fog/slicehost/models/image.rb"
load "fog/slicehost/models/images.rb"
load "fog/slicehost/models/server.rb"
load "fog/slicehost/models/servers.rb"
load "fog/slicehost/parsers/create_slice.rb"
load "fog/slicehost/parsers/get_backups.rb"
load "fog/slicehost/parsers/get_flavor.rb"
load "fog/slicehost/parsers/get_flavors.rb"
load "fog/slicehost/parsers/get_image.rb"
load "fog/slicehost/parsers/get_images.rb"
load "fog/slicehost/parsers/get_slice.rb"
load "fog/slicehost/parsers/get_slices.rb"
load "fog/slicehost/requests/create_slice.rb"
load "fog/slicehost/requests/delete_slice.rb"
load "fog/slicehost/requests/get_backups.rb"
load "fog/slicehost/requests/get_flavor.rb"
load "fog/slicehost/requests/get_flavors.rb"
load "fog/slicehost/requests/get_image.rb"
load "fog/slicehost/requests/get_images.rb"
load "fog/slicehost/requests/get_slice.rb"
load "fog/slicehost/requests/get_slices.rb"
load "fog/slicehost/requests/reboot_slice.rb"
self.dependencies.each {|dependency| load(dependency)}
if Fog.mocking?
reset_data
end
@ -80,4 +83,4 @@ module Fog
end
end
Fog::Slicehost.reload
Fog::Slicehost.dependencies.each {|dependency| require(dependency)}

View File

@ -1,16 +1,21 @@
module Fog
class Terremark
def self.reload
load 'fog/terremark/parsers/get_catalog.rb'
load 'fog/terremark/parsers/get_organization.rb'
load 'fog/terremark/parsers/get_organizations.rb'
load 'fog/terremark/parsers/get_vdc.rb'
def self.dependencies
[
'fog/terremark/parsers/get_catalog.rb',
'fog/terremark/parsers/get_organization.rb',
'fog/terremark/parsers/get_organizations.rb',
'fog/terremark/parsers/get_vdc.rb',
'fog/terremark/requests/get_catalog.rb',
'fog/terremark/requests/get_organization.rb',
'fog/terremark/requests/get_organizations.rb',
'fog/terremark/requests/get_vdc.rb'
]
end
load 'fog/terremark/requests/get_catalog.rb'
load 'fog/terremark/requests/get_organization.rb'
load 'fog/terremark/requests/get_organizations.rb'
load 'fog/terremark/requests/get_vdc.rb'
def self.reload
self.dependencies.each {|dependency| load(dependency)}
end
def initialize(options={})
@ -58,4 +63,5 @@ module Fog
end
end
Fog::Terremark.reload
Fog::Terremark.dependencies.each {|dependency| require(dependency)}