Merge lp:~ricardokirkner/locolander/explicit-dependencies into lp:locolander

[Ricardo Kirkner]

use explicit dependencies in locolander.yml file to improve build speed

streamline Dockerfile builder to cache as much as possible

[Facundo Batista (facundo)]

review: Approve

=== modified file '.locolander.yml'
--- .locolander.yml	2013-07-13 17:02:33 +0000
+++ .locolander.yml	2013-07-27 00:07:31 +0000
@@ -1,5 +1,57 @@
 precise:
-    pip: -r requirements.txt
+    apt:
+        python-dev:
+        libpq-dev:
+        libxml2-dev:
+        libxslt1-dev:
+    pip:
+        Django: 1.5.1
+        PyYAML: 3.10.0
+        South: 0.8.1
+        amqp: 1.0.12
+        anyjson: 0.3.3
+        argparse: 1.2.1
+        billiard: 2.7.3.31
+        bzr: 2.6b2
+        celery: 3.0.21
+        cssselect: 0.8
+        distribute: 0.6.34
+        django-allauth: 0.12.0
+        django-celery: 3.0.17
+        flower: 0.5.2
+        github3.py: 0.7.0
+        gunicorn: 17.5
+        httplib2: 0.8
+        keyring: 1.5
+        kombu: 2.5.12
+        launchpadlib: 1.10.2
+        lazr.authentication: 0.1.2
+        lazr.restfulclient: 0.13.3
+        lazr.uri: 1.0.3
+        lxml: 3.2.1
+        meld3: 0.6.10
+        mock: 1.0.1
+        oauth: 1.0.1
+        oauthlib: 0.5.0
+        pep8: 1.4.6
+        psycopg2: 2.5.1
+        pyflakes: 0.7.3
+        pyquery: 1.2.4
+        python-dateutil: 2.1
+        python-openid: 2.2.5
+        pytz: 2013b
+        redis: 2.7.6
+        requests: 1.2.3
+        requests-oauthlib: 0.3.2
+        simplejson: 3.3.0
+        six: 1.3.0
+        supervisor: 3.0b2
+        testresources: 0.2.7
+        tornado: 3.1
+        wadllib: 1.3.2
+        wsgi-intercept: 0.5.1
+        wsgiref: 0.1.2
+        zope.interface: 4.0.5
 
 metadata:
     test_script: ./run_tests.sh

=== modified file 'ns2df.py'
--- ns2df.py	2013-07-09 18:41:19 +0000
+++ ns2df.py	2013-07-27 00:07:31 +0000
@@ -15,13 +15,13 @@
 will be converted to
 
     from locolander:precise
-    run apt-get -q -y install apache2=3.3-4
-    run apt-get -q -y install bzr
+    run apt-get -q -y install apache2=3.3-4 bzr
     run pip install --download=/tmp/pipcache --no-install foobar
     run ip link set dev eth0 down
     run pip install --find-links=file:///tmp/pipcache --no-index foobar
+    cmd cd /srv/locolander/project && timeout 300 ./test
 
-and also the system will use "./test" as script
+(provided the project name used is 'project')
 """
 
 import os.path
@@ -59,9 +59,7 @@
 
 def _get_code(config, **params):
     return ['run mkdir -p {target_path}'.format(**params),
-            'add . {target_path}'.format(**params),
-            'run chown -R locolander.locolander {target_path}'.format(
-                **params)]
+            'add . {target_path}'.format(**params)]
 
 
 def _get_depends_prev(config, **params):
@@ -89,7 +87,7 @@
         packages = _get_pip_packages(items)
         pip_cache_dir = params['pip_cache_dir']
         dependencies.append(
-            'run cd {target_path} && pip install --download={pip_cache_dir} '
+            'run pip install --download={pip_cache_dir} '
             '--no-install {packages}'.format(
                 pip_cache_dir=pip_cache_dir, packages=packages,
                 target_path=params['target_path']))
@@ -112,7 +110,7 @@
         packages = _get_pip_packages(items)
         pip_cache_dir = params['pip_cache_dir']
         dependencies.append(
-            'run cd {target_path} && pip install '
+            'run pip install '
             '--find-links=file://{pip_cache_dir} --no-index '
             '{packages}'.format(pip_cache_dir=pip_cache_dir,
                                 packages=packages,
@@ -140,10 +138,10 @@
     # the order for calling these functions is VERY important
     functions = [
         _get_base,
-        _get_code,
         _get_depends_prev,
         _get_secure,
         _get_depends_post,
+        _get_code,
         _get_rest,
     ]
     data = []

=== modified file 'tests/test_ns2df.py'
--- tests/test_ns2df.py	2013-07-09 18:41:19 +0000
+++ tests/test_ns2df.py	2013-07-27 00:07:31 +0000
@@ -52,7 +52,7 @@
         })
         res = ns2df._get_depends_prev(config, **self.params)
         self.assertEqual(res, [
-            "run cd /srv/locolander/project && pip install --download=/tmp/pipcache --no-install foo",
+            "run pip install --download=/tmp/pipcache --no-install foo",
         ])
 
     def test_pip_prev_several(self):
@@ -61,7 +61,7 @@
         })
         res = ns2df._get_depends_prev(config, **self.params)
         self.assertEqual(res, [
-            "run cd /srv/locolander/project && pip install --download=/tmp/pipcache --no-install bar foo",
+            "run pip install --download=/tmp/pipcache --no-install bar foo",
         ])
 
     def test_pip_prev_versions(self):
@@ -70,7 +70,7 @@
         })
         res = ns2df._get_depends_prev(config, **self.params)
         self.assertEqual(res, [
-            ("run cd /srv/locolander/project && pip install --download=/tmp/pipcache --no-install "
+            ("run pip install --download=/tmp/pipcache --no-install "
              "bar==2.1 foo"),
         ])
 
@@ -80,7 +80,7 @@
         })
         res = ns2df._get_depends_prev(config, **self.params)
         self.assertEqual(res, [
-            ("run cd /srv/locolander/project && pip install --download=/tmp/pipcache --no-install "
+            ("run pip install --download=/tmp/pipcache --no-install "
              "-r requirements.txt"),
         ])
 
@@ -90,7 +90,7 @@
         })
         res = ns2df._get_depends_post(config, **self.params)
         self.assertEqual(res, [
-            "run cd /srv/locolander/project && pip install --find-links=file:///tmp/pipcache --no-index foo"
+            "run pip install --find-links=file:///tmp/pipcache --no-index foo"
         ])
 
     def test_pip_post_several(self):
@@ -99,7 +99,7 @@
         })
         res = ns2df._get_depends_post(config, **self.params)
         self.assertEqual(res, [
-            ("run cd /srv/locolander/project && pip install --find-links=file:///tmp/pipcache --no-index "
+            ("run pip install --find-links=file:///tmp/pipcache --no-index "
              "bar foo"),
         ])
 
@@ -109,7 +109,7 @@
         })
         res = ns2df._get_depends_post(config, **self.params)
         self.assertEqual(res, [
-            ("run cd /srv/locolander/project && pip install --find-links=file:///tmp/pipcache --no-index "
+            ("run pip install --find-links=file:///tmp/pipcache --no-index "
              "bar==2.1 foo"),
         ])
 
@@ -119,7 +119,7 @@
         })
         res = ns2df._get_depends_post(config, **self.params)
         self.assertEqual(res, [
-            ("run cd /srv/locolander/project && pip install --find-links=file:///tmp/pipcache --no-index "
+            ("run pip install --find-links=file:///tmp/pipcache --no-index "
              "-r requirements.txt"),
         ])
 
@@ -131,7 +131,7 @@
         res = ns2df._get_depends_prev(config, **self.params)
         self.assertEqual(res, [
             "run apt-get -q -y install apache2=3.3-4 bzr",
-            "run cd /srv/locolander/project && pip install --download=/tmp/pipcache --no-install bar foo",
+            "run pip install --download=/tmp/pipcache --no-install bar foo",
         ])
 
     def test_mixed_post(self):
@@ -141,7 +141,7 @@
         })
         res = ns2df._get_depends_post(config, **self.params)
         self.assertEqual(res, [
-            ("run cd /srv/locolander/project && pip install --find-links=file:///tmp/pipcache --no-index "
+            ("run pip install --find-links=file:///tmp/pipcache --no-index "
              "bar foo"),
         ])
 
@@ -166,7 +166,8 @@
         res = ns2df._get_rest({},
                               target_path='/srv/locolander',
                               test_cmd='./run_tests.sh')
-        self.assertEqual(res, ["cmd cd /srv/locolander && timeout 300 ./run_tests.sh"])
+        self.assertEqual(
+            res, ["cmd cd /srv/locolander && timeout 300 ./run_tests.sh"])
 
     def test_all_mixed(self):
         config_text = """
@@ -182,13 +183,12 @@
         docker = ns2df.parse(config_text, "/tmp/pipcache", 'project')
         self.assertEqual(docker,
             "from locolander:precise\n"
-            "run mkdir -p /srv/locolander/project\n"
-            "add . /srv/locolander/project\n"
-            "run chown -R locolander.locolander /srv/locolander/project\n"
             "run apt-get -q -y install apache2=3.3-4 bzr\n"
-            "run cd /srv/locolander/project && pip install --download=/tmp/pipcache --no-install foobar\n"
+            "run pip install --download=/tmp/pipcache --no-install foobar\n"
             "run ip link set dev eth0 down\n"
-            "run cd /srv/locolander/project && pip install --find-links=file:///tmp/pipcache "
+            "run pip install --find-links=file:///tmp/pipcache "
                 "--no-index foobar\n"
+            "run mkdir -p /srv/locolander/project\n"
+            "add . /srv/locolander/project\n"
             "cmd cd /srv/locolander/project && timeout 300 foo"
         )