mailcatcher 0.1.3 → 0.1.6

data/bin/mailcatcher

@@ -1,12 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'bundler'
-Bundler.setup
-
 $: << File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
 
 require 'mail_catcher'
-
 require 'optparse'
 
 options = {}

data/lib/mail_catcher.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'eventmachine'
 require 'json'
 require 'ostruct'
@@ -87,21 +88,32 @@ module MailCatcher
     end
 
     def receive_message
-      mail = Mail.new(current_message.source)
-      result = insert_message.execute(current_message.sender, current_message.recipients.inspect, mail.subject, current_message.source, current_message.source.length)
-      mail_id = MailCatcher.db.last_insert_row_id
-      if mail.multipart?
-        mail.all_parts.each do |part|
-          body = part.body.to_s
-          insert_part.execute(mail_id, part.cid, part.mime_type, part.attachment? ? 1 : 0, part.filename, body, body.length)
+      MailCatcher.db.transaction do
+        mail = Mail.new(current_message.source)
+        result = insert_message.execute(current_message.sender, current_message.recipients.inspect, mail.subject, current_message.source, current_message.source.length)
+        mail_id = MailCatcher.db.last_insert_row_id
+        if mail.multipart?
+          mail.all_parts.each do |part|
+            body = part.body.to_s
+            insert_part.execute(mail_id, part.cid, part.mime_type, part.attachment? ? 1 : 0, part.filename, body, body.length)
+          end
+        else
+          body = mail.body.to_s
+          insert_part.execute(mail_id, nil, mail.mime_type, 0, mail.filename, body, body.length)
         end
-      else
-        body = mail.body.to_s
-        insert_part.execute(mail_id, nil, mail.mime_type, 0, mail.filename, body, body.length)
+        puts "==> SMTP: Received message '#{mail.subject}' from '#{current_message.sender}'"
+        true
+      end
+    rescue
+      puts "*** Error receiving message: #{current_message.inspect}"
+      puts "    Exception: #{$!}"
+      puts "    Backtrace:"
+      $!.backtrace.each do |line|
+        puts "       #{line}"
       end
-      puts "==> SMTP: Received message '#{mail.subject}' from '#{current_message.sender}'"
+      puts "    Please submit this as an issue at http://github.com/sj26/mailcatcher/issues"
+    ensure
       @current_message = nil
-      true
     end
   end
   
@@ -209,8 +221,8 @@ module MailCatcher
     puts "==> http://#{options[:http_ip]}:#{options[:http_port]}"
 
     Thin::Logging.silent = true
-    EM::run do
-      EM::start_server options[:smtp_ip], options[:smtp_port], SmtpServer
+    EM.run do
+      EM.start_server options[:smtp_ip], options[:smtp_port], SmtpServer
       Thin::Server.start WebApp, options[:http_ip], options[:http_port]
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Samuel Cochran
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 +08:00
+date: 2010-10-26 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -31,7 +31,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: haml
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,7 +44,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: json
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -57,7 +57,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: mail
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -70,7 +70,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: mail
+  name: thin
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -83,7 +83,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: thin
+  name: sqlite3-ruby
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -96,7 +96,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: sinatra
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -109,7 +109,7 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: sunshowers
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -122,7 +122,7 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: sunshowers
+  name: i18n
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -134,19 +134,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: i18n
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id010
 description: "    MailCatcher runs a super simple SMTP server which catches any\n    message sent to it to display in a web interface. Run\n    mailcatcher, set your favourite app to deliver to\n    smtp://127.0.0.1:1025 instead of your default SMTP server,\n    then check out http://127.0.0.1:1080 to see the mail.\n"
 email: sj26@sj26.com
 executables: