cerberus 0.4.1 → 0.4.2

data/CHANGES

@@ -1,5 +1,11 @@
 = Cerberus Changelog
 
+== Version 0.4.2
+RSpec builder bugfixes
+
+* Fixed bugs with rspec builder not giving correct error count
+* Extracted rspec-specific code to the rspec builder
+
 == Version 0.4.1
 Minor bugfixes
 

data/Rakefile

@@ -158,7 +158,7 @@ task :www => :webgen
   end
 
 task :publish_site => :webgen do
-  sh %{scp -r -q doc/site/output/* #{RUBYFORGE_USER}@rubyforge.org:/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/}
+  sh %{scp -r -q doc/site/out/* #{RUBYFORGE_USER}@rubyforge.org:/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/}
 end
 
 task :release => [:release_files, :publish_news, :publish_site]

data/lib/cerberus/builder/rspec.rb

@@ -5,9 +5,23 @@ class Cerberus::Builder::RSpec < Cerberus::Builder::RubyBase
     super(config, "rspec", "spec")
   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
+      `#{@config[:bin_path]}rake #{choose_exec()} 2>&1`
+    end
+    successful?
+  end
+
   def brokeness
-    if @output =~ /\d+ examples, (\d+) failures/
+    if @output =~ /\d+ examples, (\d+) failures?/
       $1.to_i
     end
   end
+
+  def successful?
+    $?.exitstatus == 0 and not @output.include?("#{@cmd} aborted!") and @output.include?("0 failures")
+  end
 end

data/lib/cerberus/builder/ruby_base.rb

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

data/lib/cerberus/constants.rb

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

data/lib/cerberus/publisher/rss.rb

@@ -1,4 +1,6 @@
 require 'cerberus/publisher/base'
+require 'time'
+require 'builder'
 
 class Cerberus::Publisher::RSS < Cerberus::Publisher::Base
   def self.publish(state, manager, options)

data/test/mock/manager.rb

@@ -8,4 +8,28 @@ class DummyManager
     @scm = DummyScm.new(last_commit_message, current_revision, last_author)
     @builder = DummyBuilder.new(output)
   end
-end
+end
+
+class DummyStatus
+  attr_reader :previous_brokeness, :current_brokeness
+
+  def initialize(param)
+    @hash = param
+    @current_build_sucessful = @hash['state']
+    @previous_build_successful = @hash['previous_build'] || false
+    @previous_brokeness = @hash['previous_brokeness'] || ''
+    @current_brokeness = @hash['current_brokeness'] || ''
+  end
+
+  def current_state
+    if @current_build_successful
+      if @previous_build_sucessful.nil?
+        :setup
+      else
+        @previous_build_successful ? :successful : :revival
+      end
+    else
+      @previous_build_successful ? :failed : :broken
+    end
+  end
+end

data/test/rspec_builder_test.rb

@@ -0,0 +1,100 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+require 'cerberus/builder/rspec'
+require 'tmpdir'
+
+class Cerberus::Builder::RSpec
+ attr_writer :output
+end
+
+class RSpecBuilderTest < Test::Unit::TestCase
+ def test_builder
+   tmp = Dir::tmpdir
+   builder = Cerberus::Builder::RSpec.new(:application_root => tmp)
+
+   builder.output = RSPEC_TEST_OK_OUTPUT
+   assert builder.successful?
+
+   builder.output = RSPEC_TEST_OK_OUTPUT_WITH_PENDING
+   assert builder.successful?
+
+   builder.output = RSPEC_TEST_ERROR_OUTPUT
+   assert !builder.successful?
+   assert_equal 1, builder.brokeness
+
+   builder.output = RSPEC_TEST_ERROR_OUTPUT_WITH_PENDING
+   assert !builder.successful?
+   assert_equal 1, builder.brokeness
+ end
+end
+
+RSPEC_TEST_OK_OUTPUT =<<-END
+/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby /Library/Ruby/Gems/1.8/gems/rspec-1.1.12/bin/spec spec/views/clients/show.html.erb_spec.rb spec/models/role_spec.rb spec/models/dashboard_spec.rb spec/models/client_spec.rb spec/helpers/admin/users_helper_spec.rb spec/controllers/sessions_controller_spec.rb spec/models/query_dates_spec.rb spec/helpers/heatmaps_helper_spec.rb spec/helpers/passwords_helper_spec.rb spec/controllers/admin/reports_controller_spec.rb spec/models/role_assignment_spec.rb spec/models/default_role_spec.rb spec/controllers/sites_controller_spec.rb spec/controllers/dashboards_controller_spec.rb spec/models/widget_instance_spec.rb spec/models/widget_spec.rb spec/controllers/admin/roles_controller_spec.rb spec/models/user_spec.rb spec/models/right_spec.rb spec/views/clients/new.html.erb_spec.rb spec/helpers/reports_helper_spec.rb spec/controllers/reports_controller_spec.rb spec/models/site_spec.rb spec/helpers/admin/rights_helper_spec.rb spec/models/data_warehouse_spec.rb spec/helpers/users_helper_spec.rb spec/helpers/clients_helper_spec.rb spec/helpers/admin/roles_helper_spec.rb spec/views/clients/index.html.erb_spec.rb spec/controllers/users_controller_spec.rb spec/controllers/clients_routing_spec.rb spec/controllers/clients_controller_spec.rb spec/controllers/admin/users_controller_spec.rb spec/controllers/access_control_spec.rb spec/models/query_cache_key_spec.rb spec/views/clients/edit.html.erb_spec.rb spec/controllers/passwords_controller_spec.rb spec/controllers/authenticated_system_spec.rb spec/helpers/application_helper_spec.rb spec/models/report_spec.rb spec/models/query_spec.rb spec/helpers/admin/reports_helper_spec.rb spec/controllers/queries_controller_spec.rb spec/controllers/application_controller_spec.rb spec/models/excel_export_spec.rb spec/controllers/admin/rights_controller_spec.rb -O spec/spec.opts 
+..............................................................................................................................................................................................................................................*....*..................................................................................................................................................................................................................*.................................................................................................................*..*....*.................................................................................................................................................................................................
+
+Pending:
+
+SessionsController logout_keeping_session! forgets me (Not Yet Implemented)
+/src/parkassist/paseweb/vendor/gems/rspec-rails-1.1.12/lib/spec/rails/example/controller_example_group.rb:109:in `initialize'
+
+SessionsController logout_killing_session! forgets me (Not Yet Implemented)
+/src/parkassist/paseweb/vendor/gems/rspec-rails-1.1.12/lib/spec/rails/example/controller_example_group.rb:109:in `initialize'
+
+Report query_data should return a hash of all queries via :dom_id => :data (TODO)
+./spec/models/report_spec.rb:109
+
+ReportsController GET show xls format request should return an excel spreadsheet (TODO)
+./spec/controllers/reports_controller_spec.rb:56
+
+ReportsController GET show should query the DataWarehouse (TODO)
+./spec/controllers/reports_controller_spec.rb:39
+
+DashboardsController it should save user-customized layout should check access before saving (TODO)
+./spec/controllers/dashboards_controller_spec.rb:280
+
+Finished in 41.688393 seconds
+
+770 examples, 0 failures, 6 pending
+END
+
+RSPEC_TEST_OK_OUTPUT_WITH_PENDING =<<-END
+/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby /Library/Ruby/Gems/1.8/gems/rspec-1.1.12/bin/spec spec/views/clients/show.html.erb_spec.rb spec/models/role_spec.rb spec/models/dashboard_spec.rb spec/models/client_spec.rb spec/helpers/admin/users_helper_spec.rb spec/controllers/sessions_controller_spec.rb spec/models/query_dates_spec.rb spec/helpers/heatmaps_helper_spec.rb spec/helpers/passwords_helper_spec.rb spec/controllers/admin/reports_controller_spec.rb spec/models/role_assignment_spec.rb spec/models/default_role_spec.rb spec/controllers/sites_controller_spec.rb spec/controllers/dashboards_controller_spec.rb spec/models/widget_instance_spec.rb spec/models/widget_spec.rb spec/controllers/admin/roles_controller_spec.rb spec/models/user_spec.rb spec/models/right_spec.rb spec/views/clients/new.html.erb_spec.rb spec/helpers/reports_helper_spec.rb spec/controllers/reports_controller_spec.rb spec/models/site_spec.rb spec/helpers/admin/rights_helper_spec.rb spec/models/data_warehouse_spec.rb spec/helpers/users_helper_spec.rb spec/helpers/clients_helper_spec.rb spec/helpers/admin/roles_helper_spec.rb spec/views/clients/index.html.erb_spec.rb spec/controllers/users_controller_spec.rb spec/controllers/clients_routing_spec.rb spec/controllers/clients_controller_spec.rb spec/controllers/admin/users_controller_spec.rb spec/controllers/access_control_spec.rb spec/models/query_cache_key_spec.rb spec/views/clients/edit.html.erb_spec.rb spec/controllers/passwords_controller_spec.rb spec/controllers/authenticated_system_spec.rb spec/helpers/application_helper_spec.rb spec/models/report_spec.rb spec/models/query_spec.rb spec/helpers/admin/reports_helper_spec.rb spec/controllers/queries_controller_spec.rb spec/controllers/application_controller_spec.rb spec/models/excel_export_spec.rb spec/controllers/admin/rights_controller_spec.rb -O spec/spec.opts 
+............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
+
+Finished in 23.895298 seconds
+
+764 examples, 0 failures
+END
+
+RSPEC_TEST_ERROR_OUTPUT =<<-END
+/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby /Library/Ruby/Gems/1.8/gems/rspec-1.1.12/bin/spec spec/models/site_spec.rb -O spec/spec.opts 
+...........F...
+
+1)
+'Site being created increments Site#count' FAILED
+count should not have changed, but did change from 1 to 2
+./spec/models/site_spec.rb:21:
+
+Finished in 0.433946 seconds
+
+15 examples, 1 failure
+END
+
+RSPEC_TEST_ERROR_OUTPUT_WITH_PENDING =<<-END
+/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby /Library/Ruby/Gems/1.8/gems/rspec-1.1.12/bin/spec spec/models/site_spec.rb -O spec/spec.opts 
+...........F..*
+
+Pending:
+
+Site should respond to :client (TODO)
+./spec/models/site_spec.rb:31
+
+1)
+'Site being created increments Site#count' FAILED
+count should not have changed, but did change from 1 to 2
+./spec/models/site_spec.rb:21:
+
+Finished in 0.245002 seconds
+
+15 examples, 1 failure, 1 pending
+END

data/test/rss_publisher_test.rb

@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/test_helper'
 require 'cerberus/publisher/rss'
 require 'mock/manager'
 require 'tempfile'
+require 'rexml/document'
 
 class RSSPublisherTest < Test::Unit::TestCase
   def test_publisher

data/test/test_helper.rb

@@ -5,6 +5,7 @@ require 'test/unit'
 require 'fileutils'
 
 require 'cerberus/utils'
+require 'mock/manager'
 
 class Test::Unit::TestCase
   TEMP_DIR = File.expand_path(File.dirname(__FILE__)) + '/__workdir'
@@ -110,7 +111,7 @@ end"
   end
 
   def build_status(successful)
-    Cerberus::Status.new('state' => successful)
+    DummyStatus.new('state' => successful)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cerberus
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Anatol Pomozov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-06 00:00:00 -08:00
+date: 2009-01-26 00:00:00 -05:00
 default_executable: cerberus
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,61 +93,62 @@ extra_rdoc_files: []
 files: 
 - bin/cerberus
 - lib/cerberus
-- lib/cerberus/config.example.yml
+- 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/config_migration.rb
+- lib/cerberus/constants.rb
+- lib/cerberus/latch.rb
+- lib/cerberus/manager.rb
 - lib/cerberus/publisher
-- lib/cerberus/publisher/mail.rb
+- 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/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/svn.rb
 - lib/cerberus/scm/perforce.rb
-- lib/cerberus/scm/darcs.rb
-- lib/cerberus/scm/cvs.rb
-- lib/cerberus/latch.rb
+- lib/cerberus/scm/svn.rb
 - lib/cerberus/utils.rb
-- lib/cerberus/constants.rb
-- lib/cerberus/manager.rb
-- lib/cerberus/cli.rb
-- test/integration_test.rb
-- test/config_test.rb
-- test/rss_publisher_test.rb
-- test/perforce_scm_test.rb
-- test/jabber_publisher_test.rb
-- test/test_helper.rb
-- test/twitter_publisher_test.rb
 - test/bjam_builder_test.rb
-- test/mock
-- test/mock/marshmallow.rb
-- test/mock/twitter.rb
-- test/mock/manager.rb
-- test/mock/xmpp4r.rb
-- test/mock/irc.rb
+- test/config_test.rb
 - test/data
-- test/data/subversion.dump
 - test/data/darcs.zip
 - test/data/git.zip
+- test/data/subversion.dump
 - test/functional_test.rb
-- test/maven2_builer_test.rb
-- test/mail_publisher_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/mock
+- test/mock/irc.rb
+- test/mock/manager.rb
+- test/mock/marshmallow.rb
+- test/mock/twitter.rb
+- test/mock/xmpp4r.rb
+- test/perforce_scm_test.rb
+- test/rspec_builder_test.rb
+- test/rss_publisher_test.rb
+- test/test_helper.rb
+- test/twitter_publisher_test.rb
 - LICENSE
 - README
 - CHANGES
@@ -180,14 +181,15 @@ signing_key:
 specification_version: 2
 summary: Cerberus is a Continuous Integration tool that could be easily run from Cron.
 test_files: 
-- test/integration_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/config_test.rb
 - test/functional_test.rb
-- test/maven2_builer_test.rb
-- test/mail_publisher_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/rspec_builder_test.rb
+- test/rss_publisher_test.rb
+- test/twitter_publisher_test.rb