Changes in / [20:30]

Location:

/server/trunk/web

Files:

• Makefile.PL (modified) (3 diffs)
• Sophie.spec.in (added)
• lib/Sophie/Base.pm (modified) (2 diffs)
• lib/Sophie/Base/Result/RpmsChangelog.pm (added)
• lib/Sophie/Controller/Distrib.pm (modified) (4 diffs)
• lib/Sophie/Controller/Rpms.pm (modified) (10 diffs)
• lib/Sophie/View/Json.pm (added)
• root/templates/html/distrib/distrib.html (added)
• root/templates/html/distrib/list_arch.html (added)
• root/templates/html/distrib/list_arch.tt (added)
• root/templates/html/distrib/media_list_rpms.html (added)
• root/templates/html/distrib/media_list_rpms.tt (added)
• root/templates/html/distrib/media_rpm_bypkgid.html (added)
• root/templates/html/distrib/media_rpm_bypkgid.tt (added)
• root/templates/html/rpms (added)
• root/templates/html/rpms/rpms.html (added)
• root/templates/html/rpms/rpms.tt (added)
• root/templates/includes/header.tt (modified) (1 diff)
• sophie.conf.in (added)
• t/controller_Distrib.t (modified) (2 diffs)

/server/trunk/web/Makefile.PL

@@ -10 +10 @@
 all_from 'lib/Sophie.pm';
 
+requires 'DBD::Pg';
+requires 'DBIx::Class';
+
 requires 'Catalyst::Runtime' => '5.80025';
 requires 'Catalyst::Plugin::ConfigLoader';
@@ -16 +19 @@
 requires 'Moose';
 requires 'namespace::autoclean';
+requires 'Catalyst::Plugin::Authentication' => '0';
+requires 'Catalyst::Plugin::Session' => '0';
+requires 'Catalyst::Plugin::Session::Store::DBI' => '0';
+requires 'Catalyst::Plugin::Session::State::Cookie' => '0';
+requires 'Catalyst::Plugin::Prototype' => '0';
+requires 'Catalyst::View::TT' => '0';
+requires 'Catalyst::View::JSON' => '0';
+requires 'Catalyst::Plugin::Compress::Zlib';
+requires 'Catalyst::Plugin::Server';
+requires 'Catalyst::Plugin::Server::XMLRPC';
 requires 'Config::General'; # This should reflect the config file format you've chosen
                  # See Catalyst::Plugin::ConfigLoader for supported formats
@@ -22 +35 @@
 
 install_script glob('script/*.pl');
-auto_install;
-WriteAll;
+
+WriteMakefile(
+    macro => { 
+        DESTRPMDIR => '$(shell pwd)',
+    },
+);
+
+package MY;
+
+sub install {
+    my ($self) = @_;
+    my $section = $self->SUPER::install();
+
+    $section =~ s/(^install ::.*)/$1 install_config/m;
+
+    $section .= qq[
+install_config: sophie.conf.in
+\tinstall -d \$(DESTDIR)/etc
+\tinstall -d \$(DESTDIR)/etc/sophie
+\tinstall sophie.conf.in \$(DESTDIR)/etc/sophie/sophie.conf
+
+    ];
+
+    $section
+}
+
+sub postamble {
+    <<EOF;
+# .PHONY .= svnmanifest
+
+svnmanifest:
+\tsvn ls -R| grep -v "/\$\$"  > MANIFEST
+
+ChangeLog:
+\tsvn log > ChangeLog
+
+\$(DISTNAME).spec: \$(DISTNAME).spec.in Makefile
+\tsed -e 's/\@VERSION@/\$(VERSION)/' < \$< > \$@
+
+rpm: \$(DISTVNAME).tar.gz \$(DISTNAME).spec
+\tmkdir \$(DESTRPMDIR)/noarch || :
+\trpmbuild -ba --clean\\
+\t --define "_sourcedir `pwd`" \\
+\t --define "_specdir `pwd`" \\
+\t --define "_srcrpmdir \$(DESTRPMDIR)" \\
+\t --define "_rpmdir \$(DESTRPMDIR)" \\
+\t \$(DISTNAME).spec
+
+svnrpm: \$(DISTVNAME).tar.gz \$(DISTNAME).spec
+\tmkdir \$(DESTRPMDIR)/noarch || :
+\trpmbuild -ba --clean\\
+\t --define "_sourcedir `pwd`" \\
+\t --define "_specdir `pwd`" \\
+\t --define "_srcrpmdir \$(DESTRPMDIR)" \\
+\t --define "_rpmdir \$(DESTRPMDIR)" \\
+\t --define "svnrelease `LC_ALL=C svn info | grep '^Revision:' | sed 's/Revision: //'`" \\
+\t \$(DISTNAME).spec
+
+EOF
+}

/server/trunk/web/lib/Sophie/Base.pm

@@ -6 +6 @@
 use base qw/DBIx::Class::Schema/;
 use FindBin qw($Bin);
+use Config::General;
 
 __PACKAGE__->load_namespaces();
@@ -18 +19 @@
 sub db {
    my ($self) = @_;
-   require Config::General;
-   my $cg = Config::General->new("$Bin/../sophie.conf");
-   my $config = { $cg->getall() };
+   my $config;
+   foreach my $file ('sophie.conf', "$Bin/../sophie.conf",
+       '/etc/sophie/sophie.conf') {
+       -f $file or next;
+        my $cg = Config::General->new($file);
+        $config = { $cg->getall() };
+    }
+    $config or die "No config found";
 
    DBI->connect_cached(

/server/trunk/web/lib/Sophie/Controller/Distrib.pm

@@ -33 +33 @@
     my $rs = $c->model('Base')->resultset('Distribution');
     if (!$distribution) {
-        return $c->stash->{xmlrpc} = [ map { $_->name } $rs->all ];
+        return $c->stash->{xmlrpc} = [ map { $_->name }
+            $rs->search(undef, { order_by => ['name'] })->all ];
     }
     $rs = $rs->search(name => $distribution)->search_related('Release');
     if (!$release) {
-        return $c->stash->{xmlrpc} = [ map { $_->version } $rs->all ];
-        
+        return $c->stash->{xmlrpc} = [ map { $_->version }
+            $rs->search(undef, { order_by => ['version'] })->all ];
     }
     $rs = $rs->search(version => $release)->search_related('Arch');
     if (!$arch) {
-        return $c->stash->{xmlrpc} = [ map { $_->arch } $rs->all ];
+        return $c->stash->{xmlrpc} = [ map { $_->arch } 
+            $rs->search(undef, { order_by => ['arch'] })->all ];
     }
     $rs = $rs->search(arch => $arch)->search_related('Medias');
-    $c->stash->{xmlrpc} = [ map { $_->label } $rs->all ];
-    $c->stash->{xmlrpc}
+    return $c->stash->{xmlrpc} = [ map { $_->label }
+        $rs->search(undef, { order_by => ['label'] })->all ];
 }
 
@@ -117 +119 @@
 sub distrib :Chained('distrib_view') PathPart('') {
     my ( $self, $c ) = @_;
-    $c->forward('list', $c->stash->{dist});
-    $c->forward('rpms', $c->stash->{dist});
+    $c->forward('list', [ $c->stash->{dist} ]);
     # TODO store properly results
     # No call from json here
@@ -208 +209 @@
 sub rpm_by_name :Chained('distrib_view') PathPart('rpms/by-name') Args(1) {
 }
-sub rpm_by_pkid :Chained('distrib_view') PathPart('rpms/by-pkgid') Args(1) {
+sub rpm_by_pkid :Chained('distrib_view') PathPart('by-pkgid') Args(1) {
 }
 
@@ -250 +251 @@
     $c->forward('media_rpms', [ $c->stash->{dist}, $c->stash->{media} ]);
 }
-sub media_rpm_byname :Chained('_media_list_rpms') PathPart('rpms/by_name') {
-    my ( $self, $c ) = @_;
-}
-sub media_srpm_byname :Chained('_media_list_rpms') PathPart('srpms/by_name') {
-    my ( $self, $c ) = @_;
-}
-sub media_rpm_bypkgid :Chained('_media_list_rpms') PathPart('rpms/by_pkgid') {
-    my ( $self, $c ) = @_;
+
+sub media_rpm_byname :Chained('_media_list_rpms') PathPart('rpms/by-name') {
+    my ( $self, $c ) = @_;
+}
+sub media_srpm_byname :Chained('_media_list_rpms') PathPart('srpms/by-name') {
+    my ( $self, $c ) = @_;
+}
+sub media_rpm_bypkgid :Chained('_media_list_rpms') PathPart('by-pkgid') {
+    my ( $self, $c, $pkgid ) = @_;
+    $c->forward('/rpms/rpms', [ $pkgid ]);
 }
 

/server/trunk/web/lib/Sophie/Controller/Rpms.pm

@@ -2 +2 @@
 use Moose;
 use namespace::autoclean;
+use Encode::Guess;
+use Encode;
 
 BEGIN {extends 'Catalyst::Controller'; }
@@ -30 +32 @@
 sub queryformat : XMLRPCLocal {
     my ( $self, $c, $pkgid, $qf ) = @_;
-    @{$c->stash->{xmlrpc}} = map { $_->get_column('qf') } $c->model('Base')->resultset('Rpms')->search(
+    $c->stash->{xmlrpc} = $c->model('base')->resultset('Rpms')->search(
         { pkgid => $pkgid },
         { 
@@ -37 +39 @@
             bind => [ $qf ],
         }
-    )->all;
+    )->next->get_column('qf');
 }
 
 sub tag : XMLRPCLocal {
     my ( $self, $c, $pkgid, $tag ) = @_;
-    @{$c->stash->{xmlrpc}} = map { $_->get_column('tag') } $c->model('Base')->resultset('Rpms')->search(
+    $c->stash->{xmlrpc} = [ map { $_->get_column('tag') } $c->model('Base')->resultset('Rpms')->search(
         { pkgid => $pkgid },
         { 
@@ -49 +51 @@
             bind => [ $tag ], 
         }
-    )->all;
-}
+    )->all ]
+}
+
+
+sub info : XMLRPCLocal {
+    my ($self, $c, $pkgid, $deptype) = @_;
+
+    my %info;
+    foreach (qw(name version release epoch url group size packager
+                url summary description sourcerpm license buildhost
+                pkgid builddate arch distribution)) {
+        if (my $r = $c->model('base')->resultset('Rpms')->search(
+            { pkgid => $pkgid },
+            { 
+                select => [ qq{rpmqueryformat("header", ?)} ],
+                as => [ 'qf' ],
+                bind => [ "%{$_}" ],
+            }
+            )->next) { 
+            $info{$_} = $r->get_column('qf');
+        }
+    }
+
+    return $c->stash->{xmlrpc} = \%info;
+}
+
 
 sub deps : XMLRPCLocal {
@@ -81 +107 @@
     my ($self, $c, $pkgid) = @_;
 
+    my %deps;
     foreach (
         $c->model('Base')->resultset('Deps')->search(
@@ -94 +121 @@
             },
         )->all) {
-        push( @{ $c->stash->{xmlrpc}{deps}{$_->get_column('deptype')} },
+        push( @{ $deps{$_->get_column('deptype')} },
             {
                 name => $_->get_column('depname'),
@@ -103 +130 @@
         );
     }
+    $c->stash->{xmlrpc} = \%deps;
 }
 
@@ -108 +136 @@
     my ($self, $c, $pkgid) = @_;
 
-    @{ $c->stash->{xmlrpc}{files} } = map {
+    $c->stash->{xmlrpc} = [ map {
         {
             filename => $_->get_column('dirname') . $_->get_column('basename'),
@@ -121 +149 @@
 
             },
-        )->all;
+        )->all ];
+}
+
+sub changelog : XMLRPCLocal {
+    my ($self, $c, $pkgid) = @_;
+
+    my @ch;
+    foreach ($c->model('Base')->resultset('RpmsChangelog')->search({},
+            { 
+                bind => [ $pkgid ],
+                order_by => [ 'time::int desc' ],
+            },
+        )->all) {
+        my $chentry;
+        my $enc = guess_encoding($_->get_column('text'), qw/latin1/);
+        $chentry->{text} = $enc && ref $enc
+            ? encode('utf8', $_->get_column('text'))
+            : $_->get_column('text');
+        $enc = guess_encoding($_->get_column('name'), qw/latin1/);
+        $chentry->{name} = $enc && ref $enc
+            ? encode('utf8', $_->get_column('name'))
+            : $_->get_column('name');
+        $chentry->{time} = $_->get_column('time');
+        push(@ch, $chentry);
+    }
+
+    $c->stash->{xmlrpc} = \@ch;
 }
 
@@ -127 +181 @@
 sub rpms : Chained : PathPart {
     my ( $self, $c, $pkgid ) = @_;
-    $c->stash->{pkgid} = $c->model('Base::Rpms')->search(pkgid => $pkgid)->next;
-    $c->log->debug('rpms ' . $c->stash->{pkgid});
+    $c->stash->{pkgid} = $c->model('Base')->resultset('Rpms')->search(pkgid => $pkgid)->next;
+    $c->stash->{xmlrpc} = {
+        info      => $c->forward('info', [ $pkgid ]),
+        changelog => $c->forward('changelog', [ $pkgid ]),
+        files     => $c->forward('files', [ $pkgid ]),
+        deps      => $c->forward('alldeps', [ $pkgid ]),
+    };
 }
 

/server/trunk/web/root/templates/includes/header.tt

@@ -18 +18 @@
     <div style="float:left">
         <p id="sitename">Sophie</p>
-        <p id="sophie_menu">fff</p>
+        <p id="sophie_menu">
+        <span><a href="[% c.uri_for('/distrib') %]">Distribution</a></span>
+        </p>
     </div>
     <div style="clear:both"></div>

/server/trunk/web/t/controller_Distrib.t

@@ -7 +7 @@
 # know existing data:
 my $distribution = 'Mandriva';
+my $release = 'cooker';
+my $arch = 'i586';
 
 BEGIN { use_ok 'Catalyst::Test', 'Sophie' }
@@ -26 +28 @@
 ok( request( xmlrpcreq('distrib.list') ), "XMLRPC");
 ok( request( xmlrpcreq('distrib.list', $distribution) ), "XMLRPC");
+ok( request("/distrib/$distribution/$release")->is_success, 'Request should succeed' );
+ok( request("/distrib/$distribution/$release/$arch")->is_success, 'Request should succeed' );
 done_testing();