cerberus 0.4.0 → 0.4.1

data/CHANGES

@@ -1,5 +1,11 @@
 = Cerberus Changelog
 
+== Version 0.4.1
+Minor bugfixes
+
+* Fixed potential Git version issue when updating repository
+* Fixed problem with rspec builder always returning false even when build was successful
+
 == Version 0.4.0
 Git, Twitter support
 

data/Rakefile

@@ -146,14 +146,16 @@ task :publish_news do
   end
 end
 
-# if require 'webgen/rake/webgentask'
-# 
-#   Webgen::Rake::WebgenTask.new do |t|
-#     t.directory = File.join( File.dirname( __FILE__ ), 'doc/site')
-#     t.clobber_outdir = true
-#   end
-# 
-# end
+
+
+require 'webgen/webgentask'
+
+task :www => :webgen
+
+  Webgen::WebgenTask.new do |t|
+    t.directory = File.join( File.dirname( __FILE__ ), 'doc/site')
+    t.clobber_outdir = true
+  end
 
 task :publish_site => :webgen do
   sh %{scp -r -q doc/site/output/* #{RUBYFORGE_USER}@rubyforge.org:/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/}

data/lib/cerberus/builder/ruby_base.rb

@@ -16,12 +16,22 @@ class Cerberus::Builder::RubyBase
   end
 
   def successful?
-    $?.exitstatus == 0 and not @output.include?("#{@cmd} aborted!") and @output.include?("0 failures, 0 errors")
+    if @output.include?("errors")
+      $?.exitstatus == 0 and not @output.include?("#{@cmd} aborted!") and @output.include?("0 failures, 0 errors")
+    else
+      $?.exitstatus == 0 and not @output.include?("#{@cmd} aborted!") and @output.include?("0 failures")
+    end
   end
 
   def brokeness
-    if @output =~ /\d+ tests, \d+ assertions, (\d+) failures, (\d+) errors/
-      $1.to_i + $2.to_i
+    if @output.include?("errors")
+      if @output =~ /\d+ tests, \d+ assertions, (\d+) failures, (\d+) errors/
+        return $1.to_i + $2.to_i
+      end
+    else
+      if @output =~ /\d+ examples, (\d+) failures, 1 pending/
+        return $1.to_i
+      end
     end
   end
 

data/lib/cerberus/constants.rb

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

data/lib/cerberus/scm/git.rb

@@ -16,7 +16,7 @@ class Cerberus::SCM::Git
     if test(?d, @path + '/.git')
       extract_last_commit_info
       #@status = execute('pull', '')
-      @status = execute('fetch') + execute("reset", "--hard #{@revision}")
+      @status = execute("reset", "--hard #{@revision}") + execute('pull')
     else
       FileUtils.rm_rf(@path) if test(?d, @path)
       encoded_url = (@config[:scm, :url].include?(' ') ? "\"#{@config[:scm, :url]}\"" : @config[:scm, :url])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cerberus
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Anatol Pomozov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-29 00:00:00 -08:00
+date: 2009-01-06 00:00:00 -08:00
 default_executable: cerberus
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,61 +93,61 @@ extra_rdoc_files: []
 files: 
 - bin/cerberus
 - lib/cerberus
-- lib/cerberus/builder
-- lib/cerberus/builder/base.rb
-- lib/cerberus/builder/bjam.rb
-- lib/cerberus/builder/maven2.rb
-- lib/cerberus/builder/rake.rb
-- lib/cerberus/builder/rant.rb
-- lib/cerberus/builder/rspec.rb
-- lib/cerberus/builder/ruby_base.rb
-- lib/cerberus/cli.rb
-- lib/cerberus/component_lazy_loader.rb
 - lib/cerberus/config.example.yml
-- lib/cerberus/config.rb
+- lib/cerberus/component_lazy_loader.rb
 - lib/cerberus/config_migration.rb
-- lib/cerberus/constants.rb
-- lib/cerberus/latch.rb
-- lib/cerberus/manager.rb
 - lib/cerberus/publisher
-- lib/cerberus/publisher/base.rb
-- lib/cerberus/publisher/campfire.rb
-- lib/cerberus/publisher/gmailer.rb
-- lib/cerberus/publisher/irc.rb
-- lib/cerberus/publisher/jabber.rb
 - lib/cerberus/publisher/mail.rb
+- lib/cerberus/publisher/gmailer.rb
 - lib/cerberus/publisher/netsmtp_tls_fix.rb
+- lib/cerberus/publisher/campfire.rb
 - lib/cerberus/publisher/rss.rb
+- lib/cerberus/publisher/base.rb
 - lib/cerberus/publisher/twitter.rb
+- lib/cerberus/publisher/irc.rb
+- lib/cerberus/publisher/jabber.rb
+- lib/cerberus/builder
+- lib/cerberus/builder/ruby_base.rb
+- lib/cerberus/builder/rspec.rb
+- lib/cerberus/builder/bjam.rb
+- lib/cerberus/builder/rant.rb
+- lib/cerberus/builder/base.rb
+- lib/cerberus/builder/maven2.rb
+- lib/cerberus/builder/rake.rb
+- lib/cerberus/config.rb
 - lib/cerberus/scm
-- lib/cerberus/scm/cvs.rb
-- lib/cerberus/scm/darcs.rb
 - lib/cerberus/scm/git.rb
-- lib/cerberus/scm/perforce.rb
 - lib/cerberus/scm/svn.rb
+- lib/cerberus/scm/perforce.rb
+- lib/cerberus/scm/darcs.rb
+- lib/cerberus/scm/cvs.rb
+- lib/cerberus/latch.rb
 - lib/cerberus/utils.rb
-- test/bjam_builder_test.rb
-- test/config_test.rb
-- test/data
-- test/data/darcs.zip
-- test/data/git.zip
-- test/data/subversion.dump
-- test/functional_test.rb
+- lib/cerberus/constants.rb
+- lib/cerberus/manager.rb
+- lib/cerberus/cli.rb
 - test/integration_test.rb
-- test/irc_publisher_test.rb
+- test/config_test.rb
+- test/rss_publisher_test.rb
+- test/perforce_scm_test.rb
 - test/jabber_publisher_test.rb
-- test/mail_publisher_test.rb
-- test/maven2_builer_test.rb
+- test/test_helper.rb
+- test/twitter_publisher_test.rb
+- test/bjam_builder_test.rb
 - test/mock
-- test/mock/irc.rb
-- test/mock/manager.rb
 - test/mock/marshmallow.rb
 - test/mock/twitter.rb
+- test/mock/manager.rb
 - test/mock/xmpp4r.rb
-- test/perforce_scm_test.rb
-- test/rss_publisher_test.rb
-- test/test_helper.rb
-- test/twitter_publisher_test.rb
+- test/mock/irc.rb
+- test/data
+- test/data/subversion.dump
+- test/data/darcs.zip
+- test/data/git.zip
+- test/functional_test.rb
+- test/maven2_builer_test.rb
+- test/mail_publisher_test.rb
+- test/irc_publisher_test.rb
 - LICENSE
 - README
 - CHANGES
@@ -175,19 +175,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cerberus
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Cerberus is a Continuous Integration tool that could be easily run from Cron.
 test_files: 
-- test/bjam_builder_test.rb
-- test/config_test.rb
-- test/functional_test.rb
 - test/integration_test.rb
-- test/irc_publisher_test.rb
-- test/jabber_publisher_test.rb
-- test/mail_publisher_test.rb
-- test/maven2_builer_test.rb
-- test/perforce_scm_test.rb
+- test/config_test.rb
 - test/rss_publisher_test.rb
+- test/perforce_scm_test.rb
+- test/jabber_publisher_test.rb
 - test/twitter_publisher_test.rb
+- test/bjam_builder_test.rb
+- test/functional_test.rb
+- test/maven2_builer_test.rb
+- test/mail_publisher_test.rb
+- test/irc_publisher_test.rb