From 9382978cbfcd404d5607c8961ffd6d6565068d3b Mon Sep 17 00:00:00 2001
From: Wesley Beary <wbeary@engineyard.com>
Date: Sun, 12 Jul 2009 15:20:46 -0700
Subject: [PATCH] cleanup requires, remove duplicates and push them higher

---
 lib/fog/aws.rb                                      | 10 ++++++----
 lib/fog/aws/ec2.rb                                  |  2 +-
 lib/fog/aws/parsers/ec2/allocate_address.rb         |  2 --
 lib/fog/aws/parsers/ec2/basic.rb                    |  2 --
 lib/fog/aws/parsers/ec2/create_key_pair.rb          |  2 --
 lib/fog/aws/parsers/ec2/create_snapshot.rb          |  2 --
 lib/fog/aws/parsers/ec2/create_volume.rb            |  2 --
 lib/fog/aws/parsers/ec2/describe_addresses.rb       |  2 --
 lib/fog/aws/parsers/ec2/describe_images.rb          |  2 --
 lib/fog/aws/parsers/ec2/describe_instances.rb       |  2 --
 lib/fog/aws/parsers/ec2/describe_key_pairs.rb       |  2 --
 lib/fog/aws/parsers/ec2/describe_security_groups.rb |  2 --
 lib/fog/aws/parsers/ec2/describe_snapshots.rb       |  2 --
 lib/fog/aws/parsers/ec2/describe_volumes.rb         |  2 --
 lib/fog/aws/parsers/s3/copy_object.rb               |  2 --
 lib/fog/aws/parsers/s3/get_bucket.rb                |  2 --
 lib/fog/aws/parsers/s3/get_bucket_location.rb       |  2 --
 lib/fog/aws/parsers/s3/get_request_payment.rb       |  2 --
 lib/fog/aws/parsers/s3/get_service.rb               |  2 --
 lib/fog/aws/parsers/simpledb/basic.rb               |  2 --
 lib/fog/aws/parsers/simpledb/domain_metadata.rb     |  2 --
 lib/fog/aws/parsers/simpledb/get_attributes.rb      |  2 --
 lib/fog/aws/parsers/simpledb/select.rb              |  2 --
 23 files changed, 7 insertions(+), 47 deletions(-)

diff --git a/lib/fog/aws.rb b/lib/fog/aws.rb
index a0d09ba46..273bcdfec 100644
--- a/lib/fog/aws.rb
+++ b/lib/fog/aws.rb
@@ -1,12 +1,14 @@
-require File.dirname(__FILE__) + '/aws/ec2'
-require File.dirname(__FILE__) + '/aws/simpledb'
-require File.dirname(__FILE__) + '/aws/s3'
-
 require 'rubygems'
 require 'openssl'
 require 'socket'
 require 'uri'
 
+current_directory = File.dirname(__FILE__)
+require "#{current_directory}/parser"
+require "#{current_directory}/aws/ec2"
+require "#{current_directory}/aws/simpledb"
+require "#{current_directory}/aws/s3"
+
 module Fog
   module AWS
     class Connection
diff --git a/lib/fog/aws/ec2.rb b/lib/fog/aws/ec2.rb
index 5470cde73..d8f8ec838 100644
--- a/lib/fog/aws/ec2.rb
+++ b/lib/fog/aws/ec2.rb
@@ -17,7 +17,7 @@ require "#{parsers_directory}/describe_security_groups"
 require "#{parsers_directory}/describe_snapshots"
 require "#{parsers_directory}/describe_volumes"
 
-
+requests_directory = "#{File.dirname(__FILE__)}/requests/ec2"
 module Fog
   module AWS
     class EC2
diff --git a/lib/fog/aws/parsers/ec2/allocate_address.rb b/lib/fog/aws/parsers/ec2/allocate_address.rb
index 351044ae6..ec8ab27b3 100644
--- a/lib/fog/aws/parsers/ec2/allocate_address.rb
+++ b/lib/fog/aws/parsers/ec2/allocate_address.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/basic'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/ec2/basic.rb b/lib/fog/aws/parsers/ec2/basic.rb
index 48943c9be..29594d1bc 100644
--- a/lib/fog/aws/parsers/ec2/basic.rb
+++ b/lib/fog/aws/parsers/ec2/basic.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/../../../parser'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/ec2/create_key_pair.rb b/lib/fog/aws/parsers/ec2/create_key_pair.rb
index d4ea9799e..a99e4bc8a 100644
--- a/lib/fog/aws/parsers/ec2/create_key_pair.rb
+++ b/lib/fog/aws/parsers/ec2/create_key_pair.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/basic'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/ec2/create_snapshot.rb b/lib/fog/aws/parsers/ec2/create_snapshot.rb
index 149a8954d..84dcca0ee 100644
--- a/lib/fog/aws/parsers/ec2/create_snapshot.rb
+++ b/lib/fog/aws/parsers/ec2/create_snapshot.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/basic'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/ec2/create_volume.rb b/lib/fog/aws/parsers/ec2/create_volume.rb
index c57ca2b1b..22a0cbf4d 100644
--- a/lib/fog/aws/parsers/ec2/create_volume.rb
+++ b/lib/fog/aws/parsers/ec2/create_volume.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/basic'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/ec2/describe_addresses.rb b/lib/fog/aws/parsers/ec2/describe_addresses.rb
index 8593a757e..7646de04b 100644
--- a/lib/fog/aws/parsers/ec2/describe_addresses.rb
+++ b/lib/fog/aws/parsers/ec2/describe_addresses.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/basic'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/ec2/describe_images.rb b/lib/fog/aws/parsers/ec2/describe_images.rb
index b456c3bce..e684fdc8c 100644
--- a/lib/fog/aws/parsers/ec2/describe_images.rb
+++ b/lib/fog/aws/parsers/ec2/describe_images.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/basic'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/ec2/describe_instances.rb b/lib/fog/aws/parsers/ec2/describe_instances.rb
index b75b1a185..27c64f024 100644
--- a/lib/fog/aws/parsers/ec2/describe_instances.rb
+++ b/lib/fog/aws/parsers/ec2/describe_instances.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/basic'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/ec2/describe_key_pairs.rb b/lib/fog/aws/parsers/ec2/describe_key_pairs.rb
index e43b3c2de..e88711147 100644
--- a/lib/fog/aws/parsers/ec2/describe_key_pairs.rb
+++ b/lib/fog/aws/parsers/ec2/describe_key_pairs.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/basic'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/ec2/describe_security_groups.rb b/lib/fog/aws/parsers/ec2/describe_security_groups.rb
index baa81fd1f..f3a288532 100644
--- a/lib/fog/aws/parsers/ec2/describe_security_groups.rb
+++ b/lib/fog/aws/parsers/ec2/describe_security_groups.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/basic'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/ec2/describe_snapshots.rb b/lib/fog/aws/parsers/ec2/describe_snapshots.rb
index a6fb80692..46f13319d 100644
--- a/lib/fog/aws/parsers/ec2/describe_snapshots.rb
+++ b/lib/fog/aws/parsers/ec2/describe_snapshots.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/basic'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/ec2/describe_volumes.rb b/lib/fog/aws/parsers/ec2/describe_volumes.rb
index 956fdb2e2..90eba4f06 100644
--- a/lib/fog/aws/parsers/ec2/describe_volumes.rb
+++ b/lib/fog/aws/parsers/ec2/describe_volumes.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/basic'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/s3/copy_object.rb b/lib/fog/aws/parsers/s3/copy_object.rb
index 7dea20e8e..97ef33cf3 100644
--- a/lib/fog/aws/parsers/s3/copy_object.rb
+++ b/lib/fog/aws/parsers/s3/copy_object.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/../../../parser'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/s3/get_bucket.rb b/lib/fog/aws/parsers/s3/get_bucket.rb
index b6ec7230f..9c1c80440 100644
--- a/lib/fog/aws/parsers/s3/get_bucket.rb
+++ b/lib/fog/aws/parsers/s3/get_bucket.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/../../../parser'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/s3/get_bucket_location.rb b/lib/fog/aws/parsers/s3/get_bucket_location.rb
index 709d6fcc9..86b88986e 100644
--- a/lib/fog/aws/parsers/s3/get_bucket_location.rb
+++ b/lib/fog/aws/parsers/s3/get_bucket_location.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/../../../parser'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/s3/get_request_payment.rb b/lib/fog/aws/parsers/s3/get_request_payment.rb
index 55cba3081..6778c1feb 100644
--- a/lib/fog/aws/parsers/s3/get_request_payment.rb
+++ b/lib/fog/aws/parsers/s3/get_request_payment.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/../../../parser'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/s3/get_service.rb b/lib/fog/aws/parsers/s3/get_service.rb
index 6f51216e0..8a2e0de47 100644
--- a/lib/fog/aws/parsers/s3/get_service.rb
+++ b/lib/fog/aws/parsers/s3/get_service.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/../../../parser'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/simpledb/basic.rb b/lib/fog/aws/parsers/simpledb/basic.rb
index 677fb5f45..d6bde6cef 100644
--- a/lib/fog/aws/parsers/simpledb/basic.rb
+++ b/lib/fog/aws/parsers/simpledb/basic.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/../../../parser'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/simpledb/domain_metadata.rb b/lib/fog/aws/parsers/simpledb/domain_metadata.rb
index 9039315d4..e0a316c1c 100644
--- a/lib/fog/aws/parsers/simpledb/domain_metadata.rb
+++ b/lib/fog/aws/parsers/simpledb/domain_metadata.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/basic'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/simpledb/get_attributes.rb b/lib/fog/aws/parsers/simpledb/get_attributes.rb
index 0f89aeebf..11cee5499 100644
--- a/lib/fog/aws/parsers/simpledb/get_attributes.rb
+++ b/lib/fog/aws/parsers/simpledb/get_attributes.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/basic'
-
 module Fog
   module Parsers
     module AWS
diff --git a/lib/fog/aws/parsers/simpledb/select.rb b/lib/fog/aws/parsers/simpledb/select.rb
index cd60bdb03..3d8beb20c 100644
--- a/lib/fog/aws/parsers/simpledb/select.rb
+++ b/lib/fog/aws/parsers/simpledb/select.rb
@@ -1,5 +1,3 @@
-require File.dirname(__FILE__) + '/basic'
-
 module Fog
   module Parsers
     module AWS