request-log-analyzer 1.13.1 → 1.13.3

data/lib/request_log_analyzer/tracker/traffic.rb

@@ -1,5 +1,4 @@
 module RequestLogAnalyzer::Tracker
-
   # Analyze the average and total traffic of requests
   #
   # === Options
@@ -10,16 +9,15 @@ module RequestLogAnalyzer::Tracker
   # * <tt>:title</tt> Title do be displayed above the report
   # * <tt>:unless</tt> Handle request if this proc is false for the handled request.
   class Traffic < NumericValue
-
     # Check if duration and catagory option have been received,
     def prepare
       options[:value] = options[:traffic] if options[:traffic]
       options[:total] = true
       super
-      
+
       @number_of_buckets = options[:number_of_buckets] || 1000
       @min_bucket_value  = options[:min_bucket_value] ? options[:min_bucket_value].to_f : 1
-      @max_bucket_value  = options[:max_bucket_value] ? options[:max_bucket_value].to_f : 1000_000_000_000
+      @max_bucket_value  = options[:max_bucket_value] ? options[:max_bucket_value].to_f : 1_000_000_000_000
 
       # precalculate the bucket size
       @bucket_size = (Math.log(@max_bucket_value) - Math.log(@min_bucket_value)) / @number_of_buckets.to_f
@@ -27,15 +25,15 @@ module RequestLogAnalyzer::Tracker
 
     # Formats the traffic number using x B/kB/MB/GB etc notation
     def display_value(bytes)
-      return "-"   if bytes.nil?
-      return "0 B" if bytes.zero?
-      
+      return '-'   if bytes.nil?
+      return '0 B' if bytes.zero?
+
       case [Math.log10(bytes.abs).floor, 0].max
       when  0...4  then '%d B'  % bytes
       when  4...7  then '%d kB' % (bytes / 1000)
-      when  7...10 then '%d MB' % (bytes / 1000_000)
-      when 10...13 then '%d GB' % (bytes / 1000_000_000)
-      else              '%d TB' % (bytes / 1000_000_000_000)
+      when  7...10 then '%d MB' % (bytes / 1_000_000)
+      when 10...13 then '%d GB' % (bytes / 1_000_000_000)
+      else              '%d TB' % (bytes / 1_000_000_000_000)
       end
     end
 

data/lib/request_log_analyzer/version.rb

@@ -1,3 +1,3 @@
 module RequestLogAnalyzer
-  VERSION = "1.13.1"
+  VERSION = '1.13.3'
 end

data/request-log-analyzer.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |gem|
   gem.summary     = "A command line tool to analyze request logs for Apache, Rails, Merb, MySQL and other web application servers"
   gem.description = <<-eos
     Request log analyzer's purpose is to find out how your web application is being used, how it performs and to
-    focus your optimization efforts. This tool will parse all requests in the application's log file and aggregate the 
-    information. Once it is finished parsing the log file(s), it will show the requests that take op most server time 
+    focus your optimization efforts. This tool will parse all requests in the application's log file and aggregate the
+    information. Once it is finished parsing the log file(s), it will show the requests that take op most server time
     using various metrics. It can also insert all parsed request information into a database so you can roll your own
-    analysis. It supports Rails-, Merb- and Rack-based applications logs, Apache and Amazon S3 access logs and MySQL 
-    slow query logs out of the box, but file formats of other applications can easily be supported by supplying an 
+    analysis. It supports Rails-, Merb- and Rack-based applications logs, Apache and Amazon S3 access logs and MySQL
+    slow query logs out of the box, but file formats of other applications can easily be supported by supplying an
     easy to write log file format definition.
   eos
 
@@ -32,7 +32,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('rspec', '~> 2.14')
+  gem.add_development_dependency('rspec', '~> 3')
   gem.add_development_dependency('activerecord')
   if defined?(JRUBY_VERSION)
     gem.add_development_dependency('jdbc-sqlite3')
@@ -46,7 +46,7 @@ Gem::Specification.new do |gem|
     gem.add_development_dependency('mysql2')
     gem.add_development_dependency('pg')
   end
-  
+
   gem.files = `git ls-files`.split($/)
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
 

data/spec/integration/command_line_usage_spec.rb

@@ -10,85 +10,85 @@ describe RequestLogAnalyzer, 'running from command line' do
     cleanup_temp_files!
   end
 
-  it "should find 4 requests in default mode" do
+  it 'should find 4 requests in default mode' do
     output = run("#{log_fixture(:rails_1x)}")
-    output.any? { |line| /^Parsed requests\:\s*4\s/ =~ line }.should be_true
+    output.any? { |line| /^Parsed requests\:\s*4\s/ =~ line }.should == true
   end
 
-  it "should find 2 requests when parsing a compressed file" do
+  it 'should find 2 requests when parsing a compressed file' do
     output = run("#{log_fixture(:decompression, :tgz)}")
-    output.any? { |line| /^Parsed requests\:\s*2\s/ =~ line }.should be_true
+    output.any? { |line| /^Parsed requests\:\s*2\s/ =~ line }.should == true
   end
 
-  it "should skip 1 requests with a --select option" do
+  it 'should skip 1 requests with a --select option' do
     output = run("#{log_fixture(:rails_1x)} --select controller PeopleController")
-    output.any? { |line| /^Skipped requests\:\s*1\s/ =~ line }.should be_true
+    output.any? { |line| /^Skipped requests\:\s*1\s/ =~ line }.should == true
   end
 
-  it "should skip 3 requests with a --reject option" do
+  it 'should skip 3 requests with a --reject option' do
     output = run("#{log_fixture(:rails_1x)} --reject controller PeopleController")
-    output.any? { |line| /^Skipped requests\:\s*3\s/ =~ line }.should be_true
+    output.any? { |line| /^Skipped requests\:\s*3\s/ =~ line }.should == true
   end
 
-  it "should not write output with the --silent option" do
+  it 'should not write output with the --silent option' do
     output = run("#{log_fixture(:rails_1x)} --silent --file #{temp_output_file(:report)}")
     output.should be_empty
-    File.exist?(temp_output_file(:report)).should be_true
+    File.exist?(temp_output_file(:report)).should == true
   end
 
-  it "should write output to a file with the --file option" do
+  it 'should write output to a file with the --file option' do
     run("#{log_fixture(:rails_1x)} --file #{temp_output_file(:report)}")
-    File.exist?(temp_output_file(:report)).should be_true
+    File.exist?(temp_output_file(:report)).should == true
   end
 
-  it "should write only ASCII characters to a file with the --file option" do
+  it 'should write only ASCII characters to a file with the --file option' do
     run("#{log_fixture(:rails_1x)} --file #{temp_output_file(:report)}")
     /^[\x00-\x7F]*$/.match(File.read(temp_output_file(:report))).should_not be_nil
   end
 
-  it "should write HTML if --output HTML is provided" do
+  it 'should write HTML if --output HTML is provided' do
     output = run("#{log_fixture(:rails_1x)} --output HTML")
-    output.any? { |line| /<html[^>]*>/ =~ line}.should be_true
+    output.any? { |line| /<html[^>]*>/ =~ line }.should == true
   end
 
-  it "should run with the --database option" do
+  it 'should run with the --database option' do
     run("#{log_fixture(:rails_1x)} --database #{temp_output_file(:database)}")
-    File.exist?(temp_output_file(:database)).should be_true
+    File.exist?(temp_output_file(:database)).should == true
   end
 
-  it "should use no colors in the report with the --boring option" do
+  it 'should use no colors in the report with the --boring option' do
     output = run("#{log_fixture(:rails_1x)} --boring --format rails")
-    output.any? { |line| /\e/ =~ line }.should be_false
+    output.any? { |line| /\e/ =~ line }.should == false
   end
 
-  it "should use only ASCII characters in the report with the --boring option" do
+  it 'should use only ASCII characters in the report with the --boring option' do
     output = run("#{log_fixture(:rails_1x)} --boring")
-    output.all? { |line| /^[\x00-\x7F]*$/ =~ line }.should be_true
+    output.all? { |line| /^[\x00-\x7F]*$/ =~ line }.should == true
   end
 
-  it "should parse a Merb file if --format merb is set" do
+  it 'should parse a Merb file if --format merb is set' do
     output = run("#{log_fixture(:merb)} --format merb")
-    output.any? { |line| /Parsed requests\:\s*11/ =~ line }.should be_true
+    output.any? { |line| /Parsed requests\:\s*11/ =~ line }.should == true
   end
 
-  it "should parse a Apache access log file if --apache-format is set" do
+  it 'should parse a Apache access log file if --apache-format is set' do
     output = run("#{log_fixture(:apache_combined)} --apache-format combined")
-    output.any? { |line| /Parsed requests\:\s*5/ =~ line }.should be_true
+    output.any? { |line| /Parsed requests\:\s*5/ =~ line }.should == true
   end
 
-  it "should dump the results to a YAML file" do
+  it 'should dump the results to a YAML file' do
     run("#{log_fixture(:rails_1x)} --yaml #{temp_output_file(:yaml)}")
-    File.exist?(temp_output_file(:yaml)).should be_true
-    YAML.load(File.read(temp_output_file(:yaml))).should have_at_least(1).item
+    File.exist?(temp_output_file(:yaml)).should == true
+    YAML.load(File.read(temp_output_file(:yaml))).length.should be >= 1
   end
 
-  it "should parse 4 requests from the standard input" do
+  it 'should parse 4 requests from the standard input' do
     output = run("--format rails - < #{log_fixture(:rails_1x)}")
-    output.any? { |line| /^Parsed requests\:\s*4\s/ =~ line }.should be_true
+    output.any? { |line| /^Parsed requests\:\s*4\s/ =~ line }.should == true
   end
 
-  it "should accept a directory as a commandline option" do
-    output = run("#{log_directory_fixture("s3_logs")} --format amazon_s3")
-    output.any? { |line| /^Parsed requests:\s*8\s/ =~ line }.should be_true
+  it 'should accept a directory as a commandline option' do
+    output = run("#{log_directory_fixture('s3_logs')} --format amazon_s3")
+    output.any? { |line| /^Parsed requests:\s*8\s/ =~ line }.should == true
   end
 end

data/spec/integration/mailer_spec.rb

@@ -1,230 +1,226 @@
 require 'spec_helper'
 require 'socket'
 
-unless defined?(JRUBY_VERSION) #No Fork on JRUBY
+unless defined?(JRUBY_VERSION) # No Fork on JRUBY
 
-describe RequestLogAnalyzer, 'running mailer integration' do
+  describe RequestLogAnalyzer, 'running mailer integration' do
 
-  before(:each) do
-    @log_file = temp_output_file('mailtrap.log')
+    before(:each) do
+      @log_file = temp_output_file('mailtrap.log')
 
-    Process.fork {
-      Mailtrap.new('localhost', 2525, true, @log_file)
-      Process.exit! # Do not call rspec after exit hook!
-    }
-  end
+      Process.fork do
+        Mailtrap.new('localhost', 2525, true, @log_file)
+        Process.exit! # Do not call rspec after exit hook!
+      end
+    end
 
-  after(:each) do
-    cleanup_temp_files!
-  end
+    after(:each) do
+      cleanup_temp_files!
+    end
 
-  it "should send plaintext mail" do
-    RequestLogAnalyzer::Controller.build(
-      :mail         => 'root@localhost',
-      :mailhost     => 'localhost:2525',
-      :source_files => log_fixture(:rails_1x),
-      :format       => RequestLogAnalyzer::FileFormat::Rails,
-      :no_progress  => true
-    ).run!
-
-    Process.wait # Wait for mailer to complete
-
-    find_string_in_file("From: <contact@railsdoctors.com>", @log_file).should_not be_nil
-    find_string_in_file("To: <root@localhost>", @log_file).should_not be_nil
-    find_string_in_file("From: Request-log-analyzer reporter <contact@railsdoctors.com>", @log_file).should_not be_nil
-    find_string_in_file("Subject: Request log analyzer report - generated on", @log_file).should_not be_nil
-    find_string_in_file("Request summary", @log_file).should_not be_nil
-    find_string_in_file("PeopleControll |    1 |   40ms |   40ms |    0ms |   40ms |   40ms |   40ms-41ms", @log_file).should_not be_nil
-  end
+    it 'should send plaintext mail' do
+      RequestLogAnalyzer::Controller.build(
+        mail: 'root@localhost',
+        mailhost: 'localhost:2525',
+        source_files: log_fixture(:rails_1x),
+        format: RequestLogAnalyzer::FileFormat::Rails,
+        no_progress: true
+      ).run!
+
+      Process.wait # Wait for mailer to complete
+
+      find_string_in_file('From: <contact@railsdoctors.com>', @log_file).should_not be_nil
+      find_string_in_file('To: <root@localhost>', @log_file).should_not be_nil
+      find_string_in_file('From: Request-log-analyzer reporter <contact@railsdoctors.com>', @log_file).should_not be_nil
+      find_string_in_file('Subject: Request log analyzer report - generated on', @log_file).should_not be_nil
+      find_string_in_file('Request summary', @log_file).should_not be_nil
+      find_string_in_file('PeopleControll |    1 |   40ms |   40ms |    0ms |   40ms |   40ms |   40ms-41ms', @log_file).should_not be_nil
+    end
 
-  it "should allow a custom mail subject" do
-    RequestLogAnalyzer::Controller.build(
-      :mail         => 'root@localhost',
-      :mailhost     => 'localhost:2525',
-      :mailsubject  => 'TESTSUBJECT',
-      :source_files => log_fixture(:rails_1x),
-      :format       => RequestLogAnalyzer::FileFormat::Rails,
-      :no_progress  => true
-    ).run!
+    it 'should allow a custom mail subject' do
+      RequestLogAnalyzer::Controller.build(
+        mail: 'root@localhost',
+        mailhost: 'localhost:2525',
+        mailsubject: 'TESTSUBJECT',
+        source_files: log_fixture(:rails_1x),
+        format: RequestLogAnalyzer::FileFormat::Rails,
+        no_progress: true
+      ).run!
 
-    Process.wait # Wait for mailer to complete
+      Process.wait # Wait for mailer to complete
 
-    find_string_in_file("Subject: TESTSUBJECT", @log_file).should_not be_nil
-  end
+      find_string_in_file('Subject: TESTSUBJECT', @log_file).should_not be_nil
+    end
 
-  it "should allow a custom mail sender address" do
-    RequestLogAnalyzer::Controller.build(
-      :mail         => 'root@localhost',
-      :mailhost     => 'localhost:2525',
-      :mailfrom     => 'customaddr@example.com',
-      :source_files => log_fixture(:rails_1x),
-      :format       => RequestLogAnalyzer::FileFormat::Rails,
-      :no_progress  => true
-    ).run!
+    it 'should allow a custom mail sender address' do
+      RequestLogAnalyzer::Controller.build(
+        mail: 'root@localhost',
+        mailhost: 'localhost:2525',
+        mailfrom: 'customaddr@example.com',
+        source_files: log_fixture(:rails_1x),
+        format: RequestLogAnalyzer::FileFormat::Rails,
+        no_progress: true
+      ).run!
 
-    Process.wait # Wait for mailer to complete
+      Process.wait # Wait for mailer to complete
 
-    find_string_in_file("From: Request-log-analyzer reporter <customaddr@example.com>", @log_file).should_not be_nil
-  end
+      find_string_in_file('From: Request-log-analyzer reporter <customaddr@example.com>', @log_file).should_not be_nil
+    end
 
-  it "should allow a custom mail sender name" do
-    RequestLogAnalyzer::Controller.build(
-      :mail         => 'root@localhost',
-      :mailhost     => 'localhost:2525',
-      :mailfrom_name => 'Custom Name',
-      :source_files => log_fixture(:rails_1x),
-      :format       => RequestLogAnalyzer::FileFormat::Rails,
-      :no_progress  => true
-    ).run!
+    it 'should allow a custom mail sender name' do
+      RequestLogAnalyzer::Controller.build(
+        mail: 'root@localhost',
+        mailhost: 'localhost:2525',
+        mailfrom_name: 'Custom Name',
+        source_files: log_fixture(:rails_1x),
+        format: RequestLogAnalyzer::FileFormat::Rails,
+        no_progress: true
+      ).run!
 
-    Process.wait # Wait for mailer to complete
+      Process.wait # Wait for mailer to complete
 
-    find_string_in_file("From: Custom Name <contact@railsdoctors.com>", @log_file).should_not be_nil
-  end
+      find_string_in_file('From: Custom Name <contact@railsdoctors.com>', @log_file).should_not be_nil
+    end
 
-  it "should send html mail" do
-    RequestLogAnalyzer::Controller.build(
-      :output       => 'HTML',
-      :mail         => 'root@localhost',
-      :mailhost     => 'localhost:2525',
-      :source_files => log_fixture(:rails_1x),
-      :format       => RequestLogAnalyzer::FileFormat::Rails,
-      :no_progress  => true
-    ).run!
-
-    Process.wait # Wait for mailer to complete
-
-    find_string_in_file("From: <contact@railsdoctors.com>", @log_file).should_not be_nil
-    find_string_in_file("To: <root@localhost>", @log_file).should_not be_nil
-    find_string_in_file("From: Request-log-analyzer reporter <contact@railsdoctors.com>", @log_file).should_not be_nil
-    find_string_in_file('<h1>Request-log-analyzer summary report</h1>', @log_file).should_not be_nil
-    find_string_in_file('<td class="alt">287ms-296ms</td></tr><tr><td>DashboardController#index.html [GET]</td>', @log_file).should_not be_nil
+    it 'should send html mail' do
+      RequestLogAnalyzer::Controller.build(
+        output: 'HTML',
+        mail: 'root@localhost',
+        mailhost: 'localhost:2525',
+        source_files: log_fixture(:rails_1x),
+        format: RequestLogAnalyzer::FileFormat::Rails,
+        no_progress: true
+      ).run!
+
+      Process.wait # Wait for mailer to complete
+
+      find_string_in_file('From: <contact@railsdoctors.com>', @log_file).should_not be_nil
+      find_string_in_file('To: <root@localhost>', @log_file).should_not be_nil
+      find_string_in_file('From: Request-log-analyzer reporter <contact@railsdoctors.com>', @log_file).should_not be_nil
+      find_string_in_file('<h1>Request-log-analyzer summary report</h1>', @log_file).should_not be_nil
+      find_string_in_file('<td class="alt">287ms-296ms</td></tr><tr><td>DashboardController#index.html [GET]</td>', @log_file).should_not be_nil
+    end
   end
-end
-
 
+  # Mailtrap
+  #     by Matt Mower <self@mattmower.com>
+  #     http://matt.blogs.it/
+  #
+  # Included in RLA because original mailtrap puts anoying stuff when called
+  # through ruby.
+  #
+  # Mailtrap creates a TCP server that listens on a specified port for SMTP
+  # clients. Accepts the connection and talks just enough of the SMTP protocol
+  # for them to deliver a message which it writes to disk.
+  #
+  class Mailtrap
+    VERSION = '0.2.1'
+
+    # Create a new Mailtrap on the specified host:port. If once it true it
+    # will listen for one message then exit. Specify the msgdir where messages
+    # are written.
+    def initialize(host, port, once, msgfile)
+      @host = host
+      @port = port
+      @once = once
+      @msgfile = msgfile
+
+      File.open(@msgfile, 'a') do |file|
+        file.puts "\n* Mailtrap started at #{@host}:#{port}\n"
+      end
 
-# Mailtrap
-#     by Matt Mower <self@mattmower.com>
-#     http://matt.blogs.it/
-#
-# Included in RLA because original mailtrap puts anoying stuff when called
-# through ruby.
-#
-# Mailtrap creates a TCP server that listens on a specified port for SMTP
-# clients. Accepts the connection and talks just enough of the SMTP protocol
-# for them to deliver a message which it writes to disk.
-#
-class Mailtrap
-  VERSION = '0.2.1'
-
-  # Create a new Mailtrap on the specified host:port. If once it true it
-  # will listen for one message then exit. Specify the msgdir where messages
-  # are written.
-  def initialize( host, port, once, msgfile )
-    @host = host
-    @port = port
-    @once = once
-    @msgfile = msgfile
-
-    File.open( @msgfile, "a" ) do |file|
-      file.puts "\n* Mailtrap started at #{@host}:#{port}\n"
+      service = TCPServer.new(@host, @port)
+      accept(service)
     end
 
-    service = TCPServer.new( @host, @port )
-    accept( service )
-  end
+    # Service one or more SMTP client connections
+    def accept(service)
+      while session = service.accept
 
-  # Service one or more SMTP client connections
-  def accept( service )
-    while session = service.accept
+        class << session
+          def get_line
+            line = gets
+            line.chomp! unless line.nil?
+            line
+          end
+        end
 
-      class << session
-        def get_line
-          line = gets
-          line.chomp! unless line.nil?
-          line
+        begin
+          serve(session)
+        rescue => e
         end
-      end
 
-      begin
-        serve( session )
-      rescue Exception => e
+        break if @once
       end
-
-      break if @once
     end
-  end
 
-  # Write a plain text dump of the incoming email to a text
-  # file. The file will be in the @msgdir folder and will
-  # be called smtp0001.msg, smtp0002.msg, and so on.
-  def write( from, to_list, message )
-
-    # Strip SMTP commands from To: and From:
-    from.gsub!( /MAIL FROM:\s*/, "" )
-    to_list = to_list.map { |to| to.gsub( /RCPT TO:\s*/, "" ) }
-
-    # Append to the end of the messages file
-    File.open( @msgfile, "a" ) do |file|
-      file.puts "* Message begins"
-      file.puts "From: #{from}"
-      file.puts "To: #{to_list.join(", ")}"
-      file.puts "Body:"
-      file.puts message
-      file.puts "\n* Message ends"
+    # Write a plain text dump of the incoming email to a text
+    # file. The file will be in the @msgdir folder and will
+    # be called smtp0001.msg, smtp0002.msg, and so on.
+    def write(from, to_list, message)
+      # Strip SMTP commands from To: and From:
+      from.gsub!(/MAIL FROM:\s*/, '')
+      to_list = to_list.map { |to| to.gsub(/RCPT TO:\s*/, '') }
+
+      # Append to the end of the messages file
+      File.open(@msgfile, 'a') do |file|
+        file.puts '* Message begins'
+        file.puts "From: #{from}"
+        file.puts "To: #{to_list.join(', ')}"
+        file.puts 'Body:'
+        file.puts message
+        file.puts "\n* Message ends"
+      end
     end
 
-  end
-
-  # Talk pidgeon-SMTP to the client to get them to hand over the message
-  # and go away.
-  def serve( connection )
-    connection.puts( "220 #{@host} MailTrap ready ESTMP" )
-    helo = connection.get_line # whoever they are
+    # Talk pidgeon-SMTP to the client to get them to hand over the message
+    # and go away.
+    def serve(connection)
+      connection.puts("220 #{@host} MailTrap ready ESTMP")
+      helo = connection.get_line # whoever they are
 
-    if helo =~ /^EHLO\s+/
-      connection.puts "250-#{@host} offers just ONE extension my pretty"
-      connection.puts "250 HELP"
-    end
+      if helo =~ /^EHLO\s+/
+        connection.puts "250-#{@host} offers just ONE extension my pretty"
+        connection.puts '250 HELP'
+      end
 
-    # Accept MAIL FROM:
-    from = connection.get_line
-    connection.puts( "250 OK" )
+      # Accept MAIL FROM:
+      from = connection.get_line
+      connection.puts('250 OK')
 
-    to_list = []
+      to_list = []
 
-    # Accept RCPT TO: until we see DATA
-    loop do
-      to = connection.get_line
-      break if to.nil?
+      # Accept RCPT TO: until we see DATA
+      loop do
+        to = connection.get_line
+        break if to.nil?
 
-      if to =~ /^DATA/
-        connection.puts( "354 Start your message" )
-        break
-      else
-        to_list << to
-        connection.puts( "250 OK" )
+        if to =~ /^DATA/
+          connection.puts('354 Start your message')
+          break
+        else
+          to_list << to
+          connection.puts('250 OK')
+        end
       end
-    end
 
-    # Capture the message body terminated by <CR>.<CR>
-    lines = []
-    loop do
-      line = connection.get_line
-      break if line.nil? || line == "."
-      lines << line
-    end
+      # Capture the message body terminated by <CR>.<CR>
+      lines = []
+      loop do
+        line = connection.get_line
+        break if line.nil? || line == '.'
+        lines << line
+      end
 
-    # We expect the client will go away now
-    connection.puts( "250 OK" )
-    connection.gets # Quit
-    connection.puts "221 Seeya"
-    connection.close
+      # We expect the client will go away now
+      connection.puts('250 OK')
+      connection.gets # Quit
+      connection.puts '221 Seeya'
+      connection.close
 
-    write( from, to_list, lines.join( "\n" ) )
+      write(from, to_list, lines.join("\n"))
+    end
   end
-end
 
 else
   p 'Skipping mailer integration specs, because of missing Process.fork()'