lib/rubber/cloud/generic.rb in rubber-2.5.0 vs lib/rubber/cloud/generic.rb in rubber-2.5.1

@@ -1,24 +1,21 @@
-require 'fog'
+require 'rubber/cloud/fog'
 
 module Rubber
   module Cloud
-    class Generic < Base
+    class Generic < Fog
       MUTEX = Mutex.new
 
-      attr_reader :storage_provider
-
       def initialize(env, capistrano)
         # TODO (nirvdrum 05/23/13): This is here until the storage provider stuff is cleaned up.  That's why this class inherits from Base rather than Fog.
         if env.cloud_providers && env.cloud_providers.aws
           storage_credentials = {
-            :provider => 'AWS',
-            :aws_access_key_id => env.cloud_providers.aws.access_key,
-            :aws_secret_access_key => env.cloud_providers.aws.secret_access_key
+              :provider => 'AWS',
+              :aws_access_key_id => env.cloud_providers.aws.access_key,
+              :aws_secret_access_key => env.cloud_providers.aws.secret_access_key
           }
 
           env['storage_credentials'] = storage_credentials
-          @storage_provider = ::Fog::Storage.new(Rubber::Util.symbolize_keys(env.storage_credentials))
         end
 
         super(env, capistrano)
       end
 
\ No newline at end of file