Merge lp:~oubiwann/ubuntu-accomplishments-system/941201-missing-deps into lp:~jonobacon/ubuntu-accomplishments-system/trophyinfo

[Duncan McGreggor]

This branch just adds a convenience script for installing deps.

It should be merged *after* the following:
  https://code.launchpad.net/~oubiwann/ubuntu-accomplishments-system/941255-unified-source-dir/+merge/95839

The reason for this is that the current branch has merged the "unified-source-dir" branch already, and that would circumvent the other branch :-)

Unmerged revisions

72. By Duncan McGreggor on 2012-03-05

Added more deps.

71. By Duncan McGreggor on 2012-03-05

Merged sibling branch.

70. By Duncan McGreggor on 2012-03-05

Added more deps.

69. By Duncan McGreggor on 2012-03-04

Added a convenience install script.

68. By Duncan McGreggor on 2012-03-04

Merged sibling branch.

=== modified file 'AUTHORS'
--- AUTHORS	2012-01-22 23:09:09 +0000
+++ AUTHORS	2012-03-05 04:37:19 +0000
@@ -1,1 +1,2 @@
-Copyright (C) YYYY <Your Name> <Your E-mail>
+Copyright (c) 2012 Duncan McGreggor <[e-mail]>
+Copyright (c) YYYY <Your Name> <Your E-mail>

=== renamed directory 'trophyinfo' => 'accomplishments'
=== added file 'accomplishments/__init__.py'
=== renamed file 'trophyinfo_lib/trophyinfoconfig.py' => 'accomplishments/config.py'
--- trophyinfo_lib/trophyinfoconfig.py	2012-01-22 23:09:09 +0000
+++ accomplishments/config.py	2012-03-05 04:37:19 +0000
@@ -3,61 +3,8 @@
 # This file is in the public domain
 ### END LICENSE
 
-# THIS IS Trophyinfo CONFIGURATION FILE
-# YOU CAN PUT THERE SOME GLOBAL VALUE
-# Do not touch unless you know what you're doing.
-# you're warned :)
-
-__all__ = [
-    'project_path_not_found',
-    'get_data_file',
-    'get_data_path',
-    ]
-
 # Where your project will look for your data (for instance, images and ui
 # files). By default, this is ../data, relative your trunk layout
-__trophyinfo_data_directory__ = '../data/'
+__trophyinfo_data_directory__ = 'data'
 __license__ = ''
 __version__ = 'VERSION'
-
-import os
-
-import gettext
-from gettext import gettext as _
-gettext.textdomain('trophyinfo')
-
-class project_path_not_found(Exception):
-    """Raised when we can't find the project directory."""
-
-
-def get_data_file(*path_segments):
-    """Get the full path to a data file.
-
-    Returns the path to a file underneath the data directory (as defined by
-    `get_data_path`). Equivalent to os.path.join(get_data_path(),
-    *path_segments).
-    """
-    return os.path.join(get_data_path(), *path_segments)
-
-
-def get_data_path():
-    """Retrieve trophyinfo data path
-
-    This path is by default <trophyinfo_lib_path>/../data/ in trunk
-    and /usr/share/trophyinfo in an installed version but this path
-    is specified at installation time.
-    """
-
-    # Get pathname absolute or relative.
-    path = os.path.join(
-        os.path.dirname(__file__), __trophyinfo_data_directory__)
-
-    abs_data_path = os.path.abspath(path)
-    if not os.path.exists(abs_data_path):
-        raise project_path_not_found
-
-    return abs_data_path
-
-
-def get_version():
-    return __version__

=== renamed directory 'daemon' => 'accomplishments/daemon'
=== added file 'accomplishments/daemon/__init__.py'
=== renamed file 'daemon/libaccomplishments-daemon/daemon.py' => 'accomplishments/daemon/app.py'
--- daemon/libaccomplishments-daemon/daemon.py	2012-02-24 06:08:50 +0000
+++ accomplishments/daemon/app.py	2012-03-05 04:37:19 +0000
@@ -3,12 +3,28 @@
 Provides a D-Bus API to record accomplishments as achieved (trophies) and
 to enumerate achieved and unachieved accomplishments.
 """
+import ConfigParser
+import Image, ImageEnhance
+from StringIO import StringIO
+import datetime
+import getpass
+import glob
+import gobject
+import gpgme
+import json
+import logging
+from optparse import OptionParser
+import os
+import pwd
+import subprocess
+import time
+
+import dbus
+from dbus.mainloop.glib import DBusGMainLoop
+import dbus.service
 
 from twisted.internet import glib2reactor
 glib2reactor.install()
-from dbus.mainloop.glib import DBusGMainLoop
-DBusGMainLoop(set_as_default=True)
-
 from twisted.internet import defer, reactor
 from twisted.internet.protocol import ProcessProtocol
 from twisted.python import filepath
@@ -17,35 +33,25 @@
 from ubuntuone.couch import auth
 
 import xdg.BaseDirectory
-import os
-import glob
-import getpass
-import ConfigParser
-import gobject
-import pwd
-import subprocess
-import time
-import dbus
-import dbus.service
-import json
-import logging
-import gpgme
-import Image, ImageEnhance
-from StringIO import StringIO
-import datetime
-import xdg.BaseDirectory
-from dbus.mainloop.glib import DBusGMainLoop
-from optparse import OptionParser
+
 try:
     import pynotify
 except ImportError:
     pynotify = None
 
+import accomplishments
+from accomplishments import exceptions
+
+
+DBusGMainLoop(set_as_default=True)
 MATRIX_USERNAME = "openiduser155707"
 LOCAL_USERNAME = getpass.getuser()
 SCRIPT_DELAY = 900
 
+
 class SubprocessReturnCodeProtocol(ProcessProtocol):
+    """
+    """
     def connectionMade(self):
         self.returnCodeDeferred = defer.Deferred()
 
@@ -58,16 +64,12 @@
     def errReceived(self, data):
         print data
 
-class NoSuchAccomplishment(ValueError):
-    "No such accomplishment has been registered"
-
-class AccomplishmentLocked(ValueError):
-    "This accomplishment requires other things to be accomplished first"
 
 class Accomplishments(object):
     """The main accomplishments daemon
-    No D-Bus required, so that it can be used for testing."""
-    
+
+    No D-Bus required, so that it can be used for testing.
+    """
     def __init__(self, service, show_notifications=None):
         self.accomplishments_path = None
         self.scripts_path = None
@@ -79,9 +81,9 @@
         self.dir_config = None
         self.dir_data = None
         self.dir_cache = None
-        
+
         # create config / data dirs if they don't exist
-        
+
         self.dir_config = os.path.join(xdg.BaseDirectory.xdg_config_home, "accomplishments")
         self.dir_data = os.path.join(xdg.BaseDirectory.xdg_data_home, "accomplishments")
         self.dir_cache = os.path.join(xdg.BaseDirectory.xdg_cache_home, "accomplishments")
@@ -93,20 +95,20 @@
             os.makedirs(self.dir_data)
 
         if not os.path.exists(self.dir_cache):
-            os.makedirs(self.dir_cache)            
+            os.makedirs(self.dir_cache)
 
         # set up logging
         logdir = os.path.join(self.dir_cache, "logs")
-        
+
         if not os.path.exists(logdir):
             os.makedirs(logdir)
-        
+
         #self.logging = logging
         logging.basicConfig(filename=(os.path.join(logdir, 'daemon.log')), level=logging.INFO)
 
         now = datetime.datetime.now()
         logging.info("------------------- Ubuntu Accomplishments Daemon Log - %s -------------------", str(now))
-        
+
         self._loadConfigFile()
 
         print "Accomplishments path: " + self.accomplishments_path
@@ -119,7 +121,7 @@
 
         self.wait_until_a_sig_file_arrives()
         self.generate_all_trophies()
-        
+
         reactor.callLater(5, self.run_scripts, False)
 
     @defer.inlineCallbacks
@@ -127,7 +129,7 @@
         path, info = yield self.sd.wait_for_signals(signal_ok="DownloadFinished", success_filter=lambda path, info: path.startswith(self.trophies_path) and path.endswith(".asc"))
         logging.info("Trophy signature recieved...")
         accomname = os.path.splitext(os.path.splitext(os.path.split(path)[1])[0])[0]
-        data = self.listAccomplishmentInfo(accomname)            
+        data = self.listAccomplishmentInfo(accomname)
         iconpath = os.path.join(os.path.join(os.path.join(self.accomplishments_path, data[0]["application"]), "trophyimages"), data[0]["icon"])
 
         item = os.path.split(path)[1][:-11]
@@ -135,7 +137,7 @@
 
         data = self.listAccomplishmentInfo(item)
 
-        if self.show_notifications == True and pynotify and (        
+        if self.show_notifications == True and pynotify and (
         pynotify.is_initted() or pynotify.init("icon-summary-body")):
             self.service.trophy_received("foo")
             trophy_icon_path = "file://%s" % os.path.realpath(os.path.join(os.path.split(__file__)[0], "trophy-accomplished.svg"))
@@ -148,7 +150,7 @@
 
     def _get_accomplishments_files_list(self):
         logging.info("Looking for accomplishments files in " + self.accomplishments_path)
-        accom_files = os.path.join(self.accomplishments_path, 
+        accom_files = os.path.join(self.accomplishments_path,
             "*", "*.accomplishment")
         return glob.glob(accom_files)
 
@@ -164,10 +166,10 @@
 
     def _get_trophies_files_list(self):
         logging.info("Get trophies files list")
-        
+
         trophy_files = os.path.join(self.trophies_path, "*", "*.trophy")
         unverif_list = glob.glob(trophy_files)
-        
+
         verif_list = []
 
         for t in unverif_list:
@@ -191,14 +193,14 @@
                 else:
                     result = {'timestamp': sig[0].timestamp, 'signer': sig[0].fpr}
                     logging.info("...Verified!")
-                    verif_list.append(t)                
+                    verif_list.append(t)
             else:
                 logging.info(".asc does not exist for this trophy")
 
         logging.info("Verifying trophy signature")
-          
+
         return verif_list
-        
+
     def _load_trophy_file(self, f):
         logging.info("Load trophy file: " + f)
         config = ConfigParser.RawConfigParser()
@@ -210,41 +212,45 @@
 
     def listAllAccomplishments(self):
         logging.info("List all accomplishments")
-        fs = [self._load_accomplishment_file(f) for f in 
+        fs = [self._load_accomplishment_file(f) for f in
             self._get_accomplishments_files_list()]
         return fs
 
     def generate_all_trophies(self):
         paths = []
         final = []
-        
-        files = self._get_accomplishments_files_list()  
-        
+
+        files = self._get_accomplishments_files_list()
+
         for f in files:
             paths.append(os.path.split(f)[0])
 
         paths = list(set(paths))
-      
+
         for p in paths:
             app = os.path.split(p)[1]
             app_trophyimagespath = os.path.join(p, "trophyimages")
             cache_trophyimagespath = os.path.join(os.path.join(self.dir_cache, "trophyimages"), app)
             if not os.path.exists(cache_trophyimagespath):
                 os.makedirs(cache_trophyimagespath)
-            
+
             # first delete existing images
             lockedlist=glob.glob(cache_trophyimagespath + "/*locked*")
-            
+
             opplist=glob.glob(cache_trophyimagespath + "/*opportunity*")
-            
+
             for l in lockedlist:
                 os.remove(l)
 
             for o in opplist:
                 os.remove(o)
-            
+
             # now generate our trophy images
-            self.generate_trophy_images(app_trophyimagespath, cache_trophyimagespath, "lock.png")
+            lock_image_path = os.path.join(
+                os.path.dirname(accomplishments.__path__[0]),
+                "data/media/lock.png")
+            self.generate_trophy_images(
+                app_trophyimagespath, cache_trophyimagespath, lock_image_path)
 
     def reduce_trophy_opacity(self, im, opacity):
         """Returns an image with reduced opacity."""
@@ -257,25 +263,25 @@
         alpha = ImageEnhance.Brightness(alpha).enhance(opacity)
         im.putalpha(alpha)
         return im
-    
+
     def generate_trophy_images(self, infolder, outfolder, watermark):
         mark = Image.open(watermark)
         for root, dirs, files in os.walk(infolder):
-            for name in files:        
+            for name in files:
                 try:
                     im = Image.open(os.path.join(root, name))
                     filename = os.path.join(outfolder, name)
                     filecore = os.path.splitext(filename)[0]
                     filetype = os.path.splitext(filename)[1]
-                    
+
                     im.save(filename)
 
                     # Opacity set to 1.0 until we figure out a better way of showing opportunities
                     reduced = self.reduce_trophy_opacity(im, 1.0)
                     reduced.save(filecore + "-opportunity" + filetype)
-                    
+
                     if im.mode != 'RGBA':
-                        im = im.convert('RGBA')              
+                        im = im.convert('RGBA')
                     layer = Image.new('RGBA', im.size, (0,0,0,0))
                     position = (im.size[0]-mark.size[0], im.size[1]-mark.size[1])
                     layer.paste(mark, position)
@@ -283,14 +289,18 @@
                 except Exception, (msg):
                     print msg
 
-
     def verifyU1Account(self):
         # check if this machine has an Ubuntu One account
         logging.info("Check if this machine has an Ubuntu One account...")
-        u1email = json.loads(auth.request(url='https://one.ubuntu.com/api/account/')[1])['email']
+        u1auth_response = auth.request(
+            url='https://one.ubuntu.com/api/account/')
+        u1email = None
+        if not isinstance(u1auth_response, basestring):
+            u1email = json.loads(u1auth_response[1])['email']
 
         if u1email is None:
             logging.info("...No.")
+            logging.info(u1auth_response)
             self.has_u1 = False
             return False
         else:
@@ -332,7 +342,7 @@
         # Writing our configuration file to 'example.cfg'
         with open(cfile, 'wb') as configfile:
             config.write(configfile)
-   
+
         self._loadConfigFile()
 
     def _writeConfigFile(self):
@@ -351,7 +361,7 @@
         with open(cfile, 'wb') as configfile:
         # Writing our configuration file to 'example.cfg'
             config.write(configfile)
-    
+
         self.accomplishments_path = os.path.join(self.accomplishments_path, "accomplishments")
         logging.info("...done.")
 
@@ -362,27 +372,27 @@
         try:
             data = self._load_accomplishment_file(accom_file)
         except KeyError:
-            raise NoSuchAccomplishment()
-        
+            raise exceptions.NoSuchAccomplishment()
+
         needsinfolist = []
-        
+
         for k in data:
             if "needs-information" in k:
                 needsinfolist.append(data[k])
-       
+
         for n in needsinfolist:
             values = self.getExtraInformation(app, n)
             data[n] = values[0][n]
-               
+
         if "depends" in data:
             for dependency in data["depends"].split(","):
                 dapp, dname = dependency.split("/")
                 dtrophy_file = os.path.join(
-                    self.trophies_path, dapp, 
+                    self.trophies_path, dapp,
                     "%s.trophy" % dname)
                 if not os.path.exists(dtrophy_file):
-                    raise AccomplishmentLocked()
-        
+                    raise exceptions.AccomplishmentLocked()
+
         cp = ConfigParser.RawConfigParser()
         cp.add_section("trophy")
         del data["_filename"]
@@ -393,7 +403,7 @@
             os.makedirs(os.path.join(self.trophies_path, app))
         except OSError:
             pass # already exists
-        trophy_file = os.path.join(self.trophies_path, app, 
+        trophy_file = os.path.join(self.trophies_path, app,
             "%s.trophy" % accomplishment_name)
         fp = open(trophy_file, "w")
         cp.write(fp)
@@ -401,10 +411,10 @@
 
         if not data["needs-signing"] or data["needs-signing"] == False:
             self.trophy_received()
-            if self.show_notifications == True and pynotify and (        
+            if self.show_notifications == True and pynotify and (
             pynotify.is_initted() or pynotify.init("icon-summary-body")):
                 trophy_icon_path = "file://%s" % os.path.realpath(os.path.join(os.path.split(__file__)[0], "trophy-accomplished.svg"))
-                n = pynotify.Notification("You have accomplished something!", 
+                n = pynotify.Notification("You have accomplished something!",
                     data["title"], trophy_icon_path)
                 n.show()
 
@@ -413,7 +423,7 @@
 
     def listAllTrophies(self):
         logging.info("List all trophies")
-        fs = [self._load_trophy_file(f) for f in 
+        fs = [self._load_trophy_file(f) for f in
             self._get_trophies_files_list()]
         return fs
 
@@ -528,9 +538,9 @@
                 except IOError as e:
                     infofile = os.path.join(accomextrainfo, accomconfig.get("accomplishment", "needs-information"))
                     infoconfig = ConfigParser.RawConfigParser()
-                    infoconfig.read(infofile)                    
+                    infoconfig.read(infofile)
                     d = {"application" : accomconfig.get("accomplishment", "application"), "needs-information" : accomconfig.get("accomplishment", "needs-information"), "label" : infoconfig.get("label", self.lang), "description" : infoconfig.get("description", self.lang)}
-                    infoneeded.append(d)        
+                    infoneeded.append(d)
 
         # uniqify all the data required
         final = []
@@ -563,9 +573,9 @@
             config = ConfigParser.RawConfigParser()
             config.read(infofile)
             final = config.get("general", "name")
-            
+
             data["application-human"] = final
-            
+
             # If the trophy file exists, this must be accomplished and not locked
             trophy_file = os.path.join(self.trophies_path, app, "%s.trophy" % name)
             got = os.path.exists(trophy_file + ".asc")
@@ -590,7 +600,7 @@
                     for dependency in dependencies:
                         dapp, dname = dependency.split("/")
                         daccomplishment_file = os.path.join(
-                            self.accomplishments_path, dapp, 
+                            self.accomplishments_path, dapp,
                             "%s.accomplishment" % dname)
                         daccomplishment_data = things[daccomplishment_file]
                         if daccomplishment_data["accomplished"] == False:
@@ -629,7 +639,7 @@
         for i in files:
             if search in i:
                 match = i
-    
+
         config = ConfigParser.RawConfigParser()
         config.read(match)
         data.append(dict(config._sections["accomplishment"]))
@@ -640,7 +650,7 @@
         print "--- Starting Running Scripts ---"
         logging.info("--- Starting Running Scripts ---")
         self.service.scriptrunner_start()
-        
+
         # Is the user currently logged in and running a gnome session?
         username = pwd.getpwuid(uid).pw_name
         try:
@@ -670,9 +680,9 @@
         except dbus.exceptions.DBusException:
             logging.info("User %s does not have the accomplishments daemon available" % username)
             return
-        
+
         accoms = self.listAllAvailableAccomplishmentsWithScripts()
-        
+
         for accom in accoms:
             print "Running: " + accom["_script"]
             logging.info("Running: " + accom["_script"])
@@ -701,14 +711,14 @@
         pprotocol = SubprocessReturnCodeProtocol()
         reactor.spawnProcess(pprotocol, command[0], command, env=os.environ)
         return pprotocol.returnCodeDeferred
-        
+
     def run_scripts_for_all_active_users(self):
-        for uid in [x.pw_uid for x in pwd.getpwall() 
+        for uid in [x.pw_uid for x in pwd.getpwall()
             if x.pw_dir.startswith('/home/') and x.pw_shell != '/bin/false']:
             os.seteuid(0)
             self.run_scripts_for_user(uid)
 
-    def run_scripts(self, run_by_client):        
+    def run_scripts(self, run_by_client):
         uid = os.getuid()
         if uid == 0:
             logging.info("Run scripts for all active users")
@@ -722,7 +732,7 @@
 
     def createExtraInformationFile(self, app, item, data):
         logging.info("Creating Extra Information file: %s, %s, %s", app, item, data)
-        
+
         extrainfodir = os.path.join(self.trophies_path, ".extrainformation/")
 
         if not os.path.isdir(extrainfodir):
@@ -765,58 +775,58 @@
         # because doing that confuses everything, so we create our own
         # private Accomplishments object and use it.
         self.ad = Accomplishments(self, self.show_notifications)
- 
-    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments', 
+
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="", out_signature="aa{sv}")
     def listAllAccomplishments(self):
         return self.ad.listAllAccomplishments()
 
-    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments', 
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="", out_signature="aa{sv}")
     def listAllTrophies(self):
         return self.ad.listAllTrophies()
 
-    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments', 
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="", out_signature="aa{sv}")
     def listAllAccomplishmentsAndStatus(self):
         return self.ad.listAllAccomplishmentsAndStatus()
 
-    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments', 
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="", out_signature="aa{sv}")
     def listAllAvailableAccomplishmentsWithScripts(self):
         return self.ad.listAllAvailableAccomplishmentsWithScripts()
 
-    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments', 
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="", out_signature="aa{sv}")
     def getAllExtraInformationRequired(self):
         return self.ad.getAllExtraInformationRequired()
 
-    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments', 
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="", out_signature="aa{sv}")
     def listAccomplishmentInfo(self, accomplishment):
         return self.ad.listAccomplishmentInfo(accomplishment)
 
-    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments', 
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="b", out_signature="")
     def run_scripts(self, run_by_client):
         return self.ad.run_scripts(run_by_client)
 
-    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments', 
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="", out_signature="aa{sv}")
     def getExtraInformation(self, app, info):
         return self.ad.getExtraInformation(app, info)
 
-    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments', 
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="", out_signature="")
     def createExtraInformationFile(self, app, item, data):
         return self.ad.createExtraInformationFile(app, item, data)
 
-    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments', 
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="ss", out_signature="")
     def accomplish(self, app, accomplishment_name):
         trophy = self.ad.accomplish(app, accomplishment_name)
 
-    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments', 
+    @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="b")
     def registerTrophyDir(self, trophydir):
         return self.ad.registerTrophyDir(trophydir)
@@ -844,7 +854,7 @@
     @dbus.service.signal(dbus_interface='org.ubuntu.accomplishments')
     def scriptrunner_finish(self):
         pass
-        
+
 if __name__ == "__main__":
     parser = OptionParser()
     parser.set_defaults(suppress_notifications=False)

=== renamed file 'daemon/libaccomplishments/__init__.py' => 'accomplishments/daemon/dbusapi.py'
--- daemon/libaccomplishments/__init__.py	2012-01-27 06:28:24 +0000
+++ accomplishments/daemon/dbusapi.py	2012-03-05 04:37:19 +0000
@@ -1,10 +1,10 @@
 # A stupid Python-specific wrapper for the libaccomplishments-daemon D-Bus API
-# This should not be a Python library. It should be a 
+# This should not be a Python library. It should be a
 # GObject-introspection-capable C thing so anyone can use it. But someone else
 # needs to write that because I'm crap at Vala.
-
 import dbus
 
+
 def Accomplishments():
     obj = dbus.SessionBus().get_object("org.ubuntu.accomplishments", "/")
     return dbus.Interface(obj, "org.ubuntu.accomplishments")

=== renamed directory 'daemon/libaccomplishments-daemon/tests' => 'accomplishments/daemon/tests'
=== modified file 'accomplishments/daemon/tests/tests.py'
--- daemon/libaccomplishments-daemon/tests/tests.py	2012-01-27 06:28:24 +0000
+++ accomplishments/daemon/tests/tests.py	2012-03-05 04:37:19 +0000
@@ -1,5 +1,6 @@
-"Tests for libaccomplishments-daemon"
-
+"""
+Tests for accomplishments daemon.
+"""
 import unittest
 import sys, os
 import tempfile
@@ -9,7 +10,8 @@
 import subprocess
 
 sys.path.append(os.path.join(os.path.split(__file__)[0], ".."))
-import daemon
+from accomplishments.daemon import app
+
 
 class TestDaemon(unittest.TestCase):
     def setUp(self):
@@ -19,7 +21,7 @@
         os.mkdir(os.path.join(self.td, "scripts"))
         os.mkdir(os.path.join(self.td, "scripts", "app1"))
         os.mkdir(os.path.join(self.td, "trophies"))
-        fp = open(os.path.join(self.td, "accomplishments", "app1", 
+        fp = open(os.path.join(self.td, "accomplishments", "app1",
             "first.accomplishment"), "w")
         fp.write("""[accomplishment]
 application=app1
@@ -27,7 +29,7 @@
 description=An example accomplishment for the test suite
 """)
         fp.close()
-        fp = open(os.path.join(self.td, "accomplishments", "app1", 
+        fp = open(os.path.join(self.td, "accomplishments", "app1",
             "second.accomplishment"), "w")
         fp.write("""[accomplishment]
 application=app1
@@ -36,7 +38,7 @@
 depends=app1/first
 """)
         fp.close()
-        fp = open(os.path.join(self.td, "accomplishments", "app1", 
+        fp = open(os.path.join(self.td, "accomplishments", "app1",
             "third.accomplishment"), "w")
         fp.write("""[accomplishment]
 application=app1
@@ -44,11 +46,11 @@
 description=Another example accomplishment for the test suite, no dependency
 """)
         fp.close()
-        fp = open(os.path.join(self.td, "scripts", "app1", 
+        fp = open(os.path.join(self.td, "scripts", "app1",
             "third.py"), "w")
         fp.write("""print 'hello'""")
         fp.close()
-        self.d = daemon.Accomplishments(
+        self.d = app.Accomplishments(
             accomplishments_path=os.path.join(self.td, "accomplishments"),
             trophies_path=os.path.join(self.td, "trophies"),
             scripts_path=os.path.join(self.td, "scripts"))
@@ -62,12 +64,12 @@
         self.assertTrue("title" in accoms[0])
         fn = accoms[0].get("_filename", "")
         self.assertTrue(
-            fn.endswith("app1/first.accomplishment") or 
-            fn.endswith("app1/second.accomplishment") or 
+            fn.endswith("app1/first.accomplishment") or
+            fn.endswith("app1/second.accomplishment") or
             fn.endswith("app1/third.accomplishment"))
 
     def test_bad_accomplishment_award_rejected(self):
-        self.assertRaises(daemon.NoSuchAccomplishment, self.d.accomplish, 
+        self.assertRaises(app.NoSuchAccomplishment, self.d.accomplish,
             "app1", "nonexistent")
 
     def test_accomplish(self):
@@ -117,7 +119,7 @@
                 self.assert_("Found an accomplishment that shouldn't exist")
 
     def test_cannot_accomplished_locked(self):
-        self.assertRaises(daemon.AccomplishmentLocked, self.d.accomplish, "app1", "second")
+        self.assertRaises(app.AccomplishmentLocked, self.d.accomplish, "app1", "second")
 
     def test_all_available_accomplishments_with_scripts(self):
         asa = self.d.listAllAvailableAccomplishmentsWithScripts()
@@ -129,8 +131,8 @@
     def setUp(self):
         TestDaemon.setUp(self)
         env = os.environ.copy()
-        path = os.path.join(os.path.split(__file__)[0], "..", "daemon.py")
-        self.p = subprocess.Popen(['python', path, 
+        path = os.path.join(os.path.split(__file__)[0], "..", "app.py")
+        self.p = subprocess.Popen(['python', path,
             "--accomplishments-path=%s" % os.path.join(self.td, "accomplishments"),
             "--trophies-path=%s" % os.path.join(self.td, "trophies"),
             "--scripts-path=%s" % os.path.join(self.td, "scripts"),
@@ -144,7 +146,7 @@
         self.d = dbus.Interface(obj, "org.ubuntu.accomplishments")
 
     def test_bad_accomplishment_award_rejected(self):
-        self.assertRaises(dbus.DBusException, self.d.accomplish, 
+        self.assertRaises(dbus.DBusException, self.d.accomplish,
             "app1", "nonexistent")
 
     def test_cannot_accomplished_locked(self):

=== added file 'accomplishments/exceptions.py'
--- accomplishments/exceptions.py	1970-01-01 00:00:00 +0000
+++ accomplishments/exceptions.py	2012-03-05 04:37:19 +0000
@@ -0,0 +1,32 @@
+class Error(Exception):
+    """
+    A base class for exceptions.
+    """
+    def __init__(self, msg=None):
+        if msg == None:
+            msg = self.__doc__.strip()
+        super(Error, self).__init__(msg)
+
+
+class PathNotFound(Error):
+    """
+    Could not find the specified directory.
+    """
+
+
+class VersionError(Error):
+    """
+    There is a problem with the software version.
+    """
+
+
+class NoSuchAccomplishment(Error):
+    """
+    No such accomplishment has been registered.
+    """
+
+
+class AccomplishmentLocked(Error):
+    """
+    This accomplishment requires other things to be accomplished first.
+    """

=== added directory 'accomplishments/gui'
=== renamed file 'trophyinfo/AboutTrophyinfoDialog.py' => 'accomplishments/gui/AboutTrophyinfoDialog.py'
--- trophyinfo/AboutTrophyinfoDialog.py	2012-01-22 23:09:09 +0000
+++ accomplishments/gui/AboutTrophyinfoDialog.py	2012-03-05 04:37:19 +0000
@@ -5,20 +5,22 @@
 
 import gettext
 from gettext import gettext as _
+import logging
+
+from accomplishments.gui.base.AboutDialog import AboutDialog
+
+
 gettext.textdomain('trophyinfo')
-
-import logging
 logger = logging.getLogger('trophyinfo')
 
-from trophyinfo_lib.AboutDialog import AboutDialog
 
-# See trophyinfo_lib.AboutDialog.py for more details about how this class works.
+# See trophyinfo/gui/base/AboutDialog.py for more details about how this class
+# works.
 class AboutTrophyinfoDialog(AboutDialog):
+
     __gtype_name__ = "AboutTrophyinfoDialog"
-    
+
     def finish_initializing(self, builder): # pylint: disable=E1002
         """Set up the about dialog"""
         super(AboutTrophyinfoDialog, self).finish_initializing(builder)
-
         # Code for other initialization actions should be added here.
-

=== renamed file 'trophyinfo/PreferencesTrophyinfoDialog.py' => 'accomplishments/gui/PreferencesTrophyinfoDialog.py'
--- trophyinfo/PreferencesTrophyinfoDialog.py	2012-01-22 23:09:09 +0000
+++ accomplishments/gui/PreferencesTrophyinfoDialog.py	2012-03-05 04:37:19 +0000
@@ -9,18 +9,22 @@
 # data/glib-2.0/schemas/net.launchpad.trophyinfo.gschema.xml
 # See http://developer.gnome.org/gio/stable/GSettings.html for more info.
 
-from gi.repository import Gio # pylint: disable=E0611
 
 import gettext
 from gettext import gettext as _
+import logging
+
+from gi.repository import Gio # pylint: disable=E0611
+
+from accomplishments.gui.base.PreferencesDialog import PreferencesDialog
+
+
 gettext.textdomain('trophyinfo')
-
-import logging
 logger = logging.getLogger('trophyinfo')
 
-from trophyinfo_lib.PreferencesDialog import PreferencesDialog
 
 class PreferencesTrophyinfoDialog(PreferencesDialog):
+
     __gtype_name__ = "PreferencesTrophyinfoDialog"
 
     def finish_initializing(self, builder): # pylint: disable=E1002

=== renamed file 'trophyinfo/TrophyinfoWindow.py' => 'accomplishments/gui/TrophyinfoWindow.py'
--- trophyinfo/TrophyinfoWindow.py	2012-03-04 10:42:54 +0000
+++ accomplishments/gui/TrophyinfoWindow.py	2012-03-05 04:37:19 +0000
@@ -2,33 +2,31 @@
 ### BEGIN LICENSE
 # This file is in the public domain
 ### END LICENSE
-
 import gettext
 from gettext import gettext as _
-gettext.textdomain('trophyinfo')
-
-from dbus.mainloop.glib import DBusGMainLoop
-DBusGMainLoop(set_as_default=True)
-
-from gi.repository import Gtk, GdkPixbuf, WebKit # pylint: disable=E0611
 import logging
 import os
 import sys
 import webbrowser
+
 import dbus
 import dbus.service
-
-sys.path.append("./daemon/")
-
+from dbus.mainloop.glib import DBusGMainLoop
+
+from gi.repository import Gtk, GdkPixbuf, WebKit # pylint: disable=E0611
+
+from accomplishments.daemon import dbusapi
+from accomplishments.gui.base import Window
+from accomplishments.gui.base.helpers import get_media_file
+from accomplishments.gui.AboutTrophyinfoDialog import AboutTrophyinfoDialog
+from accomplishments.gui.PreferencesTrophyinfoDialog import (
+    PreferencesTrophyinfoDialog)
+
+
+gettext.textdomain('trophyinfo')
+DBusGMainLoop(set_as_default=True)
 logger = logging.getLogger('trophyinfo')
-import libaccomplishments
-
-
-from trophyinfo_lib import Window
-from trophyinfo.AboutTrophyinfoDialog import AboutTrophyinfoDialog
-from trophyinfo.PreferencesTrophyinfoDialog import PreferencesTrophyinfoDialog
-
-from trophyinfo_lib.helpers import get_media_file
+
 
 COL_TITLE = 0
 COL_PIXBUF = 1
@@ -37,10 +35,12 @@
 COL_APPLICATION = 4
 COL_ACCOMPLISHMENT = 5
 
+
 # See trophyinfo_lib.Window.py for more details about how this class works
 class TrophyinfoWindow(Window):
+
     __gtype_name__ = "TrophyinfoWindow"
-    
+
     def finish_initializing(self, builder): # pylint: disable=E1002
         """Set up the main window"""
         super(TrophyinfoWindow, self).finish_initializing(builder)
@@ -52,7 +52,7 @@
 
         self.accomdb = []
 
-        self.libaccom = libaccomplishments.Accomplishments()
+        self.libaccom = dbusapi.Accomplishments()
 
         self.tb_mytrophies = self.builder.get_object("tb_mytrophies")
         self.tb_opportunities = self.builder.get_object("tb_opportunities")
@@ -74,11 +74,11 @@
         self.scrolledwindow = self.builder.get_object("scrolledwindow")
         self.webkitview = self.builder.get_object("webkitview")
         self.webkitbox = self.builder.get_object("webkitbox")
-           
+
         # make the toolbar black in Ubuntu
         context = self.toolbar.get_style_context()
         context.add_class(Gtk.STYLE_CLASS_PRIMARY_TOOLBAR)
-        
+
         self.trophystore = Gtk.ListStore(str, GdkPixbuf.Pixbuf, bool, bool, str, str) # title, icon accomplished, locked, app, accomplishment
         self.trophystore.set_sort_column_id(COL_TITLE, Gtk.SortType.ASCENDING)
         self.trophy_icon.set_model(self.trophystore)
@@ -98,8 +98,7 @@
         #scrolledwindow = self.builder.get_object("scrolledwindow")
         self.webview = WebKit.WebView()
         self.scrolledwindow.add(self.webview)
-        
-        
+
         #scrolledwindow.pack_start(self.webview)
 
         self.webview.show()
@@ -117,7 +116,7 @@
         self.opp_combo_cat.add_attribute(self.cat_combo_renderer_text, "text", 1)
 
         self.populate_opp_combos()
-        self.update_views(None)   
+        self.update_views(None)
 
         self.has_u1 = self.libaccom.getConfigValue("config", "has_u1")
         self.has_verif = self.libaccom.getConfigValue("config", "has_verif")
@@ -137,7 +136,7 @@
 
 
         dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-        
+
         bus = dbus.SessionBus()
         try:
             object  = bus.get_object("org.ubuntu.accomplishments","/org/ubuntu/accomplishments")
@@ -165,13 +164,13 @@
         self.spinner.start()
         self.spinner.show()
         self.statusbox.show()
-        
+
     def scriptrunner_finish(self):
         self.statusbar.set_text("")
         self.spinner.stop()
         self.spinner.hide()
         self.statusbox.hide()
-        
+
     def approve_u1_trophies(self):
 
         self.u1_button.set_label("Register with Ubuntu One")
@@ -220,7 +219,7 @@
     def register_with_verif(self, widget):
         self.u1_button.set_label("Approve verified trophies")
 
-        if widget is not None:    
+        if widget is not None:
             self.u1_button.disconnect(self.u1_button_sig)
 
         self.u1_button_sig = self.u1_button.connect("clicked", self.create_trophy_share)
@@ -234,14 +233,14 @@
 
         status_trophies = 0
         status_opps = 0
-        
+
         show_locked = True
-        
+
         if self.opp_showlocked.get_active():
             show_locked = True
         else:
             show_locked = False
-                 
+
         trophymodel = self.trophy_icon.get_model()
         oppmodel = self.opp_icon.get_model()
 
@@ -262,15 +261,15 @@
 
         if cattree_iter == None:
             cat = ""
-            catname = ""        
+            catname = ""
         else:
             cat, catname = catmodel[cattree_iter][:2]
 
         # update opportunities
-        for acc in self.accomdb:            
+        for acc in self.accomdb:
             icon = None
             icon = GdkPixbuf.Pixbuf.new_from_file_at_size(str(acc["iconpath"]), 120, 120)
-            
+
             if str(acc["accomplished"]) == '1':
                 trophymodel.append([acc["title"], icon, bool(acc["accomplished"]), acc["locked"], acc["application"], acc["accomplishment"]])
                 status_trophies = status_trophies + 1
@@ -301,13 +300,13 @@
         self._load_accomplishments()
 
         temp = []
-        
+
         for i in self.accomdb:
             temp.append({i["application"] : i["application-human"] })
 
-        # uniqify the values     
+        # uniqify the values
         result = [dict(tupleized) for tupleized in set(tuple(item.items()) for item in temp)]
-     
+
         # set up app
         self.opp_app_store.append(["", "All"])
 
@@ -318,7 +317,7 @@
 
         self.opp_combo_app.set_active(0)
         self.opp_combo_app.show()
-        
+
         # set up cat
 
         self.opp_combo_cat.set_model(self.opp_cat_store)
@@ -371,7 +370,7 @@
         self.update_views(None)
         self.notebook.set_current_page(2)
 
-    
+
     def get_icon(self, name):
         theme = Gtk.IconTheme.get_default()
         return theme.load_icon(name, 48, 0)
@@ -379,14 +378,14 @@
 
     def check_for_extra_info_required(self):
         infoneeded = self.libaccom.getAllExtraInformationRequired()
-        
+
         if len(infoneeded) == 0:
             self.notebook.set_current_page(0)
         else:
             self.gather_auth_info(infoneeded)
 
     def gather_auth_info(self, infoneeded):
-        self.additional_notebook.set_current_page(0)        
+        self.additional_notebook.set_current_page(0)
 
         table = Gtk.Table(len(infoneeded), 2, False)
         self.auth_viewport.add(table)
@@ -399,7 +398,7 @@
             label = Gtk.Label(i["label"])
             table.attach(label, 0, 1, ii, (ii+1))
             entry = Gtk.Entry()
-            table.attach(entry, 1, 2,ii, (ii+1))        
+            table.attach(entry, 1, 2,ii, (ii+1))
             ii = ii + 1
             d = {"application" : i["application"], "needs-information" : i["needs-information"], "entry" : entry}
             self.auth_widget_lookup.append(d)
@@ -412,7 +411,7 @@
         for i in self.auth_widget_lookup:
             self.libaccom.createExtraInformationFile(i["application"], i["needs-information"], i["entry"].get_text())
         self.additional_expander.set_visible(False)
-    
+
         self.notebook.set_current_page(2)
 
     def _load_accomplishments(self):
@@ -446,8 +445,8 @@
         html = None
 
         title = a[0]["title"]
-        
-        application = a[0]["application"]   
+
+        application = a[0]["application"]
 
         for accom in self.accomdb:
             if title in accom["title"]:
@@ -465,7 +464,7 @@
         html = html + "<td><img src='" + str(iconpath) + "' height='100'></td>"
 
         html = html + "<td><strong>Trophy Information:</strong><br/><hr />"
-        
+
         if "description" in a[0]:
             description = a[0]["description"]
             html = html + description
@@ -535,4 +534,3 @@
         self.notebook.set_current_page(0)
         self.webview.load_html_string(html, "file:///")
         self.webview.show()
-

=== added file 'accomplishments/gui/__init__.py'
=== renamed directory 'trophyinfo_lib' => 'accomplishments/gui/base'
=== modified file 'accomplishments/gui/base/AboutDialog.py'
--- trophyinfo_lib/AboutDialog.py	2012-01-22 23:09:09 +0000
+++ accomplishments/gui/base/AboutDialog.py	2012-03-05 04:37:19 +0000
@@ -2,18 +2,19 @@
 ### BEGIN LICENSE
 # This file is in the public domain
 ### END LICENSE
-
 from gi.repository import Gtk # pylint: disable=E0611
 
 from . helpers import get_builder
 
+
 class AboutDialog(Gtk.AboutDialog):
+
     __gtype_name__ = "AboutDialog"
 
     def __new__(cls):
-        """Special static method that's automatically called by Python when 
+        """Special static method that's automatically called by Python when
         constructing a new instance of this class.
-        
+
         Returns a fully instantiated AboutDialog object.
         """
         builder = get_builder('AboutTrophyinfoDialog')
@@ -28,10 +29,9 @@
         and creating a AboutDialog object with it in order
         to finish initializing the start of the new AboutTrophyinfoDialog
         instance.
-        
+
         Put your initialization code in here and leave __init__ undefined.
         """
         # Get a reference to the builder and set up the signals.
         self.builder = builder
         self.ui = builder.get_ui(self)
-

=== modified file 'accomplishments/gui/base/Builder.py'
--- trophyinfo_lib/Builder.py	2012-01-22 23:09:09 +0000
+++ accomplishments/gui/base/Builder.py	2012-03-05 04:37:19 +0000
@@ -2,18 +2,18 @@
 ### BEGIN LICENSE
 # This file is in the public domain
 ### END LICENSE
-
 '''Enhances builder connections, provides object to access glade objects'''
-
-from gi.repository import GObject, Gtk # pylint: disable=E0611
-
+import functools
 import inspect
-import functools
 import logging
-logger = logging.getLogger('trophyinfo_lib')
-
 from xml.etree.cElementTree import ElementTree
 
+from gi.repository import GObject, Gtk # pylint: disable=E0611
+
+
+logger = logging.getLogger('trophyinfo')
+
+
 # this module is big so uses some conventional prefixes and postfixes
 # *s list, except self.widgets is a dictionary
 # *_dict dictionary
@@ -162,7 +162,7 @@
         cannot_message = """cannot bind ui.%s, name already exists
         consider using a pythonic name instead of design name '%s'"""
         consider_message = """consider using a pythonic name instead of design name '%s'"""
-        
+
         for (widget_name, widget) in widget_dict.items():
             pyname = make_pyname(widget_name)
             if pyname != widget_name:
@@ -195,7 +195,7 @@
     return pyname
 
 
-# Until bug https://bugzilla.gnome.org/show_bug.cgi?id=652127 is fixed, we 
+# Until bug https://bugzilla.gnome.org/show_bug.cgi?id=652127 is fixed, we
 # need to reimplement inspect.getmembers.  GObject introspection doesn't
 # play nice with it.
 def getmembers(obj, check):

=== modified file 'accomplishments/gui/base/PreferencesDialog.py'
--- trophyinfo_lib/PreferencesDialog.py	2012-01-22 23:09:09 +0000
+++ accomplishments/gui/base/PreferencesDialog.py	2012-03-05 04:37:19 +0000
@@ -2,23 +2,25 @@
 ### BEGIN LICENSE
 # This file is in the public domain
 ### END LICENSE
-
-"""this dialog adjusts values in gsettings
-"""
+"""this dialog adjusts values in gsettings"""
+import logging
 
 from gi.repository import Gtk # pylint: disable=E0611
-import logging
-logger = logging.getLogger('trophyinfo_lib')
 
 from . helpers import get_builder, show_uri, get_help_uri
 
+
+logger = logging.getLogger('trophyinfo')
+
+
 class PreferencesDialog(Gtk.Dialog):
+
     __gtype_name__ = "PreferencesDialog"
 
     def __new__(cls):
-        """Special static method that's automatically called by Python when 
+        """Special static method that's automatically called by Python when
         constructing a new instance of this class.
-        
+
         Returns a fully instantiated PreferencesDialog object.
         """
         builder = get_builder('PreferencesTrophyinfoDialog')
@@ -33,7 +35,7 @@
         and creating a PreferencesDialog object with it in order to
         finish initializing the start of the new PerferencesTrophyinfoDialog
         instance.
-        
+
         Put your initialization code in here and leave __init__ undefined.
         """
 
@@ -48,4 +50,3 @@
 
     def on_btn_help_clicked(self, widget, data=None):
         show_uri(self, "ghelp:%s" % get_help_uri('preferences'))
-

=== modified file 'accomplishments/gui/base/Window.py'
--- trophyinfo_lib/Window.py	2012-01-22 23:09:09 +0000
+++ accomplishments/gui/base/Window.py	2012-03-05 04:37:19 +0000
@@ -2,19 +2,23 @@
 ### BEGIN LICENSE
 # This file is in the public domain
 ### END LICENSE
+import logging
 
 from gi.repository import Gio, Gtk # pylint: disable=E0611
-import logging
-logger = logging.getLogger('trophyinfo_lib')
 
 from . helpers import get_builder, show_uri, get_help_uri
 
+
+logger = logging.getLogger('trophyinfo')
+
+
 # This class is meant to be subclassed by TrophyinfoWindow.  It provides
 # common functions and some boilerplate.
 class Window(Gtk.Window):
+
     __gtype_name__ = "Window"
 
-    # To construct a new instance of this method, the following notable 
+    # To construct a new instance of this method, the following notable
     # methods are called in this order:
     # __new__(cls)
     # __init__(self)
@@ -23,11 +27,11 @@
     #
     # For this reason, it's recommended you leave __init__ empty and put
     # your initialization code in finish_initializing
-    
+
     def __new__(cls):
-        """Special static method that's automatically called by Python when 
+        """Special static method that's automatically called by Python when
         constructing a new instance of this class.
-        
+
         Returns a fully instantiated BaseTrophyinfoWindow object.
         """
         builder = get_builder('TrophyinfoWindow')
@@ -53,9 +57,11 @@
         self.settings.connect('changed', self.on_preferences_changed)
 
         # Optional Launchpad integration
-        # This shouldn't crash if not found as it is simply used for bug reporting.
-        # See https://wiki.ubuntu.com/UbuntuDevelopment/Internationalisation/Coding
-        # for more information about Launchpad integration.
+        # This shouldn't crash if not found as it is simply used for bug
+        # reporting. See the following for more information about Launchpad
+        # integration:
+        #
+        # https://wiki.ubuntu.com/UbuntuDevelopment/Internationalisation/Coding
         try:
             from gi.repository import LaunchpadIntegration # pylint: disable=E0611
             LaunchpadIntegration.add_items(self.ui.helpMenu, 1, True, True)
@@ -69,7 +75,7 @@
         #  http://owaislone.org/quickly-add-indicator/
         #  https://wiki.ubuntu.com/DesktopExperienceTeam/ApplicationIndicators
         try:
-            from trophyinfo import indicator
+            from accomplishments import indicator
             # self is passed so methods of this class can be called from indicator.py
             # Comment this next line out to disable appindicator
             self.indicator = indicator.new_application_indicator(self)
@@ -118,10 +124,9 @@
 
     def on_preferences_dialog_destroyed(self, widget, data=None):
         '''only affects gui
-        
+
         logically there is no difference between the user closing,
         minimising or ignoring the preferences dialog'''
         logger.debug('on_preferences_dialog_destroyed')
         # to determine whether to create or present preferences_dialog
         self.preferences_dialog = None
-

=== modified file 'accomplishments/gui/base/__init__.py'
--- trophyinfo_lib/__init__.py	2012-01-22 23:09:09 +0000
+++ accomplishments/gui/base/__init__.py	2012-03-05 04:37:19 +0000
@@ -3,10 +3,9 @@
 # This file is in the public domain
 ### END LICENSE
 
-'''facade - makes trophyinfo_lib package easy to refactor
+'''facade - makes the accomplishments.gui.base subpackage easy to refactor
 
 while keeping its api constant'''
-from . helpers import set_up_logging
 from . Window import Window
-from . trophyinfoconfig import get_version
 
+from accomplishments.util import get_version, set_up_logging

=== modified file 'accomplishments/gui/base/helpers.py'
--- trophyinfo_lib/helpers.py	2012-01-22 23:09:09 +0000
+++ accomplishments/gui/base/helpers.py	2012-03-05 04:37:19 +0000
@@ -2,22 +2,23 @@
 ### BEGIN LICENSE
 # This file is in the public domain
 ### END LICENSE
-
 """Helpers for an Ubuntu application."""
-import logging
 import os
-
-from . trophyinfoconfig import get_data_file
-from . Builder import Builder
-
 import gettext
 from gettext import gettext as _
+
+from accomplishments.util import get_data_file
+
+from . Builder import Builder
+
+
 gettext.textdomain('trophyinfo')
 
+
 def get_builder(builder_file_name):
-    """Return a fully-instantiated Gtk.Builder instance from specified ui 
+    """Return a fully-instantiated Gtk.Builder instance from specified ui
     file
-    
+
     :param builder_file_name: The name of the builder file, without extension.
         Assumed to be in the 'ui' directory under the data path.
     """
@@ -40,34 +41,6 @@
 
     return "file:///"+media_filename
 
-class NullHandler(logging.Handler):
-    def emit(self, record):
-        pass
-
-def set_up_logging(opts):
-    # add a handler to prevent basicConfig
-    root = logging.getLogger()
-    null_handler = NullHandler()
-    root.addHandler(null_handler)
-
-    formatter = logging.Formatter("%(levelname)s:%(name)s: %(funcName)s() '%(message)s'")
-
-    logger = logging.getLogger('trophyinfo')
-    logger_sh = logging.StreamHandler()
-    logger_sh.setFormatter(formatter)
-    logger.addHandler(logger_sh)
-
-    lib_logger = logging.getLogger('trophyinfo_lib')
-    lib_logger_sh = logging.StreamHandler()
-    lib_logger_sh.setFormatter(formatter)
-    lib_logger.addHandler(lib_logger_sh)
-
-    # Set the logging level to show debug messages.
-    if opts.verbose:
-        logger.setLevel(logging.DEBUG)
-        logger.debug('logging enabled')
-    if opts.verbose > 1:
-        lib_logger.setLevel(logging.DEBUG)
 
 def get_help_uri(page=None):
     # help_uri from source tree - default language
@@ -89,6 +62,7 @@
     screen = parent.get_screen()
     Gtk.show_uri(screen, link, Gtk.get_current_event_time())
 
+
 def alias(alternative_function_name):
     '''see http://www.drdobbs.com/web-development/184406073#l9'''
     def decorator(function):

=== renamed file 'trophyinfo/__init__.py' => 'accomplishments/main.py'
--- trophyinfo/__init__.py	2012-02-16 01:45:30 +0000
+++ accomplishments/main.py	2012-03-05 04:37:19 +0000
@@ -2,37 +2,16 @@
 ### BEGIN LICENSE
 # This file is in the public domain
 ### END LICENSE
-
-import optparse
-
-import gettext
-from gettext import gettext as _
-gettext.textdomain('trophyinfo')
-
 from gi.repository import Gtk # pylint: disable=E0611
 
-from trophyinfo import TrophyinfoWindow
-
-from trophyinfo_lib import set_up_logging, get_version
-
-def parse_options():
-    """Support for command line options"""
-    parser = optparse.OptionParser(version="%%prog %s" % get_version())
-    parser.add_option(
-        "-v", "--verbose", action="count", dest="verbose",
-        help=_("Show debug messages (-vv debugs trophyinfo_lib also)"))
-    parser.add_option(
-        "-c", "--clear-trophies", action="count", dest="clear",
-        help=_("Clear your trophies collection"))
-    (options, args) = parser.parse_args()
-
-    set_up_logging(options)
+from accomplishments import util
+from accomplishments.gui import TrophyinfoWindow
+
 
 def main():
-    'constructor for your class instances'
-    parse_options()
-
-    # Run the application.    
+    options = util.parse_options()
+    util.set_up_logging(options)
+    # Run the application.
     window = TrophyinfoWindow.TrophyinfoWindow()
     window.show()
     Gtk.main()

=== added directory 'accomplishments/util'
=== added file 'accomplishments/util/__init__.py'
--- accomplishments/util/__init__.py	1970-01-01 00:00:00 +0000
+++ accomplishments/util/__init__.py	2012-03-05 04:37:19 +0000
@@ -0,0 +1,88 @@
+import logging
+import optparse
+import os
+
+import gettext
+from gettext import gettext as _
+
+import accomplishments
+from accomplishments import config
+from accomplishments import exceptions
+
+
+gettext.textdomain('trophyinfo')
+
+
+def get_version():
+    return config.__version__
+
+
+class NullHandler(logging.Handler):
+    """
+    """
+    def emit(self, record):
+        pass
+
+
+def set_up_logging(opts):
+    # add a handler to prevent basicConfig
+    root = logging.getLogger()
+    null_handler = NullHandler()
+    root.addHandler(null_handler)
+
+    formatter = logging.Formatter(
+        "%(levelname)s:%(name)s: %(funcName)s() '%(message)s'")
+
+    logger = logging.getLogger('trophyinfo')
+    logger_sh = logging.StreamHandler()
+    logger_sh.setFormatter(formatter)
+    logger.addHandler(logger_sh)
+
+    # Set the logging level to show debug messages.
+    if opts.verbose:
+        logger.setLevel(logging.DEBUG)
+        logger.debug('logging enabled')
+    if opts.verbose > 1:
+        lib_logger.setLevel(logging.DEBUG)
+
+
+def get_data_path():
+    """Retrieve trophyinfo data path
+
+    This path is by default <trophyinfo_lib_path>/../data/ in trunk
+    and /usr/share/trophyinfo in an installed version but this path
+    is specified at installation time.
+    """
+
+    # Get pathname absolute or relative.
+    path = os.path.join(
+        os.path.dirname(accomplishments.__path__[0]),
+        config.__trophyinfo_data_directory__)
+    abs_data_path = os.path.abspath(path)
+    if not os.path.exists(abs_data_path):
+        msg = "Could not find the project data directory."
+        raise exceptions.PathNotFound(msg)
+    return abs_data_path
+
+
+def get_data_file(*path_segments):
+    """Get the full path to a data file.
+
+    Returns the path to a file underneath the data directory (as defined by
+    `get_data_path`). Equivalent to os.path.join(get_data_path(),
+    *path_segments).
+    """
+    return os.path.join(get_data_path(), *path_segments)
+
+
+def parse_options():
+    """Support for command line options"""
+    parser = optparse.OptionParser(version="%%prog %s" % get_version())
+    parser.add_option(
+        "-v", "--verbose", action="count", dest="verbose",
+        help=_("Show debug messages (-vv debugs trophyinfo_lib also)"))
+    parser.add_option(
+        "-c", "--clear-trophies", action="count", dest="clear",
+        help=_("Clear your trophies collection"))
+    (options, args) = parser.parse_args()
+    return options

=== added file 'accomplishments/util/dist.py'
--- accomplishments/util/dist.py	1970-01-01 00:00:00 +0000
+++ accomplishments/util/dist.py	2012-03-05 04:37:19 +0000
@@ -0,0 +1,75 @@
+import os
+import sys
+
+try:
+    import DistUtilsExtra.auto
+except ImportError:
+    DistUtilsExtra = None
+
+from accomplishments import exceptions
+
+
+if not DistUtilsExtra:
+    msg = ('To build trophyinfo you need '
+           'https://launchpad.net/python-distutils-extra')
+    print >> sys.stderr, msg
+    sys.exit(1)
+elif DistUtilsExtra.auto.__version__ < '2.18':
+    raise exceptions.VersionError('needs DistUtilsExtra.auto >= 2.18')
+
+
+def update_config(values = {}):
+    oldvalues = {}
+    try:
+        fin = file('trophyinfo_lib/trophyinfoconfig.py', 'r')
+        fout = file(fin.name + '.new', 'w')
+
+        for line in fin:
+            fields = line.split(' = ') # Separate variable from value
+            if fields[0] in values:
+                oldvalues[fields[0]] = fields[1].strip()
+                line = "%s = %s\n" % (fields[0], values[fields[0]])
+            fout.write(line)
+
+        fout.flush()
+        fout.close()
+        fin.close()
+        os.rename(fout.name, fin.name)
+    except (OSError, IOError), e:
+        print ("ERROR: Can't find trophyinfo_lib/trophyinfoconfig.py")
+        sys.exit(1)
+    return oldvalues
+
+
+def update_desktop_file(datadir):
+    try:
+        fin = file('trophyinfo.desktop.in', 'r')
+        fout = file(fin.name + '.new', 'w')
+
+        for line in fin:
+            if 'Icon=' in line:
+                line = "Icon=%s\n" % (datadir + 'media/trophyinfo.svg')
+            fout.write(line)
+        fout.flush()
+        fout.close()
+        fin.close()
+        os.rename(fout.name, fin.name)
+    except (OSError, IOError), e:
+        print ("ERROR: Can't find trophyinfo.desktop.in")
+        sys.exit(1)
+
+
+class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):
+
+    def run(self):
+        values = {
+            '__trophyinfo_data_directory__': "'%s'" % (
+                self.prefix + '/share/trophyinfo/'),
+            '__version__': "'%s'" % self.distribution.get_version()}
+        previous_values = update_config(values)
+        update_desktop_file(self.prefix + '/share/trophyinfo/')
+        DistUtilsExtra.auto.install_auto.run(self)
+        update_config(previous_values)
+
+
+setup = DistUtilsExtra.auto.setup

=== renamed file 'daemon/rundaemon.sh' => 'bin/rundaemon.sh'
--- daemon/rundaemon.sh	2012-02-22 05:33:30 +0000
+++ bin/rundaemon.sh	2012-03-05 04:37:19 +0000
@@ -4,12 +4,12 @@
 export PYTHONPATH=$PYTHONPATH:.
 
 echo Importing the validation key...
-gpg --import validation-key.pub
+gpg --import ./data/daemon/validation-key.pub
 
 echo Starting the accomplishments daemon...
 echo "(this would be done by D-Bus activation in the real world)"
 
-python ./libaccomplishments-daemon/daemon.py
+python ./accomplishments/daemon/app.py
 DAEMON=$!
 
 

=== modified file 'bin/trophyinfo'
--- bin/trophyinfo	2012-01-22 23:09:09 +0000
+++ bin/trophyinfo	2012-03-05 04:37:19 +0000
@@ -3,14 +3,16 @@
 ### BEGIN LICENSE
 # This file is in the public domain
 ### END LICENSE
-
 import sys
 import os
 
 import gettext
 from gettext import gettext as _
+
+from accomplishments.main import main
+
+
 gettext.textdomain('trophyinfo')
-
 # Add project root directory (enable symlink and trunk execution)
 PROJECT_ROOT_DIRECTORY = os.path.abspath(
     os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))))
@@ -22,12 +24,14 @@
         opt_path = path.replace('/usr', '/opt/extras.ubuntu.com/trophyinfo')
         python_path.insert(0, opt_path)
         sys.path.insert(0, opt_path)
-if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'trophyinfo'))
+if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'accomplishments'))
     and PROJECT_ROOT_DIRECTORY not in sys.path):
     python_path.insert(0, PROJECT_ROOT_DIRECTORY)
     sys.path.insert(0, PROJECT_ROOT_DIRECTORY)
 if python_path:
-    os.putenv('PYTHONPATH', "%s:%s" % (os.getenv('PYTHONPATH', ''), ':'.join(python_path))) # for subprocesses
+    os.putenv(
+        'PYTHONPATH', 
+        "%s:%s" % (os.getenv('PYTHONPATH', ''), 
+        ':'.join(python_path))) # for subprocesses
 
-import trophyinfo
-trophyinfo.main()
+main()

=== removed directory 'daemon/libaccomplishments'
=== removed directory 'daemon/libaccomplishments-daemon'
=== removed file 'daemon/libaccomplishments-daemon/trophy-accomplished.svg'
--- daemon/libaccomplishments-daemon/trophy-accomplished.svg	2012-01-28 20:03:46 +0000
+++ daemon/libaccomplishments-daemon/trophy-accomplished.svg	1970-01-01 00:00:00 +0000
@@ -1,854 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="200"
-   height="300"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="trophy-accomplished.svg">
-  <title
-     id="title3265">Trophy</title>
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4099"
-       inkscape:collect="always">
-      <stop
-         id="stop4101"
-         offset="0"
-         style="stop-color:#ffc022;stop-opacity:1" />
-      <stop
-         id="stop4103"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4088">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4090" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4092" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4070">
-      <stop
-         style="stop-color:#f0be63;stop-opacity:1;"
-         offset="0"
-         id="stop4072" />
-      <stop
-         style="stop-color:#b88100;stop-opacity:1"
-         offset="1"
-         id="stop4074" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3277">
-      <stop
-         style="stop-color:#804d00;stop-opacity:1;"
-         offset="0"
-         id="stop3279" />
-      <stop
-         style="stop-color:#b98304;stop-opacity:1"
-         offset="1"
-         id="stop3281" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3267">
-      <stop
-         style="stop-color:#692017;stop-opacity:1;"
-         offset="0"
-         id="stop3269" />
-      <stop
-         style="stop-color:#46150f;stop-opacity:1"
-         offset="1"
-         id="stop3271" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3961">
-      <stop
-         style="stop-color:#804d00;stop-opacity:1;"
-         offset="0"
-         id="stop3963" />
-      <stop
-         style="stop-color:#b88100;stop-opacity:1"
-         offset="1"
-         id="stop3965" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3953">
-      <stop
-         style="stop-color:#804d00;stop-opacity:1;"
-         offset="0"
-         id="stop3955" />
-      <stop
-         style="stop-color:#ffc022;stop-opacity:1"
-         offset="1"
-         id="stop3957" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3945">
-      <stop
-         style="stop-color:#804d00;stop-opacity:1;"
-         offset="0"
-         id="stop3947" />
-      <stop
-         style="stop-color:#ffc022;stop-opacity:1"
-         offset="1"
-         id="stop3949" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3918">
-      <stop
-         style="stop-color:#fcca77;stop-opacity:1;"
-         offset="0"
-         id="stop3920" />
-      <stop
-         style="stop-color:#fcca77;stop-opacity:0;"
-         offset="1"
-         id="stop3922" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3908">
-      <stop
-         style="stop-color:#f6c374;stop-opacity:1;"
-         offset="0"
-         id="stop3910" />
-      <stop
-         style="stop-color:#b88100;stop-opacity:1"
-         offset="1"
-         id="stop3912" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3896">
-      <stop
-         style="stop-color:#e7bc77;stop-opacity:1;"
-         offset="0"
-         id="stop3898" />
-      <stop
-         style="stop-color:#e7bc77;stop-opacity:0;"
-         offset="1"
-         id="stop3900" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3886">
-      <stop
-         style="stop-color:#fed78a;stop-opacity:1;"
-         offset="0"
-         id="stop3888" />
-      <stop
-         style="stop-color:#fed78a;stop-opacity:0;"
-         offset="1"
-         id="stop3890" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3872">
-      <stop
-         style="stop-color:#dcac62;stop-opacity:1;"
-         offset="0"
-         id="stop3874" />
-      <stop
-         style="stop-color:#b88100;stop-opacity:1"
-         offset="1"
-         id="stop3876" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3854">
-      <stop
-         style="stop-color:#b88100;stop-opacity:1;"
-         offset="0"
-         id="stop3856" />
-      <stop
-         style="stop-color:#fecd7b;stop-opacity:1"
-         offset="1"
-         id="stop3858" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3842">
-      <stop
-         style="stop-color:#804d00;stop-opacity:1;"
-         offset="0"
-         id="stop3844" />
-      <stop
-         style="stop-color:#804d00;stop-opacity:0;"
-         offset="1"
-         id="stop3846" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3842"
-       id="linearGradient3848"
-       x1="-216.17264"
-       y1="218.98633"
-       x2="-217.1828"
-       y2="249.29091"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5,0,0,0.5,-209.64022,192.29962)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3854"
-       id="linearGradient3860"
-       x1="-211.12189"
-       y1="245.25031"
-       x2="-201.02036"
-       y2="389.70212"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5,0,0,0.5,-209.64022,192.29962)" />
-    <filter
-       inkscape:collect="always"
-       id="filter3862"
-       x="-0.13795282"
-       width="1.2759056"
-       y="-0.051161319"
-       height="1.1023226"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.2515796"
-         id="feGaussianBlur3864" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter3866"
-       x="-0.12734108"
-       width="1.2546821"
-       y="-0.047225833"
-       height="1.0944517"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.0014581"
-         id="feGaussianBlur3868" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3872"
-       id="radialGradient3878"
-       cx="-197.15332"
-       cy="316.23712"
-       fx="-197.15332"
-       fy="316.23712"
-       r="42.421329"
-       gradientTransform="matrix(-1.1182277,0.0551342,-0.09068266,-2.5015192,-384.72423,1069.5515)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       inkscape:collect="always"
-       id="filter3880"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.7321539"
-         id="feGaussianBlur3882" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3886"
-       id="radialGradient3892"
-       cx="-199.00005"
-       cy="379.85995"
-       fx="-199.00005"
-       fy="379.85995"
-       r="38.890873"
-       gradientTransform="matrix(0.15584403,-1.7142858,0.9570922,0.08700819,-531.54808,4.3965634)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3896"
-       id="radialGradient3902"
-       cx="-273.75134"
-       cy="320.53235"
-       fx="-273.75134"
-       fy="320.53235"
-       r="49.711224"
-       gradientTransform="matrix(-0.48768998,-1.5849921,0.8254465,-0.2539842,-744.60397,11.938684)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3896"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.48768998,-1.5849921,-0.8254465,-0.2539842,133.90024,12.443759)"
-       cx="-273.75134"
-       cy="320.53235"
-       fx="-273.75134"
-       fy="320.53235"
-       r="49.711224" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="radialGradient3914"
-       cx="-188.89853"
-       cy="456.47113"
-       fx="-188.89853"
-       fy="456.47113"
-       r="62.046875"
-       gradientTransform="matrix(-0.0895426,6.0823415e-8,-4.0337866e-7,-0.59384305,-321.00376,691.05285)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3918"
-       id="radialGradient3924"
-       cx="-192.93913"
-       cy="403.7388"
-       fx="-192.93913"
-       fy="403.7388"
-       r="62.046875"
-       gradientTransform="matrix(-4.9230025e-8,0.3500303,-0.59384305,-8.35212e-8,-66.352315,456.20047)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3945"
-       id="radialGradient3951"
-       cx="-196.83202"
-       cy="310.99088"
-       fx="-196.83202"
-       fy="310.99088"
-       r="49.663921"
-       gradientTransform="matrix(-0.11552005,0.44604223,-1.5340915,-0.54706546,257.51838,583.13425)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient3959"
-       cx="-226.07143"
-       cy="271.32739"
-       fx="-226.07143"
-       fy="271.32739"
-       r="5.2734375"
-       gradientTransform="matrix(-1.7273801e-7,4.0634919,-2.7259259,-1.158765e-7,513.5469,1182.7873)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3961"
-       id="radialGradient3967"
-       cx="-193.85033"
-       cy="285.24863"
-       fx="-193.85033"
-       fy="285.24863"
-       r="6.2866349"
-       gradientTransform="matrix(1.5443388,0.31346969,-0.12981992,0.948631,142.5512,75.37164)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3854"
-       id="linearGradient4091"
-       gradientUnits="userSpaceOnUse"
-       x1="-211.12189"
-       y1="245.25031"
-       x2="-201.02036"
-       y2="389.70212"
-       gradientTransform="matrix(0.6338819,0,0,0.6089088,221.83905,644.83223)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="radialGradient4093"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.09790279,7.1628508e-8,-4.410403e-7,-0.69933743,83.202705,1239.4944)"
-       cx="-188.89853"
-       cy="456.47113"
-       fx="-188.89853"
-       fy="456.47113"
-       r="62.046875" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3872"
-       id="radialGradient4095"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.1182277,0.0551342,-0.09068266,-2.5015192,-764.72423,1065.2658)"
-       cx="-197.15332"
-       cy="316.23712"
-       fx="-197.15332"
-       fy="316.23712"
-       r="42.421329" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3886"
-       id="radialGradient4097"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.15584403,-1.7142858,0.9570922,0.08700819,-531.54808,4.3965634)"
-       cx="-199.00005"
-       cy="379.85995"
-       fx="-199.00005"
-       fy="379.85995"
-       r="38.890873" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3896"
-       id="radialGradient4099"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6182757,-1.9302312,1.0464712,-0.30930642,-456.36859,425.1855)"
-       cx="-273.75134"
-       cy="320.53235"
-       fx="-273.75134"
-       fy="320.53235"
-       r="49.711224" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3896"
-       id="radialGradient4101"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6182757,-1.9302312,-1.0464712,-0.30930642,657.36721,425.80059)"
-       cx="-273.75134"
-       cy="320.53235"
-       fx="-273.75134"
-       fy="320.53235"
-       r="49.711224" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3918"
-       id="radialGradient4103"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-6.2412045e-8,0.41681683,-0.7528527,-9.9457215e-8,403.49427,962.83622)"
-       cx="-192.93913"
-       cy="403.7388"
-       fx="-192.93913"
-       fy="403.7388"
-       r="62.046875" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4105"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0731693e-7,2.5245251,-1.6935357,-7.199058e-8,-66.303286,853.92148)"
-       cx="-226.07143"
-       cy="271.32739"
-       fx="-226.07143"
-       fy="271.32739"
-       r="5.2734375" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3961"
-       id="radialGradient4107"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9594512,0.19474928,-0.08065321,0.58935591,-260.62434,178.25247)"
-       cx="-193.85033"
-       cy="285.24863"
-       fx="-193.85033"
-       fy="285.24863"
-       r="6.2866349" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3842"
-       id="linearGradient4163"
-       gradientUnits="userSpaceOnUse"
-       x1="-216.17264"
-       y1="218.98633"
-       x2="-217.1828"
-       y2="249.29091"
-       gradientTransform="matrix(0.63675565,0,0,0.59461726,-397.39056,671.91253)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3854"
-       id="linearGradient4165"
-       gradientUnits="userSpaceOnUse"
-       x1="-211.12189"
-       y1="245.25031"
-       x2="-201.02036"
-       y2="389.70212"
-       gradientTransform="matrix(0.63675565,0,0,0.59461726,-397.39056,671.91253)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="radialGradient4167"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.11403351,7.2333305e-8,-5.1370729e-7,-0.70621865,-539.21329,1265.047)"
-       cx="-188.89853"
-       cy="456.47113"
-       fx="-188.89853"
-       fy="456.47113"
-       r="62.046875" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3872"
-       id="radialGradient4169"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.1182277,0.0551342,-0.09068266,-2.5015192,-679.00994,1500.9801)"
-       cx="-197.15332"
-       cy="316.23712"
-       fx="-197.15332"
-       fy="316.23712"
-       r="42.421329" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3886"
-       id="radialGradient4171"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.15584403,-1.7142858,0.9570922,0.08700819,-531.54808,4.3965634)"
-       cx="-199.00005"
-       cy="379.85995"
-       fx="-199.00005"
-       fy="379.85995"
-       r="38.890873" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3896"
-       id="radialGradient4173"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6210787,-1.8849273,1.0512155,-0.30204677,-1078.6729,457.42109)"
-       cx="-273.75134"
-       cy="320.53235"
-       fx="-273.75134"
-       fy="320.53235"
-       r="49.711224" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3896"
-       id="radialGradient4175"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6210787,-1.8849273,-1.0512155,-0.30204677,40.112094,458.02174)"
-       cx="-273.75134"
-       cy="320.53235"
-       fx="-273.75134"
-       fy="320.53235"
-       r="49.711224" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3918"
-       id="radialGradient4177"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-6.2694994e-8,0.41626811,-0.75626583,-9.9326294e-8,-214.9118,985.75254)"
-       cx="-192.93913"
-       cy="403.7388"
-       fx="-192.93913"
-       fy="403.7388"
-       r="62.046875" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4179"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0629016e-7,2.5003717,-1.6773327,-7.1301808e-8,-68.017833,1423.1127)"
-       cx="-226.07143"
-       cy="271.32739"
-       fx="-226.07143"
-       fy="271.32739"
-       r="5.2734375" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3961"
-       id="radialGradient4181"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9502716,0.192886,-0.07988155,0.58371719,-260.25926,813.70895)"
-       cx="-193.85033"
-       cy="285.24863"
-       fx="-193.85033"
-       fy="285.24863"
-       r="6.2866349" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3961"
-       id="radialGradient4187"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7721694,0.15673485,-0.06490996,0.4743155,-118.68886,249.90306)"
-       cx="-193.85033"
-       cy="285.24863"
-       fx="-193.85033"
-       fy="285.24863"
-       r="6.2866349" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3953"
-       id="radialGradient4189"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-8.6369005e-8,2.031746,-1.3629629,-5.793825e-8,47.13323,783.69327)"
-       cx="-226.07143"
-       cy="271.32739"
-       fx="-226.07143"
-       fy="271.32739"
-       r="5.2734375" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3267"
-       id="linearGradient3275"
-       x1="65.5"
-       y1="987.36218"
-       x2="64.5"
-       y2="1039.3622"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98544976,0,0,1.0180642,0.72159872,-21.779314)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3277"
-       id="linearGradient3283"
-       x1="107.5"
-       y1="780.36218"
-       x2="106.5"
-       y2="788.86218"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4070"
-       id="linearGradient4076"
-       x1="98.5"
-       y1="993.86218"
-       x2="64.5"
-       y2="995.36218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.216216,0,-213.44294)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4088"
-       id="linearGradient4094"
-       x1="100"
-       y1="127"
-       x2="98.5"
-       y2="99"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4099"
-       id="linearGradient4097"
-       gradientUnits="userSpaceOnUse"
-       x1="92.166664"
-       y1="123.31897"
-       x2="90.139999"
-       y2="74.939651" />
-    <filter
-       inkscape:collect="always"
-       id="filter4115"
-       x="-0.28636364"
-       width="1.5727273"
-       y="-0.067379679"
-       height="1.1347594">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.1477273"
-         id="feGaussianBlur4117" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter4125"
-       x="-0.13295501"
-       width="1.26591"
-       y="-4.0853449"
-       height="9.1706899">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="9.3622488"
-         id="feGaussianBlur4127" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2"
-     inkscape:cx="125.59398"
-     inkscape:cy="57.960461"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1600"
-     inkscape:window-height="876"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Trophy</dc:title>
-        <dc:date>2011-02-16</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>netalloy</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>trophy</rdf:li>
-            <rdf:li>sports</rdf:li>
-            <rdf:li>prize</rdf:li>
-            <rdf:li>winner</rdf:li>
-            <rdf:li>racing</rdf:li>
-            <rdf:li>motorsports</rdf:li>
-            <rdf:li>victory</rdf:li>
-            <rdf:li>achievement</rdf:li>
-            <rdf:li>award</rdf:li>
-            <rdf:li>cup</rdf:li>
-            <rdf:li>merit</rdf:li>
-            <rdf:li>No.1</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:description>motorsports clip art by NetAlloy</dc:description>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-752.36218)">
-    <path
-       inkscape:connector-curvature="0"
-       id="path4047"
-       d="m 173.24805,767.86986 c -1.45786,0.004 -2.96097,0.0757 -4.45699,0.19029 -2.99202,0.22916 -5.92202,0.64168 -8.28008,1.12267 -1.17902,0.2405 -2.22151,0.49034 -3.07036,0.76114 -0.84885,0.27079 -1.45084,0.44702 -2.11955,1.04656 -1.6129,1.4461 -2.37386,3.34018 -2.7138,5.23281 -0.33994,1.89263 -0.31746,3.82765 -0.31694,5.67046 5e-4,1.84282 -0.031,3.59015 -0.35656,4.98544 -0.3256,1.39529 -0.85654,2.39935 -1.94127,3.15872 -0.5849,0.40946 -2.95543,0.64126 -5.05124,0.41862 -2.09582,-0.22264 -3.88253,-0.66599 -3.88253,-0.66599 l -0.79235,2.93037 c 0,0 1.97944,0.49154 4.33813,0.74211 2.35869,0.25057 5.13106,0.49392 7.25002,-0.98948 1.8008,-1.26066 2.7376,-3.07787 3.16941,-4.92835 0.43182,-1.85049 0.41651,-3.78937 0.41599,-5.65144 -5e-4,-1.86207 0.007,-3.65198 0.27732,-5.15669 0.27026,-1.50472 0.76495,-2.66222 1.74318,-3.53929 -0.17038,0.15276 0.30964,-0.16339 0.99044,-0.38057 0.68079,-0.21717 1.61541,-0.46097 2.7138,-0.68502 2.19678,-0.44809 5.03128,-0.8471 7.88391,-1.06559 2.85263,-0.21849 5.73444,-0.23769 8.00276,0.019 2.26832,0.25672 3.81231,0.95158 4.08061,1.29394 3.54594,4.52465 4.15268,12.33478 2.19878,21.74946 -1.9539,9.41467 -6.38474,20.32746 -12.26165,30.92115 -11.75383,21.18738 -31.53134,39.03872 -45.91613,43.74427 l 1.01025,2.87329 c 16.12505,-5.27483 35.69932,-23.59574 47.67911,-45.19043 5.9899,-10.79735 10.53819,-21.92689 12.57859,-31.7584 2.04041,-9.83152 1.67802,-18.48622 -2.77323,-24.16607 -1.35081,-1.72366 -3.62221,-2.17969 -6.21996,-2.47369 -1.29889,-0.147 -2.7218,-0.21284 -4.17966,-0.20931 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b88100;fill-opacity:1;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       sodipodi:nodetypes="csscssccssccssscccssscsssccsssscc" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4061"
-       d="m 174.04495,768.48495 c 1.51962,-0.004 2.98217,0.0616 4.33607,0.20688 2.7078,0.29058 5.07542,0.74131 6.48346,2.44492 4.63982,5.61381 5.01755,14.16788 2.89071,23.88508 -2.12683,9.7172 -6.84716,20.71732 -13.0908,31.38913 -12.48729,21.3436 -32.82669,39.42822 -49.63484,44.64171 l -1.05305,-2.83988 c 14.99417,-4.65083 35.52477,-22.27135 47.77652,-43.21237 6.12588,-10.47052 10.74442,-21.25641 12.78109,-30.56161 2.03667,-9.3052 1.40423,-17.02452 -2.29192,-21.49657 -0.27967,-0.33838 -1.88907,-1.02515 -4.25348,-1.27888 -2.36441,-0.25374 -5.3683,-0.23476 -8.34178,-0.0187 -2.97347,0.21595 -5.92804,0.61032 -8.21788,1.0532 -1.14492,0.22144 -2.11914,0.4624 -2.82877,0.67705 -0.70964,0.21466 -1.20999,0.52713 -1.0324,0.37615 -1.01967,0.86687 -1.53531,2.0109 -1.81702,3.49813 -0.28171,1.48722 -0.26897,3.25632 -0.26842,5.09673 5e-4,1.84042 -0.004,3.75676 -0.45426,5.58573 -0.4501,1.82896 -1.42659,3.62504 -3.30368,4.87105 -2.20872,1.46614 -5.09854,1.22563 -7.55715,0.97797 -2.4586,-0.24766 -4.5219,-0.73348 -4.5219,-0.73348 l 0.82592,-2.8963 c 0,0 1.8624,0.4382 4.047,0.65825 2.1846,0.22005 4.65555,-0.009 5.26523,-0.41376 1.13067,-0.75054 1.70476,-1.74292 2.04415,-3.12198 0.33938,-1.37907 0.3722,-3.10609 0.37166,-4.92748 -5e-4,-1.82138 -0.0446,-3.7339 0.30972,-5.60453 0.35434,-1.87062 1.14754,-3.74267 2.82877,-5.17196 0.69703,-0.59258 1.34517,-0.76675 2.22998,-1.03439 0.88481,-0.26765 1.95081,-0.51459 3.17978,-0.75229 2.45795,-0.47539 5.51209,-0.88312 8.63085,-1.10962 1.55939,-0.11325 3.14682,-0.18458 4.66644,-0.18807 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#radialGradient4101);fill-opacity:1;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       sodipodi:nodetypes="cssssccsssscsscsccssccscsccsssscc" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4045"
-       d="m 26.345915,767.86986 c -1.45786,-0.004 -2.86098,0.0623 -4.15985,0.20931 -2.59776,0.294 -4.86915,0.75004 -6.21997,2.4737 -4.45125,5.67984 -4.81363,14.33455 -2.77323,24.16606 2.0404,9.83152 6.56889,20.96106 12.55878,31.7584 11.97979,21.5947 31.57388,39.91561 47.69893,45.19044 l 1.01025,-2.87329 c -14.38479,-4.70555 -34.1623,-22.5569 -45.91613,-43.74428 -5.87692,-10.59369 -10.30776,-21.50647 -12.26166,-30.92115 -1.95389,-9.41467 -1.34715,-17.2248 2.19878,-21.74946 0.2683,-0.34236 1.81229,-1.03721 4.08062,-1.29393 2.26832,-0.25672 5.15013,-0.23752 8.00275,-0.019 2.85263,0.21849 5.68713,0.6175 7.88391,1.06559 1.09839,0.22405 2.03301,0.46785 2.71381,0.68503 0.68079,0.21717 1.16081,0.53332 0.99044,0.38056 0.97822,0.87707 1.47291,2.03457 1.74317,3.53929 0.27026,1.50471 0.25804,3.29462 0.25752,5.15669 -5e-4,1.86207 0.004,3.80095 0.43579,5.65144 0.43181,1.85048 1.36861,3.66769 3.16941,4.92835 2.11896,1.4834 4.89134,1.24005 7.25002,0.98948 2.35869,-0.25057 4.33813,-0.74211 4.33813,-0.74211 l -0.79235,-2.93037 c 0,0 -1.78671,0.44335 -3.88252,0.66599 -2.09582,0.22264 -4.46635,-0.009 -5.05125,-0.41862 -1.08473,-0.75937 -1.63548,-1.76343 -1.96107,-3.15872 -0.3256,-1.39529 -0.35708,-3.14262 -0.35656,-4.98544 5e-4,-1.84281 0.0428,-3.77783 -0.29713,-5.67046 -0.33994,-1.89263 -1.10091,-3.78671 -2.71381,-5.23281 -0.6687,-0.59954 -1.2905,-0.77577 -2.13935,-1.04656 -0.84885,-0.2708 -1.87153,-0.52064 -3.05056,-0.76114 -2.35806,-0.48099 -5.28806,-0.89351 -8.28008,-1.12267 -1.49601,-0.11458 -3.01893,-0.18676 -4.47679,-0.19029 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b88100;fill-opacity:1;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       sodipodi:nodetypes="cssssccsssscsscsccssccscscsscsscc" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#radialGradient4099);fill-opacity:1;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 26.953645,767.86986 c -1.51962,-0.004 -2.98218,0.0616 -4.33607,0.20688 -2.70781,0.29058 -5.07543,0.74132 -6.48346,2.44492 -4.63982,5.61381 -5.01756,14.16788 -2.89072,23.88508 2.12684,9.7172 6.84716,20.71732 13.09081,31.38913 12.48728,21.3436 32.82669,41.42822 49.63484,46.64171 l 1.05305,-2.83988 c -14.99417,-4.65083 -35.52478,-24.27135 -47.77653,-45.21237 -6.12588,-10.47052 -10.74442,-21.25641 -12.78108,-30.56161 -2.03667,-9.3052 -1.40423,-17.02452 2.29192,-21.49657 0.27966,-0.33837 1.88907,-1.02515 4.25348,-1.27888 2.36441,-0.25374 5.3683,-0.23476 8.34177,-0.0188 2.97347,0.21595 5.92805,0.61032 8.21789,1.0532 1.14492,0.22144 2.11914,0.4624 2.82877,0.67705 0.70963,0.21466 1.20999,0.52713 1.03239,0.37615 1.01967,0.86687 1.53532,2.01091 1.81703,3.49813 0.28171,1.48722 0.26897,3.25632 0.26842,5.09674 -5e-4,1.84041 0.004,3.75675 0.45426,5.58572 0.4501,1.82896 1.42658,3.62504 3.30367,4.87105 2.20873,1.46614 5.09855,1.22563 7.55715,0.97797 2.45861,-0.24766 4.52191,-0.73348 4.52191,-0.73348 l -0.82592,-2.8963 c 0,0 -1.8624,0.4382 -4.047,0.65825 -2.1846,0.22005 -4.65555,-0.009 -5.26523,-0.41376 -1.13067,-0.75054 -1.70476,-1.74292 -2.04415,-3.12198 -0.33939,-1.37907 -0.37221,-3.10609 -0.37166,-4.92747 5e-4,-1.82139 0.0446,-3.73391 -0.30972,-5.60454 -0.35434,-1.87062 -1.14755,-3.74267 -2.82877,-5.17196 -0.69703,-0.59257 -1.34517,-0.76675 -2.22999,-1.03439 -0.8848,-0.26765 -1.9508,-0.51459 -3.17977,-0.75229 -2.45796,-0.47539 -5.51209,-0.88312 -8.63085,-1.10962 -1.55939,-0.11325 -3.14683,-0.18458 -4.66644,-0.18808 z"
-       id="path4059"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssssccssssssccsccssccscsccscssc" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path4035"
-       d="m 46.349625,1001.9294 107.049755,-0.7859 4.40793,14.147 -113.976505,0 z"
-       style="fill:#310e0a;fill-opacity:1;stroke:#918d89;stroke-width:0;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0" />
-    <path
-       id="path4037"
-       d="m 94.943815,783.09258 0.0792,0.19028 c -5.04828,0.11159 -10.93977,0.2564 -14.69814,0.41863 -8.8353,0.38138 -26.24667,3.69151 -26.24667,3.69151 l -1.28757,3.69151 c 0,0 18.71785,-3.31402 28.18793,-3.69151 6.34248,-0.25282 14.72066,-0.75449 18.83818,-1.00851 4.129675,0.25472 12.485715,0.75608 18.818375,1.00851 9.47009,0.37749 28.16813,3.69151 28.16813,3.69151 l -1.26777,-3.69151 c 0,0 -17.41137,-3.31013 -26.24667,-3.69151 -3.75837,-0.16223 -9.64987,-0.30704 -14.69815,-0.41863 l 0.0792,-0.19028 c 0,0 -3.03839,0.0607 -4.853155,0.0951 -1.82773,-0.0347 -4.87297,-0.0951 -4.87297,-0.0951 z"
-       style="fill:url(#linearGradient3283);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:nodetypes="cccsccsccccc"
-       inkscape:connector-curvature="0"
-       id="path4039"
-       d="m 97.499155,786.17518 0,0.19029 c -13.34789,0.34054 -25.52406,-0.8199 -43.42091,5.34698 0,0 -1.42233,31.08928 3.20903,47.97059 3.45424,12.59074 9.33588,27.35141 19.19473,36.28716 14.01122,10.98765 34.003185,10.62835 46.629945,0 9.85885,-8.93575 15.7603,-23.69642 19.21455,-36.28716 4.63135,-16.88131 3.20902,-47.97059 3.20902,-47.97059 -17.90592,-6.17001 -30.08487,-5.02377 -43.44072,-5.36601 l 0,-0.17126 c -0.77367,0.0449 -1.53535,0.0837 -2.297825,0.11417 -0.75725,-0.0304 -1.5295,-0.0696 -2.29782,-0.11417 z"
-       style="fill:url(#linearGradient4091);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cccccscccccccscccccc"
-       inkscape:connector-curvature="0"
-       id="path4041"
-       d="m 91.760723,881.00795 1.657135,8.00254 1.65713,18.48211 -4.971395,4.30611 3.860948,4.9349 c 0,0 4.877148,23.3695 -5.456109,32.21224 -2.352979,2.01359 -2.13973,-1.17515 -2.13973,-1.17515 l -5.754587,3.50737 -15.367504,7.94529 c 10.325113,10.32254 22.173616,8.74714 33.911413,8.04064 11.738196,0.70646 23.603026,2.28231 33.928496,-8.04064 l -15.36751,-7.94529 -5.75459,-3.50737 c 0,0 0.21327,3.18874 -2.13971,1.17515 -10.333269,-8.84274 -5.45613,-32.21224 -5.45613,-32.21224 l 3.86094,-4.9349 -4.9714,-4.30611 1.65715,-18.48211 1.65714,-8.00254 c -13.444745,5.18428 -4.56111,2.20785 -14.811687,0 z"
-       style="fill:url(#radialGradient4093);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
-       id="path4043"
-       d="m 65.764065,958.9648 -12.8197,0.23685 -3.84391,22.13575 c 36.98708,1.3293 64.853805,0.2823 102.333815,0 l -5.76487,-22.13575 c -5.23853,-0.10412 -17.16597,0.12787 -12.3197,-1.23685 -19.43083,10.21076 -52.626825,13.28829 -67.585635,1 z"
-       style="fill:#3a0704;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4049"
-       d="m 90.378491,945.37519 c -2.648588,0.72535 -4.290176,1.74429 -4.290176,2.87329 0,2.20644 6.295636,3.99597 14.054025,3.99597 7.75841,0 14.03556,-1.78953 14.03556,-3.99597 0,-1.129 -1.64159,-2.14794 -4.29019,-2.87329 -0.51543,0.44332 -1.09484,0.85369 -1.73826,1.21782 1.19966,0.46694 1.92318,1.03328 1.92318,1.65547 0,1.55925 -4.44757,2.8162 -9.93029,2.8162 -5.482709,0 -9.930279,-1.25695 -9.930279,-2.8162 0,-0.62219 0.705041,-1.18853 1.904694,-1.65547 -0.643408,-0.36413 -1.222842,-0.7745 -1.738264,-1.21782 z"
-       style="fill:#804d00;fill-opacity:1;stroke:#918d89;stroke-width:0;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-    <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
-       id="path4051"
-       d="m -592.13203,378.34534 c -24.34186,-21.17521 -40.34192,-23.95756 -46.46702,-141.42136 l 6.06092,-2.0203 c 0.99724,55.24396 -7.934,101.34849 40.4061,143.44166 z"
-       style="fill:#804d00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3862)"
-       transform="matrix(0.6338819,0,0,0.6089088,462.71418,647.44183)" />
-    <path
-       style="fill:#804d00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3866)"
-       d="m -561.82747,388.44686 c 24.34186,-21.17521 50.44345,-33.04893 56.56855,-150.51273 l -6.06092,-2.0203 c -0.99724,55.24396 -2.16753,110.43986 -50.50763,152.53303 z"
-       id="path4053"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc"
-       transform="matrix(0.6338819,0,0,0.6089088,462.71418,647.44183)" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path4055"
-       d="m -614.35539,236.18319 13.13199,83.57331 60.60915,-1.14485 10.10152,-84.71813 c -29.79783,-11.81867 -56.63225,-3.48616 -83.84266,2.28967 z"
-       style="fill:url(#radialGradient4095);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3880)"
-       transform="matrix(0.6338819,0,0,0.6089088,462.71418,647.44183)" />
-    <path
-       style="fill:url(#radialGradient4103);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 90.579445,880.00795 1.92146,8.09195 1.92145,18.68854 -5.76436,4.35422 4.47679,4.99003 c 0,0 5.63478,21.09474 -6.99251,30.5182 -2.87535,2.14582 -2.61476,-1.25232 -2.61476,-1.25232 l -7.03213,3.7377 -16.65921,9.9608 c 11.97203,10.43788 25.71044,8.84487 39.32049,8.13048 13.610525,0.71436 27.367855,2.30777 39.340295,-8.13048 l -16.65921,-9.9608 -7.03212,-3.7377 c 0,0 0.26058,3.39814 -2.61477,1.25232 -12.627295,-9.42346 -6.99252,-30.5182 -6.99252,-30.5182 l 4.47679,-4.99003 -5.76436,-4.35422 1.92146,-18.68854 1.92145,-8.09195 c -15.589255,5.24222 -5.28862,2.2325 -17.174235,0 z"
-       id="path4063"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccscccccccscccccc" />
-    <rect
-       ry="0.50903207"
-       y="980.23029"
-       x="49.593613"
-       height="28.179085"
-       width="101.59111"
-       id="rect4065"
-       style="fill:url(#linearGradient3275);fill-opacity:1;stroke:#918d89;stroke-width:0;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-    <rect
-       style="fill:#692017;fill-opacity:1;stroke:#918d89;stroke-width:0;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect4067"
-       width="113.9765"
-       height="10.686725"
-       x="43.690475"
-       y="1014.6754"
-       ry="0" />
-    <text
-       transform="scale(1.1209551,0.8920964)"
-       sodipodi:linespacing="125%"
-       id="text4155"
-       y="1556.0684"
-       x="55.365215"
-       style="font-size:20.11759758px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.37560975;fill:#ffc022;fill-opacity:1;stroke:none;font-family:Sans"
-       xml:space="preserve"><tspan
-         style="fill:#ffc022;fill-opacity:1"
-         y="1556.0684"
-         x="55.365215"
-         id="tspan4157"
-         sodipodi:role="line" /></text>
-    <path
-       style="fill:url(#linearGradient4076);fill-opacity:1;stroke:#918d89;stroke-width:0;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       d="m 73.006446,984.36218 c 0.0042,0.043 0.03324,0.083 0.03324,0.12641 0,1.994 2.059387,3.64041 -3.039682,3.88693 l 0,6.85744 c 0,0.14259 0.231841,0.25282 0.531748,0.25282 -0.299907,0 -0.531748,0.10702 -0.531748,0.25281 l 0,7.01541 c 5.099069,0.2521 3.039682,1.9425 3.039682,3.9818 0,0.044 -0.03007,0.083 -0.03324,0.1264 l 50.682054,0 c -0.0633,-0.169 -0.13295,-0.3463 -0.13295,-0.5214 0,-1.7131 -0.88561,-3.1523 3.44445,-3.6658 l 0,-6.93641 c 0,-0.14582 -0.23184,-0.25281 -0.53175,-0.25281 0.29991,0 0.53175,-0.11019 0.53175,-0.25282 l 0,-6.77843 c -4.33006,-0.50201 -3.44445,-1.91169 -3.44445,-3.58674 0,-0.1713 0.0696,-0.34032 0.13295,-0.50561 z"
-       id="rect3285"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cscscscsccscscscscc" />
-    <path
-       style="opacity:0.22439025000000001;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4115)"
-       d="m 95.5,194 2.5,-11.5 1,-16.5 -3,-4.5 2,-3 L 95.5,132 C 86.96546,129.38739 82.88593,124.10178 81,117.5"
-       id="path4105"
-       inkscape:connector-curvature="0"
-       transform="translate(0,752.36218)"
-       sodipodi:nodetypes="ccccccc" />
-  </g>
-</svg>

=== added directory 'data/daemon'
=== renamed file 'daemon/validation-key.pub' => 'data/daemon/validation-key.pub'
=== renamed file 'daemon/lock.png' => 'data/media/lock.png'
=== modified file 'data/ui/TrophyinfoWindow.ui'
--- data/ui/TrophyinfoWindow.ui	2012-02-22 04:59:12 +0000
+++ data/ui/TrophyinfoWindow.ui	2012-03-05 04:37:19 +0000
@@ -20,7 +20,7 @@
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Accomplishment Information</property>
     <property name="window_position">center</property>
-    <property name="icon">trophy-accomplished.svg</property>
+    <property name="icon">../media/trophy-accomplished.svg</property>
     <property name="icon_name">distributor-logo</property>
     <child>
       <object class="GtkVBox" id="vbox1">

=== added file 'install_deps.sh'
--- install_deps.sh	1970-01-01 00:00:00 +0000
+++ install_deps.sh	2012-03-05 04:37:19 +0000
@@ -0,0 +1,3 @@
+sudo apt-get install -y python-distutils-extra python-gpgme quickly \
+    quickly-ubuntu-template pylint python-twisted python-imaging \
+    python-ubuntuone-client python-ubuntuone-devtools

=== modified file 'setup.py'
--- setup.py	2012-01-30 06:58:49 +0000
+++ setup.py	2012-03-05 04:37:19 +0000
@@ -3,86 +3,17 @@
 ### BEGIN LICENSE
 # This file is in the public domain
 ### END LICENSE
-
-###################### DO NOT TOUCH THIS (HEAD TO THE SECOND PART) ######################
-
-import os
-import sys
-
-try:
-    import DistUtilsExtra.auto
-except ImportError:
-    print >> sys.stderr, 'To build trophyinfo you need https://launchpad.net/python-distutils-extra'
-    sys.exit(1)
-assert DistUtilsExtra.auto.__version__ >= '2.18', 'needs DistUtilsExtra.auto >= 2.18'
-
-def update_config(values = {}):
-
-    oldvalues = {}
-    try:
-        fin = file('trophyinfo_lib/trophyinfoconfig.py', 'r')
-        fout = file(fin.name + '.new', 'w')
-
-        for line in fin:
-            fields = line.split(' = ') # Separate variable from value
-            if fields[0] in values:
-                oldvalues[fields[0]] = fields[1].strip()
-                line = "%s = %s\n" % (fields[0], values[fields[0]])
-            fout.write(line)
-
-        fout.flush()
-        fout.close()
-        fin.close()
-        os.rename(fout.name, fin.name)
-    except (OSError, IOError), e:
-        print ("ERROR: Can't find trophyinfo_lib/trophyinfoconfig.py")
-        sys.exit(1)
-    return oldvalues
-
-
-def update_desktop_file(datadir):
-
-    try:
-        fin = file('trophyinfo.desktop.in', 'r')
-        fout = file(fin.name + '.new', 'w')
-
-        for line in fin:            
-            if 'Icon=' in line:
-                line = "Icon=%s\n" % (datadir + 'media/trophyinfo.svg')
-            fout.write(line)
-        fout.flush()
-        fout.close()
-        fin.close()
-        os.rename(fout.name, fin.name)
-    except (OSError, IOError), e:
-        print ("ERROR: Can't find trophyinfo.desktop.in")
-        sys.exit(1)
-
-
-class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):
-    def run(self):
-        values = {'__trophyinfo_data_directory__': "'%s'" % (self.prefix + '/share/trophyinfo/'),
-                  '__version__': "'%s'" % self.distribution.get_version()}
-        previous_values = update_config(values)
-        update_desktop_file(self.prefix + '/share/trophyinfo/')
-        DistUtilsExtra.auto.install_auto.run(self)
-        update_config(previous_values)
-
-
-        
-##################################################################################
-###################### YOU SHOULD MODIFY ONLY WHAT IS BELOW ######################
-##################################################################################
-
-DistUtilsExtra.auto.setup(
+from accomplishments.util import dist
+
+
+dist.setup(
     name='trophyinfo',
-    version='0.1',
+    version='0.2',
     license='GPL-3',
     author='Jono Bacon',
     author_email='[e-mail]',
     description='Trophy viewer for Ubuntu Accomplishments.',
     long_description='Trophy viewer for Ubuntu Accomplishments.',
     url='https://launchpad.net/ubuntuaccomplishments',
-    cmdclass={'install': InstallAndUpdateDataDirectory}
+    cmdclass={'install': dist.InstallAndUpdateDataDirectory}
     )
-

=== modified file 'tests/test_example.py'
--- tests/test_example.py	2012-01-22 23:09:09 +0000
+++ tests/test_example.py	2012-03-05 04:37:19 +0000
@@ -3,18 +3,23 @@
 ### BEGIN LICENSE
 # This file is in the public domain
 ### END LICENSE
-
+import os
 import sys
-import os.path
+
+sys.path.insert(
+    0, os.path.realpath(os.path.join(os.path.dirname(__file__), "..")))
+
 import unittest
-sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), "..")))
-
-from trophyinfo import AboutTrophyinfoDialog
+
+from accomplishments.gui import AboutTrophyinfoDialog
+
 
 class TestExample(unittest.TestCase):
+
     def setUp(self):
         self.AboutTrophyinfoDialog_members = [
-        'AboutTrophyinfoDialog', 'get_builder', 'gettext', 'Gtk']
+            'AboutDialog', 'AboutTrophyinfoDialog', 'gettext', 'logger',
+            'logging']
 
     def test_AboutTrophyinfoDialog_members(self):
         all_members = dir(AboutTrophyinfoDialog)
@@ -22,5 +27,6 @@
         public_members.sort()
         self.assertEqual(self.AboutTrophyinfoDialog_members, public_members)
 
-if __name__ == '__main__':    
+
+if __name__ == '__main__':
     unittest.main()

=== modified file 'tests/test_lint.py'
--- tests/test_lint.py	2012-01-22 23:09:09 +0000
+++ tests/test_lint.py	2012-03-05 04:37:19 +0000
@@ -3,28 +3,31 @@
 ### BEGIN LICENSE
 # This file is in the public domain
 ### END LICENSE
-
+import subprocess
 import unittest
-import subprocess
+
 
 class TestPylint(unittest.TestCase):
+
     def test_project_errors_only(self):
-        '''run pylint in error only mode
-        
-        your code may well work even with pylint errors
-        but have some unusual code'''
-        return_code = subprocess.call(["pylint", '-E', 'trophyinfo'])
+        '''Run pylint in error only mode
+
+        Your code may well work even with pylint errors but have some unusual
+        code.
+        '''
+        return_code = subprocess.call(["pylint", '-E', 'accomplishments'])
         # not needed because nosetests displays pylint console output
         #self.assertEqual(return_code, 0)
 
-    # un-comment the following for loads of diagnostics   
+    # un-comment the following for loads of diagnostics
     #~ def test_project_full_report(self):
         #~ '''Only for the brave
-#~ 
+        #~
         #~ you will have to make judgement calls about your code standards
         #~ that differ from the norm'''
         #~ return_code = subprocess.call(["pylint", 'trophyinfo'])
 
+
 if __name__ == '__main__':
-    'you will get better results with nosetests'
+    # you will get better results with nosetests
     unittest.main()

=== modified file 'trophyinfo.desktop.in'
--- trophyinfo.desktop.in	2012-01-22 23:09:09 +0000
+++ trophyinfo.desktop.in	2012-03-05 04:37:19 +0000
@@ -3,6 +3,6 @@
 _Comment=Trophyinfo application
 Categories=GNOME;Utility;
 Exec=trophyinfo
-Icon=trophyinfo
+Icon=/home/oubiwann/lab/ubuntu-accomplishments-system/941201-missing-deps/.venv/share/trophyinfo/media/trophyinfo.svg
 Terminal=false
 Type=Application