lib/active_wrapper.rb in active_wrapper-0.3.3 vs lib/active_wrapper.rb in active_wrapper-0.3.4

@@ -1,20 +1,20 @@
 require File.dirname(__FILE__) + '/active_wrapper/gems'
 
 ActiveWrapper::Gems.require(:lib)
 
-require 'action_mailer'
 require 'active_record'
 require 'fileutils'
 require 'logger'
+require 'pony'
 require 'yaml'
 
 $:.unshift File.dirname(__FILE__) + '/active_wrapper'
 
 require 'db'
+require 'email'
 require 'log'
-require 'mail'
 require 'version'
 
 module ActiveWrapper
   class <<self
     
@@ -26,16 +26,12 @@
         :env => options[:env] || env,
         :log => options[:env] || env
       }.merge(options.reject { |k, v| v.nil? })
       
       db = Db.new(options)
+      mail = Email.new(options)
       log = Log.new(options)
-      mail = Mail.new(options)
       
-      ActionMailer::Base.logger = log
-      
-      ActiveWrapper::Gems.lockfile
-    
       [ db, log, mail ]
     end
   end
 end
 
\ No newline at end of file