--- trunk/lib/Frey/SVN.pm 2008/12/09 20:31:31 770 +++ trunk/lib/Frey/SVN.pm 2008/12/15 20:10:48 851 @@ -11,6 +11,7 @@ #with 'Frey::Storage'; use XML::Simple; +use DateTimeX::Easy; has repository => ( is => 'rw', @@ -25,25 +26,9 @@ default => 50, ); -sub as_markup { - my ($self) = @_; - - # extract svk revision: r113@athlon (orig r999): dpavlin | 2005-09-01 20:38:07 +0200 - my $svk_rev_re = '\s+(r\d+@\w+(\s+\(orig\s+r\d+\))*:\s+\w+\s+\|\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\s+\+\d+)\s*'; - - sub encode { - my $foo = shift; - $foo =~ s/$svk_rev_re//gsm; - $foo =~ s/</g; - $foo =~ s/>/>/g; - $foo =~ s/"/"/g; - $foo =~ s/([\n\r][\n\r]+)/<\/p>$1
/gis;
- $foo =~ s/([\n\r]+)([\-\*]\s+)/$1
$2/gis;
- $foo =~ s/([\n\r]+)(r\d+:\s+)/$1
$2/gis;
- $foo =~ s/([\n\r]+)(\s+r\d+@)/$1
$2/gis; # svk
- return $foo;
- }
-
+sub iterator {
+ my ($self,$coderef) = @_;
+
sub sh_regex($$) {
my ($cmd,$regex) = @_;
open(my $sh, $cmd . ' |') || die "sh_regex failed on $cmd: $!";
@@ -105,12 +90,39 @@
my $xml = XMLin($log, ForceArray => [ 'logentry', 'path' ]);
+ foreach my $e (@{$xml->{'logentry'}}) {
+ warn "# e = ",$self->dump( $e );
+ $coderef->($e);
+ }
+}
+
+sub as_markup {
+ my ($self) = @_;
+
+ # extract svk revision: r113@athlon (orig r999): dpavlin | 2005-09-01 20:38:07 +0200
+ our $svk_rev_re = '\s+(r\d+@\w+(\s+\(orig\s+r\d+\))*:\s+\w+\s+\|\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\s+\+\d+)\s*';
+
+ sub encode {
+ my $foo = shift;
+ $foo =~ s/$svk_rev_re//gsm;
+ $foo =~ s/</g;
+ $foo =~ s/>/>/g;
+ $foo =~ s/"/"/g;
+ $foo =~ s/([\n\r][\n\r]+)/<\/p>$1
/gis;
+ $foo =~ s/([\n\r]+)([\-\*]\s+)/$1
$2/gis;
+ $foo =~ s/([\n\r]+)(r\d+:\s+)/$1
$2/gis;
+ $foo =~ s/([\n\r]+)(\s+r\d+@)/$1
$2/gis; # svk
+ return $foo;
+ }
+
our $html = '';
sub html {
$html .= join("\n", @_);
}
- foreach my $e (@{$xml->{'logentry'}}) {
+ $self->iterator( sub {
+ my $e = shift;
+
my $rev = $e->{'revision'};
my $date = $e->{'date'};
@@ -128,16 +140,50 @@
push @files, "$path";
} elsif ($action eq "D") {
push @files, "$path";
- } else{
+ } else {
push @files, $path;
}
}
- html '
'; + my $msg = $e->{'msg'}; + $msg = '' if ref($msg); # FIXME why do I need this, dammit? + $msg = encode( $msg ); - } + html '',join(", ",@files),': ',encode($e->{'msg'}),'
'; + + }); return $html; } +sub codeswarm_as_markup { + my ($self) = @_; + + $self->content_type('text/xml'); + + my $file_events = ''; + + $self->iterator( sub { + my $e = shift; + + my $rev = $e->{'revision'}; + my $date = DateTimeX::Easy->new( $e->{'date'} )->epoch . '000'; # ms + my $author = $e->{'author'}; + + foreach my $p (@{$e->{'paths'}->{'path'}}) { + my ($action,$path) = ($p->{'action'},$p->{'content'}); + $file_events .= qq|\t',join(", ",@files),' ',$msg,'