From: Dan Brook <broq@cpan.org>
Date: Sun, 2 May 2010 19:06:51 +0000 (+0100)
Subject: Merge remote branch 't0m/json' into json
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=68943a848e5fae4bd91569b930ddcdcecc6dfe9b;p=catagits%2FGitalist.git

Merge remote branch 't0m/json' into json

Conflicts:
	Makefile.PL
	lib/Gitalist/Controller/Root.pm
	lib/Gitalist/Git/Repository.pm
---

68943a848e5fae4bd91569b930ddcdcecc6dfe9b
diff --cc Makefile.PL
index ca22491,9bac265..54e0b01
--- a/Makefile.PL
+++ b/Makefile.PL
@@@ -57,13 -54,11 +57,15 @@@ requires 'Catalyst::Plugin::ConfigLoade
  requires 'Catalyst::Plugin::StackTrace';
  requires 'Catalyst::Plugin::Static::Simple';
  requires 'Catalyst::Plugin::Unicode::Encoding';
 +requires 'Catalyst::Plugin::SubRequest' => '0.15';
  requires 'Catalyst::Action::RenderView';
  requires 'Catalyst::Component::InstancePerContext';
 +requires 'Catalyst::Controller::ActionRole';
 +requires 'Catalyst::View::Component::SubInclude' => '0.07';
  requires 'Catalyst::View::TT';
 +requires 'Try::Tiny';
+ requires 'Catalyst::Action::Serialize';
+ 
  requires 'Template';
  requires 'Template::Provider::Encoding';
  requires 'Template::Plugin::Cycle';
@@@ -72,14 -67,21 +74,19 @@@ requires 'Config::General'
  
  requires 'Moose';
  requires 'Moose::Autobox';
 +requires 'MooseX::MultiMethods' => '0.10';
  requires 'MooseX::Declare' => '0.32';
+ requires 'MooseX::Types::DateTime';
+ requires 'MooseX::Types::ISO8601';
  requires 'MooseX::Types::Common';
  requires 'MooseX::Types::Path::Class';
  requires 'MooseX::Types';
+ requires 'MooseX::Storage';
 -<<<<<<< HEAD
+ requires 'JSON::Any';
 -=======
+ requires 'JSON::XS';
 ->>>>>>> origin/json
  requires 'namespace::autoclean';
  
 -requires 'Git::PurePerl' => '0.43';
 +requires 'Git::PurePerl' => '0.46';
  
  requires 'aliased';
  requires 'CGI';
diff --cc lib/Gitalist/Controller/Root.pm
index 14ef8ee,be29129..a46fff0
--- a/lib/Gitalist/Controller/Root.pm
+++ b/lib/Gitalist/Controller/Root.pm
@@@ -29,12 -625,23 +29,13 @@@ sub css : Chained('/root') PathPart('co
  sub base : Chained('/root') PathPart('') CaptureArgs(0) {
    my($self, $c) = @_;
  
 -  my $repository = $c->req->param('p');
 -  if (defined $repository) {
 -    eval {
 -      $c->stash(Repository => $c->model('GitRepos')->get_repository($repository));
 -    };
 -    if ($@) {
 -      $c->detach('/error_404');
 -    }
 -  }
 -
 -  my $a_repository = $c->stash->{Repository} || $c->model()->repositories->[0];
 +  my $git_version = `git --version`;
 +  chomp($git_version);
    $c->stash(
 -    git_version => $a_repository->run_cmd('--version'),
 +    git_version => $git_version,
      version     => $Gitalist::VERSION,
  
+     # XXX Move these to a plugin!
      time_since => sub {
        return 'never' unless $_[0];
        return age_string(time - $_[0]->epoch);
diff --cc lib/Gitalist/Git/Repository.pm
index 0d0c884,a230129..e4eb595
--- a/lib/Gitalist/Git/Repository.pm
+++ b/lib/Gitalist/Git/Repository.pm
@@@ -3,13 -3,11 +3,12 @@@ use MooseX::Declare
  class Gitalist::Git::Repository with Gitalist::Git::HasUtils {
      # FIXME, use Types::Path::Class and coerce
      use MooseX::Types::Common::String qw/NonEmptySimpleStr/;
-     use MooseX::Types::Path::Class qw/Dir/;
      use MooseX::Types::Moose qw/Str Maybe Bool HashRef ArrayRef/;
-     use Gitalist::Git::Types qw/SHA1/;
 +    use MooseX::MultiMethods;
+     use Gitalist::Git::Types qw/SHA1 DateTime Dir/;
      use Moose::Autobox;
      use List::MoreUtils qw/any zip/;
-     use DateTime;
+     use aliased 'DateTime' => 'DT';
      use Encode qw/decode/;
      use I18N::Langinfo qw/langinfo CODESET/;
      use Gitalist::Git::Object::Blob;