cerberus 0.1.1 → 0.2.0

data/CHANGES

@@ -1,5 +1,24 @@
 = Cerberus Changelog
 
+== Version 0.2.0
+Config file was changed since 0.1.1 and you need regenerate config files.
+Or change it by hands: see doc/OPTIONS file to list of all avalable options.
+
+Changing required by advanced publishing mechanism. Now it is possible to add several published to one project.
+
+Also added 3 new publishers.
+  Jabber Publisher - all notification sended via Jabber server
+  IRC publisher - messages sent to IRC channel
+  RSS Publisher - result of build Cerberus writes to file in RSS format.
+    This feature would be useful for big open project when many users would like to see results of test-run.
+    If you publish results as RSS - then any user could subscribe to channel.
+
+
+* Added automatic subversion cleanup to avoid repository locking after Cedrberus process termination
+* Added Jabber publisher
+* Added IRC publisher
+* Added RSS publisher
+
 == Version 0.1.1
 Minor improvements
 

data/README

@@ -1,4 +1,4 @@
-Cerberus is a Continuous Integration (CI) software. Cerberus could be periodically run from scheduler and check if application tests are broken. If it happens then Cerberus will send notification to developers. Cerberus perfectly works both on Windows and *nix platforms.
+Cerberus is a Continuous Builder software. Cerberus could be periodically run from scheduler and check if application tests are broken. If it happens then Cerberus will send notification to developers. Cerberus perfectly works both on Windows and *nix platforms.
 
 For more CI theory read this document from Martin Fowler 
 http://www.martinfowler.com/articles/continuousIntegration.html.
@@ -17,6 +17,16 @@ He guarded the gate to Hades (the Greek underworld) and ensured that the dead co
 
 So Cerberus will guard your tests and not allow your project to go to the world of dead. 
 
+There is several solutions already present, why do you need to use Cerberus?
+Main advantages of Cerberus over other solutions:
+ = Cerberus could be installed on any machine not only where SVN repository located.
+ = Cerberus works not only for Rails projects, but for any other Ruby (or better to say for projects that use Rake)
+ = Cerberus multiplatform solution: it runs excellent both on *nix and Windows.
+ = Cerberus distributed via RubyGems, so it is very easy to install and very easy to update to the latest available versin
+ = Cerberus very easy start to use. Just type 'cerberus add PROJECT_URL|PROJECT_DIR'
+ = Cerberus is lightweigt solution: mots of the time ruby process even not run - Rake runs only in case if changes in project found
+
+ 
 To use Cerberus it is very easy. First install it. Easiest way to do it through RubyGems package manager.
 
 'gem install cerberus'
@@ -31,12 +41,13 @@ as second parameter you could pass URL to subversion repository or directory wit
 
 Go to ~./cerberus and edit config.yml file (only once after installing Cerberus). Enter your configuration options here like email server, password, user_name and other options. See ActiveMailer description - Cerberus uses it as notification layer. My config file looks like this
 
-mail:
-  address: mail.somesever.com
-  user_name: anatol
-  password: anatol
-  domain: somesever.com
-  authentication: login
+publisher:
+  mail:
+    address: mail.somesever.com
+    user_name: anatol
+    password: anatol
+    domain: somesever.com
+    authentication: login
 
 Also check ~/.cerberus/config/<APPLICATION_NAME>.yml and make sure that you have right options.
 
@@ -44,8 +55,11 @@ And then run Cerberus
 
 cerberus build APPLICATION_NAME    #Run project
 
-It will check out latest sources and run tests for your application. If tests are broken - recipients will receive notifications.
+or
+
+cerberus buildall     #Run all available projects
 
-But of course better run Cerberus automatically from Cron. Run Cerberus for project each 10 minutes would be ok.
 
-Well, thats all. If you have any questions, proposals - just let me know.
+It will check out latest sources and run tests for your application. If tests are broken - recipients will receive notifications.
+
+But of course better run Cerberus automatically from Cron. Run Cerberus for project each 10 minutes would be ok.

data/Rakefile

@@ -28,7 +28,9 @@ end
 
 desc "Clean all generated files"
 task :clean => :clobber_package do
-  rm_rf './test/__workdir'
+  rm_rf "#{File.dirname(__FILE__)}/test/__workdir"
+  rm_rf "#{File.dirname(__FILE__)}/coverage"
+  rm_rf "#{File.dirname(__FILE__)}/doc/site/output"
 end
 
 
@@ -49,11 +51,14 @@ GEM_SPEC = Gem::Specification.new do |s|
     Cerberus could be easily invoked from Cron (for Unix) or nnCron (for Windows) utilities.
   DESC
 
-  s.add_dependency 'actionmailer', '>= 1.2.1'
+  s.add_dependency 'actionmailer', '>= 1.2.3'
   s.add_dependency 'rake', '>= 0.7.1'
+  s.add_dependency 'jabber4r', '>= 0.8.0'
+  s.add_dependency 'Ruby-IRC', '>= 1.0.3'
 
-  s.files = Dir.glob("{bin,doc,lib,test}/**/*").delete_if { |item| item.include?('__workdir') }
+  s.files = Dir.glob("{bin,lib,test}/**/*").delete_if { |item| item.include?('__workdir') }
   s.files += %w(LICENSE README CHANGES Rakefile)
+  s.files += Dir.glob("doc/*").delete_if { |item| item.include?('__workdir') }
 
   s.bindir = "bin"
   s.executables = ["cerberus"]
@@ -90,12 +95,27 @@ end
 
 desc "Look for TODO and FIXME tags in the code"
 task :todo do
-  Pathname.new(File.dirname(__FILE__)).egrep(/#.*(FIXME|TODO|TBD|DEPRECATED)/) do |match|
-    puts match
+  FileList.new(File.dirname(__FILE__)+'/**/*.rb').egrep(/#.*(FIXME|TODO|TBD|DEPRECATED)/i) 
+end
+
+task :reinstall => [:uninstall, :install]
+
+task :site_webgen do
+  sh %{pushd doc/site; webgen; scp -r output/* #{RUBY_FORGE_USER}@rubyforge.org:/var/www/gforge-projects/#{RUBY_FORGE_PROJECT}/; popd }
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |t|
+    t.test_files = FileList['test/*_test.rb']
+    t.output_dir = File.dirname(__FILE__) + "/coverage"
+    t.verbose = true
   end
+rescue Object
 end
 
-task :reinstall => [:uninstall, :install] do
+task :site_coverage => [:rcov] do
+  sh %{ scp -r test/coverage/* #{RUBY_FORGE_USER}@rubyforge.org:/var/www/gforge-projects/#{RUBY_FORGE_PROJECT}/coverage/ }
 end
 
 task :release_files => [:clean, :package] do
@@ -125,7 +145,7 @@ task :publish_news do
   Rake::XForge::NewsPublisher.new(project) do |publisher|
     publisher.user_name = RUBY_FORGE_USER
     publisher.password = ENV['RUBYFORGE_PASSWORD']
-    publisher.subject = "Cerberus #{PKG_VERSION} Released"
-    publisher.details = "I am glad to announce first public release of Cerberus tool. Version #{PKG_VERSION} is out. Cerberus is a simple command-line Continuous integration tool for Ruby project. Install Cerberus with 'gem install cerberus' then add project 'cerberus add SVN_URL' and then build it 'cerberus build YOUR_PROJECT_NAME'"
+    publisher.subject = "[ANN] Cerberus #{PKG_VERSION} Released"
+    publisher.details = IO.read(File.dirname(__FILE__) + '/README')
   end
 end

data/doc/OPTIONS

@@ -0,0 +1,45 @@
+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)

data/lib/cerberus/builder/maven2.rb

@@ -0,0 +1,2 @@
+class Cerberus::Builder::Maven2
+end

data/lib/cerberus/builder/rake.rb

@@ -0,0 +1,2 @@
+class Cerberus::Builder::Rake
+end

data/lib/cerberus/cli.rb

@@ -19,17 +19,17 @@ module Cerberus
       when 'add'
         path = args.shift || Dir.pwd
         
-        command = Cerberus::Add.new(path, cli_options)
+        command = Cerberus::AddCommand.new(path, cli_options)
         command.run
       when 'build'
         say HELP if args.empty?
 
         application_name  = args.shift
 
-        command = Cerberus::Build.new(application_name, cli_options)
+        command = Cerberus::BuildCommand.new(application_name, cli_options)
         command.run
       when 'buildall'
-        command = Cerberus::BuildAll.new(cli_options)
+        command = Cerberus::BuildAllCommand.new(cli_options)
         command.run
       end
     end

data/lib/cerberus/config.example.yml

@@ -0,0 +1,23 @@
+#Copy this file to config.yml and configure notification services
+publisher:
+  active: mail jabber rss
+  mail:
+    delivery_method: smtp
+    address: smtp.mymail.com
+    port: 2525
+    domain: mymail.com
+    user_name: cerberus
+    password: somepass
+    authentication: plain
+    sender: "'Cerberus Builder' <cerberus@mymail.com>"
+  jabber:
+    jid: cerberus@gtalk.google.com
+    port: 5222
+    password: mypass
+    digest: false
+  irc:
+    nick: cerb
+    server: irc.freenode.net
+    channel: cerberus
+  rss:
+    file: /usr/www/rss.xml

data/lib/cerberus/config.rb

@@ -14,8 +14,13 @@ module Cerberus
       @config.merge!(cli_options)
     end
 
-    def [](name)
-      @config[name]
+    def [](*path)
+      c = @config
+      path.each{|p|
+        c = c[p]
+        return if c.nil?
+      }
+      c
     end
 
     private

data/lib/cerberus/constants.rb

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

data/lib/cerberus/manager.rb

@@ -5,10 +5,26 @@ require 'cerberus/utils'
 require 'cerberus/constants'
 require 'cerberus/config'
 
-require 'cerberus/notifier/email'
+require 'cerberus/publisher/mail'
+require 'cerberus/publisher/jabber'
+require 'cerberus/publisher/irc'
+require 'cerberus/publisher/rss'
+require 'cerberus/scm/svn'
 
 module Cerberus
-  class Add
+  SCM_TYPES = {
+    'svn' => Cerberus::SCM::SVN
+  }
+
+  PUBLISHER_TYPES = {
+    :mail => Cerberus::Publisher::Mail,
+    :jabber => Cerberus::Publisher::Jabber,
+    :irc => Cerberus::Publisher::IRC,
+    :rss => Cerberus::Publisher::RSS
+  }
+
+  class AddCommand
+    EXAMPLE_CONFIG = File.expand_path(File.dirname(__FILE__) + '/config.example.yml')
     include Cerberus::Utils
 
     def initialize(path, cli_options = {})
@@ -16,19 +32,23 @@ module Cerberus
     end
 
     def run
-      checkout = Checkout.new(@path, @config)
-      say "Can't find any svn application under #{@path}" unless checkout.url
+      scm_type = @config[:scm] || 'svn'
+      say "SCM #{scm_type} not supported" unless SCM_TYPES[scm_type]
+
+      scm = SCM_TYPES[scm_type].new(@path, @config)
+      say "Can't find any #{scm_type} application under #{@path}" unless scm.url
 
       application_name = @config[:application_name] || extract_project_name(@path)
 
-      create_default_config
+      create_example_config
       
       config_name = "#{HOME}/config/#{application_name}.yml"
       say "Application #{application_name} already present in Cerberus" if File.exists?(config_name)
 
-      app_config = {
-        'url' => checkout.url,
-        'recipients' => @config[:recipients]
+      app_config = { 'scm' => {
+          'url' => scm.url,
+          'type' =>  scm_type },
+          'publisher' => {'mail' => {'recipients' => @config[:recipients]}}
       }
       dump_yml(config_name, app_config)
       puts "Application '#{application_name}' was successfully added to Cerberus" unless @config[:quiet]
@@ -39,26 +59,16 @@ module Cerberus
       path = File.expand_path(path) if test(?d, path)
       File.basename(path).strip
     end
-    
-    def create_default_config
-      default_mail_config = 
-        {'mail'=>
-          { 'delivery_method'=>'smtp', 
-            'address'=>'somserver.com', 
-            'port' => 25, 
-            'domain'=>'somserver.com', 
-            'user_name'=>'secret_user', 
-            'password'=>'secret_password',
-            'authentication' => 'plain'
-          }, 
-          'sender' => "'Cerberus' <cerberus@example.com>"}
-      dump_yml(CONFIG_FILE, default_mail_config, false)
+
+    def create_example_config
+      FileUtils.mkpath(HOME) unless test(?d, HOME)
+      FileUtils.cp(EXAMPLE_CONFIG, CONFIG_FILE) unless test(?f, CONFIG_FILE)
     end
   end
 
-  class Build
+  class BuildCommand
     include Cerberus::Utils
-    attr_reader :output, :success, :checkout, :status
+    attr_reader :output, :success, :scm, :status
 
     def initialize(application_name, cli_options = {})
       unless File.exists?("#{HOME}/config/#{application_name}.yml")
@@ -72,16 +82,16 @@ module Cerberus
 
       @status = Status.new("#{app_root}/status.log")
 
-      @checkout = Checkout.new(@config[:application_root], @config)
+      @scm = SCM_TYPES[@config[:scm, :type] || 'svn'].new(@config[:application_root], @config)
     end
  
     def run
       begin
         previous_status = @status.recall
-        @checkout.update!
+        @scm.update!
 
         state = 
-        if @checkout.has_changes? or not previous_status
+        if @scm.has_changes? or not previous_status
           if status = make
             @status.keep(:succesful)
             case previous_status
@@ -101,14 +111,27 @@ module Cerberus
         end
 
         if [:failure, :broken, :revival, :setup].include?(state)
-          Cerberus::Notifier::Email.notify(state, self, @config)
+          @config[:publisher, :active].split.each do |pub|
+            silence_stream(STDOUT) { #some of publishers like IRC very noisy
+              clazz = PUBLISHER_TYPES[pub.to_sym]
+              if clazz
+                clazz.publish(state, self, @config)
+              else
+                raise "There is no such publisher: #{pub}"
+              end
+            }
+          end
         end
       rescue Exception => e
-        File.open("#{HOME}/work/#{@config[:application_name]}/error.log", File::WRONLY|File::APPEND|File::CREAT) do |f| 
-          f.puts Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")
-          f.puts e.message
-          f.puts e.backtrace.collect{|line| ' '*5 + line}
-          f.puts "\n"
+        if ENV['CERBERUS_ENV'] == 'TEST'
+          raise e
+        else
+          File.open("#{HOME}/work/#{@config[:application_name]}/error.log", File::WRONLY|File::APPEND|File::CREAT) do |f| 
+            f.puts Time.now.strftime("%a, %d %b %Y %H:%M:%S  --  #{e.class}")
+            f.puts e.message unless e.message.blank?
+            f.puts e.backtrace.collect{|line| ' '*5 + line}
+            f.puts "\n"
+          end
         end
       end
     end
@@ -116,9 +139,7 @@ module Cerberus
     private
       def make
         Dir.chdir @config[:application_root]
-
-        @output = `#{@config[:bin_path]}#{choose_rake_exec()} #{@config[:rake_task]} 2>&1`
-
+        @output = `#{@config[:bin_path]}#{choose_rake_exec()} #{@config[:builder, :rake, :task]} 2>&1`
         make_successful?
       end
       
@@ -135,7 +156,7 @@ module Cerberus
 
         ext.each{|e|
           begin
-            out = `rake#{e} --version`
+            out = `#{@config[:bin_path]}rake#{e} --version`
             return "rake#{e}" if out =~ /rake/
           rescue
           end
@@ -143,7 +164,7 @@ module Cerberus
       end
   end
 
-  class BuildAll
+  class BuildAllCommand
     def initialize(cli_options = {})
       @cli_options = cli_options
     end
@@ -153,66 +174,12 @@ module Cerberus
         fn =~ %r{#{HOME}/config/(.*).yml}
         application_name = $1
 
-        command = Cerberus::Build.new(application_name, @cli_options)
+        command = Cerberus::BuildCommand.new(application_name, @cli_options)
         command.run
       end
     end
   end
 
-  
-  class Checkout
-    def initialize(path, options = {})
-      raise "Path can't be nil" unless path
-
-      @path, @options = path.strip, options
-      @encoded_path = (@path.include?(' ') ? "\"#{@path}\"" : @path)
-    end
-
-    def update!
-      if test(?d, @path + '/.svn')
-        @status = execute("svn update")
-      else
-        FileUtils.mkpath(@path) unless test(?d,@path)
-        @status = execute("svn checkout", nil, @options[: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("svn 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 info
-        @info ||= YAML.load(execute("svn info"))
-      end
-      
-      def execute(command, parameters = nil, pre_parameters = nil)
-        `#{@options[:bin_path]}#{command} #{pre_parameters} #{@encoded_path} #{parameters}`
-      end
-  end
-
   class Status
     def initialize(path)
       @path = path

data/lib/cerberus/publisher/base.rb

@@ -0,0 +1,29 @@
+require 'cerberus/version'
+
+module Cerberus
+  module Publisher
+    class Base
+      def self.formatted_message(state, build, options)
+        subject = 
+        case state
+        when :setup
+          "Cerberus set up for project (##{build.scm.current_revision})"
+        when :broken
+          "Build still broken (##{build.scm.current_revision})"
+        when :failure
+          "Build broken by #{build.scm.last_author} (##{build.scm.current_revision})"
+        when :revival
+          "Build fixed by #{build.scm.last_author} (##{build.scm.current_revision})"
+        else
+          raise "Unknown build state #{state}"
+        end
+
+        subject = "[#{options[:application_name]}] #{subject}"
+        generated_by = "--\nCerberus #{Cerberus::VERSION::STRING}, http://rubyforge.org/projects/cerberus"
+        body = [ build.scm.last_commit_message, build.output, generated_by ].join("\n\n")
+
+        return subject, body
+      end
+    end
+  end
+end

data/lib/cerberus/publisher/irc.rb

@@ -0,0 +1,26 @@
+require 'IRC'
+require 'cerberus/publisher/base'
+
+class Cerberus::Publisher::IRC < Cerberus::Publisher::Base
+  def self.publish(state, build, options)
+    irc_options = options[:publisher, :irc]
+    subject,body = Cerberus::Publisher::Base.formatted_message(state, build, options)
+    message = subject + "\n" + '*' * subject.length + "\n" + body
+
+
+    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)
+      }
+      bot.send_quit
+    }
+    begin
+      bot.connect #Why it always fails?
+    rescue Exception => e
+      puts e.message
+    end
+  end
+end

data/lib/cerberus/publisher/jabber.rb

@@ -0,0 +1,32 @@
+require 'jabber4r/jabber4r'
+require 'cerberus/publisher/base'
+
+class Cerberus::Publisher::Jabber < Cerberus::Publisher::Base
+  def self.publish(state, build, options)
+    begin
+      jabber_options = options[:publisher, :jabber]
+      subject,body = Cerberus::Publisher::Base.formatted_message(state, build, options)
+
+      session = login(jabber_options[:jid], jabber_options[:password])
+      jabber_options[:recipients].split(',').each do |address|
+        session.new_message(address.strip).set_subject(subject).set_body(body).send
+      end
+    ensure
+      session.release if session
+    end
+  end
+
+  def self.login(id_resource, password, register_if_login_fails=true)
+    begin
+      session = ::Jabber::Session.bind(id_resource, password)
+    rescue
+      if(register_if_login_fails)
+        if(::Jabber::Session.register(id_resource, password))
+          Cerberus::Publisher::Jabber.login(id_resource, password, false)
+        else
+          raise "Failed to register #{id_resource}"
+        end
+      end
+    end
+  end
+end

data/lib/cerberus/publisher/mail.rb

@@ -0,0 +1,28 @@
+require 'action_mailer'
+require 'cerberus/publisher/base'
+
+class Cerberus::Publisher::Mail < Cerberus::Publisher::Base
+  def self.publish(state, build, options)
+    configure(options[:publisher, :mail].dup)
+    ActionMailerPublisher.deliver_message(state, build, options)
+  end
+
+  private
+  def self.configure(config)
+    [:authentication, :delivery_method].each do |k|
+      config[k] = config[k].to_sym if config[k]
+    end
+
+    ActionMailer::Base.delivery_method = config[:delivery_method] if config[:delivery_method]
+    ActionMailer::Base.server_settings = config
+  end
+
+  class ActionMailerPublisher < ActionMailer::Base
+    def message(state, build, options)
+      @subject, @body = Cerberus::Publisher::Base.formatted_message(state, build, 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]
+    end
+  end
+end

data/lib/cerberus/publisher/rss.rb

@@ -0,0 +1,26 @@
+require 'cerberus/publisher/base'
+
+class Cerberus::Publisher::RSS < Cerberus::Publisher::Base
+  def self.publish(state, build, options)
+    config = options[:publisher, :rss]
+    subject,body = Cerberus::Publisher::Base.formatted_message(state, build, options)
+
+    pub_date = Time.now.iso8601
+    result = <<-END
+<rss version="2.0">
+  <channel>
+    <title>Cerberus build feed for #{options[:application_name]}</title>
+    <pubDate>#{pub_date}</pubDate>
+    <generator>http://rubyforge.org/projects/cerberus</generator>
+    <item>
+      <title>#{subject}</title>
+      <pubDate>#{pub_date}</pubDate>
+      <description><pre>#{body}</pre></description>
+    </item>
+  </channel>
+</rss>
+    END
+
+    File.open(config[:file], 'w'){|f| f.write(result)}
+  end
+end

data/lib/cerberus/scm/cvs.rb

@@ -0,0 +1,2 @@
+class Cerberus::SCM::CVS
+end

data/lib/cerberus/scm/darcs.rb

@@ -0,0 +1,2 @@
+class Cerberus::SCM::Darcs
+end

data/lib/cerberus/scm/svn.rb

@@ -0,0 +1,53 @@
+class Cerberus::SCM::SVN
+  def initialize(path, options = {})
+    raise "Path can't be nil" unless path
+
+    @path, @options = path.strip, options
+    @encoded_path = (@path.include?(' ') ? "\"#{@path}\"" : @path)
+  end
+
+  def update!
+    if test(?d, @path + '/.svn')
+      execute("svn cleanup") #TODO check first that it was locked
+      @status = execute("svn update")
+    else
+      FileUtils.mkpath(@path) unless test(?d,@path)
+      @status = execute("svn checkout", nil, @options[: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("svn 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 info
+      @info ||= YAML.load(execute("svn info"))
+    end
+    
+    def execute(command, parameters = nil, pre_parameters = nil)
+      `#{@options[:bin_path]}#{command} #{pre_parameters} #{@encoded_path} #{parameters}`
+    end
+end

data/lib/cerberus/utils.rb

@@ -27,4 +27,13 @@ module Cerberus
       File.exists?(file_name) ? YAML::load(IO.read(file_name)) : default
     end
   end
+end
+
+alias __exec `
+def `(cmd)
+  begin
+    __exec(cmd)
+  rescue Exception => e           
+    raise "Unable to execute: #{cmd}"
+  end
 end

data/lib/cerberus/version.rb

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

data/test/config_test.rb

@@ -1,4 +1,5 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/test_helper'
+
 require 'cerberus/config'
 
 class ConfigTest < Test::Unit::TestCase

data/test/functional_test.rb

@@ -1,10 +1,11 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/test_helper'
 
 require 'cerberus/cli'
 
 class FunctionalTest < Test::Unit::TestCase
   def setup
     FileUtils.rm_rf HOME
+    ActionMailer::Base.deliveries.clear
   end
 
   def teardown
@@ -15,11 +16,13 @@ class FunctionalTest < Test::Unit::TestCase
   def test_add_by_url
     assert !File.exists?(HOME + '/config/svn_repo.yml')
 
-    command = Cerberus::Add.new("    #{SVN_URL}   ", :quiet => true)
+    command = Cerberus::AddCommand.new("    #{SVN_URL}   ", :quiet => true)
     command.run
 
     assert File.exists?(HOME + '/config/svn_repo.yml')
-    assert_equal SVN_URL, load_yml(HOME + '/config/svn_repo.yml')['url']
+    scm_conf = load_yml(HOME + '/config/svn_repo.yml')['scm']
+    assert_equal 'svn', scm_conf['type']
+    assert_equal SVN_URL, scm_conf['url']
 
     assert File.exists?(HOME + '/config.yml')
   end
@@ -27,13 +30,15 @@ class FunctionalTest < Test::Unit::TestCase
   def test_add_by_dir
     sources_dir = File.dirname(__FILE__) + '/..'
 
-    command = Cerberus::Add.new(sources_dir, :quiet => true)
+    command = Cerberus::AddCommand.new(sources_dir, :quiet => true)
     command.run
 
     project_config = HOME + "/config/#{File.basename(File.expand_path(sources_dir))}.yml" #name of added application should be calculated from File System path
 
     assert File.exists?(project_config)
-    assert_match %r{svn(\+ssh)?://(\w+@)?rubyforge.org/var/svn/cerberus}, load_yml(project_config)['url']
+    scm_conf = load_yml(project_config)['scm']
+    assert_equal 'svn', scm_conf['type']
+    assert_match %r{svn(\+ssh)?://(\w+@)?rubyforge.org/var/svn/cerberus}, scm_conf['url']
 
     assert File.exists?(HOME + '/config.yml')
   end
@@ -41,7 +46,7 @@ class FunctionalTest < Test::Unit::TestCase
   def test_build
     add_application('myapp', SVN_URL)
 
-    build = Cerberus::Build.new('myapp')
+    build = Cerberus::BuildCommand.new('myapp')
     build.run
     assert_equal 1, ActionMailer::Base.deliveries.size #first email that project was setup
 
@@ -50,13 +55,13 @@ class FunctionalTest < Test::Unit::TestCase
     assert_equal 'succesful', IO.read(status_file)
 
     FileUtils.rm status_file
-    build = Cerberus::Build.new('myapp')
+    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
 
-    build = Cerberus::Build.new('myapp')
+    build = Cerberus::BuildCommand.new('myapp')
     build.run
     assert_equal 2, ActionMailer::Base.deliveries.size #Number of mails not changed
 
@@ -64,7 +69,7 @@ class FunctionalTest < Test::Unit::TestCase
     #remove status file to run project again
     FileUtils.rm status_file
     add_test_case_to_project('myapp', 'assert false') { #if assertion failed
-      build = Cerberus::Build.new('myapp')
+      build = Cerberus::BuildCommand.new('myapp')
       build.run
 
       assert_equal 'failed', IO.read(status_file)
@@ -75,7 +80,7 @@ class FunctionalTest < Test::Unit::TestCase
     #remove status file to run project again
     FileUtils.rm status_file
     add_test_case_to_project('myapp', 'raise "Some exception here"') { #if we have exception
-      build = Cerberus::Build.new('myapp')
+      build = Cerberus::BuildCommand.new('myapp')
       build.run
 
       assert_equal 'failed', IO.read(status_file)
@@ -85,20 +90,20 @@ class FunctionalTest < Test::Unit::TestCase
   def test_have_no_awkward_header
     add_application('myapp', SVN_URL)
 
-    build = Cerberus::Build.new('myapp')
+    build = Cerberus::BuildCommand.new('myapp')
     build.run
 
-    assert build.checkout.last_commit_message !~ /-rHEAD -v/
-    assert_equal 0, build.checkout.last_commit_message.index('-' * 72)
+    assert build.scm.last_commit_message !~ /-rHEAD -v/
+    assert_equal 0, build.scm.last_commit_message.index('-' * 72)
   end
 
-  def test_have_no_awkward_header
+  def test_batch_running
     add_application('myapp1', SVN_URL)
     add_application('myapp2', SVN_URL)
     add_application('myapp3', SVN_URL)
     add_application('myapp4', SVN_URL)
 
-    build = Cerberus::BuildAll.new
+    build = Cerberus::BuildAllCommand.new
     build.run
 
     for i in 1..4 do

data/test/integration_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/test_helper'
 
 require 'yaml'
 
@@ -15,13 +15,13 @@ class IntegrationTest < Test::Unit::TestCase
     output = run_cerb("  add   #{SVN_URL}  ")
     assert_match /was successfully added/, output
     assert File.exists?(HOME + '/config/svn_repo.yml')
-    assert_equal SVN_URL, load_yml(HOME + '/config/svn_repo.yml')['url']
+    assert_equal SVN_URL, load_yml(HOME + '/config/svn_repo.yml')['scm']['url']
 
     #try to add second time
     output = run_cerb("add #{SVN_URL}")
     assert_match /already present/, output
     assert File.exists?(HOME + '/config/svn_repo.yml')
-    assert_equal SVN_URL, load_yml(HOME + '/config/svn_repo.yml')['url']
+    assert_equal SVN_URL, load_yml(HOME + '/config/svn_repo.yml')['scm']['url']
   end
 
   def test_add_project_with_parameters
@@ -31,8 +31,8 @@ class IntegrationTest < Test::Unit::TestCase
     assert File.exists?(HOME + '/config/hello_world.yml')
     cfg = load_yml(HOME + '/config/hello_world.yml')
 
-    assert_equal SVN_URL, cfg['url']
-    assert_equal 'aa@gmail.com', cfg['recipients']
+    assert_equal SVN_URL, cfg['scm']['url']
+    assert_equal 'aa@gmail.com', cfg['publisher']['mail']['recipients']
   end
 
   def test_run_project

data/test/irc_publisher_test.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+require 'cerberus/publisher/irc'
+require 'cerberus/config'
+require 'mock/irc'
+require 'mock/build'
+
+class IRCPublisherTest < Test::Unit::TestCase
+  def test_publisher
+    options = Cerberus::Config.new(nil, :publisher => {:irc => {:channel => 'hello'}}, :application_name => 'IrcApp')
+    build = DummyBuild.new('last message', 'this is output', 1232, 'anatol')
+
+    Cerberus::Publisher::IRC.publish(:setup, build, options)
+
+    assert IRCConnection.connected
+  end
+end

data/test/jabber_publisher_test.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+require 'cerberus/publisher/jabber'
+require 'mock/jabber4r'
+require 'mock/build'
+
+class JabberPublisherTest < Test::Unit::TestCase
+  def test_publisher
+    options = Cerberus::Config.new(nil, :publisher => {:jabber => {:recipients => ' jit1@google.com, another@google.com '}}, :application_name => 'MegaApp')
+    build = DummyBuild.new('last message', 'this is output', 1232, 'anatol')
+
+    Cerberus::Publisher::Jabber.publish(:setup, build, options)
+
+    messages = Jabber::Protocol::Message.messages
+    assert_equal 2, messages.size
+    assert_equal 'google.com', messages[0].to.host
+    assert_equal 'jit1', messages[0].to.node
+    assert_equal '[MegaApp] Cerberus set up for project (#1232)', messages[0].subject
+  end
+end

data/test/mail_publisher_test.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+require 'cerberus/publisher/mail'
+require 'mock/build'
+
+class MailPublisherTest < Test::Unit::TestCase
+  def setup
+    ActionMailer::Base.deliveries.clear
+  end
+
+  def test_publisher
+    options = Cerberus::Config.new(nil, :publisher => {
+       :mail => {:recipients => 'anatol.pomozov@hello.com', :sender => 'haha', :delivery_method => 'test'}}, 
+       :application_name => 'MyApp')
+    build = DummyBuild.new('last message', 'this is output', 1232, 'anatol')
+
+    Cerberus::Publisher::Mail.publish(:setup, build, options)
+
+    mails = ActionMailer::Base.deliveries
+    assert_equal 1, mails.size
+    mail = mails[0]
+    assert_equal 'haha', mail.from_addrs[0].address
+    assert_equal '[MyApp] Cerberus set up for project (#1232)', mail.subject
+  end
+end

data/test/mock/build.rb

@@ -0,0 +1,10 @@
+class DummyBuild
+  attr_reader :output, :scm
+  SCM = Struct.new(:last_commit_message, :current_revision, :last_author)
+
+  def initialize(last_commit_message, output, current_revision, last_author)
+    @output = output
+
+    @scm = SCM.new(last_commit_message, current_revision, last_author)
+  end
+end

data/test/mock/irc.rb

@@ -0,0 +1,20 @@
+class IRCConnection
+  @@messages = []
+  @@connected = false
+
+  def self.messages
+    @@messages
+  end
+
+  def self.connected
+    @@connected
+  end
+
+  def self.send_to_server(msg)
+    @@messages << msg
+  end
+
+  def self.handle_connection(server, port)
+    @@connected = true
+  end
+end

data/test/mock/jabber4r.rb

@@ -0,0 +1,24 @@
+class Jabber::Session
+  def self.bind(jid, password)
+    Jabber::Session.new
+  end
+
+  def initialize
+  end
+end
+
+class Jabber::Protocol::Message
+  @@messages = []
+
+  def self.messages
+    @@messages
+  end
+
+  def self.clear
+    @@messages = []
+  end
+
+  def send
+    @@messages << self
+  end
+end

data/test/rss_publisher_test.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+require 'cerberus/publisher/rss'
+require 'mock/build'
+require 'tempfile'
+
+class RSSPublisherTest < Test::Unit::TestCase
+  def test_publisher
+    rss_file = tf = Tempfile.new('cerberus-rss')
+    options = Cerberus::Config.new(nil, :publisher => {:rss => {:file => rss_file.path}}, :application_name => 'RSSApp')
+    build = DummyBuild.new('last message', 'this is output', 1235, 'anatol')
+
+    Cerberus::Publisher::RSS.publish(:setup, build, options)
+
+    xml = REXML::Document.new(IO.read(rss_file.path))
+
+    assert_equal '[RSSApp] Cerberus set up for project (#1235)', xml.elements["rss/channel/item/title/"].get_text.value
+  end
+end

data/test/test_helper.rb

@@ -1,4 +1,6 @@
 $:.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'rubygems'
 require 'test/unit'
 require 'fileutils'
 
@@ -14,6 +16,7 @@ class Test::Unit::TestCase
 
   HOME = TEMP_DIR + '/home'
   ENV['CERBERUS_HOME'] = HOME
+  ENV['CERBERUS_ENV'] = 'TEST'
 
   def self.refresh_subversion
     FileUtils.rm_rf TEMP_DIR
@@ -47,10 +50,15 @@ end"
   end
 
   def add_application(app_name, url, options = {})
-    opt = options.dup
-    opt['url'] = url
-    opt['recipients'] = 'somebody@com.com'
-    opt['mail'] = {'delivery_method' => 'test'}
+    opt = options.merge(
+      'scm'=>{'url'=>url}, 
+      'publisher'=>{
+        'active' => 'mail',
+        'mail'=>{'recipients'=>'somebody@com.com', 'delivery_method' => 'test'}
+    })
+
     dump_yml(HOME + "/config/#{app_name}.yml", opt)
   end
-end
+end
+
+require 'cerberus/config'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: cerberus
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-07-22 00:00:00 +04:00
+  version: 0.2.0
+date: 2006-08-11 00:00:00 +04:00
 summary: Cerberus is a Continuous Integration tool that could be easily run from Cron.
 require_paths: 
 - lib
@@ -30,27 +30,50 @@ authors:
 - Anatol Pomozov
 files: 
 - bin/cerberus
-- doc/FAQ
 - lib/cerberus
+- lib/cerberus/builder
 - lib/cerberus/cli.rb
+- lib/cerberus/config.example.yml
 - lib/cerberus/config.rb
+- lib/cerberus/config_migration.rb
 - lib/cerberus/constants.rb
 - lib/cerberus/latch.rb
 - lib/cerberus/manager.rb
-- lib/cerberus/notifier
+- lib/cerberus/publisher
+- lib/cerberus/scm
 - lib/cerberus/utils.rb
 - lib/cerberus/version.rb
-- lib/cerberus/notifier/email.rb
+- lib/cerberus/builder/maven2.rb
+- lib/cerberus/builder/rake.rb
+- lib/cerberus/publisher/base.rb
+- lib/cerberus/publisher/irc.rb
+- lib/cerberus/publisher/jabber.rb
+- lib/cerberus/publisher/mail.rb
+- lib/cerberus/publisher/rss.rb
+- lib/cerberus/scm/cvs.rb
+- lib/cerberus/scm/darcs.rb
+- lib/cerberus/scm/svn.rb
 - test/config_test.rb
 - test/data
 - test/functional_test.rb
 - test/integration_test.rb
+- test/irc_publisher_test.rb
+- test/jabber_publisher_test.rb
+- test/mail_publisher_test.rb
+- test/mock
+- test/rss_publisher_test.rb
 - test/test_helper.rb
 - test/data/application.dump
+- test/mock/build.rb
+- test/mock/irc.rb
+- test/mock/jabber4r.rb
 - LICENSE
 - README
 - CHANGES
 - Rakefile
+- doc/FAQ
+- doc/OPTIONS
+- doc/site
 test_files: 
 - test/integration_test.rb
 rdoc_options: 
@@ -72,7 +95,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 1.2.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -83,3 +106,21 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.7.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: jabber4r
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.8.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: Ruby-IRC
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.3
+    version: 

data/lib/cerberus/notifier/email.rb

@@ -1,47 +0,0 @@
-require 'action_mailer'
-
-module Cerberus
-  module Notifier
-    class Email
-      def self.notify(state, build, options)
-        Email.configure(options)
-        ActionMailerNotifier.deliver_message(state, build, options)
-      end
-
-      private
-      def self.configure(options)
-        mail_config = options[:mail] || {}
-        [:authentication, :delivery_method].each do |k|
-          mail_config[k] = mail_config[k].to_sym if mail_config[k]
-        end
-
-        ActionMailer::Base.delivery_method = mail_config[:delivery_method] if mail_config[:delivery_method]
-        ActionMailer::Base.server_settings = mail_config
-      end
-
-      class ActionMailerNotifier < ActionMailer::Base
-        def message(state, build, options)
-          subject = 
-          case state
-          when :setup
-            "Cerberus set up for project (##{build.checkout.current_revision})"
-          when :broken
-            "Build still broken (##{build.checkout.current_revision})"
-          when :failure
-            "Build broken by #{build.checkout.last_author} (##{build.checkout.current_revision})"
-          when :revival
-            "Build fixed by #{build.checkout.last_author} (##{build.checkout.current_revision})"
-          end
-
-          @subject = "[#{options[:application_name]}] #{subject}"
-          @body    = [ build.checkout.last_commit_message, build.output ].join("\n\n")
-
-          @recipients, @sent_on = options[:recipients], Time.now
-
-          @from = options[:sender] || "'Cerberus' <cerberus@example.com>"
-          raise "Please specify recipient addresses for application '#{options[:application_name]}'" unless options[:recipients]
-        end
-      end
-    end
-  end
-end