Changeset 405

Timestamp:

11/15/11 09:54:40 (12 years ago)

Author:

nanardon

Message:

• cleanup the mess between tools and bot

Files:

• bot/trunk/Makefile.PL (modified) (5 diffs)
• bot/trunk/etc (added)
• bot/trunk/sophie-bot.spec.in (moved) (moved from bot/trunk/sophie-tools.spec.in) (1 diff)
• tools/trunk/MANIFEST (modified) (1 diff)
• tools/trunk/Makefile.PL (modified) (1 diff)
• tools/trunk/bin/sophie-rpm (modified) (1 diff)
• tools/trunk/bin/sophie-rpm2 (moved) (moved from bot/trunk/bin/sophie-rpm)
• tools/trunk/lib/Sophie/Client.pm (modified) (1 diff)
• tools/trunk/lib/Sophie/Client/Transaction.pm (modified) (3 diffs)
• tools/trunk/sophie-tools.spec.in (moved) (moved from tools/trunk/Sophie-tools.spec) (3 diffs)
• tools/trunk/t/Sophie-IrcBot.t (deleted)

bot/trunk/Makefile.PL

@@ -4 +4 @@
 # the contents of the Makefile that is written.
 WriteMakefile(
-    NAME              => 'Sophie::Tools',
+    NAME              => 'Sophie::Bot',
     VERSION_FROM      => 'lib/Sophie/Bot.pm', # finds $VERSION
     PREREQ_PM         => {}, # e.g., Module::Name => 1.1
@@ -12 +12 @@
     EXE_FILES => [ qw(
         bin/sophie-bot
-        bin/sophie-rpm
     ) ],
     macro => {
@@ -34 +33 @@
 \tsvn log > ChangeLog
 
-sophie-tools.spec: sophie-tools.spec.in Makefile
+sophie-bot.spec: sophie-bot.spec.in Makefile
 \tsed -e 's/\@VERSION@/\$(VERSION)/' < \$< > \$@
 
-rpm: \$(DISTVNAME).tar.gz sophie-tools.spec
+rpm: \$(DISTVNAME).tar.gz sophie-bot.spec
 \tmkdir ./noarch || :
 \trpmbuild -ba --clean\\
@@ -44 +43 @@
 \t --define "_srcrpmdir \$(DESTRPMDIR)" \\
 \t --define "_rpmdir \$(DESTRPMDIR)" \\
-\t sophie-tools.spec
+\t sophie-bot.spec
 
-svnrpm: \$(DISTVNAME).tar.gz sophie-tools.spec
+svnrpm: \$(DISTVNAME).tar.gz sophie-bot.spec
 \tmkdir \$(DESTRPMDIR)/noarch || :
 \trpmbuild -ba --clean\\
@@ -54 +53 @@
 \t --define "_rpmdir \$(DESTRPMDIR)" \\
 \t --define "svnrelease `LC_ALL=C svn info | grep '^Revision:' | sed 's/Revision: //'`" \\
-\t sophie-tools.spec
+\t sophie-bot.spec
 
 EOF

bot/trunk/sophie-bot.spec.in

@@ -1 +1 @@
 # $Id$
 
-%define realname   Sophie-Tools
+%define realname   Sophie-Bot
 %define version    @VERSION@
 %define release    %mkrel %{?svnrelease:0.%{svnrelease}}%{?!svnrelease:1}
 
-Name:       sophie-tools
+Name:       sophie-bot
 Version:    %{version}
 Release:    %{release}

tools/trunk/MANIFEST

@@ -4 +4 @@
 README
 bin/sophie-rpm
+bin/sophie-rpm2
 lib/Sophie/Client.pm
 lib/Sophie/Client/Transaction.pm

tools/trunk/Makefile.PL

@@ -4 +4 @@
 # the contents of the Makefile that is written.
 WriteMakefile(
-    NAME              => 'Sophie-tools',
+    NAME              => 'Sophie::Tools',
     VERSION_FROM      => 'lib/Sophie/Client.pm', # finds $VERSION
     PREREQ_PM         => {}, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?     ## Add these new keywords supported since 5.005
-      (AUTHOR         => 'Olivier Thauvin <nanardon@nanardon.zarb.org>') : ()),
+      (ABSTRACT_FROM  => 'lib/Sophie/Client.pm', # retrieve abstract from module
+       AUTHOR         => 'Olivier Thauvin <nanardon@nanardon.zarb.org>') : ()),
     EXE_FILES => [ qw(
         bin/sophie-rpm
-        )],
+        bin/sophie-rpm2
+    ) ],
+    macro => {
+        INSTALLMAN5DIR      => '$(PERLPREFIX)/share/man/man5',
+        DESTINSTALLMAN5DIR  => '$(DESTDIR)$(INSTALLMAN5DIR)',
+        INST_MAN5DIR        => 'blib/man5',
+        DESTRPMDIR          => '$(shell pwd)'
+    },
 );
+
+package MY;
+
+sub postamble {
+    <<EOF;
+#.PHONY .= svnmanifest
+
+svnmanifest:
+\tsvn ls -R| grep -v "/\$\$"  > MANIFEST
+
+ChangeLog:
+\tsvn log > ChangeLog
+
+sophie-tools.spec: sophie-tools.spec.in Makefile
+\tsed -e 's/\@VERSION@/\$(VERSION)/' < \$< > \$@
+
+rpm: \$(DISTVNAME).tar.gz sophie-tools.spec
+\tmkdir ./noarch || :
+\trpmbuild -ba --clean\\
+\t --define "_sourcedir `pwd`" \\
+\t --define "_specdir `pwd`" \\
+\t --define "_srcrpmdir \$(DESTRPMDIR)" \\
+\t --define "_rpmdir \$(DESTRPMDIR)" \\
+\t sophie-tools.spec
+
+svnrpm: \$(DISTVNAME).tar.gz sophie-tools.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 sophie-tools.spec
+
+EOF
+}
+
+sub installbin {
+    my $self = shift;
+    my $inherited = $self->SUPER::installbin(@_);
+    $inherited;
+}
+
+sub top_targets {
+    my $inherited = shift->SUPER::top_targets(@_);
+    $inherited;
+}
+
+sub install {
+    my ($self) = @_;
+    my $section = $self->SUPER::install();
+
+    $section =~ s/(^install ::.*)/$1 install_config install_templates/m;
+
+    $section .= q[
+install_config ::
+
+install_templates ::
+];
+  
+    return $section;
+}

tools/trunk/bin/sophie-rpm

@@ -142 +142 @@
 }
 
-my $res = $ts->run;
+my $res = $ts->run(
+    verbose => $verbose,
+);
 $ts->summary if (@ARGV > 1);
 print "\nThis transaction would failed\n" if(!$res);

tools/trunk/lib/Sophie/Client.pm

@@ -57 +57 @@
 }
 
+sub pkgid_to_filename {
+    my ($self, $pkgid) = @_;
+
+    my $res = $self->send_request('rpms.basicinfo', $pkgid);
+    if (ref $res && !$res->is_fault) {
+        return $res->value->{filename};
+    } else {
+        die "XML RPC error";
+    }
+}
+
 sub ts {
     my ($self, $distrib) = @_;

tools/trunk/lib/Sophie/Client/Transaction.pm

@@ -105 +105 @@
         foreach($res->value->{pool}) {
         }
+    } else {
+        die( ref $res ? $res->string : $res);
     }
 }
@@ -119 +121 @@
         foreach(@{ $res->value->{pkg} || []}) {
             $self->{removed}{pkg}{$_} = 1;
+        }
+        foreach(@{ $res->value->{pool} || []}) {
+            $self->{removed}{pool}{$_} = 1;
+        }
+    }
+}
+
+sub find_obsoletes {
+    my ($self, $rpmid, %options) = @_;
+    my $res = $self->client->send_request(
+        'analysis.find_obsoletes',
+        $self->distrib,
+        $rpmid,
+        $self->rpmid
+    );
+    if (ref $res && !$res->is_fault) {
+        foreach(@{ $res->value->{pkg} || []}) {
+            if ($options{verbose}) {
+                warn sprintf("%s obsolete %s\n",
+                    $self->{rpms}{$rpmid},
+                    $self->show_pkg($_)
+                );
+            }
+                
+            $self->{removed}{pkg}{$_} = 1;
+        }
+        foreach(@{ $res->value->{pool} || []}) {
+            $self->{removed}{pool}{$_} = 1;
+        }
+    }
+}
+
+sub find_updates {
+    my ($self, $rpmid, %options) = @_;
+    my $res = $self->client->send_request(
+        'analysis.find_updates',
+        $self->distrib,
+        $rpmid,
+        $self->rpmid
+    );
+    if (ref $res && !$res->is_fault) {
+        foreach(@{ $res->value->{pkg} || []}) {
+            $self->{removed}{pkg}{$_} = 1;
+            if ($options{verbose}) {
+                warn sprintf("%s update %s\n",
+                    $self->{rpms}{$rpmid},
+                    $self->show_pkg($_)
+                );
+            }
         }
         foreach(@{ $res->value->{pool} || []}) {
@@ -235 +286 @@
     my ($self, %options) = @_;
 
+    warn "Finding package to remove\n";
+    foreach ($self->rpmid) {
+        $self->find_updates($_, %options);
+        $self->find_obsoletes($_, %options);
+    }
+
     warn "Checking rpm are not obsoleted\n";
     foreach ($self->rpmid) {

tools/trunk/sophie-tools.spec.in

@@ -1 @@
-%define realname   Sophie-tools
-%define version    0.01
-%define release    %mkrel 1
+# $Id: sophie-tools.spec.in 400 2011-11-11 17:11:23Z nanardon $
 
-Name:       Sophie-tools
+%define realname   Sophie-Tools
+%define version    @VERSION@
+%define release    %mkrel %{?svnrelease:0.%{svnrelease}}%{?!svnrelease:1}
+
+Name:       sophie-tools
 Version:    %{version}
 Release:    %{release}
 License:    GPL or Artistic
 Group:      Development/Perl
-Summary:    Sophie Tools
+Summary:    Sophie's tools
 Source:     %{realname}-%{version}.tar.gz
-Url:        http://sophie.zarb.org/
+Url:        http://search.cpan.org/dist/%{realname}
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch:  noarch
+BuildRequires: perl(RPC::XML)
 
-BuildRequires: perl(RPC::XML::Client)
+Requires: perl-Term-ReadLine-Gnu
+Requires: perl(Config::General)
+Requires: perl(POE::Component::IRC)
 
 %description
-Tools to query and check rpms using Sophie's website.
+Command line tools to query Sophie website (http://sophie.zarb.org/)
 
 %prep
@@ -33 +38 @@
 %makeinstall_std
 
-
 %clean
 rm -rf %buildroot
@@ -41 +45 @@
 %doc Changes README
 %_bindir/*
-%{_mandir}/man1/*
-%{_mandir}/man3/*
+%{_mandir}/*/*
 %perl_vendorlib/*