From 5d748000cd9faa2639257a5f88a68c2d09ba88d8 Mon Sep 17 00:00:00 2001 From: Wesley Beary Date: Mon, 17 Aug 2009 15:11:53 -0700 Subject: [PATCH] get rid of duplicated requires --- lib/fog.rb | 2 +- lib/fog/aws.rb | 7 ++-- lib/fog/aws/ec2.rb | 72 ++--------------------------------------- lib/fog/aws/s3.rb | 30 ++--------------- lib/fog/aws/simpledb.rb | 25 ++------------ 5 files changed, 10 insertions(+), 126 deletions(-) diff --git a/lib/fog.rb b/lib/fog.rb index 52b1d1cdf..ba161f336 100644 --- a/lib/fog.rb +++ b/lib/fog.rb @@ -19,4 +19,4 @@ module Fog end -require "#{File.dirname(__FILE__)}/fog/aws" +Fog.reload diff --git a/lib/fog/aws.rb b/lib/fog/aws.rb index 82cee58cc..87d52d396 100644 --- a/lib/fog/aws.rb +++ b/lib/fog/aws.rb @@ -6,11 +6,6 @@ require 'hmac-sha1' require 'hmac-sha2' require 'mime/types' -current_directory = File.dirname(__FILE__) -require "#{current_directory}/aws/ec2" -require "#{current_directory}/aws/simpledb" -require "#{current_directory}/aws/s3" - module Fog module AWS @@ -128,3 +123,5 @@ module Fog end end + +Fog::AWS.reload \ No newline at end of file diff --git a/lib/fog/aws/ec2.rb b/lib/fog/aws/ec2.rb index 7d9e27277..4bc7cf3c9 100644 --- a/lib/fog/aws/ec2.rb +++ b/lib/fog/aws/ec2.rb @@ -1,73 +1,3 @@ -current_directory = File.dirname(__FILE__) -require "#{current_directory}/../connection" -require "#{current_directory}/../parser" -require "#{current_directory}/../response" - -parsers_directory = "#{current_directory}/parsers/ec2" -require "#{parsers_directory}/allocate_address" -require "#{parsers_directory}/attach_volume" -require "#{parsers_directory}/basic" -require "#{parsers_directory}/create_key_pair" -require "#{parsers_directory}/create_snapshot" -require "#{parsers_directory}/create_volume" -require "#{parsers_directory}/describe_addresses" -require "#{parsers_directory}/describe_availability_zones" -require "#{parsers_directory}/describe_images" -require "#{parsers_directory}/describe_instances" -require "#{parsers_directory}/describe_key_pairs" -require "#{parsers_directory}/describe_regions" -require "#{parsers_directory}/describe_security_groups" -require "#{parsers_directory}/describe_snapshots" -require "#{parsers_directory}/describe_volumes" -require "#{parsers_directory}/detach_volume" -require "#{parsers_directory}/get_console_output" -require "#{parsers_directory}/run_instances" -require "#{parsers_directory}/terminate_instances" - -requests_directory = "#{current_directory}/requests/ec2" -require "#{requests_directory}/allocate_address" -require "#{requests_directory}/associate_address" -require "#{requests_directory}/attach_volume" -require "#{requests_directory}/authorize_security_group_ingress" -# TODO: require "#{requests_directory}/bundle_instance" -# TODO: require "#{requests_directory}/cancel_bundle_task" -# TODO: require "#{requests_directory}/confirm_product_instance" -require "#{requests_directory}/create_key_pair" -require "#{requests_directory}/create_security_group" -require "#{requests_directory}/create_snapshot" -require "#{requests_directory}/create_volume" -require "#{requests_directory}/delete_key_pair" -require "#{requests_directory}/delete_security_group" -require "#{requests_directory}/delete_snapshot" -require "#{requests_directory}/delete_volume" -# TODO: require "#{requests_directory}/deregister_image" -require "#{requests_directory}/describe_addresses" -require "#{requests_directory}/describe_availability_zones" -# TODO: require "#{requests_directory}/describe_bundle_tasks" -# TODO: require "#{requests_directory}/describe_image_attribute" -require "#{requests_directory}/describe_images" -require "#{requests_directory}/describe_instances" -require "#{requests_directory}/describe_key_pairs" -require "#{requests_directory}/describe_regions" -# TODO: require "#{requests_directory}/describe_reserved_instances" -# TODO: require "#{requests_directory}/describe_reserved_instances_offerings" -require "#{requests_directory}/describe_security_groups" -require "#{requests_directory}/describe_snapshots" -require "#{requests_directory}/describe_volumes" -require "#{requests_directory}/detach_volume" -require "#{requests_directory}/disassociate_address" -require "#{requests_directory}/get_console_output" -# TODO: require "#{requests_directory}/modify_image_attribute" -# TODO: require "#{requests_directory}/monitor_instances" -# TODO: require "#{requests_directory}/purchase_reserved_instances_offering" -require "#{requests_directory}/reboot_instances" -# TODO: require "#{requests_directory}/register_image" -require "#{requests_directory}/release_address" -require "#{requests_directory}/revoke_security_group_ingress" -require "#{requests_directory}/run_instances" -require "#{requests_directory}/terminate_instances" -# TODO: require "#{requests_directory}/unmonitor_instances" - module Fog module AWS class EC2 @@ -225,3 +155,5 @@ module Fog end end end + +Fog::AWS::EC2.reload diff --git a/lib/fog/aws/s3.rb b/lib/fog/aws/s3.rb index d3cf1329d..d43390ba3 100644 --- a/lib/fog/aws/s3.rb +++ b/lib/fog/aws/s3.rb @@ -1,29 +1,3 @@ -current_directory = File.dirname(__FILE__) -require "#{current_directory}/../connection" -require "#{current_directory}/../parser" -require "#{current_directory}/../response" - -parsers_directory = "#{current_directory}/parsers/s3" -require "#{parsers_directory}/copy_object" -require "#{parsers_directory}/get_bucket" -require "#{parsers_directory}/get_bucket_location" -require "#{parsers_directory}/get_request_payment" -require "#{parsers_directory}/get_service" - -requests_directory = "#{current_directory}/requests/s3" -require "#{requests_directory}/copy_object" -require "#{requests_directory}/delete_bucket" -require "#{requests_directory}/delete_object" -require "#{requests_directory}/get_bucket" -require "#{requests_directory}/get_bucket_location" -require "#{requests_directory}/get_object" -require "#{requests_directory}/get_request_payment" -require "#{requests_directory}/get_service" -require "#{requests_directory}/head_object" -require "#{requests_directory}/put_bucket" -require "#{requests_directory}/put_object" -require "#{requests_directory}/put_request_payment" - module Fog module AWS class S3 @@ -164,4 +138,6 @@ DATA end end -end \ No newline at end of file +end + +Fog::AWS::S3.reload diff --git a/lib/fog/aws/simpledb.rb b/lib/fog/aws/simpledb.rb index d738fa843..133a3d4a9 100644 --- a/lib/fog/aws/simpledb.rb +++ b/lib/fog/aws/simpledb.rb @@ -1,26 +1,3 @@ -current_directory = File.dirname(__FILE__) -require "#{current_directory}/../connection" -require "#{current_directory}/../parser" -require "#{current_directory}/../response" - -parsers_directory = "#{current_directory}/parsers/simpledb" -require "#{parsers_directory}/basic" -require "#{parsers_directory}/domain_metadata" -require "#{parsers_directory}/get_attributes" -require "#{parsers_directory}/list_domains" -require "#{parsers_directory}/select" - -requests_directory = "#{current_directory}/requests/simpledb" -require "#{requests_directory}/batch_put_attributes" -require "#{requests_directory}/create_domain" -require "#{requests_directory}/delete_attributes" -require "#{requests_directory}/delete_domain" -require "#{requests_directory}/domain_metadata" -require "#{requests_directory}/get_attributes" -require "#{requests_directory}/list_domains" -require "#{requests_directory}/put_attributes" -require "#{requests_directory}/select" - module Fog module AWS class SimpleDB @@ -176,3 +153,5 @@ module Fog end end end + +Fog::AWS::SimpleDB.reload