Merge pull request #5 from composer-version-manager/recursive-parent

Scan should recursively check parent directories

Author: morgan-wowk

cvm/commands/scan_command.py

@@ -1,12 +1,14 @@
 from argparse import Action, Namespace
+from typing import Optional
 
+from colorama import Fore
 from cvm.commands.command import Command
+from cvm.helpers.cli import warning
+from cvm.helpers.fs import find_file_in_parent
+from cvm.services.application_service import ApplicationService
 from cvm.services.composer_service import ComposerService
 from cvm.services.config_service import ConfigService
 from cvm.services.github_service import GitHubService
-from cvm.services.application_service import ApplicationService
-from cvm.helpers.cli import warning
-from colorama import Fore
 
 
 class ScanCommand(Command):
@@ -15,9 +17,10 @@ class ScanCommand(Command):
 
     def exec(self, args: Namespace):
         version = None
+        config_file = ConfigService.find()
 
-        if ConfigService.exists():
-            version = self._check_local()
+        if config_file is not None:
+            version = self._check_local(config_file)
         else:
             version = self._check_global()
 
@@ -26,13 +29,12 @@ def exec(self, args: Namespace):
 
         github_service = GitHubService('composer', 'composer')
         composer_service = ComposerService(github_service)
-
         updated_path = composer_service.use_version(version, False)
 
         print(f"export PATH=\"{updated_path}\"; echo Updated path.;")
 
-    def _check_local(self):
-        data = ConfigService.read()
+    def _check_local(self, config_file: str) -> Optional[str]:
+        data = ConfigService.read(config_file)
         if not ConfigService.validate(data):
             msg = warning(".cvm_config format in current directory is invalid.")
             print(f"echo \"{msg}\"")
@@ -41,7 +43,7 @@ def _check_local(self):
 
         return data['requires']
 
-    def _check_global(self):
+    def _check_global(self) -> Optional[str]:
         application_service = ApplicationService()
 
         return application_service.get('global')

cvm/helpers/fs.py

@@ -0,0 +1,17 @@
+import pathlib
+from typing import Optional
+
+
+def find_file_in_parent(filename: str, recursive: bool=False, current_path: Optional[pathlib.Path]=None) -> Optional[pathlib.Path]:
+    if current_path is None:
+        current_path = pathlib.Path.cwd()
+
+    file_path = current_path / filename
+
+    if file_path.exists():
+        return file_path
+    
+    if recursive and str(current_path) != '/':
+        return find_file_in_parent(filename, recursive=True, current_path=current_path.parent)
+    
+    return None

cvm/services/config_service.py

@@ -1,5 +1,8 @@
 import json
 import pathlib
+from typing import Optional
+
+from cvm.helpers.fs import find_file_in_parent
 
 
 class ConfigService:
@@ -11,8 +14,12 @@ def exists() -> bool:
         return ConfigService.CONFIG_INPUT.exists()
 
     @staticmethod
-    def read():
-        return json.load(ConfigService.CONFIG_INPUT.open('r'))
+    def find() -> Optional[pathlib.Path]:
+        return find_file_in_parent(ConfigService.FILENAME, recursive=True)
+
+    @staticmethod
+    def read(config_file: pathlib.Path):
+        return json.load(config_file.open('r'))
 
     @staticmethod
     def validate(data) -> bool: