propagate strip_top_level_dir option to slapos.recipe.build:downloadunpacked

Don't force strip_top_level_dir option to be false when calling for slapos.recipe.build:downloadunpacked - let the user decide.

Effectively adds strip_top_level_dir option to the script which allows for shorter and more consistent paths.
Also it can help mitigating the variability of path length between archives downloaded for branch, commit hash and release.

slapos/recipe/cmmi/README.rst

@@ -16,6 +16,11 @@ Supported options
     script. The ``url`` option can not be used at the same time with
     ``path``.
 
+``strip-top-level-dir``
+
+    Omit the topmost directory of the package when unpacking.
+    true or false. Defaults to false.
+
 ``prefix``
 
     Custom installation prefix passed to the ``--prefix`` option of the

slapos/recipe/cmmi/__init__.py

@@ -110,6 +110,7 @@ class Recipe(object):
         options['url'] = options.get('url', '').strip()
         options['path'] = options.get('path', '').strip()
         options['promises'] = options.get('promises', '')
+        options['strip-top-level-dir'] = options.get('strip-top-level-dir', 'false').strip()
 
         if options['url'] and options['path']:
             raise zc.buildout.UserError('You must use either "url" or "path", not both!')
@@ -318,7 +319,6 @@ class Recipe(object):
                 self.options.get('md5sum') # so that buildout does not complain "unused option md5sum"
                 opt = self.options.copy()
                 opt['destination'] = compile_dir
-                opt['strip-top-level-dir'] = 'false'
                 # no need to shared build for compile dir
                 opt['shared'] = 'false'
                 slapos.recipe.downloadunpacked.Recipe(

slapos/recipe/cmmi/tests.py

@@ -164,6 +164,23 @@ class NonInformativeTests(unittest.TestCase):
         with self.assertRaises(zc.buildout.UserError):
             recipe.run('this-command-does-not-exist')
 
+    def test_strip_top_dir_control(self):
+        recipe = self.make_recipe({}, 'test', {
+            'url': 'file://%s/testdata/package-0.0.0.tar.gz' % os.path.dirname(__file__),
+            'keep-compile-dir': 'true'})
+        os.chdir(self.dir)
+        recipe.install()
+        self.assertTrue(os.path.exists('test_parts/test__compile__/package-0.0.0'))
+
+    def test_strip_top_dir(self):
+        recipe = self.make_recipe({}, 'test', { 
+            'url': 'file://%s/testdata/package-0.0.0.tar.gz' % os.path.dirname(__file__),
+            'keep-compile-dir': 'true',
+            'strip-top-level-dir': 'true'})
+        os.chdir(self.dir)
+        recipe.install()
+        self.assertTrue(os.path.exists('test_parts/test__compile__/configure'))
+
     def test_stop_shell_on_error_midway(self):
         recipe = self.make_recipe({}, 'test', {
             'url': 'file://%s/testdata/package-0.0.0.tar.gz' % os.path.dirname(__file__),