diazona · sjlongland · Aug 12, 2023 · Aug 5, 2023 · Aug 5, 2023 · Aug 5, 2023
diff --git a/src/setuptools_pyproject_migration/__init__.py b/src/setuptools_pyproject_migration/__init__.py
@@ -18,6 +18,61 @@
 LicenseText: Type = TypedDict("LicenseText", {"text": str})
 ReadmeInfo: Type = TypedDict("ReadmeInfo", {"file": str, "content-type": str})
 
+
+def _parse_entry_point(entry_point: str) -> Tuple[str, str]:
+    """
+    Extract the entry point and name from the string.
+
+    >>> _parse_entry_point("hello-world = timmins:hello_world")
+    ('hello-world', 'timmins:hello_world')
+    >>> _parse_entry_point("hello-world=timmins:hello_world")
+    ('hello-world', 'timmins:hello_world')
+    >>> _parse_entry_point("  hello-world  =  timmins:hello_world  ")
+    ('hello-world', 'timmins:hello_world')
+    >>> _parse_entry_point("hello-world")
+    Traceback (most recent call last):
+        ...
+    ValueError: Entry point 'hello-world' is not of the form 'name = module:function'
+
+    :param: entry_point The entry point string, of the form
+                        "entry_point = module:function" (whitespace optional)
+    :returns:           A two-element `tuple`, first element is the entry point name, second element is the target
+                        (module and function name) as a string.
+    :raises ValueError: An equals (`=`) character was not present in the entry point string.
+    """
+    if "=" not in entry_point:
+        raise ValueError("Entry point %r is not of the form 'name = module:function'" % entry_point)
+
+    (name, target) = entry_point.split("=", 1)
+    return (name.strip(), target.strip())
+
+
+def _generate_entry_points(entry_points: Optional[Dict[str, List[str]]]) -> Dict[str, Dict[str, str]]:
+    """
+    Dump the entry points given, if any.
+
+    >>> _generate_entry_points(None)
+    {}
+    >>> _generate_entry_points({"type1": ["ep1=mod:fn1", "ep2=mod:fn2"],
+    ...                        "type2": ["ep3=mod:fn3", "ep4=mod:fn4"]})
+    {'type1': {'ep1': 'mod:fn1', 'ep2': 'mod:fn2'}, 'type2': {'ep3': 'mod:fn3', 'ep4': 'mod:fn4'}}
+
+    :param: entry_points The `entry_points` property from the
+                        :py:class:setuptools.dist.Distribution being examined.
+    :returns:           The entry points, split up as per
+                        :py:func:_parse_entry_point and grouped by entry point type.
+    """
+    if not entry_points:
+        return {}
+
+    parsed_entry_points: Dict[str, Dict[str, str]] = {}
+
+    for eptype, raweps in entry_points.items():
+        parsed_entry_points[eptype] = dict(map(_parse_entry_point, raweps))
+
+    return parsed_entry_points
+
+
 Project: Type = TypedDict(
     "Project",
     {
@@ -147,6 +202,19 @@ def _generate(self) -> Pyproject:
         if dependencies:
             pyproject["project"]["dependencies"] = dependencies
 
+        entry_points = _generate_entry_points(dist.entry_points)
+
+        # GUI scripts and console scripts go separate in dedicated locations.
+        if "console_scripts" in entry_points:
+            pyproject["project"]["scripts"] = entry_points.pop("console_scripts")
+
+        if "gui_scripts" in entry_points:
+            pyproject["project"]["gui-scripts"] = entry_points.pop("gui_scripts")
+
+        # Anything left over gets put in entry-points
+        if entry_points:
+            pyproject["project"]["entry-points"] = entry_points
+
         return pyproject
 
     def run(self):

diff --git a/tests/test_entry_points.py b/tests/test_entry_points.py
@@ -0,0 +1,163 @@
+"""
+Testing the logic that extracts the entrypoint data:
+    - CLI entrypoints
+    - GUI entrypoints
+    - miscellaneous entrypoints
+"""
+
+from setuptools_pyproject_migration import WritePyproject
+from setuptools.dist import Distribution
+
+
+def test_generate_noentrypoints():
+    """
+    Test distribution with no entry points generates no entry points
+    """
+    cmd = WritePyproject(
+        Distribution(
+            dict(
+                name="TestProject",
+                version="1.2.3",
+            )
+        )
+    )
+    result = cmd._generate()
+
+    assert "scripts" not in result["project"]
+    assert "gui-scripts" not in result["project"]
+    assert "entry-points" not in result["project"]
+
+
+def test_generate_clionly():
+    """
+    Test distribution with only CLI scripts generates only "scripts"
+    """
+    cmd = WritePyproject(
+        Distribution(
+            dict(
+                name="TestProject",
+                version="1.2.3",
+                entry_points=dict(
+                    console_scripts=[
+                        "spanish-inquisition=montypython.unexpected:spanishinquisition",
+                        "brian=montypython.naughtyboy:brian",
+                    ]
+                ),
+            )
+        )
+    )
+    result = cmd._generate()
+
+    assert "gui-scripts" not in result["project"]
+    assert "entry-points" not in result["project"]
+
+    assert result["project"]["scripts"] == {
+        "spanish-inquisition": "montypython.unexpected:spanishinquisition",
+        "brian": "montypython.naughtyboy:brian",
+    }
+
+
+def test_generate_guionly():
+    """
+    Test distribution with only GUI scripts generates only "gui-scripts"
+    """
+    cmd = WritePyproject(
+        Distribution(
+            dict(
+                name="TestProject",
+                version="1.2.3",
+                entry_points=dict(
+                    gui_scripts=[
+                        "dead-parrot=montypython.sketch:petshop",
+                        "shrubbery=montypython.holygrail:knightswhosayni",
+                    ]
+                ),
+            )
+        )
+    )
+    result = cmd._generate()
+
+    assert "scripts" not in result["project"]
+    assert "entry-points" not in result["project"]
+
+    assert result["project"]["gui-scripts"] == {
+        "dead-parrot": "montypython.sketch:petshop",
+        "shrubbery": "montypython.holygrail:knightswhosayni",
+    }
+
+
+def test_generate_misconly():
+    """
+    Test distribution with only misc entry points generates only "entry-points"
+    """
+    cmd = WritePyproject(
+        Distribution(
+            dict(
+                name="TestProject",
+                version="1.2.3",
+                entry_points={
+                    "project.plugins": [
+                        "babysnatchers=montypython.somethingcompletelydifferent:babysnatchers",
+                        "eels=montypython.somethingcompletelydifferent:eels",
+                    ]
+                },
+            )
+        )
+    )
+    result = cmd._generate()
+
+    assert "scripts" not in result["project"]
+    assert "gui-scripts" not in result["project"]
+
+    assert result["project"]["entry-points"] == {
+        "project.plugins": {
+            "babysnatchers": "montypython.somethingcompletelydifferent:babysnatchers",
+            "eels": "montypython.somethingcompletelydifferent:eels",
+        },
+    }
+
+
+def test_generate_all_entrypoints():
+    """
+    Test distribution with all entry point types, generates all sections
+    """
+    cmd = WritePyproject(
+        Distribution(
+            dict(
+                name="TestProject",
+                version="1.2.3",
+                entry_points={
+                    "console_scripts": [
+                        "spanish-inquisition=montypython.unexpected:spanishinquisition",
+                        "brian=montypython.naughtyboy:brian",
+                    ],
+                    "gui_scripts": [
+                        "dead-parrot=montypython.sketch:petshop",
+                        "shrubbery=montypython.holygrail:knightswhosayni",
+                    ],
+                    "project.plugins": [
+                        "babysnatchers=montypython.somethingcompletelydifferent:babysnatchers",
+                        "eels=montypython.somethingcompletelydifferent:eels",
+                    ],
+                },
+            )
+        )
+    )
+    result = cmd._generate()
+
+    assert result["project"]["scripts"] == {
+        "spanish-inquisition": "montypython.unexpected:spanishinquisition",
+        "brian": "montypython.naughtyboy:brian",
+    }
+
+    assert result["project"]["gui-scripts"] == {
+        "dead-parrot": "montypython.sketch:petshop",
+        "shrubbery": "montypython.holygrail:knightswhosayni",
+    }
+
+    assert result["project"]["entry-points"] == {
+        "project.plugins": {
+            "babysnatchers": "montypython.somethingcompletelydifferent:babysnatchers",
+            "eels": "montypython.somethingcompletelydifferent:eels",
+        },
+    }
diff --git a/tests/test_setup_command.py b/tests/test_setup_command.py
@@ -132,6 +132,14 @@ def test_everything(project) -> None:
         sphinx-lint
 
 [options.entry_points]
+console_scripts =
+        cliep1 = test_project.cliep1
+        cliep2 = test_project.cliep2
+
+gui_scripts =
+        guiep1 = test_project.guiep1
+        guiep2 = test_project.guiep2
+
 test_project.dummy =
         ep1 = test_project.ep1
         ep2 = test_project.ep2
@@ -166,6 +174,18 @@ def test_everything(project) -> None:
 [[project.maintainers]]
 name = "Stuart Longland"
 email = "me@vk4msl.com"
+
+[project.scripts]
+cliep1 = "test_project.cliep1"
+cliep2 = "test_project.cliep2"
+
+[project.gui-scripts]
+guiep1 = "test_project.guiep1"
+guiep2 = "test_project.guiep2"
+
+[project.entry-points."test_project.dummy"]
+ep1 = "test_project.ep1"
+ep2 = "test_project.ep2"
 """
     project.setup_cfg(setup_cfg)
     project.write("README.md", readme_md)