cerberus 0.6 → 0.7

data/Authors.txt

@@ -0,0 +1,4 @@
+Craig P Jolicoeur
+  cpjolicoeur@gmail.com
+  http://craigjolicoeur.com
+  http://github.com/cpjolicoeur

data/Changelog.txt

@@ -1,5 +1,16 @@
 = Cerberus Changelog
 
+== Version 0.7
+New config options, Bazaar SCM support, removed GMailer bugfixes
+
+* added support for bazaar scm
+* fixed bug with ActionMailer 2.3.3
+* removed GMailer library.  Use default Mail publisher instead
+* added 'build_dir' option for setting custom build directory
+* added 'setup_script' option for a custom script to be run before build command
+* Projects using the Git SCM were not getting the full diff output in their
+Publishers
+
 == Version 0.6
 New Ruby builder, bugfixes, and refactoring
 

data/Copyright.txt

@@ -0,0 +1,16 @@
+If you have contributed to Cerberus, you deserve to be on this list.
+Contact us (see: Authors.txt) and we will add you.
+
+Cerberus is Copyright (C) 2006-2009 by the following contributors:
+
+Anatol Pomozov
+Xavier Shay
+Mark Noworolski
+Craig P Jolicoeur
+Rob Kaufman
+Ken Mayer
+Niklas Koponen
+Mike Gunderloy
+Joe Van Dyk
+Andrew Timberlake
+Paul Hinze

data/Rakefile

@@ -1,12 +1,11 @@
-%w(rubygems rake rake/clean rake/testtask fileutils newgem rubigen).each { |f| require f }
-require File.join( File.dirname(__FILE__), 'lib', 'cerberus', 'constants.rb' )
-
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 
+require './lib/cerberus/constants'
+
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'cerberus'
 PKG_VERSION   = Cerberus::VERSION + PKG_BUILD
@@ -35,15 +34,6 @@ task :clean => :clobber_package do
   rm_rf "#{root}/doc/site/webgen.cache"
 end
 
-# $hoe = Hoe.new('cerberus', Cerberus::VERSION) do |p|
-#   p.rubyforge_name          = p.name
-#   p.developer( 'Craig P Jolicoeur', 'cpjolicoeur@gmail.com' )
-#   p.url                     = 'http://cerberus.rubyforge.org'
-#   p.need_tar                = true
-#   p.need_zip                = true
-# 
-#   p.changes                 = p.paragraphs_of( 'Changelog.txt', 0..1 ).join( "\n\n" )
-# end
 
 GEM_SPEC = Gem::Specification.new do |s|
   s.name = PKG_NAME
@@ -62,14 +52,9 @@ GEM_SPEC = Gem::Specification.new do |s|
   s.add_dependency 'actionmailer', '>= 1.3.3'
   s.add_dependency 'activesupport', '>= 1.4.2'
   s.add_dependency 'rake', '>= 0.7.3'
-  s.add_dependency 'xmpp4r', '>= 0.3.1'
-  s.add_dependency 'Ruby-IRC', '>= 1.0.7'
-  s.add_dependency 'gmailer', '>= 0.1.7'
-  s.add_dependency 'twitter4r', '>= 0.3.0'
 
   s.files = Dir.glob("{bin,lib,test}/**/*").delete_if { |item| item.include?('__workdir') }
-  s.files += %w(License.txt Readme.markdown Changelog.txt Rakefile)
-  s.files += Dir.glob("doc/*").delete_if { |item| item.include?('__workdir') }
+  s.files += %w(License.txt Readme.markdown Changelog.txt Authors.txt Copyright.txt Rakefile)
 
   s.bindir = "bin"
   s.executables = ["cerberus"]
@@ -101,7 +86,7 @@ end
 
 desc "Look for TODO and FIXME tags in the code"
 task :todo do
-  FileList.new(File.dirname(__FILE__)+'/**/*.rb').egrep(/#.*(FIXME|TODO|TBD|DEPRECATED)/i) 
+  FileList.new(File.dirname(__FILE__)+'/lib/cerberus/**/*.rb').egrep(/#.*(FIXME|TODO|TBD|DEPRECATED)/i) 
 end
 
 task :reinstall => [:uninstall, :install]
@@ -110,14 +95,14 @@ begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |t|
     t.test_files = FileList['test/*_test.rb']
-    t.output_dir = File.dirname(__FILE__) + "/coverage"
+    t.output_dir = File.join( File.dirname(__FILE__),'coverage' )
     t.verbose = true
   end
 rescue Object
 end
 
 task :site_coverage => [:rcov] do
-  sh %{ scp -r test/coverage/* #{RUBYFORGE_USER}@rubyforge.org:/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/coverage/ }
+  sh %{ scp -r coverage/* #{RUBYFORGE_USER}@rubyforge.org:/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/coverage/ }
 end
 
 task :release_files => [:clean, :package] do
@@ -152,10 +137,16 @@ task :publish_news do
   end
 end
 
-require 'webgen/webgentask'
-Webgen::WebgenTask.new do |t|
-  t.directory = File.join( File.dirname( __FILE__ ), 'doc/site')
-  t.clobber_outdir = true
+begin
+  gem 'webgen', '>=0.5.6'
+  require 'webgen/webgentask'
+
+  Webgen::WebgenTask.new do |t|
+    t.directory = File.join( File.dirname( __FILE__ ), 'doc/site')
+    t.clobber_outdir = true
+  end
+rescue Gem::LoadError
+  puts "webgen gem is required to build website output"
 end
 
 task :publish_site => :webgen do

data/Readme.markdown

@@ -35,10 +35,7 @@ Main advantages of Cerberus over other solutions include:
 * rake - 0.7.3 or higher (optional)
 * actionmailer - 1.3.3 or higher (optional)
 * activesupport - 1.4.2 or higher (optional)
-* xmpp4r - 0.3.1 or higher (optional)
-* Ruby-IRC - 1.0.7 or higher (optional)
 * gmailer - 0.1.7 or higher (optional)
-* twitter4r - 0.3.0 or higher (optional)
 
 ## Usage
  
@@ -89,6 +86,7 @@ Cerberus currently supports the following SCM tools:
   * Darcs
   * Perforce
   * CVS
+  * Bazaar
 
 Cerberus currently supports the following notification systems: 
 

data/bin/cerberus

@@ -1,5 +1,10 @@
 #!/usr/bin/env ruby
 
+# Add lib dir to load path so that we don't have to be installed in rubygems
+require 'pathname' # Use Pathname to follow symlinks
+CERBERUS_LIB_DIR = File.join( File.dirname( Pathname.new( __FILE__ ).realpath ),'..','lib' )
+$:.unshift CERBERUS_LIB_DIR
+
 require 'cerberus/cli'
 
 Cerberus::CLI.new(*ARGV)

data/lib/cerberus/builder/bjam.rb

@@ -8,8 +8,6 @@ class Cerberus::Builder::Bjam
  end
 
  def run
-   Dir.chdir @config[:application_root]
-
    #set correct mountpoint if it present
    build_dir = @config[:builder, :bjam, :build_dir]
    Dir.chdir(build_dir) if build_dir
@@ -29,4 +27,4 @@ class Cerberus::Builder::Bjam
  def brokeness
    return nil
  end
-end
+end

data/lib/cerberus/builder/maven2.rb

@@ -8,7 +8,6 @@ class Cerberus::Builder::Maven2
   end
 
   def run
-    Dir.chdir @config[:application_root]
     cmd = @config[:builder, :maven2, :cmd] || 'mvn'
     task = @config[:builder, :maven2, :task] || 'test'
     @output = `#{@config[:bin_path]}#{cmd} #{system_properties} #{settings} #{task} 2>&1`

data/lib/cerberus/builder/rake.rb

@@ -6,6 +6,6 @@ class Cerberus::Builder::Rake < Cerberus::Builder::RubyBase
   end
 
   def successful?
-    $?.exitstatus == 0 and not @output.include?("#{@cmd} aborted!") and @output.include?("0 failures, 0 errors")
+    $?.exitstatus == 0 and not @output.include?("#{@cmd} aborted!")
   end
 end

data/lib/cerberus/builder/rspec.rb

@@ -6,7 +6,6 @@ class Cerberus::Builder::RSpec < Cerberus::Builder::RubyBase
   end
 
   def run
-    Dir.chdir @config[:application_root]
     @output = if @config[:builder, @name.to_sym, :task]
       `#{@config[:bin_path]}rake #{@config[:builder, @name.to_sym, :task]} 2>&1`
     else

data/lib/cerberus/builder/ruby_base.rb

@@ -10,7 +10,6 @@ class Cerberus::Builder::RubyBase
   end
 
   def run
-    Dir.chdir @config[:application_root]
     @output = `#{@config[:bin_path]}#{choose_exec()} #{@config[:builder, @name.to_sym, :task]} 2>&1`
     successful?
   end

data/lib/cerberus/component_lazy_loader.rb

@@ -5,6 +5,7 @@ module Cerberus
       :darcs => 'Darcs',
       :perforce => 'Perforce',
       :cvs => 'CVS',
+      :bzr => 'Bazaar',
       :git => 'Git'
     }
 
@@ -25,6 +26,8 @@ module Cerberus
           'darcs'
         when test(?d, path+'/.cvs')
           'cvs'
+        when test(?d, path+'/.bzr')
+          'bzr'          
         when test(?d, path+'/.git')
           'git'          
         end
@@ -33,6 +36,8 @@ module Cerberus
         case path
         when /^:(pserver|ext|local):/
           'cvs'
+        when /^(bzr+ssh|bzr)/
+          'bzr'
         end
       end
     end
@@ -40,8 +45,7 @@ module Cerberus
 
   module Publisher
     TYPES = {
-      :mail => 'Mail', #Cerberus::Publisher
-      :gmailer => 'Gmailer',
+      :mail => 'Mail',
       :jabber => 'Jabber',
       :irc => 'IRC',
       :rss => 'RSS',

data/lib/cerberus/config.example.yml

@@ -7,6 +7,7 @@ publisher:
     authentication: plain
     user_name: someuser
     password: somepassword
+    sender: cerberus@example.com
 #    on_event: all
 #  jabber:
 #    jid: somemailbox@gmail.com/cerberus

data/lib/cerberus/constants.rb

@@ -2,7 +2,7 @@ module Cerberus
   HOME = File.expand_path(ENV['CERBERUS_HOME'] || '~/.cerberus')
   CONFIG_FILE = "#{HOME}/config.yml"
 
-  LOCK_WAIT = 30 * 60 #30 minutes
+  LOCK_WAIT = 30 * 60 # 30 minutes
 
-  VERSION = '0.6'
+  VERSION = '0.7'
 end

data/lib/cerberus/manager.rb

@@ -113,6 +113,9 @@ module Cerberus
           @scm.update!
           
           if @scm.has_changes? or @config[:force] or @status.previous_build_successful.nil?
+            Dir.chdir File.join(@config[:application_root], @config[:build_dir] || '')
+            `#{@config[:setup_script]}` if @config[:setup_script]
+
             build_successful = @builder.run
             @status.keep(build_successful, @scm.current_revision, @builder.brokeness)
             
@@ -215,7 +218,7 @@ module Cerberus
     def run
       projects = Dir["#{HOME}/config/*.yml"]
       if projects.empty?
-        puts "There are no any active projects" 
+        puts "There are no active projects" 
       else
         puts "List of active projects:"
         
@@ -313,6 +316,9 @@ module Cerberus
       @successful_build_revision = @hash['successful_build_revision']
       @previous_build_successful = @hash['successful']
       @previous_brokeness = @hash['brokeness']
+
+      # Create some convenience methods to access status
+      @hash.keys.each { |key| self.class.send( :define_method, key ) { @hash[key] } }
     end
     
     def self.read(file_name)

data/lib/cerberus/publisher/mail.rb

@@ -2,8 +2,8 @@ require 'rubygems'
 require 'action_mailer'
 require 'cerberus/publisher/base'
 
-if RUBY_VERSION > '1.8.2'
-  #This hack works only on 1.8.4
+if RUBY_VERSION =~ /1\.8\.\d/
+  # This hack works only on 1.8.x
   require 'cerberus/publisher/netsmtp_tls_fix'
 end
 
@@ -30,8 +30,8 @@ class Cerberus::Publisher::Mail < Cerberus::Publisher::Base
     def message(state, manager, options)
       @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>"
+      @from = options[:publisher, :mail, :sender] || 'cerberus@example.com' 
       raise "Please specify recipient addresses for application '#{options[:application_name]}'" unless @recipients
     end
   end
-end
+end

data/lib/cerberus/publisher/twitter.rb

@@ -13,7 +13,6 @@ require 'cerberus/utils'
 class Cerberus::Publisher::Twitter < Cerberus::Publisher::Base
   def self.publish(state, manager, options)
     begin
-      gem 'twitter4r', '>=0.3.0'
       require 'twitter'
 
       twitter_options = options[:publisher, :twitter]

data/lib/cerberus/scm/base.rb

@@ -0,0 +1,19 @@
+module Cerberus
+  module SCM
+    class Base
+
+      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 url
+        @path
+      end
+
+    end
+  end
+end
+

data/lib/cerberus/scm/bzr.rb

@@ -0,0 +1,62 @@
+require 'cerberus/utils'
+require 'cerberus/scm/base'
+require 'time'
+
+class Cerberus::SCM::Bazaar < Cerberus::SCM::Base
+
+  def installed?
+    exec_successful? "#{@config[:bin_path]}bzr --version"
+  end
+
+  def update!
+    if test(?d, File.join(@path, '.bzr'))
+      extract_last_commit_info
+      @old_revision = @revision
+      # Revert in an attempt to avoid conflicts from local file changes
+      execute("revert", "--no-backup 2>&1")
+      @status = execute("update", "2>&1")
+    else
+      @old_revision = 0
+      FileUtils.rm_rf(@path) if test(?d, @path)
+      @status = execute("checkout", nil, @config[:scm, :url])
+    end
+    extract_last_commit_info
+  end
+
+  def has_changes?
+    @revision.to_i > @old_revision.to_i
+  end
+
+  def current_revision
+    @revision
+  end
+
+  def last_commit_message
+    @message
+  end
+
+  def last_author
+    @author
+  end
+
+  private
+  def execute(command, parameters = nil, pre_parameters = nil)
+    `#{@config[:bin_path]}bzr #{command} #{pre_parameters} #{@encoded_path} #{parameters}`
+  end
+
+  def extract_last_commit_info
+    lastlog = execute("log", "-r-1")
+    # ------------------------------------------------------------
+    # revno: 2222
+    # committer: Paul Hinze <phinze@vpr0304>
+    # branch nick: my-trunk
+    # timestamp: Tue 2009-04-21 18:52:54 -0500
+    # message:
+    #   sidfugsdiufgsdifusdg
+ 
+    @revision = lastlog.match(/^revno: (\d+)$/)[1].to_i
+    @author   = lastlog.match(/^committer: (.+)$/)[1]
+    @date     = Time.parse(lastlog.match(/^timestamp: (.+)$/)[1])
+    @message  = lastlog.match(/message:\n  (.*)/m)[1]
+  end
+end

data/lib/cerberus/scm/cvs.rb

@@ -1,12 +1,7 @@
 require 'cerberus/utils'
+require 'cerberus/scm/base'
 
-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
+class Cerberus::SCM::CVS < Cerberus::SCM::Base
 
   def installed?
     exec_successful? "#{@config[:bin_path]}cvs --version"

data/lib/cerberus/scm/darcs.rb

@@ -1,12 +1,7 @@
 require 'cerberus/utils'
+require 'cerberus/scm/base'
 
-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
+class Cerberus::SCM::Darcs < Cerberus::SCM::Base
 
   def installed?
     exec_successful? "#{@config[:bin_path]}darcs --version"
@@ -37,10 +32,6 @@ class Cerberus::SCM::Darcs
     @date
   end
 
-  def url
-    @path
-  end
-
   def last_commit_message
     @message
   end