Merge lp:~achiang/laika/ppa-activity into lp:laika

[Alex Chiang]

Add support for querying PPA activity.

The code itself is relatively straightforward, but I'm looking for feedback on "taste" here.

Not a fan of growing a command line option. On the other hand, I'm not sure what the best way to ask Launchpad:

"please tell me every package I uploaded to any archive"

This seemed like a good compromise.

Thoughts?

[Paul Hummer (rockstar)]

So, I'm definitely good with this change, but I think a better solution would be trying to check up on all your ppa, regardless of which ppa it is (you can always remove erroneous reporting from your report before you send it off to your manager). Is there an API call that can provide this? If not, you should file a bug against Soyuz and request this be exposed. I'll push it on the people that need to fix it.

review: Approve (code)

[Paul Hummer (rockstar)]

What's the status of this merge now?

[Alex Chiang (achiang)]

I haven't landed it yet because I didn't want to introduce a command line option that might go away in the future (aka, once we/I figure out how to query all PPAs for activity).

Reasonable?

[Paul Hummer (rockstar)]

Sounds fine to me. I was just looking at my +activereviews and saw it and wondered where it was in the process.

[lp:~achiang/laika/ppa-activity]

7. By Alex Chiang on 2010-10-11

Do not attempt to find published date of un-published packages.

8. By Alex Chiang on 2010-10-11

Merge from lp:~achiang/laika/configparser

9. By Alex Chiang on 2010-10-11

Learn how to handle multiple PPAs

We now allow the user to specify multiple PPAs to search for activity.

On the command line, the syntax looks like:

 --ppas=ppa1,ppa2,ppaN

In the config file, the syntax looks like:

 ppas: ppa1,ppa2,ppaN

Or, for readability:

 ppas:
  ppa1
  ppa2
  ppaN

I prefer the second style, as PPA names tend to be long. Breaking them out
onto separate lines helps quite a bit with readability.

Unmerged revisions

=== modified file 'laika.py'
--- laika.py	2010-08-17 19:00:08 +0000
+++ laika.py	2010-10-11 22:45:57 +0000
@@ -11,10 +11,10 @@
 # This program is distributed under the terms of the
 # GNU General Public License version 2.
 
+import ConfigParser
 import datetime
 from optparse import OptionParser
-import ConfigParser
-import os, os.path
+import os
 import re
 import sys
 
@@ -22,7 +22,6 @@
 
 UTCNOW = datetime.datetime.utcnow()
 
-
 class Report(object):
     '''An activity report for a specified Launchpad user.
 
@@ -37,12 +36,13 @@
 
     bugs = {}
 
-    def __init__(self, user, window):
+    def __init__(self, user, window, ppas):
         cachedir = os.path.expanduser("~/.launchpadlib/cache")
         self.launchpad = Launchpad.login_with('laika', 'production', cachedir)
 
         self.user = self.launchpad.people[user]
         self.window = window
+        self.ppas = ppas
 
     def print_header(self, header):
         print "==", header, "=="
@@ -132,35 +132,91 @@
                 self.print_bugid(t)
                 print
 
+    def print_ppa_activity(self):
+        if self.ppas == '':
+            return
+
+        # Handle command line case, where user passes in comma-separated list
+        self.ppas = re.sub(",", "\n", self.ppas)
+
+        # Now each PPA is separated by a newline, which is how we might
+        # expect them if they're specified in the config file.
+        ppas = [p for p in self.ppas.split("\n") if p != '']
+
+        self.print_header("PPA Activity")
+        for ppa in ppas:
+            # A PPA seems to always belong to a person (or a team, which
+            # is a person in LP) so assuming "person/PPA" sounds reasonable.
+            person, archive = ppa.split('/')
+            owner = self.launchpad.people[person]
+            archive = owner.getPPAByName(name=archive)
+            sources = archive.getPublishedSources()
+
+            print ppa
+            for s in sources:
+                if s.package_signer != self.user:
+                    continue
+
+                # There might be yet-unpublished packages in the PPA, which
+                # would then have NoneType for date_published. Don't check
+                # in_window in that case.
+                if s.date_published:
+                    if self.in_window(s.date_published):
+                        print "\t", s.display_name
+            print
+        print
+
     def render(self):
         self.print_assignments()
         self.print_comments()
         self.print_reported()
-
-def get_launchpad_username_from_bazaar():
-    bazaar_config = ConfigParser.ConfigParser()
-    bazaar_config.read(os.path.expanduser("~/.bazaar/bazaar.conf"))
-    return bazaar_config.get("DEFAULT", "launchpad_username")
+        self.print_ppa_activity()
+
+def get_config(opts):
+    config = {}
+    FORMAT = "1.0"
+    laika_config = ConfigParser.ConfigParser()
+    laika_config.read(os.path.expanduser("~/.laikarc"))
+
+    if laika_config.has_section(FORMAT) == False:
+        print "Error: unsupported configuration file format"
+        sys.exit()
+
+    def default_user():
+        return os.getenv("USER")
+    def default_window():
+        return 8
+    def default_ppas():
+        return ''
+
+    for opt in opts:
+        try:
+            config[opt] = laika_config.get(FORMAT, opt)
+        except ConfigParser.NoOptionError:
+            config[opt] = locals()["default_%s" % opt]()
+
+    return config
 
 def main():
-    try:
-        default_user = get_launchpad_username_from_bazaar()
-    except ConfigParser.NoOptionError:
-        default_user = os.getenv("USER")
+    opts = ['user', 'window', 'ppas']
+    config = get_config(opts)
 
     parser = OptionParser()
     parser.add_option('-u', '--user', dest='user',
-        default=default_user,
+        default=config['user'],
         help='Specify the Launchpad user id.  '
-             'Defaults to launchpad username from Bazaar or session username.')
+             'Defaults to session username.')
     parser.add_option('-w', '--window', dest='window', type='int',
-        default=8,
+        default=config['window'],
         help='Number of days of past activity to look for.  '
              'Defaults to 8 days')
+    parser.add_option('--ppas', dest='ppas',
+        default=config['ppas'],
+        help='Search for activity in specified PPAs')
 
     options, arguments = parser.parse_args()
 
-    report = Report(options.user, options.window)
+    report = Report(options.user, options.window, options.ppas)
     report.render()
 
 if __name__ == "__main__":