remailer 0.5.2 → 0.9.1

data/test/bin/exercise

@@ -0,0 +1,115 @@
+#!/usr/bin/env ruby
+
+require 'eventmachine'
+require 'optparse'
+require 'securerandom'
+
+$LOAD_PATH << File.expand_path('../../lib', File.dirname(__FILE__))
+
+require 'remailer'
+
+# == Support Methods ========================================================
+
+class Exerciser
+  attr_reader :report
+
+  def initialize(options)
+    @options = options
+    @pending = [ ]
+    @report = { }
+  end
+
+  def test(server)
+    results = @report[server] = {
+      success: 0,
+      timeout: 0,
+      error: 0
+    }
+
+    @options[:count].times do
+      uuid = SecureRandom.uuid
+
+      @pending << uuid
+
+      connection_options = {
+        close: true,
+        proxy: {
+          host: @options[:proxy_host],
+          port: @options[:proxy_port]
+        },
+        connect: lambda do |success, host|
+          results[success ? :success : :error] += 1
+          @pending.delete(uuid)
+        end
+      }
+
+      if (@options[:verbose])
+        connection_options[:debug] = STDOUT
+      end
+
+      Remailer::SMTP::Client.open(server, connection_options)
+    end
+  end
+
+  def done?
+    @pending.empty?
+  end
+end
+
+# == Main ===================================================================
+
+options = {
+  count: 1,
+  concurrency: 1,
+  proxy_host: 'localhost',
+  proxy_port: 1080
+}
+
+opts = OptionParser.new do |parser|
+  parser.banner = "Usage: exerciser [options] server [server [...]]"
+  parser.on('-n', '--count=n') do |n|
+    options[:count] = n.to_i
+  end
+  parser.on('-c', '--concurrency=n') do |n|
+    options[:concurrency] = n.to_i
+  end
+  parser.on('-X', '--proxy=s') do |s|
+    server, port = s.split(/:/)
+
+    options[:proxy_host] = server
+
+    if (port)
+      options[:proxy_port] = port.to_i
+    end
+  end
+  parser.on('-v', '--verbose') do
+    options[:verbose] = true
+  end
+end
+
+servers = opts.parse(*ARGV)
+
+unless (servers.any?)
+  puts opts
+  exit(0)
+end
+
+EventMachine.run do
+  exerciser = Exerciser.new(options)
+
+  servers.each do |server|
+    exerciser.test(server)
+  end
+
+  EventMachine.add_periodic_timer(0.1) do
+    if (exerciser.done?)
+      puts '%-40s %-6s %-6s' % [ 'Server', 'Success', 'Fail' ]
+      puts '-' * 58
+      exerciser.report.each do |server, results|
+        puts '%-40s %6d %6d' % [ server, results[:success], results[:error] ]
+      end
+
+      EventMachine.stop_event_loop
+    end
+  end
+end

data/test/config.example.yml

@@ -0,0 +1,15 @@
+smtp_server:
+  host: "smtp.gmail.com"
+  identifier: "smtp.gmail.com"
+
+public_smtp_server:
+  host: "smtp.gmail.com"
+  identifier: "mx.google.com"
+  username: "<account>@gmail.com"
+  password: "<password>"
+  port: 587
+
+proxy_server: "<proxy.server>"
+
+recipient: "<account>@gmail.com"
+sender: "<account>@gmail.com"

data/test/config.rb

@@ -0,0 +1,41 @@
+require 'yaml'
+
+class TestConfig < Hash
+  CONFIG_FILE = 'config.yml'
+
+  def self.options
+    @options ||= begin
+      config_path = File.expand_path(CONFIG_FILE, File.dirname(__FILE__))
+
+      unless (File.exist?(config_path))
+        raise "Config #{CONFIG_FILE} not found. Copy test/config.example.yml and fill in appropriate test settings."
+      end
+
+      new(config_path)
+    end
+  end
+
+  def initialize(path)
+    merge!(symbolized_keys(YAML.load(File.open(path))))
+  end
+
+  def symbolized_keys(object)
+    case (object)
+    when Hash
+      Hash[
+        object.collect do |key, value|
+          [
+            key ? key.to_sym : key,
+            symbolized_keys(value)
+          ]
+        end
+      ]
+    when Array
+      object.collect do |value|
+        symbolized_keys(value)
+      end
+    else
+      object
+    end
+  end
+end

data/test/helper.rb

@@ -1,11 +1,15 @@
 require 'rubygems'
-require 'test/unit'
+
+gem 'minitest'
+require 'minitest/autorun'
+require 'minitest/reporters'
+
+Minitest::Reporters.use!(Minitest::Reporters::SpecReporter.new)
 
 $LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'timeout'
-require 'thwait'
 require 'rubygems'
 
 begin
@@ -14,8 +18,6 @@ rescue => e
   raise "EventMachine gem could not be loaded: #{e.class}: #{e}"
 end
 
-puts $LOAD_PATH.inspect
-
 require 'remailer'
 
 class Proc
@@ -38,8 +40,6 @@ end
 module TestTriggerHelper
   def self.included(base)
     base.class_eval do
-      attr_reader :triggered
-      
       def triggered
         @triggered ||= Hash.new(false)
       end
@@ -51,36 +51,64 @@ module TestTriggerHelper
   end
 end
 
-class Test::Unit::TestCase
+if (ENV['DEBUG'])
+  STDERR.sync = true
+end
+
+class MiniTest::Test
+  def debug_channel
+    ENV['DEBUG'] ? STDERR : nil
+  end
+
   def engine
     exception = nil
+    test_thread = nil
     
-    ThreadsWait.all_waits(
+    engine_thread =
       Thread.new do
         Thread.abort_on_exception = true
 
         # Create a thread for the engine to run on
         begin
           EventMachine.run
+
         rescue Object => exception
         end
-      end,
+      end
+
+    test_thread =
       Thread.new do
         # Execute the test code in a separate thread to avoid blocking
         # the EventMachine loop.
         begin
+          while (!EventMachine.reactor_running?)
+            # Wait impatiently.
+          end
+
           yield
         rescue Object => exception
         ensure
           begin
             EventMachine.stop_event_loop
           rescue Object
+            STDERR.puts("[#{exception.class}] #{exception}")
             # Shutting down may trigger an exception from time to time
             # if the engine itself has failed.
           end
         end
       end
-    )
+
+    test_thread.join
+
+    begin
+      Timeout.timeout(1) do
+        engine_thread.join
+      end
+    rescue Timeout::Error
+      engine_thread.kill
+
+      fail 'Execution timed out'
+    end
     
     if (exception)
       raise exception
@@ -89,6 +117,7 @@ class Test::Unit::TestCase
   
   def assert_timeout(time, message = nil, &block)
     Timeout::timeout(time, &block)
+
   rescue Timeout::Error
     flunk(message || 'assert_timeout timed out')
   end
@@ -106,12 +135,12 @@ class Test::Unit::TestCase
   end
 
   def assert_mapping(map, &block)
-    result_map = map.inject({ }) do |h, (k,v)|
+    result_map = map.inject({ }) do |h, (k, _v)|
       h[k] = yield(k)
       h
     end
     
-    differences = result_map.inject([ ]) do |a, (k,v)|
+    differences = result_map.inject([ ]) do |a, (k, v)|
       if (v != map[k])
         a << k
       end
@@ -123,14 +152,4 @@ class Test::Unit::TestCase
   end
 end
 
-require 'ostruct'
-
-TestConfig = OpenStruct.new
-
-config_file = File.expand_path("config.rb", File.dirname(__FILE__))
-
-if (File.exist?(config_file))
-  require config_file
-else
-  raise "No test/config.rb file found. Copy and modify test/config.example.rb"
-end
+require_relative 'config'

data/test/unit/remailer_imap_client_interpreter_test.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
-class RemailerIMAPClientInterpreterTest < Test::Unit::TestCase
+class RemailerIMAPClientInterpreterTest < MiniTest::Test
   def test_split_list_definition
     assert_mapping(
       '(\HasChildren \HasNoChildren) "/" "[Gmail]/All Mail"' =>

data/test/unit/remailer_imap_client_test.rb

@@ -1,18 +1,16 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
-class RemailerIMAPClientTest < Test::Unit::TestCase
-  def setup
-    STDERR.sync = true
-  end
-  
+class RemailerIMAPClientTest < MiniTest::Test
   def test_connect
+    skip
+
+    debug = { }
+    
     engine do
-      debug = { }
-      
       client = Remailer::IMAP::Client.open(
-        TestConfig.imap_server[:host],
-        :debug => STDERR, 
-        :connect => lambda { |success, host| connected_host = host }
+        TestConfig.options[:imap_server][:host],
+        debug: self.debug_channel, 
+        connect: lambda { |_success, host| debug[:connected_host] = host }
       )
       
       assert client
@@ -37,7 +35,7 @@ class RemailerIMAPClientTest < Test::Unit::TestCase
       
       login_status = nil
       
-      client.login(TestConfig.smtp_server[:username], TestConfig.smtp_server[:password]) do |status, message|
+      client.login(TestConfig.options[:smtp_server][:username], TestConfig.options[:smtp_server][:password]) do |status, message|
         login_status = status
       end
       

data/test/unit/remailer_interpreter_state_proxy_test.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
-class RemailerInterpreterStateTest < Test::Unit::TestCase
+class RemailerInterpreterStateTest < MiniTest::Test
   def test_defaults
     options = { }
     
@@ -15,9 +15,9 @@ class RemailerInterpreterStateTest < Test::Unit::TestCase
     proxy = Remailer::Interpreter::StateProxy.new(options)
 
     expected = {
-      :enter => [ lambda { } ],
-      :default => [ lambda { } ],
-      :leave => [ lambda { } ]
+      enter: [ lambda { } ],
+      default: [ lambda { } ],
+      leave: [ lambda { } ]
     }.freeze
 
     proxy.enter(&expected[:enter][0])
@@ -31,9 +31,9 @@ class RemailerInterpreterStateTest < Test::Unit::TestCase
     options = { }
 
     expected = {
-      :enter => [ lambda { } ],
-      :terminate => [ lambda { } ],
-      :leave => [ lambda { } ]
+      enter: [ lambda { } ],
+      terminate: [ lambda { } ],
+      leave: [ lambda { } ]
     }.freeze
 
     Remailer::Interpreter::StateProxy.new(options) do
@@ -49,10 +49,10 @@ class RemailerInterpreterStateTest < Test::Unit::TestCase
     options = { }
     
     expected = {
-      :enter => [ lambda { } ],
-      :interpret => [ [ 10, lambda { } ], [ 1, lambda { } ] ],
-      :default => [ lambda { } ],
-      :leave => [ lambda { } ]
+      enter: [ lambda { } ],
+      interpret: [ [ 10, lambda { } ], [ 1, lambda { } ] ],
+      default: [ lambda { } ],
+      leave: [ lambda { } ]
     }.freeze
 
     Remailer::Interpreter::StateProxy.new(options) do
@@ -80,7 +80,7 @@ class RemailerInterpreterStateTest < Test::Unit::TestCase
     
     proxy.leave(&proc[1])
     
-    assert_equal({ :enter => [ proc[0] ] }, options_a)
-    assert_equal({ :leave => [ proc[1] ] }, options_b)
+    assert_equal({ enter: [ proc[0] ] }, options_a)
+    assert_equal({ leave: [ proc[1] ] }, options_b)
   end
 end

data/test/unit/remailer_interpreter_test.rb

@@ -1,4 +1,18 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
+
+class RegexpInterpreter < Remailer::Interpreter
+  attr_reader :received
+  
+  state :initialized do
+    interpret(/^HELO\s+/) do |line|
+      @received = [ :helo, line ]
+    end
+
+    interpret(/^MAIL FROM:<([^>]+)>/) do |line|
+      @received = [ :mail_from, line ]
+    end
+  end
+end
 
 class ExampleDelegate
   include TestTriggerHelper
@@ -46,20 +60,6 @@ class LineInterpreterSubclass < LineInterpreter
   end
 end
 
-class RegexpInterpreter < Remailer::Interpreter
-  attr_reader :received
-  
-  state :initialized do
-    interpret(/^HELO\s+/) do |line|
-      @received = [ :helo, line ]
-    end
-
-    interpret(/^MAIL FROM:<([^>]+)>/) do |line|
-      @received = [ :mail_from, line ]
-    end
-  end
-end
-
 class ExampleInterpreter < Remailer::Interpreter
   include TestTriggerHelper
 
@@ -105,15 +105,21 @@ class InterpreterWithAccessor < Remailer::Interpreter
   attr_accessor :example
 end
 
-class RemailerInterpreterTest < Test::Unit::TestCase
+class RemailerInterpreterTest < MiniTest::Test
   def test_default_state
-    assert_equal [ :initialized, :terminated ], Remailer::Interpreter.states_defined.collect { |s| s.to_s }.sort.collect { |s| s.to_sym }
-    assert_equal true, Remailer::Interpreter.state_defined?(:initialized)
-    assert_equal true, Remailer::Interpreter.state_defined?(:terminated)
-    assert_equal false, Remailer::Interpreter.state_defined?(:unknown)
+    test_interpreter_class = Class.new(Remailer::Interpreter)
+
+    assert test_interpreter_class.states_empty?
+
+    assert_equal [ :initialized, :terminated ], test_interpreter_class.states_defined.collect { |s| s.to_s }.sort.collect { |s| s.to_sym }
+    assert_equal true, test_interpreter_class.state_defined?(:initialized)
+    assert_equal true, test_interpreter_class.state_defined?(:terminated)
+    assert_equal false, test_interpreter_class.state_defined?(:unknown)
+
+    assert_equal [ :initialized, :terminated ], test_interpreter_class.states_defined
+
+    interpreter = test_interpreter_class.new
 
-    interpreter = Remailer::Interpreter.new
-    
     assert_equal :initialized, interpreter.state
     
     buffer = 'a'
@@ -124,13 +130,15 @@ class RemailerInterpreterTest < Test::Unit::TestCase
   end
   
   def test_delegate
+    test_interpreter_class = Class.new(Remailer::Interpreter)
+    
     delegate = ExampleDelegate.new
 
     assert delegate.triggered
 
-    interpreter = Remailer::Interpreter.new(:delegate => delegate)
+    interpreter = test_interpreter_class.new(delegate: delegate)
     
-    assert_equal nil, delegate.attribute
+    assert_nil delegate.attribute
     assert_equal false, delegate.triggered[:method_no_args]
     assert_equal false, delegate.triggered[:method_with_args]
     
@@ -228,7 +236,7 @@ class RemailerInterpreterTest < Test::Unit::TestCase
     
     interpreter.process(line)
     
-    assert_equal nil, interpreter.lines[-1]
+    assert_nil interpreter.lines[-1]
     assert_equal "TEST", line
     
     line << "\0"
@@ -242,7 +250,7 @@ class RemailerInterpreterTest < Test::Unit::TestCase
   def test_regexp_interpreter
     interpreter = RegexpInterpreter.new
     
-    assert_equal nil, interpreter.received
+    assert_nil interpreter.received
     
     line = "HELO example.com"
     
@@ -269,7 +277,7 @@ class RemailerInterpreterTest < Test::Unit::TestCase
     assert_equal true, interpreter.interpret(:random)
     
     assert_equal :branch, interpreter.state
-    assert_equal nil, interpreter.error
+    assert_nil interpreter.error
     
     assert_equal :random, interpreter.reply
   end
@@ -291,7 +299,7 @@ class RemailerInterpreterTest < Test::Unit::TestCase
   def test_new_with_block
     interpreter = InterpreterWithAccessor.new
     
-    assert_equal nil, interpreter.example
+    assert_nil interpreter.example
 
     interpreter = InterpreterWithAccessor.new do |interpreter|
       interpreter.example = 'example'