cerberus 0.2.2 → 0.2.3

data/CHANGES

@@ -1,5 +1,16 @@
 = Cerberus Changelog
 
+== Version 0.2.3
+Features release
+
+* Added Lock files that prevent from mutiply build of the same project by several different processes
+* Added multythread build for 'buildall' command. Now if one of threads froses (for example because of SVN repo is broken) then other threads would continue execution.
+* Added possibility to send to gmail host using GMailer library
+* Added --force oprion that would be helpful if you want to rebuild project even if there are no changes in VSC.
+  Use 'cerberus build --force my_project'
+* Added site for Cerberus project. http://cerberus.rubyforge.org/
+* From now all builds logs their build data. It would be switched off by :log/:enable => false in configuration file
+
 == Version 0.2.2
 Minor fix release
 

data/Rakefile

@@ -3,7 +3,6 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
-require 'rake/contrib/rubyforgepublisher'
 
 require "./lib/cerberus/version"
 
@@ -100,10 +99,6 @@ end
 
 task :reinstall => [:uninstall, :install]
 
-task :site_webgen do
-  sh %{pushd doc/site; webgen; scp -r output/* #{RUBYFORGE_USER}@rubyforge.org:/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/; popd }
-end
-
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |t|
@@ -149,3 +144,8 @@ task :publish_news do
     publisher.details = IO.read(File.dirname(__FILE__) + '/README')
   end
 end
+
+task :publish_site do
+  system('cd doc/site && webgen')
+  sh %{scp -r -q doc/site/output/* #{RUBYFORGE_USER}@rubyforge.org:/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/}
+end

data/lib/cerberus/builder/maven2.rb

@@ -9,8 +9,8 @@ class Cerberus::Builder::Maven2
     Dir.chdir @config[:application_root]
     cmd = @config[:builder, :maven2, :cmd] || 'mvn'
     task = @config[:builder, :maven2, :task] || 'test'
-    output = `#{@config[:bin_path]}#{cmd} #{task} 2>&1`
-    @output = add_error_information(output)
+    @output = `#{@config[:bin_path]}#{cmd} #{task} 2>&1`
+    add_error_information
     successful?
   end
 
@@ -18,14 +18,18 @@ class Cerberus::Builder::Maven2
     $?.exitstatus == 0 and not @output.include?('[ERROR] BUILD FAILURE')
   end
 
-  def add_error_information(str)
-    output = ''
-    while str =~ /^(.|\n)*Running (.*)\n(.|\n)* <<< FAILURE!$/
+  def add_error_information
+    str = @output
+    @output = ''
+    while str =~ / <<< FAILURE!$/
+      s = $'
+
+      $` =~ /^(.|\n)*Running (.*)$/
       failed_class = $2
-      output << $` << $&
-      output << "\n" << IO.readlines("#{@config[:application_root]}/target/surefire-reports/#{failed_class}.txt")[4..-1].join   
-      str = $'
+      @output << $` << $& << ' <<< FAILURE!'
+      @output << "\n" << IO.readlines("#{@config[:application_root]}/target/surefire-reports/#{failed_class}.txt")[4..-1].join.lstrip   #map{|str| '  ' + str}..gsub('  <<< FAILURE!','')
+      str = s
     end
-    output << str
+    @output << str
   end
 end

data/lib/cerberus/cli.rb

@@ -39,9 +39,13 @@ module Cerberus
       result = {}
       args_copy = args.dup
       args_copy.each do |arg|
-        if arg =~ /^(\w+)=(.*)$/
+        case arg
+        when /^(\w+)=(.*)$/
           result[$1.downcase.to_sym] = $2
           args.delete(arg)
+        when '--force'
+          result[:force] = true
+          args.delete(arg)
         end
       end
 
@@ -50,7 +54,7 @@ module Cerberus
   end
 
   HELP = %{
-    Cerberus is a Continuous Integration tool that could be run from commad line.
+    Cerberus is a simple Continuous Integration tool for Ruby projects that run from command-line interface.
 
     Usage:
       cerberus add <URL>      --- add project from svn repository to list watched of applications

data/lib/cerberus/config.example.yml

@@ -2,14 +2,12 @@
 publisher:
   active: mail jabber rss
   mail:
-    delivery_method: smtp
-    address: smtp.mymail.com
-    port: 2525
-    domain: mymail.com
-    user_name: cerberus
-    password: somepass
+    address: smtp.gmail.com
+    port: 587
+    domain: gmail.com
     authentication: plain
-    sender: "'Cerberus Builder' <cerberus@mymail.com>"
+    user_name: someuser
+    password: somemail
   jabber:
     jid: cerberus@gtalk.google.com
     port: 5222
@@ -20,4 +18,7 @@ publisher:
     server: irc.freenode.net
     channel: cerberus
   rss:
-    file: /usr/www/rss.xml
+    file: /usr/www/rss.xml
+builder:
+  rake:
+    task: migrate test

data/lib/cerberus/config.rb

@@ -24,8 +24,14 @@ module Cerberus
       c
     end
 
-    def merge!(hash)          
-      @config.deep_merge!(hash)
+    def merge!(hash, overwrite = true)
+      if overwrite
+        @config.deep_merge!(hash)
+      else
+        d = HashWithIndifferentAccess.new(hash)
+        d.deep_merge!(@config)
+        @config = d
+      end
     end
 
     def inspect

data/lib/cerberus/constants.rb

@@ -1,4 +1,8 @@
+require 'active_support'
+
 module Cerberus
   HOME = File.expand_path(ENV['CERBERUS_HOME'] || '~/.cerberus')
   CONFIG_FILE = "#{HOME}/config.yml"
+
+  LOCK_WAIT = 30.minutes
 end

data/lib/cerberus/latch.rb

@@ -1,21 +1,26 @@
+require 'fileutils'
+
 module Cerberus
-  module FSLatch
+  class Latch
     #Emulate File.flock
-    def self.lock(lock_file, wait_for_unlock=true)
-      counter = 0
-      while File.exists?(lock_file)
-        return unless wait_for_unlock #if file exists then return
+    def self.lock(lock_file, options = {})
+      if File.exists?(lock_file)
+        modif_time = File::Stat.new(lock_file).mtime
+        ttl = options[:lock_ttl]
 
-        sleep(10) #sleep for 10 seconds
-        counter += 1
-        raise "Could not wait anymore file unlocking '#{lock_file}'" if counter > 20 #if we are waiting more than 200 secs then raise exception
+        if ttl and modif_time < ttl.ago
+          File.delete(lock_file)
+        else
+          return
+        end
       end
 
       begin
-        File.new(lock_file, 'w')
+        FileUtils.mkpath(File.dirname(lock_file))
+        File.new(lock_file, 'w').close
         yield
       ensure
-        File.rm(lockfile)
+        File.delete(lock_file)
       end
     end
   end

data/lib/cerberus/manager.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'cerberus/utils'
 require 'cerberus/constants'
 require 'cerberus/config'
+require 'cerberus/latch'
 
 require 'cerberus/publisher/mail'
 require 'cerberus/publisher/jabber'
@@ -75,6 +76,12 @@ module Cerberus
     include Cerberus::Utils
     attr_reader :builder, :success, :scm, :status
 
+    DEFAULT_CONFIG = {:scm => {:type => 'svn'}, 
+                      :builder => {:type => 'rake'}, 
+                      :publisher => {:active => 'mail'}, 
+                      :log => {:enable => true}
+                     }
+
     def initialize(application_name, cli_options = {})
       unless File.exists?("#{HOME}/config/#{application_name}.yml")
         say "Project #{application_name} does not present in Cerberus"
@@ -84,52 +91,65 @@ module Cerberus
       
       def_options = {:application_root => app_root + '/sources', :application_name => application_name} #pseudo options that stored in config. Could not be set in any config file not through CLI
       @config = Config.new(application_name, cli_options.merge(def_options))
+      @config.merge!(DEFAULT_CONFIG, false)
 
       @status = Status.new("#{app_root}/status.log")
 
-      scm_type = @config[:scm, :type] || 'svn'
+      scm_type = @config[:scm, :type]
       @scm = SCM_TYPES[scm_type.to_sym].new(@config[:application_root], @config)
 
-      builder_type = @config[:builder, :type] || 'rake'
+      builder_type = @config[:builder, :type]
       @builder = BUILDER_TYPES[builder_type.to_sym].new(@config)
     end
  
     def run
       begin
-        previous_status = @status.recall
-        @scm.update!
-
-        state = 
-        if @scm.has_changes? or not previous_status
-          if status = @builder.run
-            @status.keep(:succesful)
-            case previous_status
-            when :failed
-              :revival
-            when :succesful
-              :succesful
-            when false
-              :setup
+        Latch.lock("#{HOME}/work/#{@config[:application_name]}/.lock", :lock_ttl => 2 * LOCK_WAIT) do
+          previous_status = @status.recall
+          @scm.update!
+
+          state = 
+          if @scm.has_changes? or @config[:force] or not previous_status
+            if status = @builder.run
+              @status.keep(:succesful)
+              case previous_status
+              when :failed
+                :revival
+              when :succesful
+                :succesful
+              when false
+                :setup
+              end
+            else
+              @status.keep(:failed)
+              previous_status == :failed ? :broken : :failure
             end
           else
-            @status.keep(:failed)
-            previous_status == :failed ? :broken : :failure
+            :unchanged
+          end
+
+          #Save logs to directory
+          if @config[:log, :enable] and state != :unchanged
+            log_dir = "#{HOME}/work/#{@config[:application_name]}/logs/"
+            FileUtils.mkpath(log_dir)
+
+            time = Time.now.strftime("%Y%m%d%H%M%S")
+            file_name = "#{log_dir}/#{time}-#{state.to_s}.log"
+            body = [ scm.last_commit_message, builder.output ].join("\n\n")
+            IO.write(file_name, body)
           end
-        else
-          :unchanged
-        end
 
-        if [:failure, :broken, :revival, :setup].include?(state)
-          active_publishers = @config[:publisher, :active] || 'mail'
-          active_publishers.split(/\W+/).each do |pub|
-            raise "Publisher have no configuration: #{pub}" unless @config[:publisher, pub]
-            clazz = PUBLISHER_TYPES[pub.to_sym]
-            raise "There is no such publisher: #{pub}" unless clazz
-            silence_stream(STDOUT) { #some of publishers like IRC very noisy
+          #send notifications
+          if [:failure, :broken, :revival, :setup].include?(state)
+            active_publishers = @config[:publisher, :active]
+            active_publishers.split(/\W+/).each do |pub|
+              raise "Publisher have no configuration: #{pub}" unless @config[:publisher, pub]
+              clazz = PUBLISHER_TYPES[pub.to_sym]
+              raise "There is no such publisher: #{pub}" unless clazz
               clazz.publish(state, self, @config)
-            }
+            end
           end
-        end
+        end #lock
       rescue Exception => e
         if ENV['CERBERUS_ENV'] == 'TEST'
           raise e
@@ -151,12 +171,21 @@ module Cerberus
     end
 
     def run
+      threads = []
       Dir["#{HOME}/config/*.yml"].each do |fn|
         fn =~ %r{#{HOME}/config/(.*).yml}
         application_name = $1
 
         command = Cerberus::BuildCommand.new(application_name, @cli_options)
-        command.run
+        threads << Thread.new { command.run }
+      end
+
+      @already_waited = false
+      threads.each do |t| 
+        if @already_waited or not t.join(LOCK_WAIT)
+          t.kill
+          @already_waited = true
+        end
       end
     end
   end

data/lib/cerberus/publisher/base.rb

@@ -19,7 +19,7 @@ module Cerberus
         end
 
         subject = "[#{options[:application_name]}] #{subject}"
-        generated_by = "--\nCerberus #{Cerberus::VERSION::STRING}, http://rubyforge.org/projects/cerberus"
+        generated_by = "--\nCerberus #{Cerberus::VERSION::STRING}, http://cerberus.rubyforge.com/"
         body = [ manager.scm.last_commit_message, manager.builder.output, generated_by ].join("\n\n")
 
         return subject, body

data/lib/cerberus/publisher/irc.rb

@@ -11,17 +11,20 @@ class Cerberus::Publisher::IRC < Cerberus::Publisher::Base
 
     channel = '#' + irc_options[:channel]
     bot = IRC.new(irc_options[:nick] || 'cerberus', irc_options[:server], irc_options[:port] || 6667)
-    IRCEvent.add_callback('endofmotd') { |event| 
-      bot.add_channel(channel) 
-      message.split("\n").each{|line|
-        bot.send_message(channel, line)
+
+    silence_stream(STDOUT) {
+      IRCEvent.add_callback('endofmotd') { |event| 
+        bot.add_channel(channel) 
+        message.split("\n").each{|line|
+          bot.send_message(channel, line)
+        }
+        bot.send_quit
       }
-      bot.send_quit
+      begin
+        bot.connect #Why it always fails?
+      rescue Exception => e
+        puts e.message
+      end
     }
-    begin
-      bot.connect #Why it always fails?
-    rescue Exception => e
-      puts e.message
-    end
   end
 end

data/lib/cerberus/publisher/mail.rb

@@ -1,5 +1,6 @@
 require 'action_mailer'
 require 'cerberus/publisher/base'
+require 'cerberus/publisher/netsmtp_tls_fix'
 
 class Cerberus::Publisher::Mail < Cerberus::Publisher::Base
   def self.publish(state, manager, options)
@@ -25,7 +26,7 @@ class Cerberus::Publisher::Mail < Cerberus::Publisher::Base
       @subject, @body = Cerberus::Publisher::Base.formatted_message(state, manager, options)
       @recipients, @sent_on = options[:publisher, :mail, :recipients], Time.now
       @from = options[:publisher, :mail, :sender] || "'Cerberus' <cerberus@example.com>"
-#      raise "Please specify recipient addresses for application '#{options[:application_name]}'" unless options[:recipients]
+      raise "Please specify recipient addresses for application '#{options[:application_name]}'" unless @recipients
     end
   end
 end

data/lib/cerberus/publisher/netsmtp_tls_fix.rb

@@ -0,0 +1,65 @@
+require "openssl"
+require "net/smtp"
+
+Net::SMTP.class_eval do
+  private
+  def do_start(helodomain, user, secret, authtype)
+    raise IOError, 'SMTP session already started' if @started
+    check_auth_args user, secret, authtype if user or secret
+
+    sock = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
+    @socket = Net::InternetMessageIO.new(sock)
+    @socket.read_timeout = 60 #@read_timeout
+#    @socket.debug_output = STDERR #@debug_output
+
+    check_response(critical { recv_response() })
+    do_helo(helodomain)
+
+    raise 'openssl library not installed' unless defined?(OpenSSL)
+    starttls
+    ssl = OpenSSL::SSL::SSLSocket.new(sock)
+    ssl.sync_close = true
+    ssl.connect
+    @socket = Net::InternetMessageIO.new(ssl)
+    @socket.read_timeout = 60 #@read_timeout
+#    @socket.debug_output = STDERR #@debug_output
+    do_helo(helodomain)
+
+    authenticate user, secret, authtype if user
+    @started = true
+  ensure
+    unless @started
+      # authentication failed, cancel connection.
+      @socket.close if not @started and @socket and not @socket.closed?
+      @socket = nil
+    end
+  end
+
+  def do_helo(helodomain)
+     begin
+      if @esmtp
+        ehlo helodomain
+      else
+        helo helodomain
+      end
+    rescue Net::ProtocolError
+      if @esmtp
+        @esmtp = false
+        @error_occured = false
+        retry
+      end
+      raise
+    end
+  end
+
+  def starttls
+    getok('STARTTLS')
+  end
+
+  def quit
+    begin
+      getok('QUIT')
+    rescue EOFError
+    end
+  end
+end

data/lib/cerberus/scm/cvs.rb

@@ -1,2 +1,48 @@
 class Cerberus::SCM::CVS
+  def initialize(path, config = {})
+    raise "Path can't be nil" unless path
+
+    @path, @config = path.strip, config
+    @encoded_path = (@path.include?(' ') ? "\"#{@path}\"" : @path)
+  end
+
+  def update!
+    if test(?d, @path + '/CVS')
+      @status = execute("update")
+    else
+      FileUtils.mkpath(@path) unless test(?d,@path)
+      @status = execute("checkout", nil, @config[:scm, :url])
+    end
+  end
+
+  def has_changes?
+    @status =~ /[A-Z]\s+[\w\/]+/
+  end
+
+  def current_revision
+    info['Revision'].to_i
+  end
+
+  def url
+    info['URL']
+  end
+
+  def last_commit_message
+    message = execute("log", "--limit 1 -v")
+    #strip first line that contains command line itself (svn log --limit ...)
+    if ((idx = message.index('-'*72)) != 0 )
+      message[idx..-1]
+    else
+      message
+    end
+  end
+
+  def last_author
+    info['Last Changed Author']
+  end
+
+  private
+  def execute(command, parameters = nil, pre_parameters = nil)
+    `#{@config[:bin_path]}cvs #{command} #{pre_parameters} #{@encoded_path} #{parameters}`
+  end
 end

data/lib/cerberus/scm/darcs.rb

@@ -1,2 +1,48 @@
 class Cerberus::SCM::Darcs
+  def initialize(path, config = {})
+    raise "Path can't be nil" unless path
+
+    @path, @config = path.strip, config
+    @encoded_path = (@path.include?(' ') ? "\"#{@path}\"" : @path)
+  end
+
+  def update!
+    if test(?d, @path + '/_darcs')
+      @status = execute("pull")
+    else
+      FileUtils.mkpath(@path) unless test(?d,@path)
+      @status = execute("get", nil, @config[:scm, :url])
+    end
+  end
+
+  def has_changes?
+    @status =~ /[A-Z]\s+[\w\/]+/
+  end
+
+  def current_revision
+    info['Revision'].to_i
+  end
+
+  def url
+    info['URL']
+  end
+
+  def last_commit_message
+    message = execute("log", "--limit 1 -v")
+    #strip first line that contains command line itself (svn log --limit ...)
+    if ((idx = message.index('-'*72)) != 0 )
+      message[idx..-1]
+    else
+      message
+    end
+  end
+
+  def last_author
+    info['Last Changed Author']
+  end
+
+  private
+  def execute(command, parameters = nil, pre_parameters = nil)
+    `#{@config[:bin_path]}darcs #{command} #{pre_parameters} #{@encoded_path} #{parameters}`
+  end
 end

data/lib/cerberus/scm/svn.rb

@@ -1,17 +1,21 @@
+require 'cerberus/utils'
+
 class Cerberus::SCM::SVN
+  include Cerberus::Utils
+
   def initialize(path, config = {})
     raise "Path can't be nil" unless path
 
     @path, @config = path.strip, config
     @encoded_path = (@path.include?(' ') ? "\"#{@path}\"" : @path)
+  end
 
+  def update!
     if test(?d, @path + '/.svn') #check first that it was not locked 
       execute("cleanup") if locked?
-      FileUtils.rm_rf @path if locked? #In case if we could not unlock from command line - remove this directory at all
+      say "Could not unlock svn directory #{@encoded_path}. Please do it manually." if locked? #In case if we could not unlock from command line - ask user to do it
     end
-  end
 
-  def update!
     if test(?d, @path + '/.svn')
       @status = execute("update")
     else
@@ -52,7 +56,13 @@ class Cerberus::SCM::SVN
   end
 
   def info
-    @info ||= YAML.load(execute("info"))
+    output = execute("info")
+    @info ||= YAML.load(output)
+
+    unless @info === Hash or @info['Repository Root'] #.size > 8
+      say "Could not parse svn output. Seems source directory #{@encoded_path} is corrupted.\n#{output}"
+    end
+    @info
   end
     
   def execute(command, parameters = nil, pre_parameters = nil)

data/lib/cerberus/utils.rb

@@ -2,8 +2,8 @@ require 'yaml'
 
 module Cerberus
   module Utils
-    def say(info)
-      puts info
+    def say(msg)
+      STDERR << msg
       exit 1
     end
 

data/lib/cerberus/version.rb

@@ -2,7 +2,7 @@ module Cerberus
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/config_test.rb

@@ -28,11 +28,19 @@ class ConfigTest < Test::Unit::TestCase
     cfg = Cerberus::Config.new
     cfg.merge!(:hello => {'msg' => {:a202 => 'bye'}})
     cfg.merge!(:hello => {:msg => {:a203 => 'hello'}})
-    cfg.merge!(:hello => {:msg => {:a204 => 'another'}})
+    cfg.merge!(:hello => {:msg => {:a203 => 'another'}})
     cfg.merge!(:hello => {:bread => {:a204 => 'bread'}})
 
     assert_equal 'bye', cfg[:hello, :msg, :a202]
-    assert_equal 'hello', cfg[:hello, :msg, :a203]
+    assert_equal 'another', cfg[:hello, :msg, :a203]
     assert_equal 'bread', cfg[:hello, :bread, :a204]
   end
-end
+
+  def test_deep_merge_not_overwrite
+    cfg = Cerberus::Config.new
+    cfg.merge!({:hello => {'msg' => {:a202 => 'bye'}}}, false)
+    cfg.merge!({:hello => {:msg => {:a202 => 'hello'}}}, false)
+
+    assert_equal 'bye', cfg[:hello, :msg, :a202]
+  end
+end

data/test/functional_test.rb

@@ -49,27 +49,30 @@ class FunctionalTest < Test::Unit::TestCase
     build = Cerberus::BuildCommand.new('myapp')
     build.run
     assert_equal 1, ActionMailer::Base.deliveries.size #first email that project was setup
-    output = ActionMailer::Base.deliveries[0].body
+    mail = ActionMailer::Base.deliveries[0]
+    output = mail.body
 
     #Check outpus that run needed tasks
     assert_match /1 tests, 1 assertions, 0 failures, 0 errors/, output
     assert output !~ /Task 'custom1' has been invoked/
+    assert_equal '[myapp] Cerberus set up for project (#2)', mail.subject
 
     status_file = HOME + '/work/myapp/status.log'
     assert File.exists?(status_file)
     assert_equal 'succesful', IO.read(status_file)
+    assert 1, Dir[HOME + "/work/rake_cust/logs/*-succesful.log"].size
 
     FileUtils.rm status_file
     build = Cerberus::BuildCommand.new('myapp')
     build.run
     assert File.exists?(status_file)
-
     assert_equal 2, ActionMailer::Base.deliveries.size #first email that project was setup
+    assert 2, Dir[HOME + "/work/rake_cust/logs/*.log"].size
 
     build = Cerberus::BuildCommand.new('myapp')
     build.run
     assert_equal 2, ActionMailer::Base.deliveries.size #Number of mails not changed
-
+    assert 2, Dir[HOME + "/work/rake_cust/logs/*.log"].size #even if sources unchanged
 
     #remove status file to run project again
     FileUtils.rm status_file
@@ -155,4 +158,12 @@ class FunctionalTest < Test::Unit::TestCase
     assert_match /Task 'custom1' has been invoked/, output
     assert_match /Task 'custom2' has been invoked/, output
   end
+
+  def test_logs_disabled
+    add_application('rake_cust', SVN_URL, 'log' => {'enable' => false})
+    build = Cerberus::BuildAllCommand.new
+    build.run
+
+    assert !File.exists?(HOME + "/work/rake_cust/logs")
+  end
 end

data/test/maven2_builer_test.rb

@@ -15,12 +15,15 @@ class Maven2BuilderTest < Test::Unit::TestCase
     builder.output = MVN_OUTPUT
     assert !builder.successful?
 
-    surefire_file = "#{tmp}/target/surefire-reports/wicket.markup.html.form.persistence.CookieValuePersisterTest.txt"
-    FileUtils.mkpath File.dirname(surefire_file)
-    IO.write(surefire_file, SUREFIRE_CLASS_OUTPUT)
+    reports_dir = tmp + '/target/surefire-reports/'
+    FileUtils.mkpath reports_dir
+    IO.write(reports_dir + 'wicket.util.resource.ResourceTest.txt', SUREFIRE1_OUTPUT)
+    IO.write(reports_dir + 'wicket.markup.html.form.persistence.CookieValuePersisterTest.txt', SUREFIRE2_OUTPUT)
 
-    output = builder.add_error_information(MVN_OUTPUT)
-    assert output.include?('at wicket.markup.html.basic.SimplePageTest.testRenderHomePage_3(SimplePageTest.java:285)')
+    builder.output = MVN_OUTPUT
+    builder.add_error_information
+    assert builder.output.include?('at wicket.markup.html.basic.SimplePageTest.testRenderHomePage_3(SimplePageTest.java:285)')
+    assert builder.output.include?('This is for wicket.util.resource.ResourceTest :=')
   end
 end
 
@@ -29,6 +32,8 @@ MVN_OUTPUT =<<-END
 -------------------------------------------------------
  T E S T S
 -------------------------------------------------------
+Running wicket.util.resource.ResourceTest
+Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.047 sec <<< FAILURE!
 Running wicket.markup.html.list.PagedTableNavigatorWithMarginTest
 Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.313 sec
 Running wicket.markup.html.list.IncrementalTableNavigationTest
@@ -52,17 +57,27 @@ Tests run: 449, Failures: 4, Errors: 9, Skipped: 0
 [INFO] There are test failures.
     END
 
-SUREFIRE_CLASS_OUTPUT =<<-END
+SUREFIRE1_OUTPUT =<<-END
+-------------------------------------------------------------------------------
+Test set: wicket.markup.html.basic.SimplePageTest
+-------------------------------------------------------------------------------
+Tests run: 13, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.521 sec <<< FAILURE!
+testRenderHomePage_3(wicket.markup.html.basic.SimplePageTest)  Time elapsed: 0.06 sec  <<< FAILURE!
+This is for wicket.util.resource.ResourceTest :=
+
+END
+
+SUREFIRE2_OUTPUT =<<-END
 -------------------------------------------------------------------------------
 Test set: wicket.markup.html.basic.SimplePageTest
 -------------------------------------------------------------------------------
 Tests run: 13, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.521 sec <<< FAILURE!
 testRenderHomePage_3(wicket.markup.html.basic.SimplePageTest)  Time elapsed: 0.06 sec  <<< FAILURE!
 junit.framework.AssertionFailedError
-	at junit.framework.Assert.fail(Assert.java:47)
-	at junit.framework.Assert.assertTrue(Assert.java:20)
-	at junit.framework.Assert.assertTrue(Assert.java:27)
-	at wicket.WicketTestCase.executeTest(WicketTestCase.java:78)
-	at wicket.markup.html.basic.SimplePageTest.testRenderHomePage_3(SimplePageTest.java:285)
+    at junit.framework.Assert.fail(Assert.java:47)
+    at junit.framework.Assert.assertTrue(Assert.java:20)
+    at junit.framework.Assert.assertTrue(Assert.java:27)
+    at wicket.WicketTestCase.executeTest(WicketTestCase.java:78)
+    at wicket.markup.html.basic.SimplePageTest.testRenderHomePage_3(SimplePageTest.java:285)
 
 END

data/test/test_helper.rb

@@ -29,7 +29,7 @@ class Test::Unit::TestCase
 
   CERBERUS_PATH = File.expand_path(File.dirname(__FILE__) + '/../')
   def run_cerb(args)
-    `ruby -I"#{CERBERUS_PATH}/lib" "#{CERBERUS_PATH}/bin/cerberus" #{args}`
+    `ruby -I"#{CERBERUS_PATH}/lib" "#{CERBERUS_PATH}/bin/cerberus" #{args} 2>&1`
   end
 
   def add_test_case_to_project(project_name, content)

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.0.1
 specification_version: 1
 name: cerberus
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2006-08-26 00:00:00 +04:00
+  version: 0.2.3
+date: 2006-09-18 00:00:00 +04:00
 summary: Cerberus is a Continuous Integration tool that could be easily run from Cron.
 require_paths: 
 - lib
@@ -49,6 +49,7 @@ files:
 - lib/cerberus/publisher/irc.rb
 - lib/cerberus/publisher/jabber.rb
 - lib/cerberus/publisher/mail.rb
+- lib/cerberus/publisher/netsmtp_tls_fix.rb
 - lib/cerberus/publisher/rss.rb
 - lib/cerberus/scm/cvs.rb
 - lib/cerberus/scm/darcs.rb
@@ -72,8 +73,6 @@ files:
 - README
 - CHANGES
 - Rakefile
-- doc/FAQ
-- doc/OPTIONS
 - doc/site
 test_files: 
 - test/integration_test.rb

data/doc/FAQ

@@ -1,33 +0,0 @@
-* How to schedule Cerberus build on nnCron
-
-nnCron has simple user interface and it is easy to add new task - just run task with AsLoggedUser option.
-There is only issue - nnCron do not pass HOME environment variable to process so you need to add it to nncron.tab file.
-
-You could add CERBERUS_HOME envronment variable or HOME (in last case CERBERUS_HOME would be calculated as 
-HOME/.cerberus)
-
-Mine nncron.tab file looks like this
-
-
-
-SET CERBERUS_HOME="C:\Documents and Settings\anatol\.cerberus"
-
-#( [cerberus]watsjit
-AsLoggedUser
-Time: */15 * * * * *
-Action:
-SWHide   NormalPriority
-START-APPW: c:\progra~1\ruby\bin\cerberus.CMD build cerberus
-)#
-
-
-* How to change task for Rake
-In my project we need to run Rails migrations before tests. But by default Cerberus runs :default task.
-How could I run migations?
-
-it is easy - just set Rake tasks option in config
-builder:
-  rake:
-    task: migrate test
-
-And it would run migrations

data/doc/OPTIONS

@@ -1,47 +0,0 @@
-bin_path:
-publisher:
-  active:
-  mail:
-    delivery_method: smtp                       C
-    address: mail.tut.by                        C
-    port: 2525                                  C
-    domain:                                     C
-    user_name: anatol                           C
-    password: somepass                          C
-    authentication: login                       C
-    sender: "'Cerberus' <anatol2003@tut.by>"    C
-    recipients: anatol.pomozov@gmail.com        A
-  jabber:
-    jid:                                        C
-    port:                                       C
-    password:                                   C
-    digest:                                     C
-    recipients:                                 A
-  irc:
-    nick:                                       A
-    server:                                     A
-    port:                                       A
-    channel:                                    A
-  rss:
-    file:
-scm:
-  type: svn                                     A
-  url:                                          A
-builder:
-  type: rake #supported: maven2                 A
-  rake:                                         C
-    task: test                                  CA
-  maven2:  
-
-
-L - Only for command line interface
-C - Cerberus config
-A - application level config
-
-
-L
-recipients (add)
-verbose or quite ??(add, build)
-application_name (add)
-scm (add, default svn)
-builder