mailcatcher 0.1.2 → 0.1.3

data/README.md

@@ -11,6 +11,7 @@ MailCatcher runs a super simple SMTP server which catches any message sent to it
 * Rewrites HTML enabling display of embedded, inline images/etc. (currently very basic)
 * Lists attachments and allows separate downloading of parts.
 * Written super-simply in EventMachine, easy to dig in and change.
+* Command line options to override the default SMTP/HTTP IP and port settings.
 
 ## Caveats
 
@@ -21,7 +22,6 @@ MailCatcher runs a super simple SMTP server which catches any message sent to it
 
 ## TODO
 
-* Command line options.
 * Websockets for immediate mail viewing.
 * Download link to view original message in mail client.
 * Growl support.

data/bin/mailcatcher

@@ -14,6 +14,26 @@ options = {}
 OptionParser.new do |opts|
   opts.banner = 'Usage: mailcatcher [options]'
   
+  options[:smtp_ip] = '127.0.0.1'
+  opts.on('--smtp-ip IP', 'Set the ip address of the smtp server') do |ip|
+    options[:smtp_ip] = ip
+  end
+
+  options[:smtp_port] = 1025
+  opts.on('--smtp-port PORT', Integer, 'Set the port of the smtp server') do |port|
+    options[:smtp_port] = port
+  end
+
+  options[:http_ip] = '127.0.0.1'
+  opts.on('--http-ip IP', 'Set the ip address of the http server') do |ip|
+    options[:http_ip] = ip
+  end
+  
+  options[:http_port] = 1080
+  opts.on('--http-port PORT', Integer, 'Set the port address of the http server') do |port|
+    options[:http_port] = port
+  end
+
   options[:verbose] = false
   opts.on('-v', '--verbose', 'Be more verbose') do
     options[:verbose] = true
@@ -21,11 +41,8 @@ OptionParser.new do |opts|
   
   opts.on('-h', '--help', 'Display this help information') do
     puts opts
-    exit
+    exit!
   end
 end.parse!
 
-puts 'Starting mail catcher'
-puts '==> smtp://127.0.0.1:1025'
-puts '==> http://127.0.0.1:1080'
-MailCatcher.run
+MailCatcher.run(options)

data/lib/mail_catcher.rb

@@ -204,6 +204,10 @@ module MailCatcher
     options[:http_ip] ||= '127.0.0.1'
     options[:http_port] ||= 1080
     
+    puts "Starting MailCatcher"
+    puts "==> smtp://#{options[:smtp_ip]}:#{options[:smtp_port]}"
+    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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Samuel Cochran
@@ -44,7 +44,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: haml
   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: mail
+  name: json
   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: thin
+  name: mail
   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: sqlite3-ruby
+  name: thin
   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: sinatra
+  name: sqlite3-ruby
   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: sunshowers
+  name: sinatra
   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: i18n
+  name: sunshowers
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -134,6 +134,19 @@ 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: