bodhi.egg-info/SOURCES.txt | 1 -
bodhi.spec | 8 ++++++--
bodhi/controllers.py | 8 --------
bodhi/metrics.py | 12 +++++++++++-
bodhi/release.py | 2 +-
bodhi/tests/test_controllers.py | 8 +++++++-
6 files changed, 25 insertions(+), 14 deletions(-)
New commits:
commit 408edca0bf67836d40fbccfa3ac93406e0bf10a0
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Feb 16 18:14:43 2010 -0500
Fix our metrics JSON unit test, and add one for our flot widgets too
diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py
index 3b716a1..3df6e2f 100644
--- a/bodhi/tests/test_controllers.py
+++ b/bodhi/tests/test_controllers.py
@@ -1856,7 +1856,13 @@ class TestControllers(testutil.DBTest):
def test_metrics_api(self):
release = create_release()
refresh_metrics()
- testutil.create_request('/updates/metrics?tg_format=json', method='GET')
+ testutil.create_request('/updates/metrics/?tg_format=json', method='GET')
response = simplejson.loads(cherrypy.response.body[0])
assert 'F7' in response
assert response['F7']['TopTestersMetric']['data'] == []
+
+ def test_metrics_html(self):
+ release = create_release()
+ refresh_metrics()
+ testutil.create_request('/updates/metrics/', method='GET')
+ assert 'flot' in cherrypy.response.body[0]
commit 4e09d9794fca24f4614b4fcbd19efde378a19ade
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Feb 16 18:11:13 2010 -0500
0.7.1
diff --git a/bodhi/release.py b/bodhi/release.py
index f8d1b84..b2d74f7 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.7.0'
+VERSION = '0.7.1'
NAME = 'bodhi'
DESCRIPTION = 'Bodhi is a modular web-system that facilitates the process of publishing updates for a Fedora-based software distribution'
AUTHOR = 'Luke Macken'
commit 1d4009ed7c1401f48a1a4c92e3000cb1374f742e
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Feb 16 18:10:42 2010 -0500
Fix a regression in our MetricsController, and add a JSON API
diff --git a/bodhi.egg-info/SOURCES.txt b/bodhi.egg-info/SOURCES.txt
index 60b8600..c579c72 100644
--- a/bodhi.egg-info/SOURCES.txt
+++ b/bodhi.egg-info/SOURCES.txt
@@ -166,7 +166,6 @@ bodhi/tests/__init__.py
bodhi/tests/test_buildsystem.py
bodhi/tests/test_client.py
bodhi/tests/test_controllers.py
-bodhi/tests/test_masher.py
bodhi/tests/test_metadata.py
bodhi/tests/test_model.py
bodhi/tests/test_util.py
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index c6fbd95..08080f3 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -1238,11 +1238,3 @@ class Root(controllers.RootController):
for build in koji.getLatestBuilds(tag, package=package):
builds[tag] = build['nvr']
return builds
-
- @expose(allow_json=True)
- def metrics(self, release=None):
- metrics = {}
- query = release and [Release.byName(release)] or Release.select()
- for release in query:
- metrics[release.name] = release.metrics
- return metrics
diff --git a/bodhi/metrics.py b/bodhi/metrics.py
index a7e504f..00f8c3c 100644
--- a/bodhi/metrics.py
+++ b/bodhi/metrics.py
@@ -21,6 +21,8 @@ from turboflot import TurboFlot
from turbogears import expose, config, flash, redirect
from turbogears.controllers import Controller
+from fedora.tg.util import request_format
+
from bodhi.util import Singleton, get_age_in_days
from bodhi.model import PackageUpdate, Release, hub
@@ -482,8 +484,16 @@ class MetricData(Singleton):
class MetricsController(Controller):
- @expose(template='bodhi.templates.metrics')
+ @expose(template='bodhi.templates.metrics', allow_json=True)
def index(self, release=None):
+ # /updates/metrics?tg_format=json API
+ if request_format() == 'json':
+ json = {}
+ query = release and [Release.byName(release)] or Release.select()
+ for release in query:
+ json[release.name] = release.metrics
+ return json
+
try:
if not release:
rel = Release.select()[0]
commit 8958c0a06774e49fa779aead4fb41783b16f1534
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Feb 16 18:16:07 2010 -0500
Bump our spec file for 0.7.1 (again)
diff --git a/bodhi.spec b/bodhi.spec
index dd50a1e..9717faa 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -2,8 +2,8 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: bodhi
-Version: 0.7.0
-Release: 6%{?dist}
+Version: 0.7.1
+Release: 1%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
License: GPLv2+
@@ -116,6 +116,10 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%changelog
+* Tue Feb 16 2010 Luke Macken <lmacken(a)redhat.com> - 0.7.1-1
+- Fix a regression in our metrics controller, and unvail a new
+ metrics JSON API
+
* Mon Jan 18 2010 Luke Macken <lmacken(a)redhat.com> - 0.7.0-1
- 0.7.0 release, prepping for the F13 release
- Critical Path & No Frozen Rawhide proposals implemented