detect composer non-recursively

[#116521177]

Signed-off-by: John Shahid <[email protected]>

lib/build_pack_utils/builder.py

@@ -10,6 +10,13 @@
 from cloudfoundry import CloudFoundryUtil
 from cloudfoundry import CloudFoundryInstaller
 from detecter import TextFileSearch
+from detecter import ComposerJsonSearch
+from detecter import RegexFileSearch
+from detecter import StartsWithFileSearch
+from detecter import EndsWithFileSearch
+from detecter import ContainsFileSearch
+from runner import BuildPack
+from utils import rewrite_cfgs
 from detecter import RegexFileSearch
 from detecter import StartsWithFileSearch
 from detecter import EndsWithFileSearch
@@ -132,6 +139,11 @@ def if_found_output(self, text):
         self._output = self._ctx.format(text)
         return self
 
+    def find_composer_path(self):
+        self._detecter = self._config(ComposerJsonSearch(self._ctx))
+        #search for composer.json at that path
+        return self
+
     def when_not_found_continue(self):
         self._continue = True
         return self

lib/build_pack_utils/detecter.py

@@ -1,9 +1,9 @@
 import os
 import re
 import logging
+import utils
 from itertools import chain
 
-
 class BaseFileSearch(object):
     def __init__(self):
         self._log = logging.getLogger('detecter')
@@ -46,6 +46,17 @@ def _match(self, term):
             return term == self._text
 
 
+class ComposerJsonSearch():
+    def __init__(self, ctx):
+        extension_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '../../extensions/composer'))
+        self.extension_module = utils.load_extension(extension_path)
+        self._ctx = ctx
+
+    def search(self, term):
+        path, _ = self.extension_module.find_composer_paths(self._ctx)
+        return path is not None
+
+
 class RegexFileSearch(BaseFileSearch):
     def __init__(self, regex):
         BaseFileSearch.__init__(self)

scripts/detect.py

@@ -23,8 +23,7 @@
          .user_config(step='detect')
          .done()
      .detect()
-         .by_name("composer.json")
-         .recursive()
+         .find_composer_path()
          .if_found_output('php ' + sys.argv[2])
          .when_not_found_continue()
          .done()

tests/data/app-asp-net/src/asp-app/Startup.cs

@@ -0,0 +1 @@
+not php

tests/data/app-asp-net/src/asp-app/wwwroot/scripts/lib/fakelib/composer.json

@@ -0,0 +1 @@
+{"not": "php"}

tests/test_detect.py

@@ -132,3 +132,26 @@ def test_detect_with_invalid_json(self):
         finally:
             if os.path.exists(bp.bp_dir):
                 shutil.rmtree(bp.bp_dir)
+
+    @with_setup(setup=setUp, teardown=tearDown)
+    def test_detect_with_asp_net_app(self):
+        shutil.copytree('tests/data/app-asp-net', self.build_dir)
+        bp = BuildPack({
+            'BUILD_DIR': self.build_dir,
+            'CACHE_DIR': self.cache_dir,
+            'WEBDIR': 'htdocs'
+        }, '.')
+        # simulate clone, makes debugging easier
+        os.rmdir(bp.bp_dir)
+        shutil.copytree('.', bp.bp_dir,
+                        ignore=shutil.ignore_patterns("binaries",
+                                                      "env",
+                                                      "tests"))
+        try:
+            bp._detect().strip()
+        except Exception, e:
+            print e.output
+            assert re.match('no', e.output)
+        finally:
+            if os.path.exists(bp.bp_dir):
+                shutil.rmtree(bp.bp_dir)