@@ -2,13 +2,13 @@ module Bob module SCM class Git < Abstract def info(commit) - format = "---%nidentifier: %H%nauthor: %an " \ - "<%ae>%nmessage: >-%n %s%ncommitted_at: %ci%n" + format = "---%nid: %H%nauthor: %an " \ + "<%ae>%nmessage: >-%n %s%ntimestamp: %ci%n" dump = YAML.load(`cd #{dir_for(commit)} && git show -s \ --pretty=format:"#{format}" #{commit}`) - dump.update("committed_at" => Time.parse(dump["committed_at"])) + dump.update("timestamp" => Time.parse(dump["timestamp"])) end def head lib/bob/scm/git.rb @@ -5,10 +5,10 @@ module Bob dump = `svn log --non-interactive --revision #{rev} #{uri}`.split("\n") meta = dump[1].split(" | ") - { "identifier" => rev, - "message" => dump[3], - "author" => meta[1], - "committed_at" => Time.parse(meta[2]) } + { "id" => rev, + "message" => dump[3], + "author" => meta[1], + "timestamp" => Time.parse(meta[2]) } end def head lib/bob/scm/svn.rb @@ -35,7 +35,7 @@ module Bob::Test end def head - commits.last["identifier"] + commits.last["id"] end def short_head @@ -96,8 +96,8 @@ SH Dir.chdir(@path) { `git log --pretty=oneline`.collect { |l| l.split(" ").first }. inject([]) { |acc, sha1| - fmt = "---%nmessage: >-%n %s%ntimestamp: %ci%n" + - "identifier: %H%nauthor: %n name: %an%n email: %ae%n" + fmt = "---%nmessage: >-%n %s%ntimestamp: %ci%n" \ + "id: %H%nauthor: %n name: %an%n email: %ae%n" acc << YAML.load(`git show -s --pretty=format:"#{fmt}" #{sha1}`) }.reverse } @@ -153,9 +153,9 @@ SH Dir.chdir(@path) do doc = Hpricot::XML(`svn log --xml`) (doc/:log/:logentry).inject([]) { |acc, c| - acc << { "identifier" => c["revision"], - "message" => c.at("msg").inner_html, - "committed_at" => Time.parse(c.at("date").inner_html) } + acc << { "id" => c["revision"], + "message" => c.at("msg").inner_html, + "timestamp" => Time.parse(c.at("date").inner_html) } }.reverse end end lib/bob/test/repo.rb @@ -4,7 +4,7 @@ module ScmTest def test_successful_build repo.add_successful_commit - commit_id = repo.commits.last["identifier"] + commit_id = repo.commits.last["id"] buildable = BuilderStub.for(@repo, commit_id) buildable.build @@ -12,14 +12,14 @@ module ScmTest assert_equal :successful, buildable.status assert_equal "Running tests...\n", buildable.output assert_equal "This commit will work", buildable.commit_info["message"] - assert_equal commit_id, buildable.commit_info["identifier"] - assert buildable.commit_info["committed_at"].is_a?(Time) + assert_equal commit_id, buildable.commit_info["id"] + assert buildable.commit_info["timestamp"].is_a?(Time) end def test_failed_build repo.add_failing_commit - commit_id = repo.commits.last["identifier"] + commit_id = repo.commits.last["id"] buildable = BuilderStub.for(@repo, commit_id) buildable.build @@ -27,8 +27,8 @@ module ScmTest assert_equal :failed, buildable.status assert_equal "Running tests...\n", buildable.output assert_equal "This commit will fail", buildable.commit_info["message"] - assert_equal commit_id, buildable.commit_info["identifier"] - assert buildable.commit_info["committed_at"].is_a?(Time) + assert_equal commit_id, buildable.commit_info["id"] + assert buildable.commit_info["timestamp"].is_a?(Time) end def test_head @@ -41,6 +41,6 @@ module ScmTest assert_equal :successful, buildable.status assert_equal "Running tests...\n", buildable.output - assert_equal repo.head, buildable.commit_info["identifier"] + assert_equal repo.head, buildable.commit_info["id"] end end test/mixin/scm.rb @@ -10,13 +10,13 @@ class BobTestTest < Test::Unit::TestCase repo.add_failing_commit assert_equal 2, repo.commits.size assert_equal "This commit will fail", repo.commits.last["message"] - assert_equal repo.commits.last["identifier"], repo.head + assert_equal repo.commits.last["id"], repo.head assert repo.short_head repo.add_successful_commit assert_equal 3, repo.commits.size assert_equal "This commit will work", repo.commits.last["message"] - assert_equal repo.commits.last["identifier"], repo.head + assert_equal repo.commits.last["id"], repo.head end def test_scm_repo test/test_test.rb 19758fc0c89fdbf8000f50f711422f0006ca5a65 Simon Rozet simon@rozet.name http://github.com/integrity/bob/commit/65274ce2c17ed0bbf79ec9781f31bb8f6439eb56 65274ce2c17ed0bbf79ec9781f31bb8f6439eb56 2009-11-06T01:46:34-08:00 2009-11-05T05:43:22-08:00 Simpler commit info hash format 1014d7906eef004994c335228dbb1f5c4d94349c Simon Rozet simon@rozet.name