Merge pull request #79 from minos-framework/issue-73-create-microservice-in-microservices-directory

#73 - Microservices path.

Author: albamig

minos/cli/api/new.py

@@ -7,6 +7,9 @@
 from ..consoles import (
     console,
 )
+from ..pathlib import (
+    get_microservices_directory,
+)
 from ..templating import (
     TemplateFetcher,
     TemplateProcessor,
@@ -27,13 +30,19 @@ def new_project(path: Path) -> None:
 
 
 @app.command("microservice")
-def new_microservice(path: Path) -> None:
+def new_microservice(name: str) -> None:
     """Initialize a microservice on the given directory."""
 
     console.print(":wrench: Creating new Microservice...\n")
 
+    try:
+        microservice_path = get_microservices_directory(Path.cwd()) / name
+    except ValueError:
+        console.print("No Minos project found. Consider 'minos project init'")
+        raise typer.Exit(code=1)
+
     fetcher = TemplateFetcher.from_name("microservice-init")
-    processor = TemplateProcessor.from_fetcher(fetcher, path.absolute(), defaults={"name": path.name})
+    processor = TemplateProcessor.from_fetcher(fetcher, microservice_path, defaults={"name": name})
     processor.render()
 
 

minos/cli/pathlib.py

@@ -2,6 +2,10 @@
     Path,
 )
 
+MINOS_PROJECT_FILENAME = ".minos-project.yaml"
+MINOS_MICROSERVICE_FILENAME = ".minos-microservice.yaml"
+MICROSERVICES_DIRECTORY = "microservices"
+
 
 def get_project_target_directory(path: Path) -> Path:
     """Get the target directory for a project.
@@ -10,9 +14,10 @@ def get_project_target_directory(path: Path) -> Path:
     """
     current = path
     while current != current.parent:
-        if (current / ".minos-project.yaml").exists():
+        if (current / MINOS_PROJECT_FILENAME).exists():
             return current
-        current = current.parent
+        else:
+            current = current.parent
 
     raise ValueError(f"Unable to find the target directory from {path} origin.")
 
@@ -26,13 +31,18 @@ def get_microservice_target_directory(path: Path, name: str) -> Path:
     """
     current = path
     while current != current.parent:
-        if (current / ".minos-microservice.yaml").exists():
+        if (current / MINOS_MICROSERVICE_FILENAME).exists():
             return current
 
-        if (current / ".minos-project.yaml").exists():
-            target = current / "microservices" / name
-            if (target / ".minos-microservice.yaml").exists():
+        if (current / MINOS_PROJECT_FILENAME).exists():
+            target = current / MICROSERVICES_DIRECTORY / name
+            if (target / MINOS_MICROSERVICE_FILENAME).exists():
                 return target
         current = current.parent
 
     raise ValueError(f"Unable to find the target directory for {name} from {path} origin.")
+
+
+def get_microservices_directory(path: Path) -> Path:
+    project_directory = get_project_target_directory(path)
+    return project_directory / MICROSERVICES_DIRECTORY

tests/test_cli/test_api/test_new.py

@@ -21,6 +21,14 @@
 
 
 class TestNew(unittest.TestCase):
+    def setUp(self) -> None:
+        self.minos_project_file = Path.cwd() / ".minos-project.yaml"
+        self.minos_project_file.touch()
+
+    def tearDown(self) -> None:
+        if self.minos_project_file.exists():
+            self.minos_project_file.unlink()
+
     def test_main(self):
         self.assertEqual(__main__.main, main)
 
@@ -44,6 +52,18 @@ def test_new_microservice(self) -> None:
 
                 self.assertEqual(1, mock.call_count)
 
+    def test_new_microservice_no_project_file(self) -> None:
+        self.minos_project_file.unlink()
+
+        with TemporaryDirectory() as tmp_dir_name:
+            path = Path(tmp_dir_name) / "product"
+            with patch("minos.cli.TemplateProcessor.render") as mock:
+                result = CliRunner().invoke(app, ["new", "microservice", str(path)])
+
+                self.assertEqual(1, result.exit_code)
+
+                self.assertEqual(0, mock.call_count)
+
 
 if __name__ == "__main__":
     unittest.main()