phable-cli 0.1.10__tar.gz → 0.1.11__tar.gz

{phable_cli-0.1.10 → phable_cli-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: phable-cli
-Version: 0.1.10
+Version: 0.1.11
 Summary: Manage Phabricator tasks from the comfort of your terminal
 License: MIT
 Author: Balthazar Rouberol

{phable_cli-0.1.10 → phable_cli-0.1.11}/phable/cli/assign.py

@@ -25,8 +25,12 @@ def assign_task(
 
     \b
     Examples:
-    $ phable assign T123456             # self assign task
-    $ phable assign T123456  brouberol  # asign to username
+    \b
+    # self assign task
+    $ phable assign T123456
+    \b
+    # asign to username
+    $ phable assign T123456  --usernamme brouberol
 
     """
     if not username:

{phable_cli-0.1.10 → phable_cli-0.1.11}/phable/cli/list.py

@@ -3,7 +3,7 @@ from typing import Optional
 
 from phable.phabricator import PhabricatorClient
 from phable.config import config
-from phable.display import display_tasks
+from phable.display import display_tasks, TaskFormat
 
 
 @click.command(name="list")
@@ -30,7 +30,7 @@ from phable.display import display_tasks
 @click.option(
     "--format",
     required=False,
-    type=click.Choice(("html", "plain", "json", "markdown")),
+    type=click.Choice(TaskFormat, case_sensitive=False),
     default="plain",
     help="The output format of the task list",
 )
@@ -42,7 +42,7 @@ def list_tasks(
     columns: list[str],
     owner: Optional[str] = None,
     milestone: bool = False,
-    format: str = "plain",
+    format: TaskFormat = TaskFormat.PLAIN,
 ):
     """Lists and filter tasks
 
@@ -78,4 +78,4 @@ def list_tasks(
         column_phids=column_phids, owner_phid=owner_user, project_phid=project_phid
     )
     tasks = [client.enrich_task(task) for task in tasks]
-    display_tasks(tasks=tasks, format=format, separator="")
+    display_tasks(tasks=tasks, format=format)

{phable_cli-0.1.10 → phable_cli-0.1.11}/phable/cli/report.py

@@ -1,7 +1,7 @@
 import click
 from phable.config import config
 from phable.phabricator import PhabricatorClient
-from phable.display import display_tasks
+from phable.display import display_tasks, TaskFormat
 
 
 @click.command(name="report-done-tasks")
@@ -15,7 +15,7 @@ from phable.display import display_tasks
 )
 @click.option(
     "--format",
-    type=click.Choice(("plain", "json")),
+    type=click.Choice(TaskFormat, case_sensitive=False),
     default="plain",
     help="Output format",
 )
@@ -51,7 +51,7 @@ def report_done_tasks(
     column_destination_phid = client.find_column_in_project(
         target_project_phid, destination
     )
-    tasks = client.find_tasks_in_column(column_source_phid)
+    tasks = client.find_tasks(column_phids=[column_source_phid])
 
     enriched_tasks = []
     for task in tasks:

{phable_cli-0.1.10 → phable_cli-0.1.11}/phable/cli/show.py

@@ -1,13 +1,13 @@
 import click
 from phable.utils import Task
 from phable.phabricator import PhabricatorClient
-from phable.display import display_task
+from phable.display import display_task, TaskFormat
 
 
 @click.command(name="show")
 @click.option(
     "--format",
-    type=click.Choice(("plain", "json")),
+    type=click.Choice(TaskFormat, case_sensitive=False),
     default="plain",
     help="Output format",
 )

phable_cli-0.1.11/phable/display.py

@@ -0,0 +1,127 @@
+import json
+from collections.abc import Callable
+from enum import StrEnum, auto
+
+from .utils import Task
+
+
+class TaskFormat(StrEnum):
+    PLAIN = auto()
+    JSON = auto()
+    HTML = auto()
+    MARKDOWN = auto()
+    WIKITEXT = auto()
+
+
+def display_tasks(
+    tasks: list[dict],
+    format: TaskFormat,
+) -> None:
+    if len(tasks) == 1:
+        display_task(tasks[0], format=format)
+    get_printer(format).print_list(tasks)
+
+
+def display_task(task: dict, format: TaskFormat) -> None:
+    get_printer(format).print(task)
+
+
+class TaskPrinter:
+    def __init__(self, printer: Callable):
+        self._printer = printer
+
+    def print(self, task: dict) -> None:
+        pass
+
+    def print_list(self, tasks: list[dict]) -> None:
+        pass
+
+    def title(self, task: dict) -> str:
+        return f"{Task.from_int(task['id'])} {task['fields']['name']}"
+
+    def status(self, task: dict) -> str:
+        return f"({task['fields']['status']['name']})"
+
+
+class JsonTaskPrinter(TaskPrinter):
+    def print(self, task: dict) -> None:
+        self._printer(json.dumps(task, indent=2))
+
+    def print_list(self, tasks: list[dict]) -> None:
+        self._printer(json.dumps(tasks, indent=2))
+
+
+class MarkdownTaskPrinter(TaskPrinter):
+    def print(self, task: dict) -> None:
+        self._printer(f"* [{self.title(task)}]({task['url']}) {self.status(task)}")
+
+    def print_list(self, tasks: list[dict]) -> None:
+        for task in tasks:
+            self.print(task)
+
+
+class WikitextTaskPrinter(TaskPrinter):
+    def print(self, task: dict) -> None:
+        self._printer(f"* [{task['url']} {self.title(task)}] {self.status(task)}")
+
+    def print_list(self, tasks: list[dict]) -> None:
+        for task in tasks:
+            self.print(task)
+
+
+class HtmlTaskPrinter(TaskPrinter):
+    def print(self, task: dict) -> None:
+        self._printer(
+            f"<a href={task['url']}>{self.title(task)}</a> {self.status(task)}"
+        )
+
+    def print_list(self, tasks: list[dict]) -> None:
+        for task in tasks:
+            self._printer(
+                f"<li><a href={task['url']}>{self.title(task)}</a> {self.status(task)}</li>"
+            )
+
+
+class PlainTaskPrinter(TaskPrinter):
+    def print(self, task: dict) -> None:
+        parent_str = self.title(task.get("parent")) if task.get("parent") else ""
+        print(f"URL: {task['url']}")
+        print(f"Task: {Task.from_int(task['id'])}")
+        print(f"Title: {task['fields']['name']}")
+        if task.get("author"):
+            print(f"Author: {task['author']['fields']['username']}")
+        if task.get("owner"):
+            print(f"Owner: {task['owner']}")
+        if task.get("tags"):
+            print(f"Tags: {', '.join(task['tags'])}")
+        print(f"Status: {task['fields']['status']['name']}")
+        print(f"Priority: {task['fields']['priority']['name']}")
+        print(f"Description: {task['fields']['description']['raw']}")
+        print(f"Parent: {parent_str}")
+        print("Subtasks:")
+        if task.get("subtasks"):
+            for subtask in task["subtasks"]:
+                status = f"{'[x]' if subtask['fields']['status']['value'] == 'resolved' else '[ ]'}"
+                print(
+                    f"{status} - {Task.from_int(subtask['id'])} - @{subtask['owner']:<10} - {subtask['fields']['name']}"
+                )
+
+    def print_list(self, tasks: list[dict]) -> None:
+        for task in tasks:
+            self.print(task)
+            self._printer("=" * 50)
+
+
+def get_printer(format: TaskFormat) -> TaskPrinter:
+    if format == TaskFormat.PLAIN:
+        return PlainTaskPrinter(print)
+    elif format == TaskFormat.JSON:
+        return JsonTaskPrinter(print)
+    elif format == TaskFormat.HTML:
+        return HtmlTaskPrinter(print)
+    elif format == TaskFormat.MARKDOWN:
+        return MarkdownTaskPrinter(print)
+    elif format == TaskFormat.WIKITEXT:
+        return WikitextTaskPrinter(print)
+    else:
+        raise ValueError(f"Unknown format: {format}")

{phable_cli-0.1.10 → phable_cli-0.1.11}/phable/phabricator.py

@@ -163,9 +163,6 @@ class PhabricatorClient:
         parent = self.find_parent_task(subtask_id=task["id"])
         task["parent"] = parent
 
-    def find_tasks_in_column(self, column_phid: str) -> list[dict[str, Any]]:
-        return self.find_tasks(column_phid=column_phid)
-
     def find_tasks(
         self,
         column_phids: Optional[list[str]] = None,

{phable_cli-0.1.10 → phable_cli-0.1.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "phable-cli"
-version = "0.1.10"
+version = "0.1.11"
 description = "Manage Phabricator tasks from the comfort of your terminal"
 authors = ["Balthazar Rouberol <br@imap.cc>"]
 license = "MIT"

phable_cli-0.1.10/phable/display.py

@@ -1,68 +0,0 @@
-import json
-from typing import Literal, TypeAlias
-
-from .utils import Task
-
-TaskFormat: TypeAlias = Literal["plain", "json", "html", "markdown"]
-
-
-def display_task(task: dict, format: TaskFormat, prefix: str = "", end: str = "\n"):
-    title = f"{Task.from_int(task['id'])} {task['fields']['name']} ({task['fields']['status']['name']})"
-
-    if format == "json":
-        print(json.dumps(task, indent=2))
-    elif format == "html":
-        print(
-            f"{prefix}<a href={task['url']}>{title}</a>",
-            end=end,
-        )
-    elif format == "markdown":
-        print(
-            f"{prefix}[{title}]({task['url']})",
-            end=end,
-        )
-    else:
-        parent_str = (
-            f"{Task.from_int(task['parent']['id'])} {task['parent']['fields']['name']}"
-            if task.get("parent")
-            else ""
-        )
-        print(f"URL: {task['url']}")
-        print(f"Task: {Task.from_int(task['id'])}")
-        print(f"Title: {task['fields']['name']}")
-        if task.get("author"):
-            print(f"Author: {task['author']['fields']['username']}")
-        if task.get("owner"):
-            print(f"Owner: {task['owner']}")
-        if task.get("tags"):
-            print(f"Tags: {', '.join(task['tags'])}")
-        print(f"Status: {task['fields']['status']['name']}")
-        print(f"Priority: {task['fields']['priority']['name']}")
-        print(f"Description: {task['fields']['description']['raw']}")
-        print(f"Parent: {parent_str}")
-        print("Subtasks:")
-        if task.get("subtasks"):
-            for subtask in task["subtasks"]:
-                status = f"{'[x]' if subtask['fields']['status']['value'] == 'resolved' else '[ ]'}"
-                print(
-                    f"{status} - {Task.from_int(subtask['id'])} - @{subtask['owner']:<10} - {subtask['fields']['name']}"
-                )
-
-
-def display_tasks(
-    tasks: list[dict],
-    format: TaskFormat,
-    separator: str = "=" * 50,
-):
-    if len(tasks) == 1:
-        return display_task(tasks[0], format=format)
-
-    if format == "json":
-        print(json.dumps(tasks, indent=2))
-    elif format == "markdown":
-        for task in tasks:
-            display_task(task, format=format, prefix="* ")
-    else:
-        for task in tasks:
-            display_task(task, format=format, prefix="<li>", end="")
-            print(separator)