cerberus 0.7 → 0.7.2

data/Changelog.txt

@@ -1,5 +1,20 @@
 = Cerberus Changelog
 
+== Version 0.7.2
+Bugfixes and updates to RSS publisher
+
+* Fix mercurial builder to properly read revision number of merged commits
+* Updated RSS publisher to output a properly formatted RSS feed with the
+ability to keep a certain number of previous builds in the feed.  For more 
+info on the changes please see the commit message on the following commit:
+http://github.com/cpjolicoeur/cerberus/commit/1f7176a6a611f30a0d70e0f75ec90724f6302043
+
+== Version 0.7.1
+New configuration options for publisher
+
+* added "extra_subject" publisher option
+* added Mercurial SCM support
+
 == Version 0.7
 New config options, Bazaar SCM support, removed GMailer bugfixes
 
@@ -8,8 +23,7 @@ New config options, Bazaar SCM support, removed GMailer bugfixes
 * 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
+* 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

@@ -13,4 +13,5 @@ Niklas Koponen
 Mike Gunderloy
 Joe Van Dyk
 Andrew Timberlake
-Paul Hinze
+Paul Hinze
+McClain Looney

data/Rakefile

@@ -3,6 +3,7 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
+require 'rake/clean'
 
 require './lib/cerberus/constants'
 
@@ -25,6 +26,7 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
+CLEAN.include %w(**/*~)
 desc "Clean all generated files"
 task :clean => :clobber_package do
   root = File.dirname(__FILE__)

data/Readme.markdown

@@ -87,6 +87,7 @@ Cerberus currently supports the following SCM tools:
   * Perforce
   * CVS
   * Bazaar
+  * Mercurial
 
 Cerberus currently supports the following notification systems: 
 
@@ -126,7 +127,7 @@ is included in the License.txt file.
 
 
 [1]:http://www.martinfowler.com/articles/continuousIntegration.html
-[2]:http://wiki.github.com/cpjolicoeur/cerberusci
+[2]:http://wiki.github.com/cpjolicoeur/cerberus
 [3]:http://groups.google.com/group/cerberusci
 [4]:http://cpjolicoeur.lighthouseapp.com/projects/22299-cerberus
 [5]:http://rubyforge.org/frs/?group_id=1794

data/lib/cerberus/component_lazy_loader.rb

@@ -6,7 +6,8 @@ module Cerberus
       :perforce => 'Perforce',
       :cvs => 'CVS',
       :bzr => 'Bazaar',
-      :git => 'Git'
+      :git => 'Git',
+      :hg => 'Mercurial'
     }
 
     def self.get(type)
@@ -30,6 +31,8 @@ module Cerberus
           'bzr'          
         when test(?d, path+'/.git')
           'git'          
+        when test(?d, path+'/.hg')
+          'hg'          
         end
       else
         #guess SCM type by its url

data/lib/cerberus/config.example.yml

@@ -23,6 +23,9 @@ publisher:
 #    url: http://someemail:password@cerberustool.campfirenow.com/room/51660
 #  rss:
 #    file: /usr/www/rss.xml
+#    channel_link: http://example.com/rss.xml
+#    keep: 1
+#  extra_subject: "#deployment #tags"
 #builder:
 #  rake:
 #    task: migrate test

data/lib/cerberus/constants.rb

@@ -4,5 +4,5 @@ module Cerberus
 
   LOCK_WAIT = 30 * 60 # 30 minutes
 
-  VERSION = '0.7'
+  VERSION = '0.7.2'
 end

data/lib/cerberus/manager.rb

@@ -55,7 +55,7 @@ module Cerberus
     
     def initialize(application_name, cli_options = {})
       unless File.exists?("#{HOME}/config/#{application_name}.yml")
-        say "Project '#{application_name}' does not present in Cerberus. Type 'cerberus list' to see the list of all active projects."
+        say "Project '#{application_name}' does not exist in Cerberus. Type 'cerberus list' to see the list of all active projects."
       end
       @app_root = "#{HOME}/work/#{application_name}"
       
@@ -88,7 +88,7 @@ module Cerberus
     
     def initialize(application_name, cli_options = {})
       unless File.exists?("#{HOME}/config/#{application_name}.yml")
-        say "Project '#{application_name}' does not present in Cerberus. Type 'cerberus list' to see the list of all active projects."
+        say "Project '#{application_name}' does not exist in Cerberus. Type 'cerberus list' to see the list of all active projects."
       end
       
       app_root = "#{HOME}/work/#{application_name}"
@@ -141,7 +141,6 @@ module Cerberus
               Publisher.get(pub, publisher_config).publish(@status, self, @config) if events.include?(@status.current_state)
             end
             
-            
             #Process hooks
             hooks = @config[:hook]
             hooks.each_pair{|name, hook|

data/lib/cerberus/publisher/base.rb

@@ -32,7 +32,7 @@ module Cerberus
           raise "Unknown build state '#{state.current_state.to_s}'"
         end
 
-        subject = "[#{options[:application_name]}] #{subject}"
+        subject = "[#{options[:application_name]}]#{options[:publisher, :extra_subject]} #{subject}"
         generated_by = "--\nThis email generated by Cerberus tool ver. #{Cerberus::VERSION}, http://cerberus.rubyforge.org/"
         body = [ manager.scm.last_commit_message ]
         if options[:changeset_url]

data/lib/cerberus/publisher/rss.rb

@@ -1,29 +1,41 @@
 require 'cerberus/publisher/base'
 require 'time'
 require 'builder'
+require 'rss'
 
 class Cerberus::Publisher::RSS < Cerberus::Publisher::Base
   def self.publish(state, manager, options)
     config = options[:publisher, :rss]
     subject,body = Cerberus::Publisher::Base.formatted_message(state, manager, options)
 
-    pub_date = Time.now.iso8601
-    description = "<pre>#{body}</pre>".to_xs
-    result = <<-END
-<rss version="2.0">
-  <channel>
-    <title>Cerberus build feed for #{options[:application_name].to_xs}</title>
-    <pubDate>#{pub_date}</pubDate>
-    <generator>http://rubyforge.org/projects/cerberus</generator>
-    <item>
-      <title>#{subject.to_xs}</title>
-      <pubDate>#{pub_date}</pubDate>
-      <description>#{description}</description>
-    </item>
-  </channel>
-</rss>
-    END
+    pub_date = Time.now
 
-    IO.write(config[:file], result)
+    begin
+      feed = RSS::Parser.parse(File.read(config[:file]), false)
+      raise RSS::Error unless feed
+      keep = config[:keep] || 1
+      feed.items.slice!(keep -1 ..-1)  # one less than keep value, to make room for the new build
+    rescue RSS::Error, Errno::ENOENT
+      # if there's no existing file or we can't parse it, start a new one from scratch
+      feed = RSS::Maker.make("2.0") do |new_rss|
+        new_rss.channel.title = "#{options[:application_name].to_xs} build status"
+        new_rss.channel.description = "Cerberus build feed for #{options[:application_name].to_xs}"
+        new_rss.channel.generator = "http://rubyforge.org/projects/cerberus"
+        new_rss.channel.link = config[:channel_link] || "file://#{config[:file]}"
+      end
+    end
+
+    # update channel link if we have it explicitly set, otherwise retain existing value
+    feed.channel.link = config[:channel_link] unless config[:channel_link].nil?
+    feed.channel.pubDate = pub_date
+
+    new_item = RSS::Rss::Channel::Item.new()
+    new_item.title = subject
+    new_item.pubDate = pub_date
+    new_item.description = "<pre>#{body}</pre>"
+
+    feed.items.unshift new_item
+
+    IO.write(config[:file], feed)
   end
 end

data/lib/cerberus/scm/bzr.rb

@@ -54,7 +54,7 @@ class Cerberus::SCM::Bazaar < Cerberus::SCM::Base
     # message:
     #   sidfugsdiufgsdifusdg
  
-    @revision = lastlog.match(/^revno: (\d+)$/)[1].to_i
+    @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]

data/lib/cerberus/scm/hg.rb

@@ -0,0 +1,87 @@
+require 'cerberus/utils'
+require 'cerberus/scm/base'
+
+class Cerberus::SCM::Mercurial < Cerberus::SCM::Base
+  
+  def installed?
+    exec_successful? "#{@config[:bin_path]}hg --version"
+  end
+
+  def update!
+    @new =false
+    if test( ?d, File.join( @path,'.hg' ) )
+      r = get_localrev
+      get_updates
+      r_new = get_localrev
+      @has_changes = r_new !=r
+    else
+      FileUtils.rm_rf(@path) if test(?d, @path)
+      encoded_url = (@config[:scm, :url].include?(' ') ? "\"#{@config[:scm, :url]}\"" : @config[:scm, :url])
+      @new = true
+      @has_changes = true
+      @status = execute("clone", "#{encoded_url} #{@path}", false)
+      if branch = @config[:scm, :branch]
+        execute('update', "-C #{branch}")
+      end
+    end
+    extract_commit_info if @has_changes
+  end
+
+  def has_changes?
+    @has_changes
+  end
+
+
+  def new?
+    @new
+  end
+
+  def current_revision
+    @revision
+  end
+
+  def last_commit_message
+    @message
+  end
+
+  def last_author
+    @author
+  end
+
+  def output
+    @status
+  end
+
+  private
+  def get_localrev
+    execute("id", '-i').strip
+  end
+  
+  def get_updates
+    execute("pull", '-u')
+  end
+
+  def remote_head
+    branch = @config[:scm, :branch]  || 'default'
+  end
+
+  def execute(command, parameters = nil, with_path = true)
+   if with_path
+     cmd = "cd #{@config[:application_root]} && #{@config[:bin_path]}hg #{command} #{parameters}"
+   else
+     cmd = "#{@config[:bin_path]}hg #{command} #{parameters}"
+   end
+   `#{cmd}`
+  end
+
+  def extract_commit_info( branch='default' )
+    message =  execute("log", "-b #{ branch } -r tip --template '{author}|{date|shortdate}|{node}|{desc}'").split("|")
+    m= { :author => message.shift, :date => message.shift, :revision => message.shift, :message => message.shift }
+    @message = m[:message]
+    @author = m[:author]
+    @date = m[:date]
+    @revision = m[:revision]
+    m
+  end
+
+end

data/test/functional_test.rb

@@ -330,6 +330,70 @@ class FunctionalTest < Test::Unit::TestCase
     build.run
     assert_equal false, build.scm.has_changes?
   end
+  
+  def test_mercurial
+    add_application('hgapp', HG_URL, :scm => {:type => 'hg'})
+
+    build = Cerberus::BuildCommand.new('hgapp')
+    build.run
+    assert build.scm.has_changes?
+    assert_equal 1, ActionMailer::Base.deliveries.size #first email that project was setup
+    mail = ActionMailer::Base.deliveries[0]
+    output = mail.body
+
+    #Check output that run needed tasks
+    assert_match /1 tests, 1 assertions, 0 failures, 0 errors/, output
+    assert output !~ /Task 'custom1' has been invoked/
+    assert_match  /\[hgapp\] Cerberus set up for project/, mail.subject
+    
+    status_file = HOME + '/work/hgapp/status.log'
+    assert File.exists?(status_file)
+    assert build_successful?(status_file)
+    assert 1, Dir[HOME + "/work/hgapp/logs/*.log"].size
+    
+    #There were no changes - no reaction should be
+    build = Cerberus::BuildCommand.new('hgapp')
+    build.run
+    assert_equal false, build.scm.has_changes?
+    assert_equal 1, ActionMailer::Base.deliveries.size #first email that project was setup
+    assert 1, Dir[HOME + "/work/hgapp/logs/*.log"].size
+    
+    #now we add new broken test
+    rand_val = rand(10000)
+    test_case_name = "test/#{rand_val}_test.rb"
+    File.open(HG_REPO + '/' + test_case_name, 'w') { |f|
+      f << %Q( require 'test/unit'
+        class A#{rand_val}Test < Test::Unit::TestCase
+          def test_ok
+            assert false
+          end
+        end )
+    }
+    
+    curr_dir = Dir.pwd
+    Dir.chdir HG_REPO
+    `hg add #{test_case_name}`
+    `hg commit -m 'somepatch'`
+    Dir.chdir curr_dir
+    
+    build = Cerberus::BuildCommand.new('hgapp')
+    build.run
+    assert build.scm.has_changes?
+    assert_equal 2, ActionMailer::Base.deliveries.size #first email that project was setup plus new alert email
+    assert 2, Dir[HOME + "/work/hgapp/logs/*.log"].size
+    
+    build = Cerberus::BuildCommand.new('hgapp')
+    build.run
+    assert_equal false, build.scm.has_changes?
+    assert_equal 2, ActionMailer::Base.deliveries.size #first email that project was setup
+    assert 2, Dir[HOME + "/work/hgapp/logs/*.log"].size
+    
+    #Now we broke remote repository (imitate that network unaccessable)
+    FileUtils.rm_rf HG_REPO
+    build = Cerberus::BuildCommand.new('hgapp')
+    build.run
+    assert_equal false, build.scm.has_changes?
+  end
 
   def test_campfire_publisher
     # there were not any messages causing login/password is incorrect. We just check that there was no any exceptions

data/test/integration_test.rb

@@ -11,7 +11,7 @@ class IntegrationTest < Test::Unit::TestCase
     FileUtils.rm_rf HOME
   end
 
-  def test_add_project_as_url
+  def test_add_project_as_url_subversion
     output = run_cerb("  add   #{SVN_URL}  ")
     assert_match /has been added to Cerberus successfully/, output
     assert File.exists?(HOME + '/config/svn_repo.yml')
@@ -31,8 +31,13 @@ class IntegrationTest < Test::Unit::TestCase
   end
 
   def test_status_command
-    # FIXME: add real tests
-    assert true
+    run_cerb("  add   #{SVN_URL}  APPLICATION_NAME=mamba ")
+    output = run_cerb(" status ")
+    assert_match /Project Name/, output
+    assert_match /Revision/, output
+    assert_match /Status/, output
+    assert_match /mamba/, output
+    assert_match /(Pass|Fail)/, output
   end
 
   def test_add_project_with_parameters
@@ -80,7 +85,7 @@ class IntegrationTest < Test::Unit::TestCase
 
   def test_run_unexist_project
     output = run_cerb("build some_project")
-    assert_match /Project 'some_project' does not present in Cerberus/, output
+    assert_match /Project 'some_project' does not exist in Cerberus/, output
     assert !test(?d, HOME + '/work/some_project')
   end
 
@@ -104,7 +109,7 @@ class IntegrationTest < Test::Unit::TestCase
 
   def test_hook
     some_number = rand(100000)
-    tmp_file = File.join(TEMP_DIR, 'some_number')
+    tmp_file = File.join(TEMP_DIR, '/some_number')
     config_file = HOME + '/config/hooks.yml'
 
     add_application('hooks', SVN_URL, 'quiet' => true)
@@ -113,7 +118,7 @@ class IntegrationTest < Test::Unit::TestCase
     cfg['hook'] = {'echo' => {'action' => "echo #{some_number} > #{tmp_file}"}}
     dump_yml(config_file, cfg)
 
-    File.rm_f tmp_file
+    # File.rm_f tmp_file
     run_cerb("build hooks")
     assert_equal some_number.to_s, IO.read(tmp_file).strip
     File.rm_f tmp_file

data/test/mail_publisher_test.rb

@@ -11,7 +11,8 @@ class MailPublisherTest < Test::Unit::TestCase
 
   def test_publisher
     options = Cerberus::Config.new(nil, :publisher => {
-       :mail => {:recipients => 'anatol.pomozov@hello.com', :sender => "cerberus@example.com", :delivery_method => 'test'}}, 
+       :mail => {:recipients => 'anatol.pomozov@hello.com', :sender => "cerberus@example.com", :delivery_method => 'test'},
+       :extra_subject => "[#deployment]"}, 
        :application_name => 'MyApp')
     build = DummyManager.new('last message', 'this is output', 1232, 'anatol')
 
@@ -21,6 +22,6 @@ class MailPublisherTest < Test::Unit::TestCase
     assert_equal 1, mails.size
     mail = mails[0]
     assert_equal 'cerberus@example.com', mail.from_addrs[0].address
-    assert_equal '[MyApp] Cerberus set up for project (1232)', mail.subject
+    assert_equal '[MyApp][#deployment] Cerberus set up for project (1232)', mail.subject
   end
 end

data/test/test_helper.rb

@@ -21,6 +21,9 @@ class Test::Unit::TestCase
 
   GIT_REPO = TEMP_DIR + '/git_repo'
   GIT_URL = 'file:///' + GIT_REPO.gsub(/\\/,'/').gsub(/^\//,'').gsub(' ', '%20')
+  
+  HG_REPO = TEMP_DIR + '/hg_repo'
+  HG_URL  = 'file:///' + HG_REPO.gsub(/\\/, '/').gsub(/^\//, '').gsub(' ', '%20')
 
   def self.refresh_repos
     # setup base subversion repos
@@ -50,6 +53,16 @@ class Test::Unit::TestCase
         zf.extract(e, fpath)
       }
     }
+    
+    # setup base hg repos
+    FileUtils.mkpath HG_REPO
+    Zip::ZipFile::open("#{File.dirname(__FILE__)}/data/mercurial.zip") { |zf|
+      zf.each { |e|
+        fpath = File.join(HG_REPO, e.name)
+        FileUtils.mkdir_p(File.dirname(fpath))
+        zf.extract(e, fpath)
+      }
+    }
   end
 
   refresh_repos

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cerberus
 version: !ruby/object:Gem::Version 
-  version: "0.7"
+  version: 0.7.2
 platform: ruby
 authors: 
 - Craig P Jolicoeur
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-05 00:00:00 -04:00
+date: 2010-03-20 00:00:00 -04:00
 default_executable: cerberus
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,6 +81,7 @@ files:
 - lib/cerberus/scm/cvs.rb
 - lib/cerberus/scm/darcs.rb
 - lib/cerberus/scm/git.rb
+- lib/cerberus/scm/hg.rb
 - lib/cerberus/scm/perforce.rb
 - lib/cerberus/scm/svn.rb
 - lib/cerberus/utils.rb
@@ -346,6 +347,7 @@ files:
 - test/cron_string_test.rb
 - test/data/darcs.zip
 - test/data/git.zip
+- test/data/mercurial.zip
 - test/data/subversion.dump
 - test/functional_test.rb
 - test/integration_test.rb
@@ -394,7 +396,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cerberus
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Cerberus is a Continuous Integration tool that could be easily run from Cron.