Merge lp:~sergiusens/snapcraft/1496381 into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

Fetch from the wiki only once

Based on Chipaca's example code

[Sergio Schvezov (sergiusens)]

I'm just noticing this is a useless branch :-)

[Sergio Schvezov (sergiusens)]

there we go

[Daniel Holbach (dholbach)]

gcc -Wall -Wextra -Werror -pedantic -o test ./test.c -I/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/include -I/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/usr/include -I/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/include/x86_64-linux-gnu -I/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/usr/include/x86_64-linux-gnu -L/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/lib -L/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/usr/lib -L/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/lib/x86_64-linux-gnu -L/tmp/1496381/examples/downloader-with-wiki-parts/parts/curl/install/usr/lib/x86_64-linux-gnu -lcurl -lssl -lcrypto -lssl -lcrypto -lz
make install DESTDIR=/tmp/1496381/examples/downloader-with-wiki-parts/parts/main/install
install -d -m755 /tmp/1496381/examples/downloader-with-wiki-parts/parts/main/install/bin/
install -m755 ./test /tmp/1496381/examples/downloader-with-wiki-parts/parts/main/install/bin/test
Staging main
Snapping main
Traceback (most recent call last):
  File "../../bin/snapcraft", line 33, in <module>
    snapcraft.main.main()
  File "/tmp/1496381/snapcraft/main.py", line 77, in main
    args.func(args)
  File "/tmp/1496381/snapcraft/cmds.py", line 94, in assemble
    snap(args)
  File "/tmp/1496381/snapcraft/cmds.py", line 82, in snap
    config = _load_config()
  File "/tmp/1496381/snapcraft/cmds.py", line 299, in _load_config
    return snapcraft.yaml.Config()
  File "/tmp/1496381/snapcraft/yaml.py", line 99, in __init__
    self._compute_part_dependencies(after_requests)
  File "/tmp/1496381/snapcraft/yaml.py", line 130, in _compute_part_dependencies
    wiki_part = w.get_part(dep)
  File "/tmp/1496381/snapcraft/wiki.py", line 59, in get_part
    return self.wiki_parts[name]
AttributeError: 'Wiki' object has no attribute 'wiki_parts'
daniel@daydream:/tmp/1496381/examples/downloader-with-wiki-parts$

review: Needs Fixing

[lp:~sergiusens/snapcraft/1496381]

168. By Sergio Schvezov on 2015-09-16

Fetch from the wiki only once

[Daniel Holbach (dholbach)]

Good work!

review: Approve

[John Lenton (chipaca)]

review: Approve

=== modified file 'snapcraft/cmds.py'
--- snapcraft/cmds.py	2015-09-14 09:48:23 +0000
+++ snapcraft/cmds.py	2015-09-16 21:02:24 +0000
@@ -41,6 +41,9 @@
 '''
 
 
+_config = None
+
+
 def init(args):
     if os.path.exists("snapcraft.yaml"):
         logger.error('snapcraft.yaml already exists!')
@@ -295,8 +298,13 @@
 
 
 def _load_config():
+    global _config
+    if _config:
+        return _config
+
     try:
-        return snapcraft.yaml.Config()
+        _config = snapcraft.yaml.Config()
+        return _config
     except snapcraft.yaml.SnapcraftYamlFileError as e:
         logger.error(
             'Could not find {}.  Are you sure you are in the right directory?\n'

=== modified file 'snapcraft/tests/test_wiki.py'
--- snapcraft/tests/test_wiki.py	2015-09-15 15:06:54 +0000
+++ snapcraft/tests/test_wiki.py	2015-09-16 21:02:24 +0000
@@ -42,9 +42,9 @@
     def test_get_part(self):
         w = snapcraft.wiki.Wiki()
 
+        self.assertEqual(w.get_part('part1'), {'type': 'go'})
+        self.assertEqual(w.get_part('part2'), None)
+
         self.mock_requests.assert_called_once_with(
             'https://wiki.ubuntu.com/Snappy/Parts',
             params={'action': 'raw'})
-
-        self.assertEqual(w.get_part('part1'), {'type': 'go'})
-        self.assertEqual(w.get_part('part2'), None)

=== modified file 'snapcraft/wiki.py'
--- snapcraft/wiki.py	2015-09-15 14:45:57 +0000
+++ snapcraft/wiki.py	2015-09-16 21:02:24 +0000
@@ -28,23 +28,22 @@
 
 
 class Wiki:
-
-    def __init__(self):
-        self.wiki_parts = self._fetch()
+    wiki_parts = None
 
     def _fetch(self):
-        raw_content = requests.get(PARTS_URI, params=PARTS_URI_PARAMS)
-        content = raw_content.text.strip()
-
-        if content.startswith(_WIKI_OPEN):
-            content = content[len(_WIKI_OPEN):].strip()
-        if content.endswith(_WIKI_CLOSE):
-            content = content[:-len(_WIKI_CLOSE)]
-
-        return yaml.load(content)
+        if self.wiki_parts is None:
+            raw_content = requests.get(PARTS_URI, params=PARTS_URI_PARAMS)
+            content = raw_content.text.strip()
+
+            if content.startswith(_WIKI_OPEN):
+                content = content[len(_WIKI_OPEN):].strip()
+            if content.endswith(_WIKI_CLOSE):
+                content = content[:-len(_WIKI_CLOSE)]
+
+            self.wiki_parts = yaml.load(content)
 
     def get_part(self, name):
-        try:
+        self._fetch()
+
+        if name in self.wiki_parts:
             return self.wiki_parts[name]
-        except KeyError:
-            return None