[storage] consolidate

lib/fog.rb

@@ -22,3 +22,4 @@ require 'fog/terremark'
 require 'fog/vcloud'
 require 'fog/zerigo'
 
+require 'fog/storage'

lib/fog/aws.rb

@@ -16,7 +16,7 @@ module Fog
     service(:iam,       'aws/iam')
     service(:s3,        'aws/s3')
     service(:simpledb,  'aws/simpledb')
-    service(:storage,   'aws/storage')
+    service(:storage,   'storage/aws')
 
     def self.indexed_param(key, values)
       params = {}

lib/fog/core.rb

@@ -29,6 +29,5 @@ require 'fog/core/mock'
 require 'fog/core/provider'
 require 'fog/core/service'
 require 'fog/core/ssh'
-require 'fog/core/storage'
 require 'fog/core/time'
 require 'fog/core/wait_for'

lib/fog/google.rb

@@ -8,7 +8,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:storage, 'google/storage')
+    service(:storage, 'storage/google')
 
     class Mock
 

lib/fog/local.rb

@@ -5,7 +5,7 @@ module Fog
 
     extend Fog::Provider
 
-    service(:storage, 'local/storage')
+    service(:storage, 'storage/local')
 
     def self.new(attributes = {})
       location = caller.first

lib/fog/rackspace.rb

@@ -9,7 +9,7 @@ module Fog
     service(:compute, 'rackspace/compute')
     service(:files,   'rackspace/files')
     service(:servers, 'rackspace/servers')
-    service(:storage, 'rackspace/storage')
+    service(:storage, 'storage/rackspace')
 
     def self.authenticate(options)
       rackspace_auth_url = options[:rackspace_auth_url] || "auth.api.rackspacecloud.com"

lib/fog/storage.rb

@@ -1,3 +1,8 @@
+require 'fog/aws'
+require 'fog/google'
+require 'fog/local'
+require 'fog/rackspace'
+
 module Fog
   class Storage
 
@@ -22,4 +27,4 @@ module Fog
     end
 
   end
-end
+end

lib/fog/storage/aws.rb

@@ -5,13 +5,13 @@ module Fog
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
       
-      model_path 'fog/aws/models/storage'
+      model_path 'fog/storage/models/aws'
       collection  :directories
       model       :directory
       collection  :files
       model       :file
 
-      request_path 'fog/aws/requests/storage'
+      request_path 'fog/storage/requests/aws'
       request :abort_multipart_upload
       request :complete_multipart_upload
       request :copy_object

lib/fog/storage/requests/aws/complete_multipart_upload.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/aws/parsers/storage/complete_multipart_upload'
+        require 'fog/storage/parsers/aws/complete_multipart_upload'
 
         # Complete a multipart upload
         #

lib/fog/storage/requests/aws/copy_object.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/aws/parsers/storage/copy_object'
+        require 'fog/storage/parsers/aws/copy_object'
 
         # Copy an object from one S3 bucket to another
         #

lib/fog/storage/requests/aws/get_bucket.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/aws/parsers/storage/get_bucket'
+        require 'fog/storage/parsers/aws/get_bucket'
 
         # List information about objects in an S3 bucket
         #

lib/fog/storage/requests/aws/get_bucket_acl.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/aws/parsers/storage/access_control_list'
+        require 'fog/storage/parsers/aws/access_control_list'
 
         # Get access control list for an S3 bucket
         #

lib/fog/storage/requests/aws/get_bucket_location.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/aws/parsers/storage/get_bucket_location'
+        require 'fog/storage/parsers/aws/get_bucket_location'
 
         # Get location constraint for an S3 bucket
         #

lib/fog/storage/requests/aws/get_bucket_logging.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/aws/parsers/storage/get_bucket_logging'
+        require 'fog/storage/parsers/aws/get_bucket_logging'
 
         # Get logging status for an S3 bucket
         #

lib/fog/storage/requests/aws/get_bucket_object_versions.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/aws/parsers/storage/get_bucket_object_versions'
+        require 'fog/storage/parsers/aws/get_bucket_object_versions'
 
         # List information about object versions in an S3 bucket
         #

lib/fog/storage/requests/aws/get_bucket_versioning.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/aws/parsers/storage/get_bucket_versioning'
+        require 'fog/storage/parsers/aws/get_bucket_versioning'
 
         # Get versioning status for an S3 bucket
         #

lib/fog/storage/requests/aws/get_object_acl.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/aws/parsers/storage/access_control_list'
+        require 'fog/storage/parsers/aws/access_control_list'
 
         # Get access control list for an S3 object
         #

lib/fog/storage/requests/aws/get_request_payment.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/aws/parsers/storage/get_request_payment'
+        require 'fog/storage/parsers/aws/get_request_payment'
 
         # Get configured payer for an S3 bucket
         #

lib/fog/storage/requests/aws/get_service.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/aws/parsers/storage/get_service'
+        require 'fog/storage/parsers/aws/get_service'
 
         # List information about S3 buckets for authorized user
         #

lib/fog/storage/requests/aws/initiate_multipart_upload.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/aws/parsers/storage/initiate_multipart_upload'
+        require 'fog/storage/parsers/aws/initiate_multipart_upload'
 
         # Initiate a multipart upload to an S3 bucket
         #

lib/fog/storage/requests/aws/list_multipart_uploads.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/aws/parsers/storage/list_multipart_uploads'
+        require 'fog/storage/parsers/aws/list_multipart_uploads'
 
         # List multipart uploads for a bucket
         #

lib/fog/storage/requests/aws/list_parts.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/aws/parsers/storage/list_parts'
+        require 'fog/storage/parsers/aws/list_parts'
 
         # List parts for a multipart upload
         #

lib/fog/storage/requests/google/copy_object.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/google/parsers/storage/copy_object'
+        require 'fog/storage/parsers/google/copy_object'
 
         # Copy an object from one Google Storage bucket to another
         #

lib/fog/storage/requests/google/get_bucket.rb

@@ -4,7 +4,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/google/parsers/storage/get_bucket'
+        require 'fog/storage/parsers/google/get_bucket'
 
         # List information about objects in an Google Storage bucket
         #

lib/fog/storage/requests/google/get_bucket_acl.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/google/parsers/storage/access_control_list'
+        require 'fog/storage/parsers/google/access_control_list'
 
         # Get access control list for an Google Storage bucket
         #

lib/fog/storage/requests/google/get_object_acl.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/google/parsers/storage/access_control_list'
+        require 'fog/storage/parsers/google/access_control_list'
 
         # Get access control list for an Google Storage object
         #

lib/fog/storage/requests/google/get_service.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/google/parsers/storage/get_service'
+        require 'fog/storage/parsers/google/get_service'
 
         # List information about Google Storage buckets for authorized user
         #