Merge pull request #7 from brianobot/dev

Dev

Author: brianobot

src/fastapi_gen8/main.py

@@ -49,53 +49,84 @@ def generate_default_project_details() -> dict[str, str | int | tuple]:
         "email": "brianobot9@gmail.com",
         "repository_link": "",
         "open_source_license": (1, [
-            (1, "MIT"), 
-            (2, "BSD"), 
-            (3, "GPLv3"), 
-            (4, "Apache Software License 2.0"), 
-            (5, "Not open source"),
+            "MIT", 
+            "BSD", 
+            "GPLv3", 
+            "Apache Software License 2.0", 
+            "Not open source",
         ]),    
     }
 
+
+class ProjectOptionConfig:
+    """
+    Utility Functions for working with Project Detail Options.
+    """
+    
+    @classmethod
+    def get_option_at(cls, option: list[str], position: int) -> str:
+        """
+        Since indexes are zero based and position are 1 based
+        substracting 1 from each get the option at the current index
+        """
+        return option[position - 1]
+    
+    @classmethod
+    def get_default_option(cls, default: tuple[int, list[str]]) -> str:
+        """
+        Takes the whole default value, extracts the default index and extract the default value
+        based on the default index
+        """
+        default_index = default[0]
+        return cls.get_option_at(default[1], default_index)
+
 
 def get_project_detail(
     attr: str, 
-    default: str | int | tuple[str, ...], 
+    default: str | tuple[int, list[str]], 
     project_detail: dict[str, str | int | tuple]
-) -> str | int | tuple[str, ...]:
+) -> str | int:
     """
     Get a project detail (attr) from the user via the command line interface, if nothing is provided
     the default value is used for the project detail value.
     """
+    
+    if "_" in attr:
+        attr = attr.lower()
+        
+    if attr == "slug_name":
+        default = slugify(str(project_detail["name"]))
 
     # Tuples Attrs means the detail have options, so process them differently
-    if not isinstance(attr, tuple):
+    if not isinstance(default, tuple):
         detail = input(f"Enter Project {attr} ['{default}']: ")
     else:
         count = 0
         detail = ""
         is_not_valid = True
-        default_index = int(cast(tuple, project_detail[attr])[0]) - 1
-        default = cast(tuple, project_detail[attr])[1][default_index][1]
+        
+        default_value = ProjectOptionConfig.get_default_option(default)
 
         while is_not_valid:
-            options = cast(tuple[str, list[tuple[int, str]]], project_detail[attr])[1]
+            options = default[1]
+            print("Options: ", options)
+            
             print(f"Select {attr}:")
-            for index, option in options:
+            for index, option in enumerate(options, start=1):
                 print(f"\t{index} - {option}")
 
-            prompt_msg = f"Choose from {', '.join(str(i) for i in range(index))}: [{cast(tuple, project_detail[attr])[0]}]: "
+            prompt_msg = f"Choose from {', '.join(str(i) for i in range(1, index + 1))}: [{cast(tuple, project_detail[attr])[0]}]: "
             detail_index = input(prompt_msg)
 
             if not detail_index or detail_index.isspace():
-                detail = default
+                detail = default_value
                 is_not_valid = False
             elif not detail_index.isdigit():
                 warning_print(f"Invalid Value {detail_index} for {attr}... Please Try Again!")
-            elif int(detail_index) not in range(index + 1):
+            elif int(detail_index) not in range(1, index + 1):
                 warning_print(f"Invalid Value {detail_index} for {attr}... Please Try Again!")
             else:
-                detail = detail = cast(tuple, project_detail[attr])[1][int(detail_index) - 1][1]
+                detail = ProjectOptionConfig.get_option_at(options, int(detail_index))
                 is_not_valid = False
 
             count += 1
@@ -185,8 +216,8 @@ def generate_project_scaffold(project_detail: dict[str, str]):
 
     # create and activate virtual environment
     subprocess.Popen(["python3", "-m", "venv", "venv"]).wait()
-    subprocess.Popen(["bash", "-c", "source", "venv/bin/activate"]).wait()
-    subprocess.Popen(["pip", "install", "-r", "requirements.txt"]).wait()
+    subprocess.Popen(["bash", "-c", "source venv/bin/activate && pip install -r requirements.txt"]).wait()
+    # subprocess.Popen(["pip", "install", "-r", "requirements.txt"]).wait()
 
 
     print("____________________________________________")
@@ -228,7 +259,8 @@ def main():
 
     # Generate Projects with the Details Provided by the User
     generate_project_scaffold(cast(dict[str, str], project_details))
+    
 
-
+    
 if __name__ == "__main__":
     main()

src/fastapi_gen8/tests/test_main.py

@@ -24,20 +24,20 @@ def test_generate_default_project_details():
 @pytest.mark.parametrize(
     "attr,default_value,project_detail",
     [
-        # ("name", "My Awesome FastAPI Project Test", main.generate_default_project_details()),
-        # ("slug_name", "my_awesome_fastapi_project_test", main.generate_default_project_details()),
-        # ("description", "FastAPI Project Description", main.generate_default_project_details()),
-        # ("author(s)", "John Doe", main.generate_default_project_details()),
-        # ("virtual_env_folder_name", "venv", main.generate_default_project_details()),
-        # ("version", "0.0.1", main.generate_default_project_details()),
-        # ("email", "brianobot9@gmail.com", main.generate_default_project_details()),
-        # ("repository_url", "Default Name", main.generate_default_project_details()),
+        ("name", "My Awesome FastAPI Project Test", main.generate_default_project_details()),
+        ("slug_name", "my_awesome_fastapi_project", main.generate_default_project_details()),
+        ("description", "FastAPI Project Description", main.generate_default_project_details()),
+        ("author(s)", "John Doe", main.generate_default_project_details()),
+        ("virtual_env_folder_name", "venv", main.generate_default_project_details()),
+        ("version", "0.0.1", main.generate_default_project_details()),
+        ("email", "brianobot9@gmail.com", main.generate_default_project_details()),
+        ("repository_url", "Default Name", main.generate_default_project_details()),
         ("open_source_license", (1, [
-            (1, "MIT"), 
-            (2, "BSD"), 
-            (3, "GPLv3"), 
-            (4, "Apache Software License 2.0"), 
-            (5, "Not open source"),
+            "MIT", 
+            "BSD", 
+            "GPLv3", 
+            "Apache Software License 2.0", 
+            "Not open source",
         ]), main.generate_default_project_details()),
     ]
 )
@@ -47,10 +47,9 @@ def test_get_project_detail(attr: str, default_value: str | int | tuple, project
         print("✅ Response: ", result)
         # assert None
         if isinstance(default_value, tuple):
-            print("Default Value is a Tuple")
             default_value = cast(tuple, default_value)
-            assert result == cast(list, default_value[1])[default_value[0]][1]
+            assert result == cast(list, default_value[1])[default_value[0] - 1]
         else:
-            print("Default Value is not a Tuple")
             assert result == default_value
-        assert isinstance(result, str | int | tuple)
+        assert isinstance(result, str | int | tuple)
+