Merge branch 'master' into pylons0.10

* master:
  updated translations
  add support for non-url information

ChangeLog

@@ -3,3 +3,5 @@
 	* add support for extra parameters forumsid and wikihomepage
 	* add new patterns wiki and forum to section membership
 	* update copyright information
+	* add support for non-URL type information
+	* add ssh commands for MIA, owned debian.net-Domains and group membership

ddportfolioservice/controllers/ddportfolio.py

@@ -105,6 +105,12 @@ developer name on all bug logs)'),
             'website' : N_('Debian website'),
             'search' : N_('Debian search'),
             },
+        'ssh' : {
+            'label' : N_('Information reachable via ssh (for DDs)'),
+            'owndndoms' : N_('owned debian.net domains'),
+            'miainfo' : N_('<a href="http://wiki.debian.org/qa.debian.org/MIATeam">MIA</a> database information'),
+            'groupinfo' : N_('Group membership information'),
+            },
         'ubuntu' : {
             'label' : N_('Ubuntu'),
             'ubuntudiff' : N_('Available patches from Ubuntu'),
@@ -170,11 +176,11 @@ developer name on all bug logs)'),
             response.headers['Content-Type'] = 'text/javascript'
             return simplejson.dumps(
                 dict([("%s.%s" % \
-                           (entry[1], entry[2]), entry[3]) \
+                           (entry[1], entry[2].name), entry[3]) \
                           for entry in data if entry[0] == 'url']))
         for entry in data:
             if entry[0] in ('url', 'error'):
-                entry.append(_(self._get_label(entry[1], entry[2])))
+                entry.append(_(self._get_label(entry[1], entry[2].name)))
             elif entry[0] == 'section':
                 entry.append(_(self._get_label(entry[1])))
         c.urldata = data

ddportfolioservice/i18n/ddportfolioservice.pot

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ddportfolioservice 0.2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2010-06-03 23:36+0200\n"
+"POT-Creation-Date: 2010-06-04 00:32+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -191,10 +191,28 @@ msgid "Debian search"
 msgstr ""
 
 #: ddportfolioservice/controllers/ddportfolio.py:109
-msgid "Ubuntu"
+msgid "Information reachable via ssh (for DDs)"
 msgstr ""
 
 #: ddportfolioservice/controllers/ddportfolio.py:110
+msgid "owned debian.net domains"
+msgstr ""
+
+#: ddportfolioservice/controllers/ddportfolio.py:111
+msgid ""
+"<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database "
+"information"
+msgstr ""
+
+#: ddportfolioservice/controllers/ddportfolio.py:112
+msgid "Group membership information"
+msgstr ""
+
+#: ddportfolioservice/controllers/ddportfolio.py:115
+msgid "Ubuntu"
+msgstr ""
+
+#: ddportfolioservice/controllers/ddportfolio.py:116
 msgid "Available patches from Ubuntu"
 msgstr ""
 
@@ -222,8 +240,8 @@ msgstr ""
 msgid "Alioth user name"
 msgstr ""
 
-#: ddportfolioservice/model/urlbuilder.py:86
+#: ddportfolioservice/model/urlbuilder.py:95
-#: ddportfolioservice/model/urlbuilder.py:90
+#: ddportfolioservice/model/urlbuilder.py:99
 #, python-format
 msgid "Missing input: %s"
 msgstr ""
@@ -329,7 +347,7 @@ msgstr ""
 msgid "Error during URL creation:"
 msgstr ""
 
-#: ddportfolioservice/templates/showurls.mako:62
+#: ddportfolioservice/templates/showurls.mako:68
 msgid "Restart"
 msgstr ""
 

ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po

@@ -9,9 +9,9 @@ msgstr ""
 "Project-Id-Version: ddportfolioservice 0.2\n"
 "Report-Msgid-Bugs-To: jan@dittberner.info\n"
 "POT-Creation-Date: 2009-01-20 23:13+0100\n"
-"PO-Revision-Date: 2010-06-03 23:37+0200\n"
+"PO-Revision-Date: 2010-06-04 00:34+0200\n"
 "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
-"Language-Team: de <LL@li.org>\n"
+"Language-Team: de <de@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -203,10 +203,30 @@ msgid "Debian search"
 msgstr "Debian-Suche"
 
 #: ddportfolioservice/controllers/ddportfolio.py:109
+msgid "Information reachable via ssh (for DDs)"
+msgstr "Per ssh erreichbare Informationen (für DDs)"
+
+#: ddportfolioservice/controllers/ddportfolio.py:110
+msgid "owned debian.net domains"
+msgstr "Besitz von debian.net-Domains"
+
+#: ddportfolioservice/controllers/ddportfolio.py:111
+msgid ""
+"<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database"
+" information"
+msgstr ""
+"Informationen in der <a "
+"href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>-Datenbank"
+
+#: ddportfolioservice/controllers/ddportfolio.py:112
+msgid "Group membership information"
+msgstr "Information über Gruppenmitgliedschaften"
+
+#: ddportfolioservice/controllers/ddportfolio.py:115
 msgid "Ubuntu"
 msgstr "Ubuntu"
 
-#: ddportfolioservice/controllers/ddportfolio.py:110
+#: ddportfolioservice/controllers/ddportfolio.py:116
 msgid "Available patches from Ubuntu"
 msgstr "Verfügbare Patches aus Ubuntu"
 
@@ -234,8 +254,8 @@ msgstr "Nicht-DD E-Mailadresse:"
 msgid "Alioth user name"
 msgstr "Alioth-Benutzername"
 
-#: ddportfolioservice/model/urlbuilder.py:86
+#: ddportfolioservice/model/urlbuilder.py:95
-#: ddportfolioservice/model/urlbuilder.py:90
+#: ddportfolioservice/model/urlbuilder.py:99
 #, python-format
 msgid "Missing input: %s"
 msgstr "Fehlende Eingabe: %s"
@@ -353,7 +373,7 @@ msgstr "URL"
 msgid "Error during URL creation:"
 msgstr "Fehler bei der URL-Erzeugung:"
 
-#: ddportfolioservice/templates/showurls.mako:62
+#: ddportfolioservice/templates/showurls.mako:68
 msgid "Restart"
 msgstr "Neu beginnen"
 

ddportfolioservice/model/ddportfolio.ini

@@ -21,7 +21,7 @@
 [DEFAULT]
 keyring.dir=${HOME}/debian/keyring.debian.org/keyrings
 urlbuilder.sections=overview,bugs,build,qa,upload,lists,files,membership,
- miscellaneous,ubuntu
+ miscellaneous,ssh,ubuntu
 
 [overview]
 urls=ddpo,alladdresses
@@ -86,17 +86,19 @@ debtags.pattern=http://debtags.alioth.debian.org/todo.html?maint=%(email)s
 links.pattern=http://www.google.com/search?hl=en&lr=&q=site%%3Adebian.org+%%22%(name)s%%22+-site%%3Anm.debian.org+-site%%3Alintian.debian.org+-site%%3Abugs.debian.org+-site%%3Alists.debian.org+-site%%3Apackages.debian.org+-site%%3Alists.alioth.debian.org+-site%%3Aftp.debian.org++-site%%3Apackages.qa.debian.org++-site%%3Aftp*.*.debian.org+-inurl%%3Adebian.org%%2Fdevel%%2Fpeople.+-inurl%%3Aindices%%2FMaintainers+-inurl%%3Adebian.org%%2Fdebian%%2Fproject++-inurl%%3A%%2Fdists%%2F&btnG=Search
 website.pattern=http://www.google.com/search?q=site:www.debian.org+%(name)s
 search.pattern=http://search.debian.org/?q=%%22%(name)s%%22
+
+[ssh]
 # SSH functions
-#
+urls=owndndoms,miainfo,groupinfo
 # owned *.debian.net domains
-# ssh merkel.debian.org ldapsearch -u -x -H ldap://db.debian.org -b dc=debian,dc=org \
+owndndoms.pattern=ssh merkel.debian.org ldapsearch -u -x -H ldap://db.debian.org -b dc=debian,dc=org uid=%(username)s dnsZoneEntry
-#  uid=%(username)s dnsZoneEntry
+owndndoms.type=ssh
-#
 # MIA information
-# ssh merkel.debian.org /srv/qa.debian.org/mia/mia-query %(username)s
+miainfo.pattern=ssh merkel.debian.org /srv/qa.debian.org/mia/mia-query %(username)s
-#
+miainfo.type=ssh
 # Group information
-# ssh merkel.debian.org id %(username)s
+groupinfo.pattern=ssh merkel.debian.org id %(username)s
+groupinfo.type=ssh
 
 [ubuntu]
 urls=ubuntudiff

ddportfolioservice/model/urlbuilder.py

@@ -46,6 +46,17 @@ _FIELDNAMES_MAP = {
     }
 
 
+class DDPortfolioEntry(object):
+    def __init__(self, config, section, key):
+        self.name = key
+        self.optional = config.has_option(section, key + '.optional') and \
+            config.getboolean(section, key + '.optional') or False
+        if config.has_option(section, key + '.type'):
+            self.type = config.get(section, key + '.type')
+        else:
+            self.type = 'url'
+
+
 def build_urls(fields):
     """Build personalized URLs using the developer information in
     fields."""
@@ -70,22 +81,20 @@ def build_urls(fields):
                                       'urlbuilder.sections').split(',')]:
         data.append(['section', section])
         if my_config.has_option(section, 'urls'):
-            for url in my_config.get(section, 'urls').split(','):
+            for entry in ([DDPortfolioEntry(my_config, section, url) for url in \
-                if my_config.has_option(section, url + '.pattern'):
+                                my_config.get(section, 'urls').split(',')]):
-                    optional = my_config.has_option(section, url + '.optional') \
-                        and my_config.getboolean(section, url + '.optional') or False
                 try:
                     data.append(
-                            ['url', section, url,
+                        ['url', section, entry,
-                             my_config.get(section, url + '.pattern',
+                             my_config.get(section, entry.name + '.pattern',
                                            False, qfields)])
                 except InterpolationMissingOptionError, e:
-                        if not optional:
+                    if not entry.optional:
                         if e.reference in _FIELDNAMES_MAP:
-                                data.append(['error', section, url,
+                            data.append(['error', section, entry,
                                          _('Missing input: %s') % \
                                              _(_FIELDNAMES_MAP[e.reference])])
                         else:
-                                data.append(['error', section, url,
+                            data.append(['error', section, entry,
                                          _('Missing input: %s') % e.reference])
     return data

ddportfolioservice/templates/showurls.mako

@@ -45,7 +45,13 @@ License along with this program.  If not, see
       % else:
       <tr class="url ${urlclass}">
         <td>${h.literal(h.textile(row[4]))}</td>
-        <td>${h.link_to(h.truncate(row[3], length=120), row[3])}</td>
+        <td>
+          % if row[2].type == 'url':
+          ${h.link_to(h.truncate(row[3], length=120), row[3])}
+          % else:
+          <tt>${row[3]}</tt>
+          % endif
+        </td>
       </tr>
       <%
          if urlclass == 'odd':