@@ -5,4 +5,4 @@ class BuilderError < RuntimeError super message @status = status end -end \ No newline at end of file +end app/models/builder_error.rb @@ -3,6 +3,8 @@ # # (this plugin is built in and needs no customization) # +require 'builder_error' + class BuilderStatus def initialize(project) @project = project lib/builder_plugins/builder_status.rb @@ -40,17 +40,17 @@ module SourceControl Git::LogParser.new.parse(git_output).first end - def update - git("reset", ["--hard", "origin/master"]) + def update(revision) + git("reset", ["--hard", revision.number]) end def up_to_date?(reasons = []) _new_revisions = new_revisions if _new_revisions.empty? - return false + return true else reasons << _new_revisions - return true + return false end end lib/source_control/git.rb @@ -5,7 +5,7 @@ module SourceControl def parse(log) @result = [] - log.each_line do |line| + log.each do |line| line.chomp! line == "" ? next : process_line(line) end lib/source_control/git/log_parser.rb @@ -18,7 +18,7 @@ EOF 'e51d66aa4f708fff1c87eb9afc9c48eaa8d5ffce', 'Alexey Verkhovsky <alexey.verkhovsky@gmail.com>', Time.at(1209921867)) - revisions = Git::LogParser.new.parse(SIMPLE_LOG_ENTRY) + revisions = Git::LogParser.new.parse(SIMPLE_LOG_ENTRY.split("\n")) assert_equal [expected_revision], revisions assert_equal expected_revision.number, revisions.first.number test/unit/source_control/git/log_parser_test.rb @@ -49,7 +49,7 @@ class SourceControl::GitTest < Test::Unit::TestCase mock_parser.expects(:parse).with("\n").returns([]) Git::LogParser.expects(:new).returns(mock_parser) - assert_true git.up_to_date? + assert git.up_to_date? end end test/unit/source_control/git_test.rb @@ -242,7 +242,7 @@ module Dependencies #:nodoc: qualified_name = qualified_name_for from_mod, const_name path_suffix = qualified_name.underscore name_error = NameError.new("uninitialized constant #{qualified_name}") - + file_path = search_for_file(path_suffix) if file_path && ! loaded.include?(File.expand_path(file_path)) # We found a matching file to load require_or_load file_path @@ -259,6 +259,7 @@ module Dependencies #:nodoc: begin return parent.const_missing(const_name) rescue NameError => e + raise unless e.missing_name? qualified_name_for(parent, const_name) raise name_error end vendor/rails/activesupport/lib/active_support/dependencies.rb b8c0ce1c3fa52f30b5058579082d7782df623c1a Alexey Verkhovsky alexey.verkhovsky@gmail.com http://github.com/willbryant/cruisecontrolrb/commit/edd69e845006da75398f3f80b41526dca13e9fee edd69e845006da75398f3f80b41526dca13e9fee 2008-05-05T17:07:41-07:00 2008-05-05T17:07:41-07:00 messing around with things d7a0034af212b3cca510e7a135813c0371017caa Alexey Verkhovsky alexey.verkhovsky@gmail.com