@@ -4,6 +4,12 @@ Revision history for Perl module Git::PurePerl: - allow subdirectories in .git/refs/*/ (thanks to martijn) - run protocol.t test with --base-path to not care about where on the filesystem the checkout is (thanks to martijn) + - when parsing a commit, split up the author and committer + fields into name, email and commit time. This adds two new + DateTime fields, authored_time and committed_time to ::Commit + and changes the type of the author and committer fields to + Git::PurePerl::Actor, which is an object with name and + email fields (thanks to martijn) 0.40 Fri Mar 13 15:29:02 GMT 2009 - Skip protocol tests on Win32 (thanks to fayland) CHANGES @@ -13,6 +13,7 @@ WriteMakefile( 'Compress::Raw::Zlib' => '0', 'Compress::Zlib' => '0', 'Data::Stream::Bulk' => '0', + 'DateTime' => '0', 'Digest::SHA1' => '0', 'File::Find::Rule' => '0', 'IO::Digest', => '0', Makefile.PL @@ -6,8 +6,10 @@ use Compress::Zlib qw(uncompress); use Data::Stream::Bulk; use Data::Stream::Bulk::Array; use Data::Stream::Bulk::Path::Class; +use DateTime; use Digest::SHA1; use File::Find::Rule; +use Git::PurePerl::Actor; use Git::PurePerl::DirectoryEntry; use Git::PurePerl::Loose; use Git::PurePerl::Object; lib/Git/PurePerl.pm @@ -8,15 +8,20 @@ has 'kind' => ( is => 'ro', isa => 'ObjectKind', required => 1, default => 'commit' ); has 'tree_sha1' => ( is => 'rw', isa => 'Str', required => 0 ); has 'parent_sha1' => ( is => 'rw', isa => 'Str', required => 0 ); -has 'author' => ( is => 'rw', isa => 'Str', required => 0 ); -has 'committer' => ( is => 'rw', isa => 'Str', required => 0 ); -has 'comment' => ( is => 'rw', isa => 'Str', required => 0 ); +has 'author' => ( is => 'rw', isa => 'Git::PurePerl::Actor', required => 0 ); +has 'authored_time' => ( is => 'rw', isa => 'DateTime', required => 0 ); +has 'committer' => + ( is => 'rw', isa => 'Git::PurePerl::Actor', required => 0 ); +has 'committed_time' => ( is => 'rw', isa => 'DateTime', required => 0 ); +has 'comment' => ( is => 'rw', isa => 'Str', required => 0 ); __PACKAGE__->meta->make_immutable; my %method_map = ( - 'tree' => 'tree_sha1', - 'parent' => 'parent_sha1', + 'tree' => 'tree_sha1', + 'parent' => 'parent_sha1', + 'author' => 'authored_time', + 'committer' => 'committed_time' ); sub BUILD { @@ -26,8 +31,22 @@ sub BUILD { while ( my $line = shift @lines ) { last unless $line; my ( $key, $value ) = split ' ', $line, 2; - $key = $method_map{$key} || $key; - $self->$key($value); + if ( $key eq 'committer' or $key eq 'author' ) { + my @data = split ' ', $value; + my ( $email, $epoch, $tz ) = splice( @data, -3 ); + $email = substr( $email, 1, -1 ); + my $name = join ' ', @data; + my $actor + = Git::PurePerl::Actor->new( name => $name, email => $email ); + $self->$key($actor); + $key = $method_map{$key}; + my $dt + = DateTime->from_epoch( epoch => $epoch, time_zone => $tz ); + $self->$key($dt); + } else { + $key = $method_map{$key} || $key; + $self->$key($value); + } } $self->comment( join "\n", @lines ); } lib/Git/PurePerl/Object/Commit.pm @@ -7,7 +7,7 @@ BEGIN { if ( $^O eq 'MSWin32' ) { plan skip_all => 'Windows does NOT have git-daemon yet'; } - plan tests => 12; + plan tests => 14; } use Git::PurePerl; use IO::File; @@ -36,8 +36,8 @@ is( $commit->size, 256 ); like( $commit->sha1, qr/^[a-z0-9]{40}$/ ); is( $commit->tree_sha1, '37b4fcd62571f07408e830f455268891f95cecf5' ); like( $commit->parent_sha1, qr/^[a-z0-9]{40}$/ ); -like( $commit->author, - qr/^Your Name Comes Here <you\@yourdomain.example.com>/ ); -like( $commit->committer, - qr/^Your Name Comes Here <you\@yourdomain.example.com>/ ); -is( $commit->comment, 'add again' ); +is( $commit->author->name, 'Your Name Comes Here' ); +is( $commit->author->email, 'you@yourdomain.example.com' ); +is( $commit->committer->name, 'Your Name Comes Here' ); +is( $commit->committer->email, 'you@yourdomain.example.com' ); +is( $commit->comment, 'add again' ); t/protocol.t @@ -1,7 +1,7 @@ #!perl use strict; use warnings; -use Test::More tests => 186; +use Test::More tests => 198; use Git::PurePerl; use Path::Class; @@ -18,11 +18,13 @@ foreach my $directory qw(test-project test-project-packs test-project-packs2) like( $commit->sha1, qr/^[a-z0-9]{40}$/ ); is( $commit->tree_sha1, '37b4fcd62571f07408e830f455268891f95cecf5' ); like( $commit->parent_sha1, qr/^[a-z0-9]{40}$/ ); - like( $commit->author, - qr/^Your Name Comes Here <you\@yourdomain.example.com>/ ); - like( $commit->committer, - qr/^Your Name Comes Here <you\@yourdomain.example.com>/ ); - is( $commit->comment, 'add again' ); + isa_ok( $commit->author, 'Git::PurePerl::Actor' ); + isa_ok( $commit->committer, 'Git::PurePerl::Actor' ); + is( $commit->author->name, 'Your Name Comes Here' ); + is( $commit->committer->name, 'Your Name Comes Here' ); + isa_ok( $commit->authored_time, 'DateTime' ); + is( $commit->authored_time->month, 11 ); + is( $commit->comment, 'add again' ); my $tree = $commit->tree; is( $tree->kind, 'tree' ); @@ -48,11 +50,9 @@ hello world, again like( $commit->sha1, qr/^[a-z0-9]{40}$/ ); is( $commit->tree_sha1, 'd0492b368b66bdabf2ac1fd8c92b39d3db916e59' ); like( $commit->parent_sha1, qr/^[a-z0-9]{40}$/ ); - like( $commit->author, - qr/^Your Name Comes Here <you\@yourdomain.example.com>/ ); - like( $commit->committer, - qr/^Your Name Comes Here <you\@yourdomain.example.com>/ ); - is( $commit->comment, 'add emphasis' ); + is( $commit->author->email, 'you@yourdomain.example.com' ); + is( $commit->committer->email, 'you@yourdomain.example.com' ); + is( $commit->comment, 'add emphasis' ); $tree = $commit->tree; is( $tree->kind, 'tree' ); @@ -75,14 +75,12 @@ hello world, again is( $commit->kind, 'commit' ); is( $commit->size, 213 ); like( $commit->sha1, qr/^[a-z0-9]{40}$/ ); - is( $commit->tree_sha1, '92b8b694ffb1675e5975148e1121810081dbdffe' ); - is( $commit->parent_sha1, undef ); - is( $commit->parent, undef ); - like( $commit->author, - qr/^Your Name Comes Here <you\@yourdomain.example.com>/ ); - like( $commit->committer, - qr/^Your Name Comes Here <you\@yourdomain.example.com>/ ); - is( $commit->comment, 'initial commit' ); + is( $commit->tree_sha1, '92b8b694ffb1675e5975148e1121810081dbdffe' ); + is( $commit->parent_sha1, undef ); + is( $commit->parent, undef ); + is( $commit->author->name, 'Your Name Comes Here' ); + is( $commit->committer->name, 'Your Name Comes Here' ); + is( $commit->comment, 'initial commit' ); $tree = $commit->tree; is( $tree->kind, 'tree' ); t/simple.t 585d0999474c5eba073b540ad3c173176eb56cf7 Leon Brocard acme@astray.com http://github.com/acme/git-pureperl/commit/5de67af6e23d1456842b829cc06c34f76e1ada21 5de67af6e23d1456842b829cc06c34f76e1ada21 2009-04-21T12:03:27-07:00 2009-04-21T12:03:27-07:00 when parsing a commit, split up the author and committer fields into name, email and commit time. This adds two new DateTime fields, authored_time and committed_time to ::Commit and changes the type of the author and committer fields to Git::PurePerl::Actor, which is an object with name and email fields (thanks to martijn) 040ff8b79e23daef121fefb895e80b423435bc54 Leon Brocard acme@astray.com