mail_sandbox 0.0.7 → 0.1.0

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-script: "bundle exec turn -Itest test/mail_sandbox"
+script: "bundle exec turn -Itest test/integration test/unit"
 rvm:
   - 1.9.3
 branches:

data/lib/mail_sandbox/config.rb

@@ -10,6 +10,8 @@ module MailSandbox
     #   :config_file:String - path to yaml config file
     #   :http_observe?:Boolean - subscribe Observer::Http to receive new messages and push them by http protocol
     #   :http_observe_url:String - url for push on receive new messages, use by Observer::Http
+    #   :daemonize:Bool - run daemonized in the background
+    #   :pidfile:String - PATH to pid file
     #
     def initialize
       @config = {

data/lib/mail_sandbox/runner.rb

@@ -1,5 +1,6 @@
 require "eventmachine"
 require 'optparse'
+require 'simple_pid'
 require 'fileutils'
 
 module MailSandbox
@@ -22,6 +23,14 @@ module MailSandbox
           config.environment = f
         end
 
+        opts.on("-D", "--daemonize", "Run daemonized") do |f|
+          config.daemonize = f
+        end
+
+        opts.on("-P", "--pid FILE", "File to store PID") do |f|
+          config.pidfile = ::File.expand_path(f)
+        end
+
       end.parse!
     end
 
@@ -39,13 +48,16 @@ module MailSandbox
                                    when :debug then Logger::DEBUG
                                  end
       STDOUT.sync = true
-      MailSandbox::Signals.trap
+      MailSandbox::Signals.trap(self)
       MailSandbox::Server.parms = config.server_params
     end
 
     def start
       configure
 
+      Process.daemon if config.daemonize
+      write_pidfile if config.pidfile
+
       MailSandbox.logger.info "Start MailSandbox::Server on #{config.listen}:#{config.port}"
 
       EventMachine::run {
@@ -57,6 +69,26 @@ module MailSandbox
       config.environment || ENV['RAILS_ENV'] || ENV['RACK_ENV'] || :development
     end
 
+    def write_pidfile
+      @simple_pid = SimplePid.new(config.pidfile)
+
+      if @simple_pid.exists?
+        unless @simple_pid.running?
+          @simple_pid.cleanup
+          @simple_pid.write!
+        end
+      else
+        @simple_pid.write!
+      end
+
+    end
+
+    def terminate
+      MailSandbox.logger.info "Got quit/terminate signal. Bye."
+      @simple_pid.cleanup if @simple_pid
+      exit
+    end
+
   end
 
 end

data/lib/mail_sandbox/server.rb

@@ -20,7 +20,7 @@ module MailSandbox
 
     def receive_message
       message.completed_at = Time.now
-      Subscribe.notify(message)
+      MailSandbox.subscriber.notify(message)
       true
     end
 

data/lib/mail_sandbox/signals.rb

@@ -1,14 +1,14 @@
 module MailSandbox
   class Signals
 
-    def self.trap
+    def self.trap(server)
+
       %w'TERM QUIT'.each do |signal|
         Signal.trap(signal) do
-          MailSandbox.logger.info "Got #{signal} signal. Bye."
-          exit
+          server.terminate
         end
-
       end
+
     end
 
   end

data/lib/mail_sandbox/subscriber.rb

@@ -0,0 +1,35 @@
+module MailSandbox
+  class Subscriber
+
+    def subscribe(observer)
+      observers[observer] ||= observer
+    end
+
+    def unsubscribe(observer)
+      observers.delete(observer)
+    end
+
+    def notify(message)
+      observers.each_value do |observer|
+
+        thread = Thread.new do
+          mutex.synchronize do
+            observer.update(message)
+          end
+        end
+
+        thread.abort_on_exception = true
+        #thread.run
+      end
+    end
+
+    def observers
+      @observers ||= {}
+    end
+
+    def mutex
+      @mutex ||= Mutex.new
+    end
+
+  end
+end

data/lib/mail_sandbox/version.rb

@@ -1,3 +1,3 @@
 module MailSandbox
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/lib/mail_sandbox.rb

@@ -6,21 +6,25 @@ module MailSandbox
   autoload :Server, 'mail_sandbox/server'
   autoload :Message, 'mail_sandbox/message'
   autoload :Observer, 'mail_sandbox/observer'
-  autoload :Subscribe, 'mail_sandbox/subscribe'
+  autoload :Subscriber, 'mail_sandbox/subscriber'
   autoload :Config, 'mail_sandbox/config'
   autoload :Runner, 'mail_sandbox/runner'
   autoload :Signals, 'mail_sandbox/signals'
 
   def self.subscribe(observer)
-    Subscribe.subscribe observer
+    subscriber.subscribe observer
   end
 
   def self.unsubscribe(observer)
-    Subscribe.unsubscribe observer
+    subscriber.unsubscribe observer
   end
 
   def self.logger
     @logger ||= Logger.new(STDOUT)
   end
 
+  def self.subscriber
+    @subscriber ||= Subscriber.new
+  end
+
 end

data/mail_sandbox.gemspec

@@ -19,8 +19,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency('em-http-request', '~> 0.3.0')
   gem.add_dependency('OptionParser')
   gem.add_dependency('file-utils')
+  gem.add_dependency('simple_pid')
 
   gem.add_development_dependency('rake')
   gem.add_development_dependency('minitest')
   gem.add_development_dependency('turn')
+  gem.add_development_dependency('mocha', '>= 0.13.1')
 end

data/test/fixtures/http_response.txt

@@ -0,0 +1,9 @@
+HTTP/1.0 200 OK
+Date: Mon, 16 Nov 2009 20:39:15 GMT
+Expires: -1
+Cache-Control: private, max-age=0
+Content-Type: text/html; charset=ISO-8859-1
+Via: 1.0 .:80 (squid)
+Connection: close
+
+Success

data/test/fixtures/message.txt

@@ -0,0 +1,7 @@
+From: Private Person <me@fromdomain.com>
+To: A Test User <test@todomain.com>
+Subject: SMTP e-mail test
+
+1 This is a test e-mail message.
+2 This is a test e-mail message.
+3 This is a test e-mail message.

data/test/integration/daemonize_test.rb

@@ -0,0 +1,24 @@
+require "test_helper"
+
+class DaemonizeTest < MiniTest::Unit::TestCase
+  include SpawnHelper
+
+  def teardown
+    kill_server
+  end
+
+  def test_daemonize
+    pid = spawn command("-D -P #{PID_FILE}")
+
+    assert wait_pid_file, "Pid file doesn't exist."
+    assert !alive?, "Server didn't daemonize."
+
+    real_pid = File.read(PID_FILE).to_i
+    assert pid != real_pid
+
+    @pid = real_pid
+    assert alive?, "Real server doesn't alive."
+  end
+
+
+end

data/test/integration/pidfile_test.rb

@@ -0,0 +1,22 @@
+require "test_helper"
+
+class PidfileTest < MiniTest::Unit::TestCase
+  include SpawnHelper
+
+  def teardown
+    kill_server
+  end
+
+  def test_pidfile
+    pid = spawn_server "-P #{PID_FILE}"
+    assert wait_pid_file, "Pid file doesn't exist."
+
+    pidfile_pid = File.read(PID_FILE).to_i
+    assert_equal pid, pidfile_pid
+
+    kill_server
+    assert !File.exist?(PID_FILE)
+  end
+
+
+end

data/test/integration/spawn_test.rb

@@ -0,0 +1,60 @@
+require "test_helper"
+
+class ServerTest < MiniTest::Unit::TestCase
+  include SpawnHelper
+
+  def setup
+    spawn_server
+  end
+
+  def teardown
+    kill_server
+  end
+
+  def test_server_run
+    assert alive?, "Server not alive."
+  end
+
+  def test_server_bind_port
+    assert wait_bind, "Server doesn't bind."
+  end
+
+  def test_server_helo
+    wait_bind
+
+    bye, helo = nil
+    Socket.tcp('127.0.0.1', 2525) do |socket|
+      helo = socket.readline
+      socket.print "EHLO localhost.localdomain\r\n"
+      socket.readpartial(65536)
+      socket.print "QUIT\r\n"
+      bye = socket.readline
+      socket.close_write
+      socket.close_read
+    end
+
+    assert_match /^220 .*/, helo
+    assert_match /^221 .*/, bye
+  end
+
+  def test_server_auth
+    wait_bind
+
+    user = 'app_user'
+    password = 'KnesSGaF9TQ9wOOdXd2m'
+
+    @message = File.read(File.expand_path("../../fixtures/message.txt", __FILE__))
+
+    smtp = Net::SMTP.new('localhost', 2525)
+    smtp.start do |smtp|
+      smtp.auth_plain(user, password)
+      smtp.send_message @message, 'me@fromdomain.com', 'test@todomain.com'
+    end
+
+    assert alive?
+  end
+
+
+
+
+end

data/test/test_helper.rb

@@ -1,12 +1,58 @@
-require 'rubygems'
-require 'bundler/setup'
+require "bundler/setup"
+Bundler.require(:default, :test)
 
-require 'test/unit'
-
-require 'mail_sandbox'
 require 'em-http-request'
-
 require "socket"
+require 'support/my_observer'
 require 'net/smtp'
-require 'my_observer'
+require 'mocha'
+
+module SpawnHelper
+  PID_FILE = "/tmp/mail_sandbox.#{rand*1000.to_i}.pid"
+
+  def spawn_server(options = "")
+    @pid = spawn command(options)
+    sleep 0.1 until alive?
+    Process.detach @pid
+    sleep 1
+    @pid
+  end
+
+  def command(options)
+    "bundle exec mail_sandbox #{options}"
+  end
+
+  def kill_server(pid = nil)
+    pid ||= @pid
+    Process.kill "QUIT", pid rescue false
+    sleep 0.1 while alive?(pid)
+  end
+
+  def alive?(pid = nil)
+    pid ||= @pid
+    Process.kill 0, pid rescue false
+  end
+
+  def wait_pid_file
+    50.times do
+      return true if File.exist?(PID_FILE)
+      sleep 0.1
+    end
+    false
+  end
+
+  def wait_bind
+    50.times do
+      begin
+        Socket.tcp('127.0.0.1', 2525)
+      rescue
+        sleep 0.1
+        next
+      end
+      return true
+    end
+    false
+  end
+
 
+end

data/test/{mail_sandbox → unit}/config_test.rb

@@ -13,14 +13,14 @@ class ConfigTest < MiniTest::Unit::TestCase
   end
 
   def test_load_from_yml_file
-    @config.load_from_yml_file(:development, 'test/config.yml')
+    @config.load_from_yml_file(:development, 'test/support/config.yml')
 
     assert @config.test_key
     assert_equal 'development value', @config.test_key
   end
 
   def test_load_file
-    @config.config_file = 'test/config.yml'
+    @config.config_file = 'test/support/config.yml'
 
     @config.load_from_yml_file(:production)
 

data/test/unit/subscribe_test.rb

@@ -0,0 +1,42 @@
+require 'test_helper'
+
+class SubscribeTest < MiniTest::Unit::TestCase
+
+  def setup
+    @message = MailSandbox::Message.new
+    @subscriber = MailSandbox::Subscriber.new
+    @observer = MyObserver.new
+  end
+
+  def test_subscribe
+    @subscriber.subscribe @observer
+
+    assert_equal 1, @subscriber.observers.count
+  end
+
+  def test_observer_notify
+    @subscriber.subscribe @observer
+
+    @subscriber.notify @message and sleep 1
+    assert_equal @message, @observer.message
+  end
+
+  def test_http_observer
+    url = "http://localhost/api"
+    body = {:body => {:message => @message.to_a}}
+
+    http_mock = mock()
+    http_mock.stubs(:callback)
+    http_mock.stubs(:errback)
+
+    EventMachine::HttpRequest.any_instance.expects(:post).with(body).returns(http_mock)
+
+    @observer = MailSandbox::Observer::Http.new url
+    @subscriber.subscribe @observer
+
+    @subscriber.notify @message and sleep 1
+
+    assert true
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail_sandbox
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simple_pid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +139,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.13.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.13.1
 description: Gem has run SMTP server and manipulate letters received. Using the Observer
   pattern you can subscribe to the event server.
 email:
@@ -147,14 +179,19 @@ files:
 - lib/mail_sandbox/runner.rb
 - lib/mail_sandbox/server.rb
 - lib/mail_sandbox/signals.rb
-- lib/mail_sandbox/subscribe.rb
+- lib/mail_sandbox/subscriber.rb
 - lib/mail_sandbox/version.rb
 - mail_sandbox.gemspec
-- test/config.yml
-- test/mail_sandbox/config_test.rb
-- test/mail_sandbox/server_test.rb
-- test/my_observer.rb
+- test/fixtures/http_response.txt
+- test/fixtures/message.txt
+- test/integration/daemonize_test.rb
+- test/integration/pidfile_test.rb
+- test/integration/spawn_test.rb
+- test/support/config.yml
+- test/support/my_observer.rb
 - test/test_helper.rb
+- test/unit/config_test.rb
+- test/unit/subscribe_test.rb
 homepage: https://github.com/kaize/mail_sandbox
 licenses: []
 post_install_message: 
@@ -167,12 +204,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 501385496686318604
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 501385496686318604
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -180,8 +223,13 @@ signing_key:
 specification_version: 3
 summary: SMTP server sandbox
 test_files:
-- test/config.yml
-- test/mail_sandbox/config_test.rb
-- test/mail_sandbox/server_test.rb
-- test/my_observer.rb
+- test/fixtures/http_response.txt
+- test/fixtures/message.txt
+- test/integration/daemonize_test.rb
+- test/integration/pidfile_test.rb
+- test/integration/spawn_test.rb
+- test/support/config.yml
+- test/support/my_observer.rb
 - test/test_helper.rb
+- test/unit/config_test.rb
+- test/unit/subscribe_test.rb

data/lib/mail_sandbox/subscribe.rb

@@ -1,37 +0,0 @@
-module MailSandbox
-  class Subscribe
-    class<<self
-
-      def subscribe(observer)
-        observers[observer] ||= observer
-      end
-
-      def unsubscribe(observer)
-        observers.delete(observer)
-      end
-
-      def notify(message)
-        observers.each_value do |observer|
-
-          thread = Thread.new do
-            mutex.synchronize do
-              observer.update(message)
-            end
-          end
-
-          thread.abort_on_exception = true
-          #thread.run
-        end
-      end
-
-      def observers
-        @observers ||= {}
-      end
-
-      def mutex
-        @mutex ||= Mutex.new
-      end
-
-    end
-  end
-end

data/test/mail_sandbox/server_test.rb

@@ -1,128 +0,0 @@
-require 'test_helper'
-
-class ServerTest < MiniTest::Unit::TestCase
-
-  def setup
-    EventMachine::MockHttpRequest.reset_registry!
-    EventMachine::MockHttpRequest.reset_counts!
-    EventMachine::MockHttpRequest.pass_through_requests = false
-
-    EventMachine::MockHttpRequest.activate!
-
-    @server = Thread.new do
-      MailSandbox::Runner.new.start
-    end
-
-    @server.abort_on_exception = true
-    @server.run
-
-    @message = <<MESSAGE_END
-    From: Private Person <me@fromdomain.com>
-    To: A Test User <test@todomain.com>
-    Subject: SMTP e-mail test
-
-    1 This is a test e-mail message.
-    2 This is a test e-mail message.
-    3 This is a test e-mail message.
-MESSAGE_END
-
-    @http_response = <<-RESPONSE.gsub(/^ +/, '')
-              HTTP/1.0 200 OK
-              Date: Mon, 16 Nov 2009 20:39:15 GMT
-              Expires: -1
-              Cache-Control: private, max-age=0
-              Content-Type: text/html; charset=ISO-8859-1
-              Via: 1.0 .:80 (squid)
-              Connection: close
-
-              Success
-            RESPONSE
-
-    @url = 'http://localhost:8080/api/mails'
-
-    #wait run server
-    sleep 0.5
-  end
-
-  def teardown
-    EventMachine::MockHttpRequest.deactivate!
-    MailSandbox::Subscribe.observers.clear
-    @server.terminate
-    sleep 0.5
-  end
-
-  def test_server_run
-    server_run = @server.alive?
-    assert server_run, "Server not alive"
-  end
-
-  def test_server_helo
-    bye, helo = nil
-    Socket.tcp('127.0.0.1', 2525) do |socket|
-      helo = socket.readline
-      socket.print "EHLO localhost.localdomain\r\n"
-      socket.readpartial(65536)
-      socket.print "QUIT\r\n"
-      bye = socket.readline
-      socket.close_write
-      socket.close_read
-    end
-    assert_match /^220 .*/, helo
-    assert_match /^221 .*/, bye
-  end
-
-  def test_subscribe_mailsandox
-
-    observer = MyObserver.new
-    MailSandbox.subscribe observer
-
-    Net::SMTP.start('localhost', 2525) do |smtp|
-      smtp.send_message @message, 'me@fromdomain.com', 'test@todomain.com'
-    end
-
-    sleep 1
-
-    assert observer.message
-
-  end
-
-  def test_http_observer
-
-    EventMachine::MockHttpRequest.register(@url,:post, nil, @http_response)
-
-    observer = MailSandbox::Observer::Http.new(@url)
-    MailSandbox.subscribe observer
-
-    Net::SMTP.start('localhost', 2525) do |smtp|
-      smtp.send_message @message, 'me@fromdomain.com', 'test@todomain.com'
-    end
-
-    sleep 1
-
-    assert_equal 1, EM::HttpRequest.count(@url, :post)
-
-  end
-
-  def test_auth
-    user = 'app_user'
-    password = 'KnesSGaF9TQ9wOOdXd2m'
-
-    observer = MyObserver.new
-    MailSandbox.subscribe observer
-
-    smtp = Net::SMTP.new('localhost', 2525)
-    smtp.start do |smtp|
-      smtp.auth_plain(user, password)
-      smtp.send_message @message, 'me@fromdomain.com', 'test@todomain.com'
-    end
-
-    sleep 1
-
-    assert observer.message
-    assert_equal user, observer.message.user
-    assert_equal password, observer.message.password
-
-  end
-
-
-end