mailcatcher 0.4.0 → 0.4.1

data/README.md

@@ -4,7 +4,7 @@ Catches mail and serves it through a dream.
 
 MailCatcher runs a super simple SMTP server which catches any message sent to it to display in a web interface. Run mailcatcher, set your favourite app to deliver to smtp://127.0.0.1:1025 instead of your default SMTP server, then check out http://127.0.0.1:1080 to see the mail that's arrived so far.
 
-![MailCatcher screenshot](http://puu.sh/2fZR)
+![MailCatcher screenshot](http://f.cl.ly/items/0w3m122B401k3Q2C373Q/Image%202011.06.01%202:06:25%20AM.png)
 
 ## Features
 

data/lib/mail_catcher.rb

@@ -1,25 +1,29 @@
 require 'active_support/all'
-require 'daemons'
 require 'eventmachine'
+require ‘rbconfig’
 require 'thin'
 
+def windows?
+  Config::CONFIG[‘host_os’] =~ /mswin|mingw/
+end
+
 module MailCatcher
   extend ActiveSupport::Autoload
-  
+
   autoload :Events
   autoload :Mail
   autoload :Smtp
   autoload :Web
-  
+
   @@defaults = {
     :smtp_ip => '127.0.0.1',
     :smtp_port => '1025',
     :http_ip => '127.0.0.1',
     :http_port => '1080',
     :verbose => false,
-    :daemon => true,
+    :daemon => true unless windows?,
   }
-  
+
   def self.parse! arguments=ARGV, defaults=@@defaults
     @@defaults.dup.tap do |options|
       OptionParser.new do |parser|
@@ -45,8 +49,10 @@ module MailCatcher
           options[:http_port] = port
         end
 
-        parser.on('-f', '--foreground', 'Run in the foreground') do
-          options[:daemon] = false
+        unless windows?
+          parser.on('-f', '--foreground', 'Run in the foreground') do
+            options[:daemon] = false
+          end
         end
 
         parser.on('-v', '--verbose', 'Be more verbose') do
@@ -60,34 +66,34 @@ module MailCatcher
       end.parse!
     end
   end
-  
+
   def self.run! options=nil
     # If we are passed options, fill in the blanks
     options &&= @@defaults.merge options
     # Otherwise, parse them from ARGV
     options ||= parse!
-    
+
     puts "Starting MailCatcher"
 
     Thin::Logging.silent = true
-    
+
     # One EventMachine loop...
     EventMachine.run do
       # TODO: DRY this up
-      
+
       # Set up an SMTP server to run within EventMachine
       rescue_port options[:smtp_port] do
         EventMachine.start_server options[:smtp_ip], options[:smtp_port], Smtp
         puts "==> smtp://#{options[:smtp_ip]}:#{options[:smtp_port]}"
       end
-      
+
       # Let Thin set itself up inside our EventMachine loop
       # (Skinny/WebSockets just works on the inside)
       rescue_port options[:http_port] do
         Thin::Server.start options[:http_ip], options[:http_port], Web
         puts "==> http://#{options[:http_ip]}:#{options[:http_port]}"
       end
-      
+
       # Daemonize, if we should, but only after the servers have started.
       if options[:daemon]
         EventMachine.next_tick do
@@ -97,17 +103,17 @@ module MailCatcher
       end
     end
   end
-  
+
   def self.quit!
     EventMachine.next_tick { EventMachine.stop_event_loop }
   end
 
-protected 
+protected
 
   def self.rescue_port port
     begin
       yield
-      
+
     # XXX: EventMachine only spits out RuntimeError with a string description
     rescue RuntimeError
       if $!.to_s =~ /\bno acceptor\b/

metadata

@@ -2,7 +2,7 @@
 name: mailcatcher
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Samuel Cochran
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 Z
+date: 2011-06-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport