Merge lp:~canonical-isd-hackers/canonical-identity-provider/versions-view into lp:canonical-identity-provider/release

[Łukasz Czyżykowski]

[Ricardo Kirkner (ricardokirkner)]

two small fixes:

l. 114: you committed commented out code
l. 156: django provides you with the django.get_version() function which does this for you :)

review: Needs Fixing

[Szilveszter Farkas (phanatic)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2010-05-27 19:23:48 +0000
+++ debian/control	2010-06-21 08:11:27 +0000
@@ -5,7 +5,8 @@
  debhelper (>= 6),
  python,
  python-central (>= 0.6),
- python-setuptools
+ python-setuptools,
+ bzr
 Maintainer: Łukasz Czyżykowski <[e-mail]>
 Standards-Version: 3.8.3
 XS-Python-Version: current

=== modified file 'debian/rules'
--- debian/rules	2010-04-21 15:29:24 +0000
+++ debian/rules	2010-06-21 08:11:27 +0000
@@ -5,3 +5,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/langpack.mk
+
+clean::
+	scripts/update-version
\ No newline at end of file

=== modified file 'identityprovider/__init__.py'
--- identityprovider/__init__.py	2010-04-21 15:29:24 +0000
+++ identityprovider/__init__.py	2010-06-21 08:11:27 +0000
@@ -1,2 +1,4 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
+
+__version__ = '2.6.0.dev2; r71'

=== added file 'identityprovider/templates/versions.html'
--- identityprovider/templates/versions.html	1970-01-01 00:00:00 +0000
+++ identityprovider/templates/versions.html	2010-06-21 08:11:27 +0000
@@ -0,0 +1,27 @@
+<!-- Copyright 2010 Canonical Ltd.  This software is licensed under the
+GNU Affero General Public License version 3 (see the file  LICENSE). -->
+
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block "title" %}{% trans "Versions" %}{% endblock %}
+
+{% block "content" %}
+<h1 class="main">{% trans "Versions" %}</h1>
+
+<div>
+  <table class="listing">
+    <thead>
+      <tr>
+        <th>{% trans "Library/Package" %}</th>
+        <th>{% trans "Version" %}</th>
+    </tr>
+    </thead>
+    <tbody>
+      {% for item in versions %}
+      <tr><td>{{ item.name }}</td><td>{{ item.version }}</td></tr>
+      {% endfor %}
+    </tbody>
+  </table>
+</div>
+{% endblock %}

=== added file 'identityprovider/tests/test_views_versions.py'
--- identityprovider/tests/test_views_versions.py	1970-01-01 00:00:00 +0000
+++ identityprovider/tests/test_views_versions.py	2010-06-21 08:11:27 +0000
@@ -0,0 +1,33 @@
+from identityprovider.tests.utils import BasicAccountTestCase
+from identityprovider.models.account import Account
+from django.conf import settings
+
+
+
+class VersionsViewAccessTestCase(BasicAccountTestCase):
+
+    fixtures = ["test"]
+
+    def test_non_authenticated_users_are_getting_404(self):
+        r = self.client.get('/+versions')
+        self.assertEquals(r.status_code, 404)
+
+    def test_account_withtout_person_receives_404(self):
+        account = Account.objects.create_account(
+            "test", "[e-mail]", "test")
+        self.client.login(username="[e-mail]", password="test")
+        r = self.client.get('/+versions')
+        self.assertEquals(r.status_code, 404)
+        account.delete()
+
+    def test_person_not_in_the_required_team_will_get_404(self):
+        self.client.login(username="[e-mail]", password="test")
+        r = self.client.get('/+versions')
+        self.assertEquals(r.status_code, 404)
+
+    def test_person_in_ubuntu_team_can_access_the_page(self):
+        settings.SSO_VERSIONS_TEAMS = ["ubuntu-team"]
+        self.client.login(username="[e-mail]", password="test")
+
+        r = self.client.get('/+versions')
+        self.assertTemplateUsed(r, "versions.html")

=== modified file 'identityprovider/urls.py'
--- identityprovider/urls.py	2010-06-16 19:42:35 +0000
+++ identityprovider/urls.py	2010-06-21 08:11:27 +0000
@@ -56,6 +56,10 @@
         (r'^set_language$', 'set_language'),
 )
 
+urlpatterns += patterns('identityprovider.views.versions',
+    (r'\+versions','versions'),
+)
+
 urlpatterns += patterns('identityprovider.views.readonly',
     (r'^readonly$', 'readonly_admin'),
     (r'^readonly/((?P<appserver>[A-Za-z0-9\-_.:]+)/)?(?P<action>enable|disable|set|clear)(/(?P<conn>[A-Za-z0-9\-_.]+))?',

=== added file 'identityprovider/views/versions.py'
--- identityprovider/views/versions.py	1970-01-01 00:00:00 +0000
+++ identityprovider/views/versions.py	2010-06-21 08:11:27 +0000
@@ -0,0 +1,39 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from django.template import RequestContext
+from django.shortcuts import render_to_response
+from django.http import Http404
+from django.conf import settings
+
+
+def gather_version_information():
+    import identityprovider
+    import lazr.restful
+    import django
+    import openid
+    import sys
+
+    return [
+        {'name': 'SSO', 'version': identityprovider.__version__},
+        {'name': 'Django', 'version': django.get_version()},
+        {'name': 'lazr.restful', 'version': lazr.restful.__version__},
+        {'name': 'openid', 'version': openid.__version__},
+        {'name': 'Python', 'version': sys.version},
+    ]
+
+
+def versions(request):
+    # 404 to not reveal this to automatic scripts
+    if not request.user.is_authenticated() or request.user.person is None:
+        raise Http404
+
+    for team in getattr(settings, 'SSO_VERSIONS_TEAMS', []):
+        if request.user.person.in_team(team):
+            break
+    else:
+        raise Http404
+
+    versions = gather_version_information()
+    return render_to_response("versions.html",
+                              RequestContext(request, {'versions': versions}))

=== added file 'scripts/update-version'
--- scripts/update-version	1970-01-01 00:00:00 +0000
+++ scripts/update-version	2010-06-21 08:11:27 +0000
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+deb_version=`dpkg-parsechangelog | sed -n '/^Version/s/Version: //p'`
+rev_no=`bzr version-info | sed -n '/^revno/s/revno: //p'`
+
+version="__version__ = '$deb_version; r$rev_no'"
+
+sed -i "/^__version__/s/^__version__.*$/$version/" identityprovider/__init__.py
\ No newline at end of file