app/controllers/builds_controller.rb app/helpers/builds_helper.rb app/views/builds/no_builds_yet.rhtml app/views/builds/show.rhtml test/functional/builds_controller_test.rb test/unit/routing_test.rb @@ -25,3 +25,4 @@ RUBY_FORGE_USER = "stellsmi" require 'tasks/rails' + Rakefile @@ -4,4 +4,14 @@ class ApplicationController < ActionController::Base # Pick a unique cookie name to distinguish our session data from others' session :session_key => '_ci_session_id' + + private + + def load_projects + Projects.load_all + end + + def find_project(projects) + projects.find {|p| p.name == params[:project] } + end end app/controllers/application.rb @@ -7,17 +7,6 @@ class ProjectsController < ApplicationController @build_states = get_build_states(@projects) end - def show - @project = find_project(load_projects) - - if params.has_key? :build - @build = @project.builds.find { |build| build.label.to_s == params[:build] } - end - @build ||= @project.last_build - - render :action => 'no_builds_yet' unless @build - end - def refresh_projects current_projects = load_projects changed_projects = [] @@ -48,14 +37,6 @@ class ProjectsController < ApplicationController private - def load_projects - Projects.load_all - end - - def find_project(projects) - projects.find {|p| p.name == params[:id] } - end - def get_build_states(projects) states = '' projects.each do |project| @@ -63,5 +44,4 @@ class ProjectsController < ApplicationController end states end - end \ No newline at end of file app/controllers/projects_controller.rb @@ -40,5 +40,11 @@ module ApplicationHelper def link_to_documentation(text = 'Documentation') '<a href="http://cruisecontrolrb.rubyforge.org">' + h(text) + '</a>' end + + def link_to_build(project, build) + text = "#{build.label} (#{format_time(build.time, :human)})" + text += " <span class='error'>FAILED</span>" if build.failed? + link_to text, {:controller => 'builds', :action => 'show', :project => project.name, :build => build.label}, :class => build.status + end end app/helpers/application_helper.rb @@ -1,42 +1,2 @@ -def format_changeset_log(log) - log.strip -end - -def link_to_build(project, build) - text = "#{build.label} (#{format_time(build.time, :human)})" - text += " <span class='error'>FAILED</span>" if build.failed? - link_to text, {:action => 'show', :id => project.name, :build => build.label}, :class => build.status -end - -def format_build_log(log) - convert_new_lines(log.gsub(/(\d+ tests, \d+ assertions, \d+ failures, \d+ errors)/, '<div class="test-results">\1</div>')) -end - -def display_test_failures_and_errors_if_any(log) - output = String.new - - testFailures = TestFailureParser.new.get_test_failures(log) - testFailures.each {|testFailure| output << format_test_error_output(testFailure)} - - testErrors = TestErrorParser.new.get_test_errors(log) - testErrors.each {|testError| output << format_test_error_output(testError)} - - if output != String.new - output.strip - else - "None" - end -end - -def format_test_error_output(testError) - message = testError.message.gsub(/\\n/, "\n"); - - "Name: #{testError.test_name}\n" + - "Type: #{testError.type}\n" + - "Message: #{message}\n\n" + - "<span class=\"error\">#{testError.stacktrace}</span>\n\n\n" -end - -def convert_new_lines(value) - value.gsub(/\n/, "<br/>\n") +module ProjectsHelper end \ No newline at end of file app/helpers/projects_helper.rb @@ -2,6 +2,7 @@ class Build include CommandLine attr_reader :project, :label + IGNORE_ARTIFACTS = /^(\..*|build_status\..+|build.log|changeset.log)$/ def initialize(project, label) @project, @label = project, label @@ -10,6 +11,10 @@ class Build @status = Status.new(artifacts_directory) end + def publish_name + "/builds/#{@project.name}/#{label}" + end + def run build_log = artifact 'build.log' # build_command must be set before doing chdir, because there may be some relative paths @@ -22,6 +27,10 @@ class Build CruiseControl::Log.verbose? ? CruiseControl::Log.debug(e) : CruiseControl::Log.info(e.message) @status.fail! end + + def additional_artifacts + Dir.entries(artifacts_directory).find_all {|artifact| !(artifact =~ IGNORE_ARTIFACTS) } + end def status @status.to_s @@ -88,7 +97,4 @@ class Build ENV['RAILS_ENV'] = old_rails_env end end - - private - end app/models/build.rb @@ -129,6 +129,11 @@ class Project def last_build builds.last end + + def find_build(label) + # this could be optimized a lot + builds.find { |build| build.label.to_s == label } + end def last_build_status builds.empty? ? :never_built : last_build.status app/models/project.rb @@ -6,7 +6,7 @@ <div> <span class="project_name"> - <%= link_to project.name, :action => 'show', :id => project.name %> + <%= link_to project.name, :controller => 'builds', :action => 'show', :project => project.name %> </span> <span class="builder_status"><%= project.builder_state_and_activity %></span> <span class="buttons"> app/views/projects/_project.rhtml @@ -17,6 +17,12 @@ ActionController::Routing::Routes.draw do |map| # map.connect 'build', :controller => 'build', :action => "index" map.connect '', :controller => 'projects', :action => 'index' + + map.connect 'builds/:project', :controller => 'builds', :action => 'show' + map.connect 'builds/:project/:build', :controller => 'builds', :action => 'show', :build => /[^\/]+/ + map.connect 'builds/:project/:build/*artifact_path', :controller => 'builds', :action => 'artifact', :build => /[^\/]+/ + + map.connect 'projects/:action/:project', :controller => 'projects' # You can have the root of your site routed with map.root # map.root '', :controller => "builds", :action => "index" config/routes.rb @@ -1,2 +1,6 @@ desc 'Continuous build target' -task :cruise => :test \ No newline at end of file +task :cruise => ['test:units:rcov', 'test:functionals:rcov', 'test:integration'] do + out = ENV[CC_BUILD_ARTIFACTS] || 'out' + mv 'coverage/units', "#{out}/unit test coverage" + mv 'coverage/functionals', "#{out}/functional test coverage" +end \ No newline at end of file lib/tasks/cruise.rake @@ -41,41 +41,13 @@ class ProjectsControllerTest < Test::Unit::TestCase assert_equal @projects, assigns(:projects) end - def test_show_with_build - @sandbox.new :file => "two/build-24/build_status.pingpong" - @sandbox.new :file => "two/build-25/build_status.pingpong" - - get :show, :id => 'two' - - assert_equal @two, assigns(:project) - assert_equal '25', assigns(:build).label - end - - def test_show_specific_build - @sandbox.new :file => "two/build-24/build_status.pingpong" - @sandbox.new :file => "two/build-25/build_status.pingpong" - - get :show, :id => 'two', :build => 24 - - assert_equal @two, assigns(:project) - assert_equal '24', assigns(:build).label - end - - def test_show_with_no_build - get :show, :id => "two" - - assert_response :success - - assert_equal @two, assigns(:project) - assert_nil assigns(:build) - assert_template 'no_builds_yet' - end - def test_should_refresh_projects_if_builder_and_build_states_tag_changed @controller.load_projects = new_project("one"), new_project("two") @sandbox.new :file => "one/build-24/build_status.pingpong" @sandbox.new :file => "two/build-24/build_status.new_status" + post :refresh_projects, :build_states => 'one:notstarted24pingpong;two:notstarted24old_status;' + assert_equal [@two], assigns(:projects) end @@ -83,7 +55,9 @@ class ProjectsControllerTest < Test::Unit::TestCase @controller.load_projects = new_project("one"), new_project("two") @sandbox.new :file => "one/build-24/build_status.pingpong" @sandbox.new :file => "two/build-24/build_status.new_status" + post :refresh_projects, :build_states => 'one:NotStarted24pingpong;two:NotStarted24old_status;' + assert_equal 'one:notstarted24pingpong;two:notstarted24new_status;', assigns(:build_states) end @@ -91,7 +65,9 @@ class ProjectsControllerTest < Test::Unit::TestCase @controller.load_projects = new_project("one"), new_project("two") @sandbox.new :file => "one/build-24/build_status.pingpong" @sandbox.new :file => "two/build-24/build_status.some_status" + get :index + assert_equal 'one:notstarted24pingpong;two:notstarted24some_status;', assigns(:build_states) end @@ -99,7 +75,9 @@ class ProjectsControllerTest < Test::Unit::TestCase @sandbox.new :file => "one/build-24/build_status.pingpong" @sandbox.new :file => "two/build-24/build_status.pingpong" @sandbox.new :file => "three/build-24/build_status.pingpong" + post :refresh_projects, :build_states => 'one:notstarted24pingpong;three:notstarted24pingpong;' + assert_equal 'one:notstarted24pingpong;two:notstarted24pingpong;three:notstarted24pingpong;', assigns(:build_states) assert_equal [@two], assigns(:new_projects) assert_equal [], assigns(:projects) @@ -110,7 +88,9 @@ class ProjectsControllerTest < Test::Unit::TestCase @controller.load_projects = new_project("one"), new_project("two") @sandbox.new :file => "one/build-24/build_status.pingpong" @sandbox.new :file => "two/build-24/build_status.pingpong" + post :refresh_projects, :build_states => 'one:notstarted24pingpong;two:notstarted24pingpong;three:notstarted24pingpong;' + assert_equal 'one:notstarted24pingpong;two:notstarted24pingpong;', assigns(:build_states) assert_equal ['three'], assigns(:deleted_projects) assert_equal [], assigns(:projects) @@ -122,12 +102,12 @@ class ProjectsControllerTest < Test::Unit::TestCase @controller.project= @two @controller.expects(:redirect_to).times(1).with({:action => :index}) @two.expects(:request_force_build).times(1).returns("result") - post :force_build, :id => "two" + + post :force_build, :project => "two" + assert_equal "result", flash[:projects_flash] end - private - def new_project(name) project = Project.new(name) project.path = "#{@sandbox.root}/#{name}" test/functional/projects_controller_test.rb @@ -11,7 +11,7 @@ silence_warnings { RAILS_ENV = "test" } require 'test/unit' require 'action_controller/test_process' require 'action_controller/integration' -require 'action_web_service/test_invoke' +#require 'action_web_service/test_invoke' require 'breakpoint' require 'mocha' require 'stubba' test/test_helper.rb @@ -141,4 +141,26 @@ class BuildTest < Test::Unit::TestCase assert_equal 3.2, Build.new(project, 3.2).label end + def test_build_should_know_about_additional_artifacts + with_sandbox_project do |sandbox, project| + sandbox.new :file => "build-1/coverage/index.html" + sandbox.new :file => "build-1/coverage/units/index.html" + sandbox.new :file => "build-1/coverage/functionals/index.html" + sandbox.new :file => "build-1/foo" + sandbox.new :file => "build-1/foo.txt" + sandbox.new :file => "build.log" + sandbox.new :file => "build_status.failure" + sandbox.new :file => "changeset.log" + + build = Build.new(project, 1) + assert_equal(%w(coverage foo foo.txt), build.additional_artifacts.sort) + end + end + + def test_build_should_know_its_publish_name + with_sandbox_project do |sandbox, project| + build = Build.new(project, 1) + assert_equal "/builds/my_project/1", build.publish_name + end + end end test/unit/build_test.rb app/views/projects/no_builds_yet.rhtml app/views/projects/show.rhtml ccd34d8440c43e5959b15d5709c2ba2d88deac7c Jeremy Stell-Smith jeremystellsmith@gmail.com http://github.com/willbryant/cruisecontrolrb/commit/0b525fa69fe97c06398982fa6a6ffe71529f8f29 0b525fa69fe97c06398982fa6a6ffe71529f8f29 2007-02-09T16:24:07-08:00 2007-02-09T16:24:07-08:00 r174: moved builds to /build/<proj>/<label> checking in patch for coverage reports w/ many changes added rcov to our project, and (hopefully) to our cruise 60f4a05d47641aa63ed975e57bcb9c9c4906498c Jeremy Stell-Smith jeremystellsmith@gmail.com