Changeset 24

Timestamp:

11/23/10 15:53:42 (14 years ago)

Author:

nanardon

Message:

• add make rpm target

Location:

server/trunk/web

Files:

• Makefile.PL (modified) (2 diffs)
• Sophie.spec.in (added)
• lib/Sophie/Base.pm (modified) (1 diff)
• lib/Sophie/Base/Result/RpmsChangelog.pm (added)
• lib/Sophie/Controller/Rpms.pm (modified) (2 diffs)

server/trunk/web/Makefile.PL

@@ -16 +16 @@
 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 'DBD::Pg';
 requires 'Config::General'; # This should reflect the config file format you've chosen
                  # See Catalyst::Plugin::ConfigLoader for supported formats
@@ -22 +29 @@
 
 install_script glob('script/*.pl');
-auto_install;
-WriteAll;
+
+WriteMakefile(
+    macro => { 
+        DESTRPMDIR => '$(shell pwd)',
+    },
+);
+
+package MY;
+
+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

@@ -19 +19 @@
    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") {
+       -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/Rpms.pm

@@ -2 +2 @@
 use Moose;
 use namespace::autoclean;
+use Encode::Guess;
+use Encode;
 
 BEGIN {extends 'Catalyst::Controller'; }
@@ -124 +126 @@
 }
 
+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}{changelog} = \@ch;
+}
+
 
 sub rpms : Chained : PathPart {