Merge lp:~ricardokirkner/click-reviewers-tools/frameworks-from-api into lp:click-reviewers-tools

[Ricardo Kirkner]

download framework data from myapps api

[lp:~ricardokirkner/click-reviewers-tools/frameworks-from-api]

241. By Ricardo Kirkner on 2014-09-19

updated frameworks.json using myapps api

[Daniel Holbach (dholbach)]

Thanks a lot - good work!

review: Approve

=== modified file 'clickreviews/apparmor_policy.py'
--- clickreviews/apparmor_policy.py	2014-07-18 20:23:21 +0000
+++ clickreviews/apparmor_policy.py	2014-09-19 17:20:28 +0000
@@ -27,7 +27,8 @@
 def get_policy_file(fn):
     if fn is None:
         fn = USER_DATA_FILE
-    clickreviews.remote.get_remote_file(fn, AA_POLICY_DATA_URL)
+    file_url = clickreviews.remote.get_remote_file_url(AA_POLICY_DATA_URL)
+    clickreviews.remote.get_remote_file(fn, file_url)
 
 
 class ApparmorPolicy(object):

=== modified file 'clickreviews/frameworks.py'
--- clickreviews/frameworks.py	2014-07-18 20:23:21 +0000
+++ clickreviews/frameworks.py	2014-09-19 17:20:28 +0000
@@ -17,10 +17,8 @@
 import clickreviews.remote
 
 USER_DATA_FILE = os.path.join(clickreviews.remote.DATA_DIR, 'frameworks.json')
-
-# XXX: This is a hack and will be gone, as soon as myapps has an API for this.
 FRAMEWORKS_DATA_URL = \
-    "http://bazaar.launchpad.net/~ubuntu-core-dev/+junk/frameworks/view/head:/frameworks.json"
+    "https://myapps.developer.ubuntu.com/dev/api/click-framework/"
 
 
 def get_frameworks_file(fn):

=== modified file 'clickreviews/remote.py'
--- clickreviews/remote.py	2014-07-18 20:23:21 +0000
+++ clickreviews/remote.py	2014-09-19 17:20:28 +0000
@@ -52,14 +52,20 @@
 #
 # Public
 #
-def get_remote_file(fn, url, data_dir=DATA_DIR):
+def get_remote_data(url):
     try:
         f = request.urlopen(url)
     except (HTTPError, URLError) as error:
         abort('Data not retrieved because %s.' % error)
     except timeout:
         abort('Socket timed out.')
-    html = f.read()
+    if not f:
+        abort()
+    return f.read()
+
+
+def get_remote_file_url(url):
+    html = get_remote_data(url)
     # XXX: This is a hack and will be gone, as soon as myapps has an API for this.
     link = re.findall(b'<a href="(\S+?)">download file</a>', html)
     if not link:
@@ -68,15 +74,17 @@
         parse.urlparse(url).scheme,
         parse.urlparse(url).netloc,
         link[0].decode("utf-8"))
-    f = request.urlopen(download_link)
-    if not f:
-        abort()
+    return download_link
+
+
+def get_remote_file(fn, url, data_dir=DATA_DIR):
+    data = get_remote_data(url)
     if os.path.exists(fn):
         os.remove(fn)
     if not os.path.exists(os.path.dirname(fn)):
         os.makedirs(os.path.dirname(fn))
     with open(fn, 'bw') as local_file:
-        local_file.write(f.read())
+        local_file.write(data)
 
 
 def read_cr_file(fn, url, local_copy_fn=None):

=== modified file 'data/frameworks.json'
--- data/frameworks.json	2014-07-30 16:33:54 +0000
+++ data/frameworks.json	2014-09-19 17:20:28 +0000
@@ -1,20 +1,23 @@
 {
- "ubuntu-sdk-13.10": "deprecated",
- "ubuntu-sdk-14.04-dev1": "deprecated",
- "ubuntu-sdk-14.04-html-dev1": "deprecated",
- "ubuntu-sdk-14.04-papi-dev1": "deprecated",
- "ubuntu-sdk-14.04-qml-dev1": "deprecated",
- "ubuntu-sdk-14.04": "available",
- "ubuntu-sdk-14.04-html": "available",
- "ubuntu-sdk-14.04-papi": "available",
- "ubuntu-sdk-14.04-qml": "available",
- "ubuntu-sdk-14.10-dev1": "obsolete",
- "ubuntu-sdk-14.10-html-dev1": "obsolete",
- "ubuntu-sdk-14.10-papi-dev1": "obsolete",
- "ubuntu-sdk-14.10-qml-dev1": "obsolete",
- "ubuntu-sdk-14.10-dev2": "available",
- "ubuntu-sdk-14.10-html-dev2": "available",
- "ubuntu-sdk-14.10-papi-dev2": "available",
- "ubuntu-sdk-14.10-qml-dev2": "available",
- "ubuntu-sdk-14.10-qml-dev3": "available"
+    "ubuntu-sdk-13.10": "deprecated",
+    "ubuntu-sdk-14.04-html": "available",
+    "ubuntu-sdk-14.04-qml-dev1": "deprecated",
+    "ubuntu-sdk-14.10-qml-dev3": "available",
+    "ubuntu-sdk-14.10-papi-dev3": "available",
+    "ubuntu-sdk-14.04-html-dev1": "deprecated",
+    "ubuntu-sdk-14.10-papi-dev1": "obsolete",
+    "ubuntu-sdk-14.04-papi-dev1": "deprecated",
+    "ubuntu-sdk-14.10-dev2": "available",
+    "ubuntu-sdk-14.04": "available",
+    "ubuntu-sdk-14.10-dev3": "available",
+    "ubuntu-sdk-14.10-qml-dev1": "obsolete",
+    "ubuntu-sdk-14.04-dev1": "deprecated",
+    "ubuntu-sdk-14.10-dev1": "obsolete",
+    "ubuntu-sdk-14.04-papi": "available",
+    "ubuntu-sdk-14.04-qml": "available",
+    "ubuntu-sdk-14.10-papi-dev2": "available",
+    "ubuntu-sdk-14.10-html-dev3": "available",
+    "ubuntu-sdk-14.10-html-dev2": "available",
+    "ubuntu-sdk-14.10-html-dev1": "obsolete",
+    "ubuntu-sdk-14.10-qml-dev2": "available"
 }