--- trunk/lib/Frey/SVK.pm	2008/11/24 21:31:54	498
+++ trunk/lib/Frey/SVK.pm	2008/11/28 01:16:21	579
@@ -1,19 +1,40 @@
 package Frey::SVK;
 use Moose;
 
-with 'Frey::Escape';
+extends 'Frey';
+with 'Frey::Web';
 
-sub modified {
-	my ($self) = @_;
-	my @modified;
-	open(my $svk, '-|', 'svk status -q') or die $@;
+sub svk {
+	my ( $self, $exec, $coderef ) = @_;
+	open(my $svk, '-|', 'svk ' . $exec) or die "svk $exec: $@";
 	while(<$svk>) {
 		chomp;
-		push @modified, $1 if /^M\s+(.+)/;
+		$coderef->( $_ );
 	}
+	close($svk) or die "can't close svk $exec: $@";
+}
+
+sub modified {
+	my ($self) = @_;
+	my @modified;
+	my $svk = $self->svk('status -q', sub {
+		push @modified, $1 if /^\w+\s+(.+)/;
+	});
 	return @modified;
 }
 
+our $info; # cache, we use it on every hit
+sub info {
+	my ($self) = @_;
+	return $info if $info;
+	my $svk = $self->svk('info', sub {
+		my ( $label, $value ) = split(/:\s+/, $_, 2);
+		$info->{$label} = $value if $label;
+	});
+	warn "# svk info ",$self->dump( $info );
+	return $info;
+}
+
 sub as_data {
 	my ($self) = @_;
 	{
@@ -24,15 +45,32 @@
 sub as_markup {
 	my ($self) = @_;
 
+	if ( ! $self->can('html_escape') ) {
+		Frey::Web->meta->apply( $self );
+		$self->TODO( "Frey::Web role missing" );
+	}
+
 	my $status = `svk status -q`;
+	$status =~ s{^(\w+\s+)(\S+)$}{$1<a href="#$2">$2</a>}gm;
+	$self->add_css( qq| pre.l a { text-decoration: none; } | );
+	$status = qq|<pre class="l">$status</pre>|;
+	$self->add_status( $status );
+
 	my $diff   = `svk diff`;
 
-	my $html 
-		= qq|<pre>$status</pre><hr><pre>|
-		. $self->html_escape( $diff )
-		. qq|</pre>|
-		;
-	warn "diff ",length($html)," bytes";
+	$diff = $self->html_escape( $diff );
+	$self->add_css( qq|
+	pre span.add { background: #dfd }
+	pre span.del { background: #fdd }
+	| );
+	$diff =~ s{^(\+.+?)$}{<span class="add">$1</span>}gm;
+	$diff =~ s{^(\-.+?)$}{<span class="del">$1</span>}gm;
+	$diff =~ s{^(===\s+)(\S+)$}{$1<a name="$2">$2</a>}gm;
+
+	$diff = qq|<pre>$diff</pre>|;
+
+	my $html = $status . $diff;
+	warn "html ",length($html)," bytes";
 
 	return $html;
 }