remailer 0.5.2 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 709e0bf509c227f3e6b529520bc82af7a02c9a43
+  data.tar.gz: d2e193e4690ae8d71004c1e0c4fdda782e5d786c
+SHA512:
+  metadata.gz: 2ec11c9db71e13589670c3841824ccba7b47c27d2e1ee464885313a0364bd40fd4ad575b06d36ce0710b866caa18287b2858ada691ede63dc18dcc840e4b8030
+  data.tar.gz: f8a2688508db19e4c5804edfc11633db29ae9d4c21ec3ab0b1e7379aee1a64bf58abc1edf8290715f401e221697b974e0f0504d9adb569c7175e8e2a36f4615b

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+before_install: gem install bundler
+rvm:
+  - 1.9.3-p551
+  - 2.0.0-p598
+  - 2.1.5
+  - 2.2.0

data/Gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org/'
+
+gem 'eventmachine'
+
+group :development do
+  gem 'minitest'
+  gem 'jeweler'
+end

data/{README.rdoc → README.md}

@@ -1,8 +1,8 @@
-= remailer
+# remailer
 
 Client/Server Mail Networking Library for SMTP and IMAP
 
-== Overview
+## Overview
 
 This is an EventMachine Connection implementation of a high-performance
 asynchronous SMTP client. Although EventMachine ships with a built-in SMTP
@@ -10,7 +10,7 @@ client, that version is limited to sending a single email per client,
 and since establishing a client can be the majority of the time required
 to send email, this limits throughput considerably.
 
-== Use
+## Use
 
 The Remailer system consists of the Remailer::Connection class which works
 within the EventMachine environment. To use it, create a client and then
@@ -21,7 +21,7 @@ make one or more requests to send email messages.
       # messages to STDERR.
       client = Remailer::SMTP::Client.open(
         'smtp.google.com',
-        :debug => STDERR
+        debug: STDERR
       )
       
       # Send a single email message through the client at the earliest
@@ -51,7 +51,7 @@ example is given here where the information is simply dumped on STDOUT:
 
     client = Remailer::SMTP::Client.open(
       'smtp.google.com',
-      :debug => lambda { |type, message|
+      debug: lambda { |type, message|
         puts "#{type}> #{message.inspect}"
       }
     )
@@ -90,18 +90,18 @@ server. Success is defined as 250, errors vary:
 
 A status code of nil is sent if the server timed out or the connection failed.
 
-== Tests
+## Tests
 
 In order to run tests, copy `test/config.example.rb` to `test/config.rb` and
 adjust as required. For obvious reasons, passwords to SMTP test accounts are
 not included in the source code of this library.
 
-== Status
+## Status
 
 This software is currently experimental and is not recommended for production
 use. Many of the internals may change significantly before a proper beta
 release is made.
 
-== Copyright
+## Copyright
 
-Copyright (c) 2010-2012 Scott Tadman, The Working Group
+Copyright (c) 2010-2015 Scott Tadman, The Working Group

data/Rakefile

@@ -1,8 +1,13 @@
 require 'rubygems'
 require 'rake'
 
+require 'bundler/setup'
+
+Bundler.require
+
 begin
   require 'jeweler'
+
   Jeweler::Tasks.new do |gem|
     gem.name = "remailer"
     gem.summary = %Q{Reactor-Ready SMTP Mailer}
@@ -10,20 +15,20 @@ begin
     gem.email = "scott@twg.ca"
     gem.homepage = "http://github.com/twg/remailer"
     gem.authors = [ "Scott Tadman" ]
-    gem.add_runtime_dependency 'eventmachine'
   end
+
   Jeweler::GemcutterTasks.new
+
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
 require 'rake/testtask'
+
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
-task :test => :check_dependencies
-
 task :default => :test

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.6.0

data/lib/remailer/abstract_connection.rb

@@ -245,6 +245,8 @@ class Remailer::AbstractConnection < EventMachine::Connection
     
   rescue Object => e
     STDERR.puts("[#{e.class}] #{e}")
+
+    raise e
   end
 
   def post_init
@@ -399,11 +401,6 @@ class Remailer::AbstractConnection < EventMachine::Connection
     
     reset_timeout!
   end
-
-  # Switches to use the SOCKS5 interpreter for all subsequent communication
-  def use_socks5_interpreter!
-    @interpreter = Remailer::SOCKS5::Client::Interpreter.new(:delegate => self)
-  end
   
   # -- Callbacks and Notifications ------------------------------------------
 

data/lib/remailer/imap/client.rb

@@ -192,7 +192,7 @@ class Remailer::IMAP::Client < Remailer::AbstractConnection
 protected
   # Switches to use the IMAP interpreter for all subsequent communication
   def use_imap_interpreter!
-    @interpreter = Interpreter.new(:delegate => self)
+    @interpreter = Interpreter.new(delegate: self)
   end
 
   def next_tag

data/lib/remailer/interpreter.rb

@@ -212,8 +212,8 @@ class Remailer::Interpreter
       yield(parsed) if (block_given?)
 
       interpret(*parsed)
-      
-      break if (s.empty?)
+
+      break if (s.empty? or self.finished?)
     end
   end
   
@@ -290,6 +290,12 @@ class Remailer::Interpreter
   def will_interpret?(proc, args)
     true
   end
+
+  # Should return true if this interpreter no longer wants any data, false
+  # otherwise. Subclasses should implement their own behavior here.
+  def finished?
+    false
+  end
   
   # Returns true if an error has been generated, false otherwise. The error
   # content can be retrived by calling error.

data/lib/remailer/smtp/client.rb

@@ -69,6 +69,11 @@ class Remailer::SMTP::Client < Remailer::AbstractConnection
     end
   end
 
+  # Switches to use the SOCKS5 interpreter for all subsequent communication
+  def use_socks5_interpreter!
+    @interpreter = Remailer::SOCKS5::Client::Interpreter.new(delegate: self)
+  end
+
   # Closes the connection after all of the queued messages have been sent.
   def close_when_complete!
     @options[:close] = true
@@ -83,10 +88,10 @@ class Remailer::SMTP::Client < Remailer::AbstractConnection
     end
     
     message = {
-      :from => from,
-      :to => to,
-      :data => data,
-      :callback => block
+      from: from,
+      to: to,
+      data: data,
+      callback: block
     }
     
     @messages << message
@@ -108,10 +113,10 @@ class Remailer::SMTP::Client < Remailer::AbstractConnection
     end
     
     message = {
-      :from => from,
-      :to => to,
-      :test => true,
-      :callback => block
+      from: from,
+      to: to,
+      test: true,
+      callback: block
     }
     
     @messages << message
@@ -146,23 +151,6 @@ class Remailer::SMTP::Client < Remailer::AbstractConnection
   def unbound?
     !!@unbound
   end
-
-  # This implements the EventMachine::Connection#receive_data method that
-  # is called each time new data is received from the socket.
-  def receive_data(data)
-    reset_timeout!
-
-    @buffer ||= ''
-    @buffer << data
-
-    if (interpreter = @interpreter)
-      interpreter.process(@buffer) do |reply|
-        debug_notification(:receive, "[#{interpreter.label}] #{reply.inspect}")
-      end
-    else
-      error_notification(:out_of_band, "Receiving data before a protocol has been established.")
-    end
-  end
   
   # Returns the current state of the active interpreter, or nil if no state
   # is assigned.
@@ -227,7 +215,7 @@ class Remailer::SMTP::Client < Remailer::AbstractConnection
   
   # Switches to use the SMTP interpreter for all subsequent communication
   def use_smtp_interpreter!
-    @interpreter = Interpreter.new(:delegate => self)
+    @interpreter = Interpreter.new(delegate: self)
   end
 
   # Callback receiver for when the proxy connection has been completed.

data/lib/remailer/smtp/server.rb

@@ -69,7 +69,7 @@ class Remailer::SMTP::Server < EventMachine::Protocols::LineAndTextProtocol
   def post_init
     super
 
-    @interpreter = Interpreter.new(:delegate => self)
+    @interpreter = Interpreter.new(delegate: self)
     
     if (@on_connect)
       @on_connect.call(@remote_ip)

data/lib/remailer/smtp/server/interpreter.rb

@@ -103,8 +103,8 @@ class Remailer::SMTP::Server::Interpreter < Remailer::Interpreter
       elsif (delegate.tls?)
         delegate.send_line("220 TLS ready to start")
         delegate.start_tls(
-          :private_key_file => Remailer::SMTP::Server.private_key_path,
-          :cert_chain_file => Remailer::SMTP::Server.ssl_cert_path
+          private_key_file: Remailer::SMTP::Server.private_key_path,
+          cert_chain_file: Remailer::SMTP::Server.ssl_cert_path
         )
         
         @tls_started = true

data/lib/remailer/socks5/client/interpreter.rb

@@ -5,14 +5,14 @@ class Remailer::SOCKS5::Client::Interpreter < Remailer::Interpreter
   SOCKS5_VERSION = 5
 
   SOCKS5_METHOD = {
-    :no_auth => 0,
-    :gssapi => 1,
-    :username_password => 2
+    no_auth: 0,
+    gssapi: 1,
+    username_password: 2
   }.freeze
   
   SOCKS5_COMMAND = {
-    :connect => 1,
-    :bind => 2
+    connect: 1,
+    bind: 2
   }.freeze
   
   SOCKS5_REPLY = {
@@ -28,9 +28,9 @@ class Remailer::SOCKS5::Client::Interpreter < Remailer::Interpreter
   }.freeze
   
   SOCKS5_ADDRESS_TYPE = {
-    :ipv4 => 1,
-    :domainname => 3,
-    :ipv6 => 4
+    ipv4: 1,
+    domainname: 3,
+    ipv6: 4
   }.freeze
   
   # == State Mapping ========================================================
@@ -114,9 +114,9 @@ class Remailer::SOCKS5::Client::Interpreter < Remailer::Interpreter
         [
           reply,
           {
-            :address => address,
-            :port => port,
-            :address_type => address_type
+            address: address,
+            port: port,
+            address_type: address_type
           }
         ]
       end
@@ -128,6 +128,7 @@ class Remailer::SOCKS5::Client::Interpreter < Remailer::Interpreter
     
     default do |reply|
       @reply = reply
+
       enter_state(:failed)
     end
   end
@@ -189,4 +190,8 @@ class Remailer::SOCKS5::Client::Interpreter < Remailer::Interpreter
   def label
     'SOCKS5'
   end
+
+  def finished?
+    self.state == :connected
+  end
 end

data/remailer.gemspec

@@ -2,22 +2,26 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: remailer 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "remailer"
-  s.version = "0.5.2"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Scott Tadman"]
-  s.date = "2012-11-30"
+  s.date = "2015-01-22"
   s.description = "EventMachine SMTP Mail User Agent"
   s.email = "scott@twg.ca"
   s.extra_rdoc_files = [
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
-    "README.rdoc",
+    ".travis.yml",
+    "Gemfile",
+    "README.md",
     "Rakefile",
     "VERSION",
     "lib/remailer.rb",
@@ -42,6 +46,7 @@ Gem::Specification.new do |s|
     "lib/remailer/socks5/client/interpreter.rb",
     "lib/remailer/support.rb",
     "remailer.gemspec",
+    "test/bin/exercise",
     "test/config.example.rb",
     "test/helper.rb",
     "test/unit/remailer_imap_client_interpreter_test.rb",
@@ -55,20 +60,25 @@ Gem::Specification.new do |s|
     "test/unit/remailer_test.rb"
   ]
   s.homepage = "http://github.com/twg/remailer"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.2.2"
   s.summary = "Reactor-Ready SMTP Mailer"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
+      s.add_development_dependency(%q<minitest>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<eventmachine>, [">= 0"])
+      s.add_dependency(%q<minitest>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<eventmachine>, [">= 0"])
+    s.add_dependency(%q<minitest>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

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.rb

@@ -1,14 +1,14 @@
 TestConfig.smtp_server = {
-  :host => "smtp.example.com",
-  :identifier => "smtp.example.com"
+  host: "smtp.example.com",
+  identifier: "smtp.example.com"
 } 
 
 TestConfig.public_smtp_server = {
-  :host => "smtp.gmail.com",
-  :identifier => "mx.google.com",
-  :username => "--your--username--gmail.com",
-  :password => "--your--password--",
-  :port => 587
+  host: "smtp.gmail.com",
+  identifier: "mx.google.com",
+  username: "--your--username--gmail.com",
+  password: "--your--password--",
+  port: 587
 }
 
 TestConfig.proxy_server = "proxy.example.com"

data/test/helper.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
-require 'test/unit'
+
+gem 'minitest'
+require 'minitest/autorun'
 
 $LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -14,8 +16,6 @@ rescue => e
   raise "EventMachine gem could not be loaded: #{e.class}: #{e}"
 end
 
-puts $LOAD_PATH.inspect
-
 require 'remailer'
 
 class Proc
@@ -51,7 +51,7 @@ module TestTriggerHelper
   end
 end
 
-class Test::Unit::TestCase
+class MiniTest::Test
   def engine
     exception = nil
     

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,6 +1,6 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
-class RemailerIMAPClientTest < Test::Unit::TestCase
+class RemailerIMAPClientTest < MiniTest::Test
   def setup
     STDERR.sync = true
   end
@@ -11,8 +11,8 @@ class RemailerIMAPClientTest < Test::Unit::TestCase
       
       client = Remailer::IMAP::Client.open(
         TestConfig.imap_server[:host],
-        :debug => STDERR, 
-        :connect => lambda { |success, host| connected_host = host }
+        debug: STDERR, 
+        connect: lambda { |success, host| connected_host = host }
       )
       
       assert client

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,4 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
 class ExampleDelegate
   include TestTriggerHelper
@@ -105,7 +105,7 @@ 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)
@@ -128,7 +128,7 @@ class RemailerInterpreterTest < Test::Unit::TestCase
 
     assert delegate.triggered
 
-    interpreter = Remailer::Interpreter.new(:delegate => delegate)
+    interpreter = Remailer::Interpreter.new(delegate: delegate)
     
     assert_equal nil, delegate.attribute
     assert_equal false, delegate.triggered[:method_no_args]

data/test/unit/remailer_smtp_client_interpreter_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
 class SMTPDelegate
   attr_accessor :options, :protocol, :active_message
@@ -62,7 +62,7 @@ class SMTPDelegate
   end
 end
 
-class RemailerSMTPClientInterpreterTest < Test::Unit::TestCase
+class RemailerSMTPClientInterpreterTest < MiniTest::Test
   def test_split_reply
     assert_mapping(
       '250 OK' => [ 250, 'OK' ],
@@ -127,12 +127,12 @@ class RemailerSMTPClientInterpreterTest < Test::Unit::TestCase
   end
 
   def test_delegate_options
-    delegate = SMTPDelegate.new(:use_tls => true)
+    delegate = SMTPDelegate.new(use_tls: true)
 
     assert_equal true, delegate.use_tls?
     assert_equal false, delegate.requires_authentication?
 
-    delegate = SMTPDelegate.new(:username => 'test@example.com', :password => 'tester')
+    delegate = SMTPDelegate.new(username: 'test@example.com', password: 'tester')
 
     assert_equal false, delegate.use_tls?
     assert_equal true, delegate.requires_authentication?
@@ -140,7 +140,7 @@ class RemailerSMTPClientInterpreterTest < Test::Unit::TestCase
 
   def test_standard_smtp_connection
     delegate = SMTPDelegate.new
-    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
+    interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
 
     assert_equal :initialized, interpreter.state
     
@@ -163,7 +163,7 @@ class RemailerSMTPClientInterpreterTest < Test::Unit::TestCase
 
   def test_standard_smtp_connection_send_email
     delegate = SMTPDelegate.new
-    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
+    interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
 
     assert_equal :initialized, interpreter.state
     
@@ -184,9 +184,9 @@ class RemailerSMTPClientInterpreterTest < Test::Unit::TestCase
     assert_equal true, delegate.closed?
     
     delegate.active_message = {
-      :from => 'from@example.com',
-      :to => 'to@example.com',
-      :data => "Subject: Test Message\r\n\r\nThis is a message!\r\n"
+      from: 'from@example.com',
+      to: 'to@example.com',
+      data: "Subject: Test Message\r\n\r\nThis is a message!\r\n"
     }
     
     interpreter.enter_state(:send)
@@ -218,7 +218,7 @@ class RemailerSMTPClientInterpreterTest < Test::Unit::TestCase
   
   def test_standard_esmtp_connection
     delegate = SMTPDelegate.new
-    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
+    interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
 
     assert_equal :initialized, interpreter.state
     
@@ -254,8 +254,8 @@ class RemailerSMTPClientInterpreterTest < Test::Unit::TestCase
   end
   
   def test_multi_line_hello_response
-    delegate = SMTPDelegate.new(:use_tls => true)
-    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new(use_tls: true)
+    interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
 
     assert_equal :initialized, interpreter.state
     assert_equal :smtp, delegate.protocol
@@ -276,8 +276,8 @@ class RemailerSMTPClientInterpreterTest < Test::Unit::TestCase
   end
 
   def test_tls_connection_with_support
-    delegate = SMTPDelegate.new(:use_tls => true)
-    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new(use_tls: true)
+    interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
     
     assert_equal true, delegate.use_tls?
     assert_equal :initialized, interpreter.state
@@ -307,8 +307,8 @@ class RemailerSMTPClientInterpreterTest < Test::Unit::TestCase
   end
 
   def test_tls_connection_without_support
-    delegate = SMTPDelegate.new(:use_tls => true)
-    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new(use_tls: true)
+    interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
 
     interpreter.process("220 mail.example.com ESMTP Exim 4.63\r\n")
     assert_equal 'EHLO localhost.local', delegate.read
@@ -322,8 +322,8 @@ class RemailerSMTPClientInterpreterTest < Test::Unit::TestCase
   end
 
   def test_basic_smtp_plaintext_auth_accepted
-    delegate = SMTPDelegate.new(:username => 'tester@example.com', :password => 'tester')
-    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new(username: 'tester@example.com', password: 'tester')
+    interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
     
     assert delegate.requires_authentication?
 
@@ -348,8 +348,8 @@ class RemailerSMTPClientInterpreterTest < Test::Unit::TestCase
   end
 
   def test_basic_esmtp_plaintext_auth_accepted
-    delegate = SMTPDelegate.new(:username => 'tester@example.com', :password => 'tester')
-    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new(username: 'tester@example.com', password: 'tester')
+    interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
 
     interpreter.process("220 mail.example.com ESMTP Exim 4.63\r\n")
     assert_equal 'EHLO localhost.local', delegate.read
@@ -368,8 +368,8 @@ class RemailerSMTPClientInterpreterTest < Test::Unit::TestCase
   end
 
   def test_basic_esmtp_plaintext_auth_rejected
-    delegate = SMTPDelegate.new(:username => 'tester@example.com', :password => 'tester')
-    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new(username: 'tester@example.com', password: 'tester')
+    interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
 
     interpreter.process("220 mx.google.com ESMTP\r\n")
     assert_equal 'EHLO localhost.local', delegate.read
@@ -396,8 +396,8 @@ class RemailerSMTPClientInterpreterTest < Test::Unit::TestCase
   end
 
   def test_unexpected_response
-    delegate = SMTPDelegate.new(:username => 'tester@example.com', :password => 'tester')
-    interpreter = Remailer::SMTP::Client::Interpreter.new(:delegate => delegate)
+    delegate = SMTPDelegate.new(username: 'tester@example.com', password: 'tester')
+    interpreter = Remailer::SMTP::Client::Interpreter.new(delegate: delegate)
 
     interpreter.process("530 Go away\r\n")
     

data/test/unit/remailer_smtp_client_test.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
-class RemailerSMTPClientTest < Test::Unit::TestCase
+class RemailerSMTPClientTest < MiniTest::Test
   def test_connect
     engine do
       debug = { }
@@ -8,8 +8,8 @@ class RemailerSMTPClientTest < Test::Unit::TestCase
 
       connection = Remailer::SMTP::Client.open(
         TestConfig.smtp_server[:host],
-        :debug => STDERR, 
-        :connect => lambda { |success, host| connected_host = host }
+        debug: STDERR, 
+        connect: lambda { |success, host| connected_host = host }
       )
 
       after_complete_trigger = false
@@ -45,13 +45,13 @@ class RemailerSMTPClientTest < Test::Unit::TestCase
 
       connection = Remailer::SMTP::Client.open(
         'example.com',
-        :debug => STDERR,
-        :error => lambda { |code, message|
+        debug: STDERR,
+        error: lambda { |code, message|
           error_received = [ code, message ]
         },
-        :on_connect => lambda { on_connect = true },
-        :on_error => lambda { on_error = true },
-        :timeout => 1
+        on_connect: lambda { on_connect = true },
+        on_error: lambda { on_error = true },
+        timeout: 1
       )
 
       assert_eventually(3) do
@@ -72,11 +72,11 @@ class RemailerSMTPClientTest < Test::Unit::TestCase
 
       connection = Remailer::SMTP::Client.open(
         'invalid-example-domain--x.com',
-        :debug => STDERR,
-        :error => lambda { |code, message|
+        debug: STDERR,
+        error: lambda { |code, message|
           error_received = [ code, message ]
         },
-        :timeout => 1
+        timeout: 1
       )
 
       assert_eventually(3) do
@@ -93,10 +93,10 @@ class RemailerSMTPClientTest < Test::Unit::TestCase
 
       connection = Remailer::SMTP::Client.open(
         TestConfig.public_smtp_server[:host],
-        :port => TestConfig.public_smtp_server[:port] || Remailer::SMTP::Client::SMTP_PORT,
-        :debug => STDERR,
-        :username => TestConfig.public_smtp_server[:username],
-        :password => TestConfig.public_smtp_server[:password]
+        port: TestConfig.public_smtp_server[:port] || Remailer::SMTP::Client::SMTP_PORT,
+        debug: STDERR,
+        username: TestConfig.public_smtp_server[:username],
+        password: TestConfig.public_smtp_server[:password]
       )
 
       after_complete_trigger = false
@@ -129,10 +129,10 @@ class RemailerSMTPClientTest < Test::Unit::TestCase
 
       connection = Remailer::SMTP::Client.open(
         TestConfig.smtp_server[:host],
-        :debug => STDERR,
-        :proxy => {
-          :proto => :socks5,
-          :host => TestConfig.proxy_server
+        debug: STDERR,
+        proxy: {
+          proto: :socks5,
+          host: TestConfig.proxy_server
         }
       )
 
@@ -164,7 +164,7 @@ class RemailerSMTPClientTest < Test::Unit::TestCase
     engine do
       connection = Remailer::SMTP::Client.open(
         TestConfig.smtp_server[:host],
-        :debug => STDERR
+        debug: STDERR
       )
 
       assert_equal :initialized, connection.state
@@ -197,7 +197,7 @@ class RemailerSMTPClientTest < Test::Unit::TestCase
     engine do
       connection = Remailer::SMTP::Client.open(
         TestConfig.smtp_server[:host],
-        :debug => STDERR
+        debug: STDERR
       )
 
       assert_equal :initialized, connection.state
@@ -222,7 +222,7 @@ class RemailerSMTPClientTest < Test::Unit::TestCase
     engine do
       connection = Remailer::SMTP::Client.open(
         TestConfig.smtp_server[:host],
-        :debug => STDERR
+        debug: STDERR
       )
 
       assert_equal :initialized, connection.state
@@ -250,7 +250,7 @@ class RemailerSMTPClientTest < Test::Unit::TestCase
     engine do
       connection = Remailer::SMTP::Client.open(
         TestConfig.smtp_server[:host],
-        :debug => STDERR
+        debug: STDERR
       )
 
       assert_equal :initialized, connection.state

data/test/unit/remailer_smtp_server_test.rb

@@ -1,6 +1,6 @@
-require File.expand_path('../helper', File.dirname(__FILE__))
+require_relative '../helper'
 
-class RemailerSMTPServerTest < Test::Unit::TestCase
+class RemailerSMTPServerTest < MiniTest::Test
   def test_bind
     engine do
       server_port = 8025
@@ -20,7 +20,7 @@ class RemailerSMTPServerTest < Test::Unit::TestCase
       server = Remailer::SMTP::Server.bind(
         nil,
         server_port,
-        :on_connect => lambda { |_remote_ip| remote_ip = _remote_ip }
+        on_connect: lambda { |_remote_ip| remote_ip = _remote_ip }
       )
     
       assert server
@@ -29,9 +29,9 @@ class RemailerSMTPServerTest < Test::Unit::TestCase
 
       client = Remailer::SMTP::Client.open(
         'localhost',
-        :port => server_port,
-        :debug => STDERR, 
-        :connect => lambda { |success, host| connected_host = host }
+        port: server_port,
+        debug: STDERR, 
+        connect: lambda { |success, host| connected_host = host }
       )
       
       assert_eventually(30) do
@@ -52,7 +52,7 @@ class RemailerSMTPServerTest < Test::Unit::TestCase
       server = Remailer::SMTP::Server.bind(
         nil,
         server_port,
-        :on_transaction => lambda { |_transaction| transaction = _transaction }
+        on_transaction: lambda { |_transaction| transaction = _transaction }
       )
     
       assert server
@@ -61,8 +61,8 @@ class RemailerSMTPServerTest < Test::Unit::TestCase
 
       client = Remailer::SMTP::Client.open(
         'localhost',
-        :port => server_port,
-        :debug => STDERR
+        port: server_port,
+        debug: STDERR
       )
       
       sender = 'sender@example.com'.freeze

data/test/unit/remailer_socks5_client_interpreter_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
 class SOCKS5Delegate
   attr_reader :options
@@ -52,15 +52,15 @@ class SOCKS5Delegate
   end
 end
 
-class RemailerSOCKS5ClientInterpreterTest < Test::Unit::TestCase
+class RemailerSOCKS5ClientInterpreterTest < MiniTest::Test
   def test_defaults
     delegate = SOCKS5Delegate.new(
-      :proxy => {
-        :host => 'example.net'
+      proxy: {
+        host: 'example.net'
       }
     )
 
-    interpreter = Remailer::SOCKS5::Client::Interpreter.new(:delegate => delegate)
+    interpreter = Remailer::SOCKS5::Client::Interpreter.new(delegate: delegate)
     
     assert_equal :initialized, interpreter.state
     assert_equal false, delegate.closed?
@@ -68,13 +68,13 @@ class RemailerSOCKS5ClientInterpreterTest < Test::Unit::TestCase
   
   def test_simple_connection
     delegate = SOCKS5Delegate.new(
-      :host => '1.2.3.4',
-      :port => 4321,
-      :proxy => {
-        :host => 'example.net'
+      host: '1.2.3.4',
+      port: 4321,
+      proxy: {
+        host: 'example.net'
       }
     )
-    interpreter = Remailer::SOCKS5::Client::Interpreter.new(:delegate => delegate)
+    interpreter = Remailer::SOCKS5::Client::Interpreter.new(delegate: delegate)
     
     assert_equal :initialized, interpreter.state
     assert_equal false, delegate.closed?
@@ -121,4 +121,64 @@ class RemailerSOCKS5ClientInterpreterTest < Test::Unit::TestCase
     
     assert_equal :connected, interpreter.state
   end
+
+  def test_combined_socks5_smtp
+    delegate = SOCKS5Delegate.new(
+      host: '1.2.3.4',
+      port: 4321,
+      proxy: {
+        host: 'example.net'
+      }
+    )
+    interpreter = Remailer::SOCKS5::Client::Interpreter.new(delegate: delegate)
+    
+    assert_equal :initialized, interpreter.state
+    assert_equal false, delegate.closed?
+    
+    sent = delegate.read
+    
+    assert_equal 2, sent.length
+    
+    assert_equal [ Remailer::SOCKS5::Client::Interpreter::SOCKS5_VERSION, 0 ], sent.unpack('CC')
+    
+    reply = [
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_VERSION,
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_METHOD[:no_auth]
+    ].pack('CC')
+    
+    interpreter.process(reply)
+    
+    assert_equal false, interpreter.error?
+    assert_equal :connect_through_proxy, interpreter.state
+    assert_equal '', reply
+    
+    sent = delegate.read
+
+    assert sent, "No data received"
+    assert_equal 10, sent.length
+    
+    assert_equal [
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_VERSION,
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_COMMAND[:connect],
+      0,
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_ADDRESS_TYPE[:ipv4],
+      [ 1, 2, 3, 4 ].pack('CCCC'),
+      4321
+    ], sent.unpack('CCCCA4n')
+
+    buffer = [
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_VERSION,
+      0, # No error
+      0,
+      Remailer::SOCKS5::Client::Interpreter::SOCKS5_ADDRESS_TYPE[:ipv4],
+      [ 1, 2, 3, 4 ].pack('CCCC'),
+      4321
+    ].pack('CCCCA4n') + '421 Welcome to an ESTMP Server'
+
+    interpreter.process(buffer)
+
+    assert_equal '421 Welcome to an ESTMP Server', buffer
+    
+    assert_equal :connected, interpreter.state
+  end
 end

data/test/unit/remailer_test.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
-class RemailerTest < Test::Unit::TestCase
+class RemailerTest < MiniTest::Test
   def test_module_loaded
     assert Remailer
   end

metadata

@@ -1,30 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: remailer
 version: !ruby/object:Gem::Version
-  version: 0.5.2
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Scott Tadman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   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: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: EventMachine SMTP Mail User Agent
@@ -32,10 +57,12 @@ email: scott@twg.ca
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 files:
-- .document
-- README.rdoc
+- ".document"
+- ".travis.yml"
+- Gemfile
+- README.md
 - Rakefile
 - VERSION
 - lib/remailer.rb
@@ -60,6 +87,7 @@ files:
 - lib/remailer/socks5/client/interpreter.rb
 - lib/remailer/support.rb
 - remailer.gemspec
+- test/bin/exercise
 - test/config.example.rb
 - test/helper.rb
 - test/unit/remailer_imap_client_interpreter_test.rb
@@ -73,26 +101,25 @@ files:
 - test/unit/remailer_test.rb
 homepage: http://github.com/twg/remailer
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Reactor-Ready SMTP Mailer
 test_files: []