@@ -80,3 +80,5 @@ Concerns from ./subversion_log_parser.rb:7:in `parse' ... + +Implement Git#clean_checkout(revision) as "git clean -d <revision.number>" \ No newline at end of file doc/tasks.txt @@ -30,7 +30,7 @@ module SourceControl end if revision - git("reset", revision.number) + git("reset", ['--hard', revision.number]) end end lib/source_control/git.rb @@ -3,7 +3,7 @@ module SourceControl class LogParser def parse(log) - return [Git::Revision.new] + return [Git::Revision.new(nil, nil, nil)] end end lib/source_control/git/log_parser.rb @@ -6,7 +6,7 @@ module SourceControl attr_reader :number, :committed_by, :time - def initiailize(number, committed_by, time) + def initialize(number, committed_by, time) @number, @committed_by, @time = number, committed_by, time end lib/source_control/git/revision.rb @@ -14,7 +14,7 @@ committer Alexey Verkhovsky <alexey.verkhovsky@gmail.com> 1209921867 -0600 EOF def test_parse_should_work - expected_revision = Git::Revision.new + expected_revision = Git::Revision.new('87a24d3447605e9b07c4ffcf408f14a48d558cfd', 'You', Time.at(0)) revisions = Git::LogParser.new.parse(SIMPLE_LOG_ENTRY) assert_equal [expected_revision], revisions end test/unit/source_control/git/log_parser_test.rb @@ -6,6 +6,54 @@ class SourceControl::GitTest < Test::Unit::TestCase include FileSandbox include SourceControl + def test_checkout_with_revision_given + in_sandbox do + git = new_git(:repository => "git:/my_repo") + git.expects(:git).with("clone", ["git:/my_repo", '.'], :execute_in_current_directory => false) + git.expects(:git).with("reset", ['--hard', '5460c9ea8872745629918986df7238871f4135ae']) + git.checkout(Git::Revision.new('5460c9ea8872745629918986df7238871f4135ae', "me", Time.at(0))) + end + end + + def test_update + in_sandbox do + git = new_git + git.expects(:git).with("reset", ["--hard", "origin/master"]) + git.update + end + end + + def test_up_to_date?_should_return_false_if_there_are_new_revisions + in_sandbox do + git = new_git + git.expects(:git).with("remote", ["update"]) + git.expects(:git).with("log", ["--pretty=raw", "HEAD..origin/master"]).returns("a log output") + + mock_parser = Object.new + mock_parser.expects(:parse).with("a log output").returns([:new_revision]) + Git::LogParser.expects(:new).returns(mock_parser) + + reasons = [] + assert_false git.up_to_date?(reasons) + assert_equal [[:new_revision]], reasons + end + end + + def test_up_to_date?_should_return_true_if_there_are_no_new_revisions + in_sandbox do + git = new_git + git.expects(:git).with("remote", ["update"]) + git.expects(:git).with("log", ["--pretty=raw", "HEAD..origin/master"]).returns("\n") + + mock_parser = Object.new + mock_parser.expects(:parse).with("\n").returns([]) + Git::LogParser.expects(:new).returns(mock_parser) + + assert_true git.up_to_date? + end + end + + def test_initialize_should_remember_repository git = Git.new(:repository => "git:/my_repo") assert_equal "git:/my_repo", git.repository @@ -31,7 +79,8 @@ class SourceControl::GitTest < Test::Unit::TestCase def test_latest_revision_should_call_git_log_and_send_it_to_parser in_sandbox do git = new_git - git.expects(:git).with("log", ["-1", '--pretty=raw']).returns('') + git.expects(:git).with("log", ["-1", '--pretty=raw', 'origin/master']).returns('') + git.expects(:git).with('remote', ['update']) stub_parser = Object.new stub_parser.stubs(:parse).returns([:foo]) Git::LogParser.expects(:new).returns(stub_parser) test/unit/source_control/git_test.rb 59e0af75b3fcecb478428a9e8fae5058f91c885a Alexey Verkhovsky alexey.verkhovsky@gmail.com http://github.com/willbryant/cruisecontrolrb/commit/9a49b7d5f66b49a8d65e3a2c6860643e3f656aee 9a49b7d5f66b49a8d65e3a2c6860643e3f656aee 2008-05-05T14:31:08-07:00 2008-05-05T14:31:08-07:00 wrote tests for git.rb 305281c789305835a4de0d7271c2180613d589fa Alexey Verkhovsky alexey.verkhovsky@gmail.com