rackamole 0.3.3 → 0.3.4

data/lib/rackamole/alert/emole.rb

@@ -1,4 +1,4 @@
-require 'pony'
+require 'mail'
 require 'erubis'
 
 module Rackamole::Alert
@@ -22,22 +22,21 @@ module Rackamole::Alert
     # args       :: The gathered information from the mole.
     #
     def self.deliver_alert( logger, options, args )
-      @options = options
-      opts     = options[:email]
-      params   = opts.clone
-      params[:to]      = opts[:to].join( ", " )
-      params[:subject] = "RackAmole <#{alert_type( args )}> #{request_time?( args )} on #{args[:app_name]}.#{args[:host]} for user #{args[:user_name]}"
+      @options   = options
+      @args      = args
+      tmpl       = File.join( template_root, %w[alert.erb] )
+      template   = Erubis::Eruby.new( IO.read( tmpl ), :trim => true )
+      body       = template.result( binding )
+      subject    = "Rackamole <#{alert_type( args )}> #{request_time?( args )}on #{args[:app_name]}.#{args[:host]} for user #{args[:user_name]}"
       
-      @args = args
-            
-      tmpl     = File.join( template_root, %w[alert.erb] )
-      template = Erubis::Eruby.new( IO.read( tmpl ), :trim => true )
-            
-      output        = template.result( binding )
-      params[:body] = output
-
-      Pony.mail( params )      
-      output
+      mail = Mail.new do
+        from    options[:email][:from]
+        to      options[:email][:to]
+        subject subject
+        body    body
+      end      
+      mail.deliver!      
+      mail
     rescue => boom
       boom.backtrace.each { |l| logger.error l }
       logger.error( "Rackamole email alert failed with error `#{boom}" )
@@ -45,7 +44,6 @@ module Rackamole::Alert
             
     def self.section( title )
       buff = []
-      # buff << "-"*80
       buff << "-"*40      
       buff << "o #{title.capitalize}\n"      
       buff << self.send( title.downcase )
@@ -103,7 +101,7 @@ module Rackamole::Alert
           when Rackamole.perf
             buff << "#{spew( :request_time )}/#{@options[:perf_threshold]}"
         end
-        buff << spew( :url ) << spew( :path ) << spew( :status ) 
+        buff << spew( :user_name) << spew( :url ) << spew( :path ) << spew( :status ) 
         buff << spew( :method ) << spew( :request_time ) << spew( :ip )
         buff.join( "\n" )
       end      
@@ -116,7 +114,7 @@ module Rackamole::Alert
       
       # Dump request time if any...
       def self.request_time?( args )
-        args[:type] == Rackamole.perf ? ("%5.2f" % args[:request_time] ) : ''        
+        args[:type] == Rackamole.perf ? ("%5.2f " % args[:request_time] ) : ''        
       end
       
       # Identify the type of alert...        
@@ -130,22 +128,5 @@ module Rackamole::Alert
             "Fault"
         end
       end
-
-      # # Dump args...
-      # def self.dump( buff, env, level=0 )
-      #   env.each_pair do |k,value|
-      #     if value.respond_to?(:each_pair) 
-      #       buff << "%s %-#{40-level}s" % ['  '*level,k]
-      #       dump( buff, env[k], level+1 )
-      #     elsif value.instance_of?(Array)
-      #       buff << "%s %-#{40-level}s" % ['  '*level,k]
-      #       value.each do |v| 
-      #         buff << "%s %-#{40-(level+1)}s" % ['  '*(level+1),v]
-      #       end
-      #     else
-      #       buff << "%s %-#{40-level}s %s" % [ '  '*level, k, value.inspect ]
-      #     end        
-      #   end
-      # end
   end
 end

data/lib/rackamole/mole.rb

@@ -169,7 +169,7 @@ module Rack
       unless duplicated?( env, attrs )
         # send email alert ?
         if alertable?( :email, attrs[:type] )
-          logger.debug ">>> Sending out email on mole type #{attrs[:type]} to #{options[:email][:to].join( ", ")}"
+          logger.debug ">>> Sending out email on mole type #{attrs[:type]} from #{options[:email][:from]} to #{options[:email][:to].join( ", ")}"
           Rackamole::Alert::Emole.deliver_alert( logger, options, attrs ) 
         end
       

data/lib/rackamole/store/mongo_db.rb

@@ -15,7 +15,18 @@ module Rackamole
       #
       # Setup rackamole to use the mongodb store as follows:
       #
-      #   config.middleware.use Rack::Mole, { :store => Rackamole::Store::MongoDb.new }
+      #   config.middleware.use Rack::Mole, { 
+      #     :store => Rackamole::Store::MongoDb.new( 
+      #       :db_name  => 'mole_blee_development_mdb',
+      #       :username => 'fernand',
+      #       :password => 'letmein',
+      #      ) 
+      #   }
+      #
+      # === NOTE 
+      #
+      # To use in conjunction with Wackamole your db_name must follow 
+      # the convention "mole_[app_name]_[environment]_mdb".
       #
       # === Options
       #

data/lib/rackamole.rb

@@ -1,7 +1,7 @@
 module Rackamole
 
   # :stopdoc:
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/spec/rackamole/alert/emole_spec.rb

@@ -6,12 +6,10 @@ describe Rackamole::Alert::Emole do
     @from = "fernand"
     @to   = %w[fernand bobo blee]
     
-    @expected = TMail::Mail.new
-    @expected.set_content_type 'text', 'plain', { 'charset' => 'utf-8' }
-    @expected.mime_version = '1.0'
-    @expected.from    = @from
-    @expected.to      = @to
-
+    Mail.defaults do
+      delivery_method :test
+    end
+    
     @options = { :email => { :from => @from, :to => @to }, :perf_threshold => 10 }
     
     @args = OrderedHash.new
@@ -56,29 +54,33 @@ describe Rackamole::Alert::Emole do
   describe "#alert" do
     
     it "should send a feature email correctly" do
-      # @expected.subject = "[M()le] (Feature) -Test@Fred- for user Fernand"
-      @expected.body    = feature_body
-# puts Rackamole::Alert::Emole.deliver_alert( nil, @options, @args )
-      Rackamole::Alert::Emole.deliver_alert( nil, @options, @args ).should == @expected.body_port.to_s
+      alert = Rackamole::Alert::Emole.deliver_alert( nil, @options, @args )
+      alert.body.should    == feature_body
+      alert.subject.should == "Rackamole <Feature> on Test.Fred for user Fernand"
+      alert.from.should    == ["fernand"]
+      alert.to.should      == ["fernand", 'bobo', 'blee']
     end
 
     it "should send a perf email correctly" do
       @args[:type] = Rackamole.perf
       @args[:request_time] = 15.2
-      # @expected.subject = "[M()le] (Performance:10.0) -Test@Fred- for user Fernand"
-      @expected.body    = perf_body
-# puts Rackamole::Alert::Emole.deliver_alert( nil, @options, @args )      
-      Rackamole::Alert::Emole.deliver_alert( nil, @options, @args ).should == @expected.body_port.to_s
+
+      alert = Rackamole::Alert::Emole.deliver_alert( nil, @options, @args )
+      alert.body.to_s.should == perf_body
+      alert.subject.should   == "Rackamole <Performance> 15.20 on Test.Fred for user Fernand"
+      alert.from.should      == ["fernand"]
+      alert.to.should        == ["fernand", 'bobo', 'blee']      
     end
 
     it "should send a fault email correctly" do
       @args[:type]   = Rackamole.fault
       @args[:fault]  = 'Oh Snap!'
       @args[:stack]  = ['fred', 'blee']
-      # @expected.subject = "[M()le] (Fault) -Test@Fred- for user Fernand"
-      @expected.body    = fault_body
-# puts Rackamole::Alert::Emole.deliver_alert( nil, @options, @args )      
-      Rackamole::Alert::Emole.deliver_alert( nil, @options, @args ).should == @expected.body_port.to_s
+      alert = Rackamole::Alert::Emole.deliver_alert( nil, @options, @args )
+      alert.body.to_s.should == fault_body
+      alert.subject.should   == "Rackamole <Fault> on Test.Fred for user Fernand"
+      alert.from.should      == ["fernand"]
+      alert.to.should        == ["fernand", 'bobo', 'blee']
     end
   end
   
@@ -89,6 +91,7 @@ Feature alert on application Test on host Fred
 ----------------------------------------
 o What
 
+  user_name: Fernand
   url: http://bumblebeetuna/fred/blee
   path: /fred/blee
   status: 200
@@ -158,6 +161,7 @@ Performance alert on application Test on host Fred
 o What
 
   request_time: 15.2/10
+  user_name: Fernand
   url: http://bumblebeetuna/fred/blee
   path: /fred/blee
   status: 200
@@ -231,6 +235,7 @@ o What
    : fred
    : blee
 
+  user_name: Fernand
   url: http://bumblebeetuna/fred/blee
   path: /fred/blee
   status: 200

data/spec/rackamole/store/mongo_db_spec.rb

@@ -185,7 +185,7 @@ describe Rackamole::Store::MongoDb do
           :username => 'fred',
           :password => 'hoy',
           :logger   => Rackamole::Logger.new( :file_name => $stdout, :log_level => 'info' ) )      
-      }.should raise_error( /Authentication failed/ )
+      }.should raise_error( /Failed to authenticate user 'fred'/ )
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rackamole
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Fernand Galiana
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-27 00:00:00 -07:00
+date: 2010-03-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency